From ac2e53fdfe5dafe6a269d574a567a740e1b13cfa Mon Sep 17 00:00:00 2001
From: David Kaspar <dkaspar@blackberry.com>
Date: Wed, 25 Sep 2013 16:18:20 +0200
Subject: [PATCH] Qnx: Fixing bb-cascades-app project template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now it uses ProjectName:s and ProjectName:h so source code
is generated correctly.

Task-number: QTCREATORBUG-10227
Change-Id: Iecf5250e765def70d7a1d2833a02f3b2a7c3e863
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
---
 .../templates/wizards/bb-cascades-app/main.cpp       |  2 +-
 .../templates/wizards/bb-cascades-app/project.cpp    |  2 +-
 .../templates/wizards/bb-cascades-app/project.hpp    | 12 ++++++------
 .../templates/wizards/bb-cascades-app/project.pro    |  5 -----
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/share/qtcreator/templates/wizards/bb-cascades-app/main.cpp b/share/qtcreator/templates/wizards/bb-cascades-app/main.cpp
index 682f978a507..08eef18c2b9 100644
--- a/share/qtcreator/templates/wizards/bb-cascades-app/main.cpp
+++ b/share/qtcreator/templates/wizards/bb-cascades-app/main.cpp
@@ -7,7 +7,7 @@ Q_DECL_EXPORT int main(int argc, char **argv)
 {
     bb::cascades::Application app(argc, argv);
 
-    new %ProjectName%(&app);
+    new %ProjectName:s%(&app);
 
     return bb::cascades::Application::exec();
 }
diff --git a/share/qtcreator/templates/wizards/bb-cascades-app/project.cpp b/share/qtcreator/templates/wizards/bb-cascades-app/project.cpp
index 499c13cfbfa..34de18ad120 100644
--- a/share/qtcreator/templates/wizards/bb-cascades-app/project.cpp
+++ b/share/qtcreator/templates/wizards/bb-cascades-app/project.cpp
@@ -4,7 +4,7 @@
 #include <bb/cascades/QmlDocument>
 #include <bb/cascades/AbstractPane>
 
-%ProjectName%::%ProjectName%(bb::cascades::Application *app)
+%ProjectName:s%::%ProjectName:s%(bb::cascades::Application *app)
     : QObject(app)
 {
     bb::cascades::QmlDocument *qml = bb::cascades::QmlDocument::create("asset:///main.qml").parent(this);
diff --git a/share/qtcreator/templates/wizards/bb-cascades-app/project.hpp b/share/qtcreator/templates/wizards/bb-cascades-app/project.hpp
index 05d9ee0b5f9..de0b701395c 100644
--- a/share/qtcreator/templates/wizards/bb-cascades-app/project.hpp
+++ b/share/qtcreator/templates/wizards/bb-cascades-app/project.hpp
@@ -1,16 +1,16 @@
-#ifndef %ProjectName%_HPP_
-#define %ProjectName%_HPP_
+#ifndef %ProjectName:h%_HPP_
+#define %ProjectName:h%_HPP_
 
 #include <QObject>
 
 namespace bb { namespace cascades { class Application; }}
 
-class %ProjectName% : public QObject
+class %ProjectName:s% : public QObject
 {
     Q_OBJECT
 public:
-    %ProjectName%(bb::cascades::Application *app);
-    virtual ~%ProjectName%() {}
+    %ProjectName:s%(bb::cascades::Application *app);
+    virtual ~%ProjectName:s%() {}
 };
 
-#endif /* %ProjectName%_HPP_ */
+#endif /* %ProjectName:h%_HPP_ */
diff --git a/share/qtcreator/templates/wizards/bb-cascades-app/project.pro b/share/qtcreator/templates/wizards/bb-cascades-app/project.pro
index 1c18913f263..a0034bfcf2e 100644
--- a/share/qtcreator/templates/wizards/bb-cascades-app/project.pro
+++ b/share/qtcreator/templates/wizards/bb-cascades-app/project.pro
@@ -1,11 +1,8 @@
 TEMPLATE = app
 
-# Additional import path used to resolve QML modules in Creator's code model
-
 LIBS += -lbbdata -lbb -lbbcascades
 QT += declarative xml
 
-# The .cpp file which was generated for your project. Feel free to hack it.
 SOURCES += main.cpp \
     %ProjectName%.cpp
 
@@ -14,5 +11,3 @@ HEADERS += %ProjectName%.hpp
 OTHER_FILES += bar-descriptor.xml \
     assets/main.qml \
     assets/SecondPage.qml
-
-
-- 
GitLab