diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 16:57:34 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:04:02 +0200 |
commit | c51d26b6ec7869641441d01597c3e7acc643f93f (patch) | |
tree | 69ee279e12be73ae385e087c9d89ce7bc8480446 /mkspecs/features/qt_plugin.prf | |
parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
parent | 967c18d29694fdeab858691a80cb8400fd02ec33 (diff) |
Merge branch 'release' into old/5.0old/5.0
Conflicts:
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: Id635e0c27df5d8e3852d12bd6433c6463bf4eadc
Diffstat (limited to 'mkspecs/features/qt_plugin.prf')
-rw-r--r-- | mkspecs/features/qt_plugin.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index 54a995daae..158de39753 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -60,7 +60,7 @@ unix|win32-g++* { !isEmpty(_QMAKE_SUPER_CACHE_): \ rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* else: \ - rplbase = $$MODULE_QMAKE_OUTDIR + rplbase = $$MODULE_BASE_OUTDIR lib_replace.match = $$rplbase/lib lib_replace.replace = $$[QT_INSTALL_LIBS/raw] QMAKE_PRL_INSTALL_REPLACE += lib_replace |