feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Automatic versioning for the qml tools.

Browse Source 
Reviewed-by: Thomas Hartmann
This commit is contained in:
con
2011-03-28 15:31:27 +02:00
parent 88d7281995
commit 530e7494dd
6 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
share/qtcreator/qml/qmldump/Info.plist → share/qtcreator/qml/qmldump/Info.plist.in
View File

@@ -1,6 +1,6 @@
<?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) 2008-2011 Nokia Corporation
@@ -20,9 +20,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<key>CFBundleIdentifier</key>
<string>com.nokia.qtcreator.qmldump</string>
<key>CFBundleVersion</key>
<string>2.1.83</string>
<string>$$QTCREATOR_VERSION</string>
<key>CFBundleShortVersionString</key>
<string>2.1.83</string>
<string>$$QTCREATOR_VERSION</string>
<key>LSUIElement</key>
<string>1</string>
</dict>

19
share/qtcreator/qml/qmlobserver/Info_mac.plist → share/qtcreator/qml/qmlobserver/Info.plist.in
View File

@@ -1,7 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
<plist version="0.1">
<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<!DOCTYPE plist SYSTEM \"file://localhost/System/Library/DTDs/PropertyList.dtd\">
<plist version=\"0.1\">
<dict>
<key>NSHumanReadableCopyright</key>
<string>(C) 2008-2011 Nokia Corporation
Commercial Usage
Licensees holding valid Qt Commercial licenses may use this file in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia.
GNU Lesser General Public License Usage
Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation and appearing in the file LICENSE.LGPL included in the packaging of this file. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</string>
<key>CFBundleIconFile</key>
<string>@ICON@</string>
<key>CFBundleIdentifier</key>
@@ -14,6 +23,10 @@
<string>@TYPEINFO@</string>
<key>CFBundleExecutable</key>
<string>@EXECUTABLE@</string>
<key>CFBundleVersion</key>
<string>$$QTCREATOR_VERSION</string>
<key>CFBundleShortVersionString</key>
<string>$$QTCREATOR_VERSION</string>
<key>UTExportedTypeDeclarations</key>
<array>
<dict>

3
share/qtcreator/qml/qmlobserver/qmlobserver.pro
View File

@@ -60,8 +60,9 @@ symbian {
LIBS += -lavkon -lcone
}
}
OTHER_FILES+=Info.plist
mac {
QMAKE_INFO_PLIST=Info_mac.plist
QMAKE_INFO_PLIST=Info.plist
TARGET=QMLObserver
ICON=qml.icns
} else {

10
share/qtcreator/static.pro
View File

@@ -96,3 +96,13 @@ QMAKE_EXTRA_COMPILERS += unconditionalCopy2build
INSTALLS += $$data_dir
}
}
# do version magic for app bundles
macx {
dumpinfo.input = qml/qmldump/Info.plist.in
dumpinfo.output = $$IDE_DATA_PATH/qml/qmldump/Info.plist
QMAKE_SUBSTITUTES += dumpinfo
observerinfo.input = qml/qmlobserver/Info.plist.in
observerinfo.output = $$IDE_DATA_PATH/qml/qmlobserver/Info.plist
QMAKE_SUBSTITUTES += observerinfo
}

10
src/tools/qmlpuppet/Info.plist → src/tools/qmlpuppet/Info.plist.in
View File

@@ -1,6 +1,6 @@
<?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) 2008-2011 Nokia Corporation
@@ -20,9 +20,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<key>CFBundleIdentifier</key>
<string>com.nokia.qtcreator.qmlpuppet</string>
<key>CFBundleVersion</key>
<string>2.1.83</string>
<string>$$QTCREATOR_VERSION</string>
<key>CFBundleShortVersionString</key>
<string>2.1.83</string>
<string>$$QTCREATOR_VERSION</string>
<key>LSUIElement</key>
<string>1</string>
</dict>

8
src/tools/qmlpuppet/qmlpuppet.pro
View File

@@ -23,5 +23,9 @@ QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
SOURCES += main.cpp
RESOURCES += qmlpuppet.qrc
OTHER_FILES += Info.plist
macx:QMAKE_INFO_PLIST = Info.plist
OTHER_FILES += Info.plist.in
macx {
info.input = Info.plist.in
info.output = $$IDE_BIN_PATH/$${TARGET}.app/Contents/Info.plist
QMAKE_SUBSTITUTES += info
}