feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Do not link against (the possibly absent) eiksrv.dso

Browse Source 
The template .pri file of the "Qt Quick Application" and
"Qt Mobile Application" wizards linked against eiksrv
when locking the screen orientation. That is however not
necessary.

The real problem is that eiksrv does not get shipped with
the Symbian^1 SDK in Nokia Qt SDK 1.0/1.1. Therefore, the
innecessary link attempt even fails.

This patch removes the -leiksrv and bumps the version for
the template.

Cherrypicking into qtcreator/2.1 is highly recommended.

Task-Number: QTCREATORBUG-3142
Task-Number: QTSDK-194
This commit is contained in:
Alessandro Portale
2010-11-19 21:11:33 +01:00
parent 4ce1f056b6
commit f1a403c778
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/templates/shared/deployment.pri
View File

@@ -21,7 +21,7 @@ MAINPROFILEPWD = $$PWD
symbian {
ICON = $${TARGET}.svg
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -leiksrv -lcone
contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -lcone
contains(DEFINES, NETWORKACCESS):TARGET.CAPABILITY += NetworkServices
} else:win32 {
!isEqual(PWD,$$OUT_PWD) {

2
src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
View File

@@ -65,7 +65,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 = 1;
const int AbstractMobileApp::StubVersion = 2;
AbstractMobileApp::AbstractMobileApp()
: m_orientation(ScreenOrientationAuto), m_networkEnabled(false)