summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-09-12 10:06:27 +0200
committerEike Ziller <eike.ziller@nokia.com>2011-09-12 11:24:19 +0200
commitcdbb6f2cb96307dae09fa84bc8cd2d4a0985afa5 (patch)
treece8e6a7f743344a830cb1b37463bf062f26e247e
parent421a1cf93c1ec5e6fae088a3bfc6547cb8481738 (diff)
downloadqt-creator-cdbb6f2cb96307dae09fa84bc8cd2d4a0985afa5.tar.gz
QtQuickApp: Fix qmake dependency to Qt Quick Components for Symbian
The .prf to add the dependency is called qt-components.prf . This broke building a SmartInstaller package. Task-number: QTCREATORBUG-6075 Change-Id: I816eac60ab15f40ffc9d3c866f0bf695bfa0983e Reviewed-on: http://codereview.qt-project.org/4641 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paweł Polański <jaggernod@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
-rw-r--r--dist/changes-2.3.11
-rw-r--r--share/qtcreator/templates/qtquickapp/app.pro2
2 files changed, 2 insertions, 1 deletions
diff --git a/dist/changes-2.3.1 b/dist/changes-2.3.1
index 01f15ca0b6..f029e4464b 100644
--- a/dist/changes-2.3.1
+++ b/dist/changes-2.3.1
@@ -41,6 +41,7 @@ Windows
Symbian Target
* Warn if EPOCROOT is on different drive from the sources
* Fix several debugging issues with CODA 4.0.23
+ * Qt Quick Application wizard: Fix qmake dependency to Qt Quick Components for Symbian (QTCREATORBUG-6075)
Remote Linux Support
* Harmattan: Include Aegis manifest file in list of files to add to project
diff --git a/share/qtcreator/templates/qtquickapp/app.pro b/share/qtcreator/templates/qtquickapp/app.pro
index fcbcc0b8af..3aebf6ed96 100644
--- a/share/qtcreator/templates/qtquickapp/app.pro
+++ b/share/qtcreator/templates/qtquickapp/app.pro
@@ -34,7 +34,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
# Add dependency to Symbian components
# QTQUICKCOMPONENTS #
-# CONFIG += qtquickcomponents
+# CONFIG += qt-components
# The .cpp file which was generated for your project. Feel free to hack it.
SOURCES += main.cpp