Remove Qt 4 build configurations

sailfishos · Jan 13, 2020 · 709356a · 709356a
1 parent ba40824
commit 709356a
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 61 deletions.
diff --git a/src/lib/lib.pro b/src/lib/lib.pro
@@ -3,8 +3,7 @@ TEMPLATE = lib
 QT += dbus
 QT -= gui
 
-equals(QT_MAJOR_VERSION, 4): TARGET = timed
-equals(QT_MAJOR_VERSION, 5): TARGET = timed-qt5
+TARGET = timed-qt5
 
 VERSION = 0.$$(TIMED_VERSION)
 
@@ -21,21 +20,14 @@ devheaders.files += hidden/exception exception.h qmacro.h
 devheaders.files += interface interface.h
 devheaders.files += event event-declarations.h
 devheaders.files += wallclock wall-declarations.h
-equals(QT_MAJOR_VERSION, 4): devheaders.path = /usr/include/timed
-equals(QT_MAJOR_VERSION, 5): devheaders.path = /usr/include/timed-qt5
+devheaders.path = /usr/include/timed-qt5
 devheaders.path  = /usr/include/$$TARGET
 
-
 pc.path = /usr/lib/pkgconfig
+pc.files = timed-qt5.pc
+
 prf.path =  $$[QT_INSTALL_DATA]/mkspecs/features
-equals(QT_MAJOR_VERSION, 4) {
-    pc.files = timed.pc
-    prf.files = timed.prf
-}
-equals(QT_MAJOR_VERSION, 5) {
-    pc.files = timed-qt5.pc
-    prf.files = timed-qt5.prf
-}
+prf.files = timed-qt5.prf
 
 INSTALLS = target devheaders prf pc
 

diff --git a/src/server/server.pro b/src/server/server.pro
@@ -3,16 +3,14 @@ QT += dbus
 
 TEMPLATE = app
 
-equals(QT_MAJOR_VERSION, 4): TARGET = timed
-equals(QT_MAJOR_VERSION, 5): TARGET = timed-qt5
+TARGET = timed-qt5
 
 VERSION = $$(TIMED_VERSION)
 
 INCLUDEPATH += ../h
 
 QMAKE_LIBDIR_FLAGS += -L../lib -L../voland
-equals(QT_MAJOR_VERSION, 4): LIBS += -ltimed -ltimed-voland
-equals(QT_MAJOR_VERSION, 5): LIBS += -ltimed-qt5 -ltimed-voland-qt5
+LIBS += -ltimed-qt5 -ltimed-voland-qt5
 
 IODATA_TYPES = queue.type config.type settings.type customization.type tzdata.type
 
@@ -86,39 +84,27 @@ HEADERS += backup.h
 SOURCES += notification.cpp
 HEADERS += notification.h
 
-CONFIG += link_pkgconfig
+CONFIG += link_pkgconfig iodata-qt5
 PKGCONFIG += libpcrecpp libsystemd-daemon
 PKGCONFIG += sailfishaccesscontrol
-equals(QT_MAJOR_VERSION, 4) {
-    CONFIG += iodata
-}
-equals(QT_MAJOR_VERSION, 5) {
-    CONFIG += iodata-qt5
-}
-
 
 CONFIG(dsme_dbus_if) {
     PKGCONFIG += dsme_dbus_if
 }
 
 target.path = $$(DESTDIR)/usr/bin
 
-equals(QT_MAJOR_VERSION, 4) {
-    timedrc.files = timed.rc
-    dbusconf.files = timed.conf
-    systemd.files = timed.service
-    oneshot.files = setcaps-timed.sh
-}
-equals(QT_MAJOR_VERSION, 5) {
-    timedrc.files = timed-qt5.rc
-    dbusconf.files = timed-qt5.conf
-    systemd.files = timed-qt5.service
-    oneshot.files = setcaps-timed-qt5.sh
-}
 timedrc.path  = $$(DESTDIR)/etc
+timedrc.files = timed-qt5.rc
+
 dbusconf.path  = $$(DESTDIR)/etc/dbus-1/system.d
+dbusconf.files = timed-qt5.conf
+
 systemd.path = $$(DESTDIR)/usr/lib/systemd/user
+systemd.files = timed-qt5.service
+
 oneshot.path = $$(DESTDIR)/usr/lib/oneshot.d
+oneshot.files = setcaps-timed-qt5.sh
 
 INSTALLS += target xml timedrc dbusconf systemd oneshot
 

diff --git a/src/voland/voland.pro b/src/voland/voland.pro
@@ -3,8 +3,7 @@ TEMPLATE = lib
 QT += dbus
 QT -= gui
 
