[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/komo/kdelibs/kutils
From:       Romain Pokrzywka <romain () kdab ! net>
Date:       2010-08-07 18:07:56
Message-ID: 20100807180756.94DABAC7CA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1160309 by pokrzywka:

make kutils build with the minimal qt

 M  +10 -3     CMakeLists.txt  
 M  +2 -0      kcmodulecontainer.cpp  
 M  +6 -0      kcmoduleproxy.cpp  


--- branches/work/komo/kdelibs/kutils/CMakeLists.txt #1160308:1160309
@@ -87,14 +87,19 @@
     kcmoduleloader.cpp
     kcmultidialog.cpp
     kcmoduleproxy.cpp
-    kpluginselector.cpp
     kcmodulecontainer.cpp
     ksettingswidgetadaptor.cpp
     ksettings/dispatcher.cpp
     ksettings/dialog.cpp
+)
+
+if (NOT WINCE)
+set(kcmutils_LIB_SRCS ${kcmutils_LIB_SRCS}
+    ksettings/componentsdialog.cpp
     ksettings/pluginpage.cpp
-    ksettings/componentsdialog.cpp
+    kpluginselector.cpp
 )
+endif(NOT WINCE)
 
 kde4_add_library(kcmutils ${LIBRARY_TYPE} ${kcmutils_LIB_SRCS})
 
@@ -125,6 +130,8 @@
 
 
 ########### kprintutils ###############
+
+if(NOT WINCE)
 set(kprintutils_LIB_SRCS
     kprintpreview.cpp
 )
@@ -143,8 +150,8 @@
  DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
 
 install(TARGETS kprintutils EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+endif(NOT WINCE)
 
-
 ########### kutils ###############
 # This is only for backwards compatibility, don't use in new projects
 if(NOT KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
--- branches/work/komo/kdelibs/kutils/kcmodulecontainer.cpp #1160308:1160309
@@ -120,7 +120,9 @@
 			/* Qt eats ampersands for dinner. But not this time. */
 			proxy->moduleInfo().moduleName().replace( '&', "&&" ));
 
+#ifndef QT_NO_TOOLTIP
 	d->tabWidget->setTabToolTip( d->tabWidget->indexOf( proxy ), proxy->moduleInfo().comment() );
+#endif
 
 	connect( proxy, SIGNAL(changed(KCModuleProxy *)), SLOT(moduleChanged(KCModuleProxy *)));
 
--- branches/work/komo/kdelibs/kutils/kcmoduleproxy.cpp #1160308:1160309
@@ -79,9 +79,13 @@
 	/* Already loaded */
 	if( !d->kcm )
 	{
+#ifndef QT_NO_CURSOR
 		QApplication::setOverrideCursor( Qt::WaitCursor );
+#endif
         const_cast<KCModuleProxyPrivate *>(d)->loadModule();
+#ifndef QT_NO_CURSOR
 		QApplication::restoreOverrideCursor();
+#endif
 	}
 	return d->kcm;
 }
@@ -108,7 +112,9 @@
         QObject::connect(kcm, SIGNAL(changed(bool)), parent, SLOT(_k_moduleChanged(bool)));
         QObject::connect(kcm, SIGNAL(destroyed()), parent, SLOT(_k_moduleDestroyed()));
 		QObject::connect( kcm, SIGNAL(quickHelpChanged()), parent, SIGNAL(quickHelpChanged()) );
+#ifndef QT_NO_WHATSTHIS
 		parent->setWhatsThis( kcm->quickHelp() );
+#endif
 
 		if ( kcm->layout() ) {
 			kcm->layout()->setMargin( 0 );
[prev in list] [next in list] [prev in thread] [next in thread]