diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-13 00:28:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-13 08:28:27 +0200 |
| commit | ae745746a666134d9e9258b8c2ff00540624d835 (patch) | |
| tree | 8294fffa3d752d61f79004fb04e21e927472fd8f /tools/qmlplugindump/Info.plist | |
| parent | a7b383ab989e74ef552c2ef9c38377e065f1ab0e (diff) | |
| parent | 531d00c1909527cb1bc28f17197267ccde408b0c (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/qml/jsapi/qjsengine.cpp
src/qml/qml/qqmlengine_p.h
src/quick/items/qquickanchors.cpp
src/quick/items/qquickanimatedimage_p_p.h
src/quick/items/qquickitem_p.h
tests/auto/qml/qqmlecmascript/testtypes.h
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/benchmarks/qml/creation/tst_creation.cpp
Change-Id: I65861e32f16e8a04c7090a90231627e1ebf6ba6f
Diffstat (limited to 'tools/qmlplugindump/Info.plist')
| -rw-r--r-- | tools/qmlplugindump/Info.plist | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmlplugindump/Info.plist b/tools/qmlplugindump/Info.plist index f35846d048..e6c4914ca0 100644 --- a/tools/qmlplugindump/Info.plist +++ b/tools/qmlplugindump/Info.plist @@ -5,11 +5,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> - <string>@TYPEINFO@</string> + <string>????</string> <key>CFBundleExecutable</key> - <string>@EXECUTABLE@</string> + <string>qmlplugindump</string> <key>CFBundleIdentifier</key> - <string>com.nokia.qt.qmlplugindump</string> + <string>org.qt-project.qt.qmlplugindump</string> <key>LSUIElement</key> <string>1</string> </dict> |