From 30c602f458938b9d0c3b5c4602a3764e34e0919a Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Tue, 11 Jun 2013 16:43:41 +0200
Subject: [PATCH] Fixing Info.plist.in for qmlobserver and qmldump
Since we use Info.plist.in we need QMAKE_SUBSTITUTES
and cannot use QMAKE_INFO_PLIST.
We manualy replicate the target logic.
Change-Id: I5b703d09db85457ba3bdadef97fd1cc2194b618f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
share/qtcreator/qml/qmldump/qmldump.pro | 8 ++++++--
share/qtcreator/qml/qmlobserver/qmlobserver.pro | 6 ++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/share/qtcreator/qml/qmldump/qmldump.pro b/share/qtcreator/qml/qmldump/qmldump.pro
index 51eb7e054b5..efc179733cc 100644
--- a/share/qtcreator/qml/qmldump/qmldump.pro
+++ b/share/qtcreator/qml/qmldump/qmldump.pro
@@ -13,8 +13,12 @@ TEMPLATE = app
SOURCES += main.cpp \
qmlstreamwriter.cpp
-OTHER_FILES += Info.plist
-macx:QMAKE_INFO_PLIST = Info.plist
+OTHER_FILES += Info.plist.in
+macx {
+ info.input = Info.plist.in
+ info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist
+ QMAKE_SUBSTITUTES += info
+}
HEADERS += \
qmlstreamwriter.h
diff --git a/share/qtcreator/qml/qmlobserver/qmlobserver.pro b/share/qtcreator/qml/qmlobserver/qmlobserver.pro
index 3bafb54ca24..f99ffd278c0 100644
--- a/share/qtcreator/qml/qmlobserver/qmlobserver.pro
+++ b/share/qtcreator/qml/qmlobserver/qmlobserver.pro
@@ -60,10 +60,12 @@ symbian {
LIBS += -lavkon -lcone
}
}
-OTHER_FILES+=Info.plist
+OTHER_FILES+=Info.plist.in
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
--
GitLab