diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-06-27 14:03:12 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-06-28 14:22:45 +0200 |
| commit | 6b0be2d4a4182a6dc35a7448dfcaf90cf665d014 (patch) | |
| tree | adf12f7eee88cb5d0d25d2d25c4d017e6b63cf32 | |
| parent | c63725ff6645ae9ef9ed992ae504351260fba583 (diff) | |
| download | qt-creator-6b0be2d4a4182a6dc35a7448dfcaf90cf665d014.tar.gz | |
Revert "Fixing Info.plist.in for qmlobserver and qmldump"
The Info.plist.in files are actually handled by static.pro.
The projects should only be compiled from the deployed sources in the
build tree.
This reverts commit 30c602f458938b9d0c3b5c4602a3764e34e0919a.
Change-Id: Ib63fb9e4db1c249817e59239029db7dd220ba5b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| -rw-r--r-- | share/qtcreator/qml/qmldump/qmldump.pro | 10 | ||||
| -rw-r--r-- | share/qtcreator/qml/qmlobserver/qmlobserver.pro | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/share/qtcreator/qml/qmldump/qmldump.pro b/share/qtcreator/qml/qmldump/qmldump.pro index efc179733c..2b7e3fc8eb 100644 --- a/share/qtcreator/qml/qmldump/qmldump.pro +++ b/share/qtcreator/qml/qmldump/qmldump.pro @@ -13,12 +13,10 @@ TEMPLATE = app SOURCES += main.cpp \ qmlstreamwriter.cpp -OTHER_FILES += Info.plist.in -macx { - info.input = Info.plist.in - info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist - QMAKE_SUBSTITUTES += info -} +# generation of Info.plist from Info.plist.in is handled by static.pro +# compiling this project directly from the Qt Creator source tree does not work +OTHER_FILES += Info.plist +macx:QMAKE_INFO_PLIST = Info.plist HEADERS += \ qmlstreamwriter.h diff --git a/share/qtcreator/qml/qmlobserver/qmlobserver.pro b/share/qtcreator/qml/qmlobserver/qmlobserver.pro index f99ffd278c..503a375dc5 100644 --- a/share/qtcreator/qml/qmlobserver/qmlobserver.pro +++ b/share/qtcreator/qml/qmlobserver/qmlobserver.pro @@ -60,12 +60,13 @@ symbian { LIBS += -lavkon -lcone } } -OTHER_FILES+=Info.plist.in + +# generation of Info.plist from Info.plist.in is handled by static.pro +# compiling this project directly from the Qt Creator source tree does not work +OTHER_FILES+=Info.plist mac { + QMAKE_INFO_PLIST=Info.plist TARGET=QMLObserver - info.input = Info.plist.in - info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist - QMAKE_SUBSTITUTES += info ICON=qml.icns } else { TARGET=qmlobserver |