From cdbb6f2cb96307dae09fa84bc8cd2d4a0985afa5 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 12 Sep 2011 10:06:27 +0200
Subject: [PATCH] QtQuickApp: Fix qmake dependency to Qt Quick Components for
Symbian
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
dist/changes-2.3.1 | 1 +
share/qtcreator/templates/qtquickapp/app.pro | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dist/changes-2.3.1 b/dist/changes-2.3.1
index 01f15ca0b6d..f029e4464bf 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 fcbcc0b8aff..3aebf6ed964 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
--
GitLab