[Kst] branches/work/kst/portto4

[Adam Treat]

SVN commit 667775 by treat:

* More placeholders


 M  +1 -1      CMakeLists.txt  
 M  +2 -2      kst/src/CMakeLists.txt  
 M  +1 -1      kst/src/kst/CMakeLists.txt  
 M  +2 -2      kst/src/kst/main.cpp  
 M  +1 -0      kst/src/libkstapp/kstapplication.cpp  
 M  +3 -1      kst/src/libkstapp/kstapplication.h  


--- branches/work/kst/portto4/CMakeLists.txt #667774:667775
@@ -1,2 +1,2 @@
 add_subdirectory(kst)
-add_subdirectory(doc)
+# add_subdirectory(doc)
--- branches/work/kst/portto4/kst/src/CMakeLists.txt #667774:667775
@@ -4,8 +4,8 @@
 add_subdirectory( libkstmath )
 add_subdirectory( datasources )
 # add_subdirectory( widgets )
-# add_subdirectory( libkstapp )
-# add_subdirectory( kst )
+add_subdirectory( libkstapp )
+add_subdirectory( kst )
 add_subdirectory( d2asc )
 add_subdirectory( d2d )
 #add_subdirectory( plugins )
--- branches/work/kst/portto4/kst/src/kst/CMakeLists.txt #667774:667775
@@ -12,7 +12,7 @@
 
 kde4_add_executable(kstexe ${kst_SRCS})
 
-target_link_libraries(kstexe ${KDE4_KDECORE_LIBS} kstapp )
+target_link_libraries(kstexe kstapp )
 
 set_target_properties(kstexe PROPERTIES OUTPUT_NAME kst)
 
--- branches/work/kst/portto4/kst/src/kst/main.cpp #667774:667775
@@ -1,7 +1,7 @@
-#include <QApplication>
+#include "kstapplication.h"
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    KstApplication app(argc, argv);
     return app.exec();
 }
--- branches/work/kst/portto4/kst/src/libkstapp/kstapplication.cpp #667774:667775
@@ -19,4 +19,5 @@
     return m_mainWindow;
 }
 
+#include "kstapplication.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/kstapplication.h #667774:667775
@@ -5,10 +5,12 @@
 #include <QApplication>
 #include <QMainWindow>
 
+#include "kst_export.h"
+
 #define kstApp \
   (static_cast<QCode*>(QCoreApplication::instance()))
 
-class KstApplication : public QApplication
+class KST_EXPORT KstApplication : public QApplication
 {
   Q_OBJECT
 public: