Skip to content

Commit 5a07df5

Browse files
committed
build: use qt5LibraryTarget() with Qt >= 5.4.2
qtbase commit 67289d0dfa64bf805c7ff2e455611affaea28558 restored qtLibraryTarget() to its original behavior, and introduced a new function qt5LibraryTarget() with the new behavior. Therefore we have to use the new function if available, so that Qt4 and Qt5 libraries can be installed side-by-side. Change-Id: Iff644bdc48984eb48c6fac2025c203502dfb2f79 Reviewed-by: Oswald Buddenhagen <[email protected]>
1 parent 2aa4efe commit 5a07df5

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

qtlockedfile/common.pri

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtlockedfile-uselib
2+
23
TEMPLATE += fakelib
3-
QTLOCKEDFILE_LIBNAME = $$qtLibraryTarget(QtSolutions_LockedFile-head)
4+
greaterThan(QT_MAJOR_VERSION, 5)|\
5+
if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\
6+
if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) {
7+
QTLOCKEDFILE_LIBNAME = $$qt5LibraryTarget(QtSolutions_LockedFile-head)
8+
} else {
9+
QTLOCKEDFILE_LIBNAME = $$qtLibraryTarget(QtSolutions_LockedFile-head)
10+
}
411
TEMPLATE -= fakelib
12+
513
QTLOCKEDFILE_LIBDIR = $$PWD/lib
614
unix:qtlockedfile-uselib:!qtlockedfile-buildlib:QMAKE_RPATHDIR += $$QTLOCKEDFILE_LIBDIR

qtsingleapplication/common.pri

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsingleapplication-uselib
2+
23
TEMPLATE += fakelib
3-
QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
4+
greaterThan(QT_MAJOR_VERSION, 5)|\
5+
if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\
6+
if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) {
7+
QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-head)
8+
} else {
9+
QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
10+
}
411
TEMPLATE -= fakelib
12+
513
QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib
614
unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR

0 commit comments

Comments
 (0)