Qnx: Cascades project template is obsolete

Qt Creator QTCREATORBUG-10375

The old Cascades template application was more sample than template
and it was simplified.

The application UI object name doesn't follow the project name anymore.
This change was introduced because C++ class name rules are more
restrictive than the project ones. More than that, it is harder
to start with some test project and then refractor it to some real one.
There is no gain to have UI object class name same as the enclosing
project one.

The application icon added to the bar-descriptor.xml

Change-Id: I198f61a631fa2c758f3e8ac377c06ce7560cc911
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>

share/qtcreator/templates/wizards/bb-cascades-app/assets/SecondPage.qml

-import bb.cascades 1.0
-
-Page {
-    id: seconPage
-    paneProperties: NavigationPaneProperties {
-        backButton: ActionItem {
-            onTriggered: {
-                navigationPane.pop()
-            }
-        }
-    }
-    Container {
-        layout: DockLayout {}
-        Label {
-            text: qsTr("Hello Cascades!")
-            horizontalAlignment: HorizontalAlignment.Center
-            verticalAlignment: VerticalAlignment.Center
-            textStyle {
-                base: SystemDefaults.TextStyles.TitleText
-            }
-        }
-    }
-}
-

share/qtcreator/templates/wizards/bb-cascades-app/assets/main.qml

 import bb.cascades 1.0
 
