.travis.yml

@@ -13,8 +13,8 @@ install:
  - sudo apt-get install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 # cmake is 32bit
 
 script:
- - ./cmake/travis.sh qt4
-# - ./cmake/travis.sh qt5
+ #- ./cmake/travis.sh qt4
+ - ./cmake/travis.sh qt5
  - ./cmake/travis.sh qt5 x64
 
 branches:

CMakeLists.txt

@@ -172,7 +172,13 @@ message(STATUS)
 
 # Find 3rd party libraries
 if (kst_qt5)
-    # http://doc-snapshot.qt-project.org/5.0/cmake-manual.html
+    # http://doc-snapshot.qt-project.org/5.0/cmake-manual.htm
+    if(kst_cross)
+        # Cross-compiled Qt, branch 4.8.4 from https://gitorious.org/~syntheticpp/qt/qt4
+        set(QT_MINGW_DIR ${kst_qt5} CACHE PATH "Qt for Mingw" FORCE)
+        set(CMAKE_FIND_ROOT_PATH /usr/${TOOLNAME} ${QT_MINGW_DIR} CACHE PATH "Mingw find root path" FORCE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
+    endif()
     macro(use_qt5lib qt5lib)
         find_package(${qt5lib} REQUIRED)
         include_directories(${${qt5lib}_INCLUDE_DIRS})

cmake/travis.sh

@@ -31,7 +31,7 @@ echo ---------- Building $versionname
 echo ---------------------------------------------------------
 
 
-if [ -f "/usr/local/bin/ninja" ]; then
+if [ -f "/usr/bin/ninja" ] || [ -f "/usr/local/bin/ninja" ]; then
     generator=-GNinja
     buildcmd=ninja
     buildcmd_parallel=ninja
@@ -186,7 +186,7 @@ else
 fi
 
 if [ "$1" = "qt5" ]; then
-    qtver=5.0.1
+    qtver=5.5.0
     tarver=
 else
     qtver=4.8.4

src/libkst/math_kst.h

@@ -57,6 +57,10 @@ static double nan__()
 #define NAN (Kst::nan__())
 #endif
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 /*
 ** Both Solaris and FreeBSD-current do weird things with the
 ** isnan() defined in math.h - in particular on FreeBSD it

src/libkst/matrix.cpp

@@ -33,6 +33,8 @@
 // used for resizing; set to 1 for loop zeroing, 2 to use memset
 #define ZERO_MEMORY 2
 
+using namespace std;
+
 namespace Kst {
 
 const QString Matrix::staticTypeString = "Matrix";

src/libkst/vector.cpp

@@ -35,6 +35,8 @@
 #include "updatemanager.h"
 #include "vectorscriptinterface.h"
 
+using namespace std;
+
 namespace Kst {
 
 #define INITSIZE 1

src/libkstapp/histogramdialog.cpp

@@ -31,6 +31,8 @@
 #include "dialogdefaults.h"
 #include "updatemanager.h"
 
+using namespace std;
+
 namespace Kst {
 
 HistogramTab::HistogramTab(QWidget *parent)

src/libkstapp/plotaxis.cpp

@@ -19,6 +19,8 @@
 
 #define MAJOR_TICK_DEBUG 0
 
+using namespace std;
+
 static int FULL_PRECISION = 15;
 static qreal JD1900 = 2415020.5;
 static qreal JD1899_12_30 = 2415018.5;

src/libkstmath/curve.cpp

@@ -56,6 +56,8 @@
 // for painting
 #define MAX_NUM_POLYLINES       3
 
+using namespace std;
+
 namespace Kst {
 
 const QString Curve::staticTypeString = "Curve";

src/libkstmath/enodefactory.cpp

@@ -19,7 +19,7 @@
 #include "enodes.h"
 
 using namespace Equations;
-
+using namespace std;
 
 //extern "C" {
 

src/libkstmath/image.cpp

@@ -30,6 +30,8 @@
 
 //#define BENCHMARK
 
+using namespace std;
+
 namespace Kst {
 
 const QString Image::staticTypeString = "Image";

src/libkstmath/psd.cpp

@@ -37,6 +37,8 @@
 
 #include "dataobjectscriptinterface.h"
 
+using namespace std;
+
 extern "C" void rdft(int n, int isgn, double *a);
 
 namespace Kst {

src/plugins/dataobject/lockin/iirfilter.h

@@ -15,6 +15,8 @@
 #include <vector>
 #include <complex>
 
+#include "math_kst.h"
+
 #ifndef IIRFILTER_H
 #define IIRFILTER_H