diff options
| author | Davide Pesavento <pesa@gentoo.org> | 2015-06-29 00:55:48 +0200 |
|---|---|---|
| committer | Davide Pesavento <davidepesa@gmail.com> | 2015-06-29 10:40:03 +0000 |
| commit | 5a07df503a6f01280f493cbcc2aace462b9dee57 (patch) | |
| tree | c1201094790b362544ccec629180cf58abce71c9 | |
| parent | 2aa4efe7cade472bf60b0d267f9346401009cd60 (diff) | |
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 <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | qtlockedfile/common.pri | 10 | ||||
| -rw-r--r-- | qtsingleapplication/common.pri | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/qtlockedfile/common.pri b/qtlockedfile/common.pri index 5e3df28..dace81d 100644 --- a/qtlockedfile/common.pri +++ b/qtlockedfile/common.pri @@ -1,6 +1,14 @@ exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtlockedfile-uselib + TEMPLATE += fakelib -QTLOCKEDFILE_LIBNAME = $$qtLibraryTarget(QtSolutions_LockedFile-head) +greaterThan(QT_MAJOR_VERSION, 5)|\ + if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\ + if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) { + QTLOCKEDFILE_LIBNAME = $$qt5LibraryTarget(QtSolutions_LockedFile-head) +} else { + QTLOCKEDFILE_LIBNAME = $$qtLibraryTarget(QtSolutions_LockedFile-head) +} TEMPLATE -= fakelib + QTLOCKEDFILE_LIBDIR = $$PWD/lib unix:qtlockedfile-uselib:!qtlockedfile-buildlib:QMAKE_RPATHDIR += $$QTLOCKEDFILE_LIBDIR diff --git a/qtsingleapplication/common.pri b/qtsingleapplication/common.pri index bae2717..924c57c 100644 --- a/qtsingleapplication/common.pri +++ b/qtsingleapplication/common.pri @@ -1,6 +1,14 @@ exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsingleapplication-uselib + TEMPLATE += fakelib -QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head) +greaterThan(QT_MAJOR_VERSION, 5)|\ + if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\ + if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) { + QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-head) +} else { + QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head) +} TEMPLATE -= fakelib + QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR |