]>
Commit | Line | Data |
---|---|---|
276a8e13 ER |
1 | --- common.pri.old 2014-08-14 15:56:14.219803957 +0200 |
2 | +++ common.pri 2014-08-14 15:55:39.936478782 +0200 | |
ad427fbe | 3 | @@ -1,6 +1,10 @@ |
276a8e13 ER |
4 | exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtlockedfile-uselib |
5 | TEMPLATE += fakelib | |
6 | -QTLOCKEDFILE_LIBNAME = $$qtLibraryTarget(QtSolutions_LockedFile-head) | |
ad427fbe JB |
7 | +greaterThan(QT_MAJOR_VERSION, 4) { |
8 | +QTLOCKEDFILE_LIBNAME = $$qtLibraryTarget(Qt$${QT_MAJOR_VERSION}Solutions_LockedFile-2.4) | |
9 | +} else { | |
276a8e13 | 10 | +QTLOCKEDFILE_LIBNAME = $$qtLibraryTarget(QtSolutions_LockedFile-2.4) |
ad427fbe | 11 | +} |
276a8e13 ER |
12 | TEMPLATE -= fakelib |
13 | QTLOCKEDFILE_LIBDIR = $$PWD/lib | |
14 | unix:qtlockedfile-uselib:!qtlockedfile-buildlib:QMAKE_RPATHDIR += $$QTLOCKEDFILE_LIBDIR |