diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:47 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:47 +0100 |
| commit | 0655209fdad022bd0f6eb20ce85522cb56506bf0 (patch) | |
| tree | cdba0c1590655f5cb75a68cedff74f8a683db3a2 /tools/qmlplugindump | |
| parent | c3babc03c99c6ca5fa210486e133eb456a405bab (diff) | |
| parent | 3d8f103c2641f35e7681485102a1b59886db8934 (diff) | |
Merge master into api_changes
Conflicts:
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/qqmlpropertycache.cpp
Change-Id: I5193a193fa301c0b518291645bf626a5fa07118f
Diffstat (limited to 'tools/qmlplugindump')
| -rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index 7662fd79c8..9cda82588f 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -23,15 +23,15 @@ macx: QMAKE_INFO_PLIST = Info.plist contains(QT_CONFIG,debug):contains(QT_CONFIG,release) { CONFIG += debug_and_release build_all + CONFIG(debug, debug|release) { + win32: TARGET = $$join(TARGET,,,d) + } } else { contains(QT_CONFIG,debug): CONFIG += debug contains(QT_CONFIG,release): CONFIG += release } } -CONFIG(debug, debug|release) { - win32: TARGET = $$join(TARGET,,,d) -} target.path = $$[QT_INSTALL_BINS] INSTALLS += target |