diff options
| author | dt <qtc-committer@nokia.com> | 2011-01-11 16:26:18 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-01-12 15:40:20 +0100 |
| commit | 2de93e9b96946ce559d4ace2657198837229084d (patch) | |
| tree | 7650752905f207ba30b0107f280ab19e65c1a93b | |
| parent | 54f4fba003c5bb60ed747552e8b7d4981fa2ecbd (diff) | |
| download | qt-creator-2de93e9b96946ce559d4ace2657198837229084d.tar.gz | |
QML template: Do not override user settings for icon and epocheapsize
Task-Nr: QTCREATORBUG-3454
Reviewed-By: Alessandro Portale
| -rw-r--r-- | share/qtcreator/templates/shared/deployment.pri | 4 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/share/qtcreator/templates/shared/deployment.pri b/share/qtcreator/templates/shared/deployment.pri index a1760b5b98..bf421fb5fa 100644 --- a/share/qtcreator/templates/shared/deployment.pri +++ b/share/qtcreator/templates/shared/deployment.pri @@ -19,8 +19,8 @@ for(deploymentfolder, DEPLOYMENTFOLDERS) { MAINPROFILEPWD = $$PWD symbian { - ICON = $${TARGET}.svg - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 + isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg + isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -lcone contains(DEFINES, NETWORKACCESS):TARGET.CAPABILITY += NetworkServices } else:win32 { diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index baf9150bd4..d19a5613f6 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -69,7 +69,7 @@ const QString AbstractMobileApp::ProFileComment(QLatin1String("#")); const QString AbstractMobileApp::DeploymentPriFileName(QLatin1String("deployment.pri")); const QString AbstractMobileApp::FileChecksum(QLatin1String("checksum")); const QString AbstractMobileApp::FileStubVersion(QLatin1String("version")); -const int AbstractMobileApp::StubVersion = 2; +const int AbstractMobileApp::StubVersion = 3; AbstractMobileApp::AbstractMobileApp() : m_orientation(ScreenOrientationAuto), m_networkEnabled(false) |