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

[Peter Kümmel]

SVN commit 1225287 by kuemmel:

also build with qmake

 M  +3 -0      config.h  
 M  +2 -1      datasourceplugin.pri  
 M  +2 -0      kst.pri  
 M  +1 -0      src/libkst/libkst.pro  
 M  +1 -1      tests/ksttest.h  


--- branches/work/kst/portto4/kst/config.h #1225286:1225287
@@ -10,5 +10,8 @@
 #define KST_INSTALL_LIBDIR  "lib"
 #define KST_INSTALL_PLUGINS "lib/kst2/plugins"
 
+#ifndef KST_HAVE_SVN_REVISION_H
+#define SVN_REVISION "unknown"
+#endif
 
 #endif
--- branches/work/kst/portto4/kst/datasourceplugin.pri #1225286:1225287
@@ -18,7 +18,8 @@
 
 INCLUDEPATH += \
 	      tmp \
-	      $$TOPLEVELDIR/src/libkst 
+	      $$TOPLEVELDIR/src/libkst \
+		  $$TOPLEVELDIR/src/libkstmath \
 
 
 macx {
--- branches/work/kst/portto4/kst/kst.pri #1225286:1225287
@@ -20,6 +20,8 @@
 !win32-msvc2010:DEFINES += INSTALL_LIBDIR=\\\"$$INSTALL_LIBDIR\\\"
 win32-msvc2010:DEFINES += INSTALL_LIBDIR=\"$$INSTALL_LIBDIR\"
 
+win32-msvc*:DEFINES += _USE_MATH_DEFINES
+
 QT += core xml
 
 CONFIG += warn_on
--- branches/work/kst/portto4/kst/src/libkst/libkst.pro #1225286:1225287
@@ -37,6 +37,7 @@
     extension.cpp \
     generatedmatrix.cpp \
     generatedvector.cpp \
+	labelinfo.cpp \
     math_kst.cpp \
     matrix.cpp \
     matrixfactory.cpp \
--- branches/work/kst/portto4/kst/tests/ksttest.h #1225286:1225287
@@ -21,7 +21,7 @@
 {
 
   template<>
-  bool qCompare(double const& val, double const * const& nan,  const char *actual, const char *expected,
+  inline bool qCompare(double const& val, double const * const& nan,  const char *actual, const char *expected,
                       const char *file, int line)
   {
           return qCompare(