diff --git a/configure.in.in b/configure.in.in index 0da1e93..213e7a3 100644 --- a/configure.in.in +++ b/configure.in.in @@ -171,3 +171,6 @@ AC_LANG_RESTORE AC_SUBST(PACKAGE_CFLAGS) AC_SUBST(PACKAGE_LIBS) AC_SUBST(XGETTEXT) + +CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE" +AC_SUBST(CXXFLAGS) diff --git a/src/Makefile.am b/src/Makefile.am index 091b8e6..d5d7a6a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -75,7 +75,7 @@ kpowersave_la_SOURCES = \ kpowersave_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -kpowersave_la_LIBADD = $(LIB_KIO) @PACKAGE_LIBS@ -ldbus-qt-1 -lXss -lXext -lXtst +kpowersave_la_LIBADD = $(LIB_KIO) @PACKAGE_LIBS@ -ldbus-tqt-1 -lXss -lXext -lXtst # this is where the desktop file will go xdg_apps_DATA = kpowersave.desktop diff --git a/src/configure.in.in b/src/configure.in.in index 8beae17..9f9bdd1 100644 --- a/src/configure.in.in +++ b/src/configure.in.in @@ -5,5 +5,5 @@ AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN AC_PATH_QT -AC_PATH_QT_TQMOC_UIC +# AC_PATH_QT_TQMOC_UIC