Fix sources that are deployed into Qt Creator build for qml(2)puppet

When qml(2)puppet is built as part of Qt Creator, we need to generate
the Info.plist from Info.plist.in. When it is deployed as source into
the Qt Creator build, we need to do that too.

Change-Id: I83aa446f19984a51822c46df2ab7f41e78002ad4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri

@@ -29,9 +29,18 @@ DEFINES -= QT_NO_CAST_FROM_ASCII
 
 OTHER_FILES += Info.plist.in
 macx {
-    info.input = $$PWD/Info.plist.in
-    info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist
-    QMAKE_SUBSTITUTES += info
+    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
+    }
 } else {
     target.path  = $$QTC_PREFIX/bin
     INSTALLS    += target

share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri

@@ -23,9 +23,18 @@ DEFINES -= QT_NO_CAST_FROM_ASCII
 
 OTHER_FILES += Info.plist.in
 macx {
-    info.input = $$PWD/Info.plist.in
-    info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist
-    QMAKE_SUBSTITUTES += info
+    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
+    }
 } else {
     target.path  = $$QTC_PREFIX/bin
     INSTALLS    += target

share/qtcreator/static.pro

@@ -44,6 +44,7 @@ macx: DATA_DIRS += scripts
 for(data_dir, DATA_DIRS) {
     files = $$files($$PWD/$$data_dir/*, true)
     win32:files ~= s|\\\\|/|g
+    # Info.plist.in are handled below
     for(file, files):!contains(file, ".*/Info\\.plist\\.in$"):!exists($$file/*):FILES += $$file
 }
 OTHER_FILES += $$FILES
@@ -74,6 +75,12 @@ OTHER_FILES += $$FILES
    observerinfo.input = qml/qmlobserver/Info.plist.in
    observerinfo.output = $$IDE_DATA_PATH/qml/qmlobserver/Info.plist
    QMAKE_SUBSTITUTES += observerinfo
+   puppetinfo.input = qml/qmlpuppet/qmlpuppet/Info.plist.in
+   puppetinfo.output = $$IDE_DATA_PATH/qml/qmlpuppet/qmlpuppet/Info.plist
+   QMAKE_SUBSTITUES += puppetinfo
+   puppet2info.input = qml/qmlpuppet/qml2puppet/Info.plist.in
+   puppet2info.output = $$IDE_DATA_PATH/qml/qmlpuppet/qml2puppet/Info.plist
+   QMAKE_SUBSTITUES += puppetinfo
 }
 
 SRCRESOURCEDIR = $$IDE_SOURCE_TREE/src/share/qtcreator/