Commit 48b8947d authored by Eike Ziller's avatar Eike Ziller Committed by Marco Bubke

qml(2)puppet: Avoid ugly logic with generating Info.plist file

The Info.plist was generated for putting the Qt Creator version into it.
Since that is not very useful nor necessary information, we can just
avoid the whole generation, and make the logic much simpler.

Change-Id: I71a12dc7e53970e3ef136e8abc78077dfba3326e
Reviewed-by: default avatarMarco Bubke <marco.bubke@digia.com>
parent c66d761a
<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
<plist version=\"1.0\">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSHumanReadableCopyright</key>
<string>(C) 2014 Digia Plc
......@@ -14,15 +14,11 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>@TYPEINFO@</string>
<string>????</string>
<key>CFBundleExecutable</key>
<string>@EXECUTABLE@</string>
<string>qml2puppet</string>
<key>CFBundleIdentifier</key>
<string>org.qt-project.qtcreator.qmlpuppet</string>
<key>CFBundleVersion</key>
<string>$$QTCREATOR_VERSION</string>
<key>CFBundleShortVersionString</key>
<string>$$QTCREATOR_VERSION</string>
<string>org.qt-project.qtcreator.qml2puppet</string>
<key>LSUIElement</key>
<string>1</string>
</dict>
......
......@@ -39,18 +39,7 @@ DEFINES -= QT_NO_CAST_FROM_ASCII
OTHER_FILES += Info.plist.in
macx {
isEmpty(QTCREATOR_PRI_INCLUDED) {
# So this .pri file is used by
# compiling the sources that were deployed to Qt Creator,
# and the Info.plist was generated by static.pro at build time
QMAKE_INFO_PLIST = $$PWD/Info.plist
} else {
# So this .pri file is used from Qt Creator source tree,
# and we need to generate the Info.plist
info.input = $$PWD/Info.plist.in
info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist
QMAKE_SUBSTITUTES += info
}
QMAKE_INFO_PLIST = $$PWD/Info.plist
} else {
target.path = $$QTC_PREFIX/bin
INSTALLS += target
......
<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
<plist version=\"1.0\">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSHumanReadableCopyright</key>
<string>(C) 2014 Digia Plc
......@@ -14,15 +14,11 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>@TYPEINFO@</string>
<string>????</string>
<key>CFBundleExecutable</key>
<string>@EXECUTABLE@</string>
<string>qmlpuppet</string>
<key>CFBundleIdentifier</key>
<string>org.qt-project.qtcreator.qml2puppet</string>
<key>CFBundleVersion</key>
<string>$$QTCREATOR_VERSION</string>
<key>CFBundleShortVersionString</key>
<string>$$QTCREATOR_VERSION</string>
<string>org.qt-project.qtcreator.qmlpuppet</string>
<key>LSUIElement</key>
<string>1</string>
</dict>
......
......@@ -24,18 +24,7 @@ DEFINES -= QT_NO_CAST_FROM_ASCII
OTHER_FILES += Info.plist.in
macx {
isEmpty(QTCREATOR_PRI_INCLUDED) {
# So this .pri file is used by
# compiling the sources that were deployed to Qt Creator,
# and the Info.plist was generated by static.pro at build time
QMAKE_INFO_PLIST = $$PWD/Info.plist
} else {
# So this .pri file is used from Qt Creator source tree,
# and we need to generate the Info.plist
info.input = $$PWD/Info.plist.in
info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist
QMAKE_SUBSTITUTES += info
}
QMAKE_INFO_PLIST = $$PWD/Info.plist
} else {
target.path = $$QTC_PREFIX/bin
INSTALLS += target
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment