diff options
author | Gerald Combs <gerald@wireshark.org> | 2012-09-05 19:00:41 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2012-09-05 19:00:41 +0000 |
commit | 42c506132e1a9039aaf4b3fb54dee35fafd1c0ce (patch) | |
tree | faa74b41527c5250373fb3131f6040f4ad681efd /ui | |
parent | e6538311a6e82a5b57e72cc3e5dec0f0bd8b7776 (diff) |
The Qt documentation is mysteriously silent about where qmake can find
Qt DLLs on Windows. %QTDIR%? $$QMAKE_LIBDIR_QT? "qmkake -query" says
$$[QT_INSTALL_BINS] so we'll try that.
svn path=/trunk/; revision=44780
Diffstat (limited to 'ui')
-rw-r--r-- | ui/qt/QtShark.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index e757d43b29..a9b8a6c959 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -326,12 +326,12 @@ win32 { CONFIG(debug, debug|release) { EXTRA_BINFILES += \ - $$QMAKE_LIBDIR_QT/QtCored4.dll \ - $$QMAKE_LIBDIR_QT/QtGuid4.dll + $$[QT_INSTALL_BINS]/QtCored4.dll \ + $$[QT_INSTALL_BINS]/QtGuid4.dll } else:CONFIG(release, debug|release) { EXTRA_BINFILES += \ - $$QMAKE_LIBDIR_QT/QtCore4.dll \ - $$QMAKE_LIBDIR_QT/QtGui4.dll + $$[QT_INSTALL_BINS]/QtCore4.dll \ + $$[QT_INSTALL_BINS]/QtGui4.dll } EXTRA_BINFILES += \ |