Fix Qt compile checks

mbasaglia · Dec 17, 2013 · 2c4f552 · 2c4f552
1 parent dcb8daf
commit 2c4f552
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/knotter.pro b/knotter.pro
@@ -83,17 +83,23 @@ contains(CONFIG,debug) {
 #DEFINES += "BUILD_INFO=\"\\\"Knotter $$VERSION\\nBuilt on $$_DATE_\\n$${QMAKE_HOST.os} \
 #$${QMAKE_HOST.version} $${QMAKE_HOST.arch}\\nQt $${QT_VERSION}\\\""\"
 
+HAS_QT_4_8=0
+HAS_QT_5=0
+
 !lessThan(QT_MAJOR_VERSION,4) !lessThan(QT_MINOR_VERSION,8) {
-    DEFINES += HAS_QT_4_8
+    HAS_QT_4_8=1
 }
 greaterThan(QT_MAJOR_VERSION, 4) {
-    DEFINES += HAS_QT_4_8 HAS_QT_5
+    HAS_QT_4_8=1
+    HAS_QT_5=1
     QT += widgets printsupport uitools
 }
 else {
     CONFIG += uitools
 }
 
+DEFINES += "HAS_QT_4_8=$${HAS_QT_4_8}" "HAS_QT_5=$${HAS_QT_5}"
+
 contains(CONFIG,c++11) {
     DEFINES += CXX_11
 }

diff --git a/src/dialogs/export_image_dialog.cpp b/src/dialogs/export_image_dialog.cpp
@@ -148,7 +148,7 @@ void Export_Image_Dialog::on_button_image_clicked()
     file_name = exname;
 
     int name_filter = filters.indexOf(export_dialog.
-#ifdef HAS_QT_5
+#if HAS_QT_5
         selectedNameFilter
 #else
         selectedFilter

diff --git a/src/dialogs/main_window.cpp b/src/dialogs/main_window.cpp
@@ -1028,7 +1028,7 @@ void Main_Window::dropEvent(QDropEvent *event)
     {
         foreach ( QUrl url, event->mimeData()->urls() )
         {
-#ifdef HAS_QT_4_8
+#if HAS_QT_4_8
             if ( url.isLocalFile() )
 #endif
             {

diff --git a/src/resource_manager.cpp b/src/resource_manager.cpp
@@ -295,8 +295,9 @@ Resource_Manager::~Resource_Manager()
 
     delete script_timeout;
 
-    delete m_network_access_manager;
-
+    #if !HAS_QT_5
+        delete m_network_access_manager;
+    #endif
     delete m_script_engine;
 }