Skip to content

Commit

Permalink
[buteo-syncml] Drop Qt4 support. Contributes to JB#38781
Browse files Browse the repository at this point in the history
  • Loading branch information
blammit committed Dec 12, 2018
1 parent 791baa9 commit 71a02f3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 90 deletions.
68 changes: 0 additions & 68 deletions rpm/buteo-syncml.spec

This file was deleted.

17 changes: 4 additions & 13 deletions src/src.pro
Expand Up @@ -4,12 +4,7 @@ include(client/client.pro)
include(transport/transport.pro)

TEMPLATE = lib
equals(QT_MAJOR_VERSION, 4): TARGET = buteosyncml
equals(QT_MAJOR_VERSION, 5): TARGET = buteosyncml5

VER_MAJ = 0
VER_MIN = 4
VER_PAT = 6
TARGET = buteosyncml5

VPATH += client \
syncelements \
Expand All @@ -21,8 +16,7 @@ CONFIG += dll \
create_prl \
link_pkgconfig

equals(QT_MAJOR_VERSION, 4): PKGCONFIG = buteosyncfw
equals(QT_MAJOR_VERSION, 5): PKGCONFIG = buteosyncfw5
PKGCONFIG = buteosyncfw5

INCLUDEPATH += . \
syncelements \
Expand Down Expand Up @@ -122,8 +116,7 @@ OTHER_FILES += config/meego-syncml-conf.xsd \

LIBS += -lsqlite3 -lwbxml2 -lopenobex

equals(QT_MAJOR_VERSION, 4): QTDIR = /usr/lib/qt4
equals(QT_MAJOR_VERSION, 5): QTDIR = /usr/lib/qt5
QTDIR = /usr/lib/qt5

QT += network \
xml \
Expand All @@ -145,9 +138,7 @@ QMAKE_CLEAN += lib*.so* \

#QMAKE_STRIPFLAGS_LIB += --strip-unneeded

equals(QT_MAJOR_VERSION, 4): headers.path = /usr/include/buteosyncml
equals(QT_MAJOR_VERSION, 5): headers.path = /usr/include/buteosyncml5

headers.path = /usr/include/buteosyncml5
headers.files = $$HEADERS
target.path = /usr/lib
config.path = /etc/buteo
Expand Down
13 changes: 4 additions & 9 deletions tests_meego/tests_common.pri
@@ -1,11 +1,6 @@
isEmpty(TESTS_COMMON_PRI_INCLUDED) {
TESTS_COMMON_PRI_INCLUDED = 1

equals(QT_MAJOR_VERSION, 4): DASH_QT_VERSION = ""
equals(QT_MAJOR_VERSION, 5): DASH_QT_VERSION = "-qt5"
equals(QT_MAJOR_VERSION, 4): NODASH_QT_VERSION = ""
equals(QT_MAJOR_VERSION, 5): NODASH_QT_VERSION = "5"

tests_subdir = $$relative_path($$dirname(_PRO_FILE_), $${PWD})
tests_subdir_r = $$relative_path($${PWD}, $$dirname(_PRO_FILE_))

Expand All @@ -19,8 +14,8 @@ CONFIG += link_prl link_pkgconfig
# So if remember to compile them when debugging
LIBS += -L$${OUT_PWD}/$${tests_subdir_r}/../src/

PKGCONFIG += buteosyncfw$${NODASH_QT_VERSION}
LIBS += -lbuteosyncml$${NODASH_QT_VERSION}
PKGCONFIG += buteosyncfw5
LIBS += -lbuteosyncml5

# This is needed to avoid adding the /usr/lib link directory before the
# newer version in buteosyncml
Expand All @@ -37,14 +32,14 @@ INCLUDEPATH = \
$${PWD}/../src/client \

# This way time to run qmake is reduced by ~35%
equals(QT_MAJOR_VERSION, 5): CONFIG -= depend_includepath
CONFIG -= depend_includepath
DEPENDPATH = \
$${PWD}/../src/syncelements \
$${PWD}/../src/transport \
$${PWD}/../src/server \
$${PWD}/../src/client \

INSTALL_TESTDIR = /opt/tests/buteo-syncml$${DASH_QT_VERSION}
INSTALL_TESTDIR = /opt/tests/buteo-syncml-qt5
INSTALL_TESTDATADIR = $${INSTALL_TESTDIR}/data

}

0 comments on commit 71a02f3

Please sign in to comment.