[Kst] branches/work/kst/portto4/kst/src

[Joshua Netterfield]

SVN commit 1253670 by joshuanetterfield:

Allows for in- and out- of-source builds with qmake using Andriy Shinkarchuck's fixes/suggestions.

The problem with SIZE_LIMITED_NAME is already fixed in svn, but I probably missed the 2.0.4 tag. Apologies!



 M  +1 -2      kst/kst.pro  
 M  +4 -0      libkst/debug.cpp  
 M  +4 -2      libkst/libkst.pro  
 M  +2 -0      libkstapp/aboutdialog.cpp  
 M  +7 -1      libkstapp/commandlineparser.cpp  
 M  +22 -4     libkstapp/libkstapp.pro  


--- branches/work/kst/portto4/kst/src/kst/kst.pro #1253669:1253670
@@ -40,8 +40,7 @@
     main.cpp
 
 RESOURCES += \
-    $$TOPLEVELDIR/src/images/images.qrc \
-    $$TOPLEVELDIR/src/libkstapp/script.qrc
+    $$TOPLEVELDIR/src/images/images.qrc
 
 win32:QT += svg opengl
 win32:RC_FILE = kst_icon.rc
--- branches/work/kst/portto4/kst/src/libkst/debug.cpp #1253669:1253670
@@ -54,7 +54,11 @@
 : QObject() {
   _applyLimit = false;
   _limit = 10000;
+#ifdef SVN_REVISION
   _kstRevision = QString::fromLatin1(SVN_REVISION);
+#else
+  _kstRevision = -1;
+#endif
   _hasNewError = false;
 }
 
--- branches/work/kst/portto4/kst/src/libkst/libkst.pro #1253669:1253670
@@ -60,7 +60,8 @@
     updatemanager.cpp \
     vector.cpp \
     vectorfactory.cpp \
-    vscalar.cpp
+    vscalar.cpp \
+    ksttimezone.cpp
 	
 #!win32:SOURCES += stdinsource.cpp
 !macx:!win32:SOURCES += sysinfo.c \
@@ -120,4 +121,5 @@
     updatemanager.h \
     vector.h \
     vectorfactory.h \
-    vscalar.h
+    vscalar.h \
+    ksttimezone.h
--- branches/work/kst/portto4/kst/src/libkstapp/aboutdialog.cpp #1253669:1253670
@@ -62,7 +62,9 @@
 
   QStringList msg = QStringList()
   << tr("<qt><h2>Kst "KSTVERSION" - A data viewing program.</h2>")
+#ifdef SVN_REVISION
   << tr("Revision "SVN_REVISION"<br><hr>")
+#endif
   << tr("Copyright © 2000-2011 Barth Netterfield<br><hr>")
   << tr("Homepage: <a href=\"http://kst-plot.kde.org/\">http://kst-plot.kde.org/</a><br>")
   << tr("Please report bugs with the 'Bug Report Wizard' of the 'Help' menu.<br>")
--- branches/work/kst/portto4/kst/src/libkstapp/commandlineparser.cpp #1253669:1253670
@@ -380,7 +380,13 @@
       printUsage(QString());
       *ok = false;
     } else if (arg == "--version" || arg == "-version") {
-      printText(QString("Kst ") + KSTVERSION + " Revision " + SVN_REVISION);
+
+      printText(QString("Kst ") + KSTVERSION
+#ifdef SVN_REVISION
++ " Revision " + SVN_REVISION
+#endif
+);
+
       *ok = false;
     } else if (arg == "-f") {
       *ok = _setIntArg(&_startFrame, i18n("Usage: -f <startframe>\n"), true);
--- branches/work/kst/portto4/kst/src/libkstapp/libkstapp.pro #1253669:1253670
@@ -144,7 +144,15 @@
     viewvectordialog.cpp \
     pluginmenuitemaction.cpp \
     exportvectorsdialog.cpp \
-    dialogscriptinterface.cpp
+    dialogscriptinterface.cpp \
+    themedialog.cpp \
+    scriptinterface.cpp \
+    buttonitem.cpp \
+    labelscriptinterface.cpp \
+    viewitemscriptinterface.cpp \
+    lineedititem.cpp \
+    stringscriptinterface.cpp \
+    scriptserver.cpp
 HEADERS += aboutdialog.h \
     application.h \
     applicationsettings.h \
@@ -254,7 +262,16 @@
     pluginmenuitemaction.h \
     logdialog.h \
     exportvectorsdialog.h \
-    dialogscriptinterface.h
+    dialogscriptinterface.h \
+    themedialog.h \
+    scriptinterface.h \
+    buttonitem.h \
+    labelscriptinterface.h \
+    viewitemscriptinterface.h \
+    lineedititem.h \
+    stringscriptinterface.h \
+    scriptserver.h
+
 FORMS += aboutdialog.ui \
     arrowpropertiestab.ui \
     axistab.ui \
@@ -305,5 +322,6 @@
     viewmatrixdialog.ui \
     viewprimitivedialog.ui \
     viewvectordialog.ui \
-    exportvectorsdialog.ui
-RESOURCES += $$TOPLEVELDIR/src/images/images.qrc script.qrc
+    exportvectorsdialog.ui \
+    themedialog.ui
+RESOURCES += $$TOPLEVELDIR/src/images/images.qrc