From f1a403c778fec44d55dd383e44b620ca1f6483c1 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Fri, 19 Nov 2010 21:11:33 +0100
Subject: [PATCH] Do not link against (the possibly absent) eiksrv.dso
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
---
share/qtcreator/templates/shared/deployment.pri | 2 +-
src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/share/qtcreator/templates/shared/deployment.pri b/share/qtcreator/templates/shared/deployment.pri
index e65eeb335c9..f57225e3db8 100644
--- a/share/qtcreator/templates/shared/deployment.pri
+++ b/share/qtcreator/templates/shared/deployment.pri
@@ -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) {
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
index 812edad8a3b..896089feddf 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
@@ -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)
--
GitLab