-equals(QT_MAJOR_VERSION, 4): TARGET = timed-voland
-equals(QT_MAJOR_VERSION, 5): TARGET = timed-voland-qt5
+TARGET = timed-voland-qt5
 VERSION = 0.$$(TIMED_VERSION)
 
 HEADERS = interface.h
@@ -15,19 +14,13 @@ INCLUDEPATH += ../h
 target.path = /usr/lib
 
 devheaders.files = reminder interface ta_interface reminder.h interface.h
-equals(QT_MAJOR_VERSION, 4): devheaders.path  = /usr/include/timed-voland
-equals(QT_MAJOR_VERSION, 5): devheaders.path  = /usr/include/timed-voland-qt5
+devheaders.path  = /usr/include/timed-voland-qt5
 
 pc.path = /usr/lib/pkgconfig
+pc.files = timed-voland-qt5.pc
+
 prf.path =  $$[QT_INSTALL_DATA]/mkspecs/features
-equals(QT_MAJOR_VERSION, 4) {
-    pc.files = timed-voland.pc
-    prf.files = timed-voland.prf
-}
-equals(QT_MAJOR_VERSION, 5) {
-    pc.files = timed-voland-qt5.pc
-    prf.files = timed-voland-qt5.prf
-}
+prf.files = timed-voland-qt5.prf
 
 INSTALLS = target devheaders prf pc
 

diff --git a/tests/tests.pro b/tests/tests.pro
@@ -1,5 +1,4 @@
-equals(QT_MAJOR_VERSION, 4): PACKAGENAME = timed
-equals(QT_MAJOR_VERSION, 5): PACKAGENAME = timed-qt5
+PACKAGENAME = timed-qt5
 
 TEMPLATE = subdirs
 

diff --git a/tests/tst_events/tst_events.pro b/tests/tst_events/tst_events.pro
@@ -7,15 +7,13 @@ QT -= gui
 INCLUDEPATH += ../../src/h
 
 QMAKE_LIBDIR_FLAGS += -L../../src/lib -L../../src/voland
-equals(QT_MAJOR_VERSION, 4): LIBS += -ltimed -ltimed-voland
-equals(QT_MAJOR_VERSION, 5): LIBS += -ltimed-qt5 -ltimed-voland-qt5
+LIBS += -ltimed-qt5 -ltimed-voland-qt5
 
 HEADERS += tst_events.h \
            simplevolandadaptor.h
 
 SOURCES += tst_events.cpp \
            simplevolandadaptor.cpp
 
-equals(QT_MAJOR_VERSION, 4): target.path = $$(DESTDIR)/opt/tests/timed-tests
-equals(QT_MAJOR_VERSION, 5): target.path = $$(DESTDIR)/opt/tests/timed-qt5-tests
+target.path = $$(DESTDIR)/opt/tests/timed-qt5-tests
 INSTALLS += target
diff --git a/tests/ut_networktime/ut_networktime.pro b/tests/ut_networktime/ut_networktime.pro
@@ -34,8 +34,7 @@ SOURCES += ut_networktime.cpp \
 
 OTHER_FILES += fakeofono/org.fakeofono.conf
 
-equals(QT_MAJOR_VERSION, 4): target.path = $$(DESTDIR)/opt/tests/timed-tests
-equals(QT_MAJOR_VERSION, 5): target.path = $$(DESTDIR)/opt/tests/timed-qt5-tests
+target.path = $$(DESTDIR)/opt/tests/timed-qt5-tests
 dbusconf.files = fakeofono/org.fakeofono.conf
 dbusconf.path  = $$(DESTDIR)/etc/dbus-1/system.d
 

diff --git a/tools/timedclient/timedclient.pro b/tools/timedclient/timedclient.pro
@@ -3,15 +3,13 @@ QT 	+= dbus
 
 TEMPLATE = app
 
-equals(QT_MAJOR_VERSION, 4): TARGET   = timedclient
-equals(QT_MAJOR_VERSION, 5): TARGET   = timedclient-qt5
+TARGET   = timedclient-qt5
 SOURCES += timedclient.cpp
 
 INCLUDEPATH += ../../src/h
 QMAKE_LIBDIR_FLAGS += -L../../src/lib
 
-equals(QT_MAJOR_VERSION, 4): LIBS += -ltimed
-equals(QT_MAJOR_VERSION, 5): LIBS += -ltimed-qt5
+LIBS += -ltimed-qt5
 
 INSTALLS += target
 target.path = $$(DESTDIR)/usr/bin