diff --git a/src/plugins/qmlprojectmanager/wizards/templates/app.pro b/src/plugins/qmlprojectmanager/wizards/templates/app.pro index c22d2afc2c93476e361d3ea6f017ee94004bba61..5a7b728ff435e4d14f70b09f73ccba811ca9c8e0 100644 --- a/src/plugins/qmlprojectmanager/wizards/templates/app.pro +++ b/src/plugins/qmlprojectmanager/wizards/templates/app.pro @@ -67,13 +67,17 @@ symbian { target.path = /opt/bin INSTALLS += target } else:macx { - for(deploymentfolder, DEPLOYMENTFOLDERS) { - item = item$${deploymentfolder} - itemsources = $${item}.files - $$itemsources = $$eval($${deploymentfolder}.source) - itempath = $${item}.path - $$itempath = Resources/$$eval($${deploymentfolder}.target) - QMAKE_BUNDLE_DATA += $$item + !isEqual(PWD,$$OUT_PWD) { + copyCommand = @echo Copying application data... + for(deploymentfolder, DEPLOYMENTFOLDERS) { + target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target) + copyCommand += && $(MKDIR) $$target + copyCommand += && $(COPY_DIR) $$PWD/$$eval($${deploymentfolder}.source) $$target + } + copydeploymentfolders.commands = $$copyCommand + first.depends = $(first) copydeploymentfolders + QMAKE_EXTRA_TARGETS += first copydeploymentfolders +message($$copyCommand) } } else { #linux !isEqual(PWD,$$OUT_PWD) { diff --git a/src/plugins/qmlprojectmanager/wizards/templates/cpp/qmlapplicationview.cpp b/src/plugins/qmlprojectmanager/wizards/templates/cpp/qmlapplicationview.cpp index d9a24eebfb38aa69949d2384c1313cc7dd99c8f1..2d0f505acc3e4fc05fb0206771a40e455a4d500a 100644 --- a/src/plugins/qmlprojectmanager/wizards/templates/cpp/qmlapplicationview.cpp +++ b/src/plugins/qmlprojectmanager/wizards/templates/cpp/qmlapplicationview.cpp @@ -26,7 +26,7 @@ QmlApplicationView::QmlApplicationView(const QString &mainQmlFile, QWidget *pare { #ifdef Q_OS_MAC m_d->mainQmlFile = QCoreApplication::applicationDirPath() - + QLatin1String("/../../Resources/") + mainQmlFile; + + QLatin1String("/../Resources/") + mainQmlFile; #else m_d->mainQmlFile = mainQmlFile; #endif