From 77f9210cef5f3fa52d6ac5d0f8abf57b26becc1e 2017-06-02 09:13:59
From: perrinel <mperrinel@itlink.fr>
Date: 2017-06-02 09:13:59
Subject: [PATCH] Merge pull request #133 from SCIQLOP-Initialisation feature/StandardQtForLinux

 Feature/StandardQtForLinux

---

diff --git a/analyzer/launch-clang-analyzer-linux.sh b/analyzer/launch-clang-analyzer-linux.sh
index 8cc659e..63ce517 100644
--- a/analyzer/launch-clang-analyzer-linux.sh
+++ b/analyzer/launch-clang-analyzer-linux.sh
@@ -1,6 +1,4 @@
 
-QT_PATH=".../Qt/5.8/gcc_64/lib/cmake/"
-
 export CC=/usr/libexec/ccc-analyzer
 export CXX=/usr/libexec/c++-analyzer
 export CCC_CC=clang
@@ -15,6 +13,6 @@ rm -rf build_clang-analyzer
 mkdir build_clang-analyzer
 cd build_clang-analyzer
 
-scan-build cmake -DCMAKE_PREFIX_PATH=$QT_PATH -DCMAKE_CXX_COMPILER=clazy -DENABLE_ANALYSIS=false -DENABLE_CPPCHECK=false -DENABLE_FORMATTING=false -DENABLE_CHECKSTYLE=false -BUILD_DOCUMENTATION=false -BUILD_TESTS=false -DCMAKE_BUILD_TYPE=Debug ../../SCIQLOP-Initialisation/
+scan-build cmake -DCMAKE_CXX_COMPILER=clazy -DENABLE_ANALYSIS=false -DENABLE_CPPCHECK=false -DENABLE_FORMATTING=false -DENABLE_CHECKSTYLE=false -BUILD_DOCUMENTATION=false -BUILD_TESTS=false -DCMAKE_BUILD_TYPE=Debug ../../SCIQLOP-Initialisation/
 
 scan-build -o clang-analyzer-output make -j2
diff --git a/app/src/main.cpp b/app/src/main.cpp
index 5187192..216e576 100644
--- a/app/src/main.cpp
+++ b/app/src/main.cpp
@@ -23,11 +23,11 @@
 #include <QProcessEnvironment>
 #include <QThread>
 #include <SqpApplication.h>
-#include <omp.h>
 #include <qglobal.h>
 
 int main(int argc, char *argv[])
 {
+    int ad;
     SqpApplication a(argc, argv);
     SqpApplication::setOrganizationName("LPP");
     SqpApplication::setOrganizationDomain("lpp.fr");
diff --git a/app/src/mainwindow.cpp b/app/src/mainwindow.cpp
index 123396f..44f6c66 100644
--- a/app/src/mainwindow.cpp
+++ b/app/src/mainwindow.cpp
@@ -26,7 +26,7 @@
 #include <QDateTime>
 #include <QDir>
 #include <QFileDialog>
-#include <omp.h>
+//#include <omp.h>
 //#include <network/filedownloader.h>
 //#include <qlopdatabase.h>
 //#include <qlopsettings.h>
@@ -38,7 +38,6 @@
 //#include "amdatxtcodec.h"
 //#include <qlopplotmanager.h>
 
-
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
diff --git a/cmake/sciqlop_params.cmake b/cmake/sciqlop_params.cmake
index cfb64d5..1d9232e 100644
--- a/cmake/sciqlop_params.cmake
+++ b/cmake/sciqlop_params.cmake
@@ -6,17 +6,6 @@
 # As the "NMake Makefiles" forces by default the CMAKE_BUILD_TYPE variable to Debug, SCIQLOP_BUILD_TYPE variable is used to be sure that the debug mode is a user choice
 #SET(SCIQLOP_BUILD_TYPE "Release" CACHE STRING "Choose to compile in Debug or Release mode")
 
-#IF(SCIQLOP_BUILD_TYPE MATCHES "Debug")
-#    MESSAGE (STATUS "Build in Debug")
-#    SET (CMAKE_BUILD_TYPE "Debug")
-#    SET (DEBUG_SUFFIX "d")
-#ELSE()
-#    MESSAGE (STATUS "Build in Release")
-#    SET (CMAKE_BUILD_TYPE "Release")
-#    SET (SCIQLOP_BUILD_TYPE "Release")
-#    SET (DEBUG_SUFFIX "")
-#ENDIF()
-
 IF(CMAKE_BUILD_TYPE MATCHES "Debug")
     SET (CMAKE_BUILD_TYPE "Debug")
     SET (DEBUG_SUFFIX "d")