From 5dea3984c4ae663b30780c792fb993480887f751 Mon Sep 17 00:00:00 2001
From: Matt Vogt <matthew.vogt@jollamobile.com>
Date: Tue, 17 Mar 2015 08:32:51 +1000
Subject: [PATCH] [transfer-engine] Remove obsolete Qt4 build configuration

---
 doc/doc.pri         | 10 +++-------
 lib/lib.pro         | 18 ++++++------------
 src/src.pro         |  6 ++----
 tests/tests.pro     |  6 ++----
 transfer-engine.pro |  6 +-----
 5 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/doc/doc.pri b/doc/doc.pri
index 480f16d..e6543a0 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -1,14 +1,10 @@
-equals(QT_MAJOR_VERSION, 4): QDOC = qdoc3
-equals(QT_MAJOR_VERSION, 5): QDOC = qdoc
+QDOC = qdoc
 QHELPGENERATOR = qhelpgenerator
-equals(QT_MAJOR_VERSION, 4): QDOCCONF = doc/config/transfer-engine-project.qdocconf
-equals(QT_MAJOR_VERSION, 5): QDOCCONF = transfer-engine-project.qdocconf
+QDOCCONF = transfer-engine-project.qdocconf
 QHELPFILE = doc/html/transferengine.qhp
 QCHFILE = doc/html/transferengine.qch
 
-equals(QT_MAJOR_VERSION, 4): docs.commands = ($$QDOC $$QDOCCONF) && \
-                ($$QHELPGENERATOR $$QHELPFILE -o $$QCHFILE)
-equals(QT_MAJOR_VERSION, 5): docs.commands = (cd doc/config; $$QDOC $$QDOCCONF; cd ../..) && \
+docs.commands = (cd doc/config; $$QDOC $$QDOCCONF; cd ../..) && \
                 ($$QHELPGENERATOR $$QHELPFILE -o $$QCHFILE)
 
 QMAKE_EXTRA_TARGETS += docs
diff --git a/lib/lib.pro b/lib/lib.pro
index 7fb5ce2..b120f52 100644
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -1,12 +1,10 @@
 TEMPLATE = lib
-equals(QT_MAJOR_VERSION, 4): TARGET = nemotransferengine
-equals(QT_MAJOR_VERSION, 5): TARGET = nemotransferengine-qt5
+TARGET = nemotransferengine-qt5
 DEPENDPATH += .
 INCLUDEPATH += .
 CONFIG += shared link_pkgconfig
 QT += dbus
-equals(QT_MAJOR_VERSION, 4): PKGCONFIG += quillmetadata
-equals(QT_MAJOR_VERSION, 5): PKGCONFIG += quillmetadata-qt5
+PKGCONFIG += quillmetadata-qt5
 
 system(qdbusxml2cpp -v -c TransferEngineInterface -p transferengineinterface.h:transferengineinterface.cpp -i metatypedeclarations.h ../dbus/org.nemo.transferengine.xml)
 
@@ -38,22 +36,18 @@ HEADERS += \
 SOURCES += \
    transferengineinterface.cpp
 
-equals(QT_MAJOR_VERSION, 4): OTHER_FILES += nemotransfernegine.pc nemotransferengine-plugin.prf
-equals(QT_MAJOR_VERSION, 5): OTHER_FILES += nemotransfernegine-qt5.pc nemotransferengine-plugin-qt5.prf
+OTHER_FILES += nemotransfernegine-qt5.pc nemotransferengine-plugin-qt5.prf
 
 headers.files = $$HEADERS
-equals(QT_MAJOR_VERSION, 4): headers.path = /usr/include/TransferEngine
-equals(QT_MAJOR_VERSION, 5): headers.path = /usr/include/TransferEngine-qt5
+headers.path = /usr/include/TransferEngine-qt5
 
 target.path = /usr/lib
 
 pkgconfigpc.path = /usr/lib/pkgconfig/
-equals(QT_MAJOR_VERSION, 4): pkgconfigpc.files = nemotransferengine.pc
-equals(QT_MAJOR_VERSION, 5): pkgconfigpc.files = nemotransferengine-qt5.pc
+pkgconfigpc.files = nemotransferengine-qt5.pc
 
 prf.path = $$[QT_INSTALL_DATA]/mkspecs/features
-equals(QT_MAJOR_VERSION, 4): prf.files = nemotransferengine-plugin.prf
-equals(QT_MAJOR_VERSION, 5): prf.files = nemotransferengine-plugin-qt5.prf
+prf.files = nemotransferengine-plugin-qt5.prf
 
 
 INSTALLS += target headers prf pkgconfigpc
diff --git a/src/src.pro b/src/src.pro
index cfdc6bf..f471177 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -11,15 +11,13 @@ packagesExist(qt5-boostable) {
   warning("qt5-boostable not available; startup times will be slower")
 }
 
-equals(QT_MAJOR_VERSION, 4): LIBS += -L../lib -lnemotransferengine
-equals(QT_MAJOR_VERSION, 5): LIBS += -L../lib -lnemotransferengine-qt5
+LIBS += -L../lib -lnemotransferengine-qt5
 
 # generate adaptor code
 system(qdbusxml2cpp -c TransferEngineAdaptor -a transferengineadaptor.h:transferengineadaptor.cpp -i metatypedeclarations.h ../dbus/org.nemo.transferengine.xml)
 
 CONFIG += link_pkgconfig
-equals(QT_MAJOR_VERSION, 4): PKGCONFIG += mlite accounts-qt
-equals(QT_MAJOR_VERSION, 5): PKGCONFIG += mlite5 accounts-qt5
+PKGCONFIG += mlite5 accounts-qt5
 
 # translations
 TS_FILE = $$OUT_PWD/nemo-transfer-engine.ts
diff --git a/tests/tests.pro b/tests/tests.pro
index d310690..7ec782f 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,13 +1,11 @@
-equals(QT_MAJOR_VERSION, 4): PACKAGENAME = nemo-transfer-engine
-equals(QT_MAJOR_VERSION, 5): PACKAGENAME = nemo-transfer-engine-qt5
+PACKAGENAME = nemo-transfer-engine-qt5
 
 TEMPLATE = app
 TARGET = ut_nemo-transfer-engine
 DEPENDPATH += .
 INCLUDEPATH += . ../src ../lib
 CONFIG += link_pkgconfig
-equals(QT_MAJOR_VERSION, 4): PKGCONFIG += quillmetadata
-equals(QT_MAJOR_VERSION, 5): PKGCONFIG += quillmetadata-qt5
+PKGCONFIG += quillmetadata-qt5
 
 # Test files
 HEADERS += \
diff --git a/transfer-engine.pro b/transfer-engine.pro
index 309f791..d00f8ff 100644
--- a/transfer-engine.pro
+++ b/transfer-engine.pro
@@ -5,11 +5,7 @@ src.depends = lib
 tests.depends = lib
 declarative.depends = lib
 
-# no daemon for Qt 4
-equals(QT_MAJOR_VERSION, 4): SUBDIRS -= src
-
-# docs only for Qt 5
-equals(QT_MAJOR_VERSION, 5): include(doc/doc.pri)
+include(doc/doc.pri)
 
 systemd.files = transferengine.service
 systemd.path  = /usr/lib/systemd/user/