-NavigationPane {
-    id: navigationPane
-    Page {
-        Container {
-            layout: DockLayout {}
-            Button {
-                horizontalAlignment: HorizontalAlignment.Center
-                verticalAlignment: VerticalAlignment.Center
-                text: qsTr("Next")
-                onClicked: {
-                    var page = getSecondPage();
-                    navigationPane.push(page);
-                }
-                property Page secondPage
-                function getSecondPage() {
-                    if (! secondPage) {
-                        secondPage = secondPageDefinition.createObject();
-                    }
-                    return secondPage;
-                }
-                attachedObjects: [
-                    ComponentDefinition {
-                        id: secondPageDefinition
-                        source: "SecondPage.qml"
-                    }
-                ]
-            }
+Page {
+    Container {
+        layout: DockLayout { }
+        Label {
+            text: qsTr("Hello World")
+            textStyle.base: SystemDefaults.TextStyles.BigText
+            verticalAlignment: VerticalAlignment.Center
+            horizontalAlignment: HorizontalAlignment.Center
         }
     }
-    onCreationCompleted: {
-        console.log("NavigationPane - onCreationCompleted()");
-        OrientationSupport.supportedDisplayOrientation = SupportedDisplayOrientation.All;
-    }
 }
-

share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml

@@ -4,14 +4,25 @@
     <name>%ProjectName%</name>
     <versionNumber>1.0.0</versionNumber>
     <description>DESCRIPTION</description>
+
     <initialWindow>
         <systemChrome>none</systemChrome>
         <transparent>false</transparent>
         <autoOrients>true</autoOrients>
         <aspectRatio>landscape</aspectRatio>
     </initialWindow>
+
+    <!--  The icon for the application, which should be 114x114. -->
+    <icon>
+        <image>icon.png</image>
+    </icon>
+
     <env value="app/native/lib:/usr/lib/qt4/lib/" var="LD_LIBRARY_PATH"/>
+
     <action system="true">run_native</action>
-    <asset path="%ProjectName%" type="Qnx/Elf" entry="true">%ProjectName%</asset>
+
+    <!-- Application assets -->
+    <asset path="%SRC_DIR%/icon.png">icon.png</asset>
     <asset path="%SRC_DIR%/assets">assets</asset>
+    <asset path="%ProjectName%" type="Qnx/Elf" entry="true">%ProjectName%</asset>
 </qnx>

share/qtcreator/templates/wizards/bb-cascades-app/main.cpp

-#include "%ProjectName%.hpp"
-
-#include <bb/cascades/Application>
-#include <Qt/qdeclarativedebug.h>
-
-Q_DECL_EXPORT int main(int argc, char **argv)
-{
-    bb::cascades::Application app(argc, argv);
-
-    new %ProjectName:s%(&app);
-
-    return bb::cascades::Application::exec();
-}

share/qtcreator/templates/wizards/bb-cascades-app/project.cpp

-#include "%ProjectName%.hpp"
-
-#include <bb/cascades/Application>
-#include <bb/cascades/QmlDocument>
-#include <bb/cascades/AbstractPane>
-
-%ProjectName:s%::%ProjectName:s%(bb::cascades::Application *app)
-    : QObject(app)
-{
-    bb::cascades::QmlDocument *qml = bb::cascades::QmlDocument::create("asset:///main.qml").parent(this);
-    bb::cascades::AbstractPane *root = qml->createRootObject<bb::cascades::AbstractPane>();
-    app->setScene(root);
-}
-

share/qtcreator/templates/wizards/bb-cascades-app/project.hpp

-#ifndef %ProjectName:h%_HPP_
-#define %ProjectName:h%_HPP_
-
-#include <QObject>
-
-namespace bb { namespace cascades { class Application; }}
-
-class %ProjectName:s% : public QObject
-{
-    Q_OBJECT
-public:
-    %ProjectName:s%(bb::cascades::Application *app);
-    virtual ~%ProjectName:s%() {}
-};
-
-#endif /* %ProjectName:h%_HPP_ */

share/qtcreator/templates/wizards/bb-cascades-app/project.pro

@@ -3,11 +3,15 @@ TEMPLATE = app
 LIBS += -lbbdata -lbb -lbbcascades
 QT += declarative xml
 
-SOURCES += main.cpp \
-    %ProjectName%.cpp
+SOURCES += \
+    src/main.cpp \
+    src/applicationui.cpp \
 
-HEADERS += %ProjectName%.hpp
+HEADERS += \
+    src/applicationui.h \
 
-OTHER_FILES += bar-descriptor.xml \
+OTHER_FILES += \
+    bar-descriptor.xml \
     assets/main.qml \
-    assets/SecondPage.qml
+
+

share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.cpp

+#include "applicationui.h"
+
+#include <bb/cascades/Application>
+#include <bb/cascades/QmlDocument>
+#include <bb/cascades/AbstractPane>
+
+using namespace bb::cascades;
+
+ApplicationUI::ApplicationUI(bb::cascades::Application *app) :
+        QObject(app)
+{
+    // By default the QmlDocument object is owned by the Application instance
+    // and will have the lifespan of the application
+    QmlDocument *qml = QmlDocument::create("asset:///main.qml");
+
+    // Create root object for the UI
+    AbstractPane *root = qml->createRootObject<AbstractPane>();
+
+    // Set created root object as the application scene
+    app->setScene(root);
+}
+

share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.h

+#ifndef APPLICATIONUI_H
+#define APPLICATIONUI_H
+
+#include <QObject>
+
+namespace bb {
+    namespace cascades {
+        class Application;
+    }
+}
+
+class ApplicationUI : public QObject
+{
+    Q_OBJECT
+public:
+    ApplicationUI(bb::cascades::Application *app);
+    virtual ~ApplicationUI() {}
+};
+
+#endif /* APPLICATIONUI_H */

share/qtcreator/templates/wizards/bb-cascades-app/src/main.cpp

+#include "applicationui.h"
+
+#include <bb/cascades/Application>
+
+#include <Qt/qdeclarativedebug.h>
+
+using namespace bb::cascades;
+
+Q_DECL_EXPORT int main(int argc, char **argv)
+{
+    Application app(argc, argv);
+
+    // Create the Application UI object, this is where the main.qml file
+    // is loaded and the application scene is set.
+    new ApplicationUI(&app);
+
+    // Enter the application main event loop.
+    return Application::exec();
+}

share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml

@@ -38,12 +38,12 @@
     <displayname>BlackBerry Cascades Application</displayname>;
     <description>Creates a Cascades application for BlackBerry 10.</description>
     <files>
-        <file source="main.cpp" openeditor="true"/>
         <file source="assets/main.qml" openeditor="true"/>
-        <file source="assets/SecondPage.qml" openeditor="true"/>
         <file source="bar-descriptor.xml" openeditor="true"/>
         <file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
-        <file source="project.hpp" target="%ProjectName%.hpp" openproject="true"/>
-        <file source="project.cpp" target="%ProjectName%.cpp" openproject="true"/>
-   </files>
+        <file source="src/main.cpp" openeditor="true"/>
+        <file source="src/applicationui.h" openproject="true"/>
+        <file source="src/applicationui.cpp" openproject="true"/>
+        <file source="icon.png"/>
+    </files>
 </wizard>