diff options
| author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2015-03-16 14:15:27 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2015-04-07 12:55:24 +0000 |
| commit | 32849f4997e13f540a6c99c9a644239e19839d73 (patch) | |
| tree | 65d8bd3f72b81d5e7768e9ec1e1cbb95c4e3f6ab /mkspecs | |
| parent | f8cb4ee31026049de4af341d2341eaa4accdf75b (diff) | |
| download | qtbase-32849f4997e13f540a6c99c9a644239e19839d73.tar.gz | |
qmake: Rework dll deployment
QT_INSTALL_LIBS is not the right place to check for Qt dlls, as they
cannot be found there in a non-developer build. In order to be able
to find the dlls and make adding dll locations easier for the user,
QMAKE_DLLS_PATHS was added. On Windows, the variable points to Qt's
bin directory by default.
Task-number: QTBUG-44960
Change-Id: Ie4e5beeaadee798a055599387e842d7c0502c27a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index b1fc248ea0..264641b5b3 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -4,10 +4,8 @@ CONFIG *= thread win32 { contains(QT_CONFIG, shared) { # this variable is read by qmake in qmake/generators/win32/msvc_vcproj.cpp - # function VcprojGenerator::initDeploymentTool(), which contains some hardcoded - # library names (the ones that were static in Qt 4) - # it probably doesn't work anymore and should not be in this file - QMAKE_QT_DLL = 1 + # function VcprojGenerator::initDeploymentTool() + QMAKE_DLL_PATHS += $$[QT_INSTALL_BINS/get] } } CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG |