diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 13:14:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 13:14:04 +0200 |
| commit | 6839f03051d2950e4721cbb5ee88fa7b07109588 (patch) | |
| tree | d5cdfeeb6e59953f5109ef87a1be08f69fcddf7a /tools/qmlplugindump | |
| parent | cc5ead1b3c8ce79c240b70bdfcfb687fe60e50f5 (diff) | |
| parent | fe92db0a0eeed502ef851930b3404b38c4a03f4f (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
tests/auto/quick/qquickitem/tst_qquickitem.cpp
Change-Id: If261f8eea84dfa5944bb55de999d1f70aba528fd
Diffstat (limited to 'tools/qmlplugindump')
| -rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index e45a7fad83..b38eea2554 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -17,7 +17,7 @@ macx { # Prevent qmlplugindump from popping up in the dock when launched. # We embed the Info.plist file, so the application doesn't need to # be a bundle. - QMAKE_LFLAGS += -sectcreate __TEXT __info_plist $$shell_quote($$PWD/Info.plist) + QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote($$PWD/Info.plist) CONFIG -= app_bundle } |