KDE/kdelibs

[Aaron J. Seigo]

SVN commit 964099 by aseigo:

builds with kdelibs, but -should- also be buildable separately. there's still the issue of the FindLibKNotificationItem.cmake file outstanding, or does that not matter now that it's in kdelibs/experimental/? build system guidance desired.
CCMAIL:kde-buildsystem at kde.org


 M  +1 -0      CMakeLists.txt  
 M  +1 -1      experimental/knotificationitem/knotificationitemprivate_p.h  
 M  +5 -4      experimental/knotificationitem/test/knotificationitemtest.cpp  


--- trunk/KDE/kdelibs/CMakeLists.txt #964098:964099
@@ -268,5 +268,6 @@
 # the following will be the correct locations once cmake has the improved FIND_PACKAGE() 
 # install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake DESTINATION ${PLUGIN_INSTALL_DIR}/cmake RENAME KDE4Config.cmake)
 
+macro_optional_add_subdirectory( experimental )
 
 macro_display_feature_log()
--- trunk/KDE/kdelibs/experimental/knotificationitem/knotificationitemprivate_p.h #964098:964099
@@ -27,7 +27,7 @@
 #include <QPixmap>
 #include <QWheelEvent>
 
-#include <KSystemTrayIcon>
+#include <ksystemtrayicon.h>
 
 #include "knotificationitem.h"
 #include "knotificationitemdbus_p.h"
--- trunk/KDE/kdelibs/experimental/knotificationitem/test/knotificationitemtest.cpp #964098:964099
@@ -1,15 +1,16 @@
 #include "knotificationitemtest.h"
 
 #include "../knotificationitem.h"
-#include <kapplication.h>
+#include <QDateTime>
 #include <QtGui/QLabel>
 #include <QMovie>
+
+#include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <kaboutdata.h>
-#include <KMenu>
-#include <KIcon>
-#include <QDateTime>
+#include <kmenu.h>
+#include <kicon.h>
 
 using namespace Experimental;