examples now use load(tizen_app) in pro files.

Change-Id: I0cf412df983bc370b402ee78a931d56670e2219f
Reviewed-by: Jarosław Staniek <staniek@kde.org>

diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644 (file)
index 0000000..2f09a2b
--- /dev/null
+++ b/.qmake.conf
@@ -0,0 +1,3 @@
+load(qt_build_config)
+
+MODULE_VERSION = 5.2.0

diff --git a/examples/helloworld/helloworld-default.qrc b/examples/helloworld/helloworld-default.qrc
index 7abd2c1..1749b67 100644 (file)
--- a/examples/helloworld/helloworld-default.qrc
+++ b/examples/helloworld/helloworld-default.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>main.qml</file>
-        <file>images/mainmenu.png</file>
+        <file alias="icons/mainmenu.png">shared/res/screen-density-xhigh/mainmenu.png</file>
     </qresource>
 </RCC>

diff --git a/examples/helloworld/helloworld.pro b/examples/helloworld/helloworld.pro
index cda80b7..53141fd 100644 (file)
--- a/examples/helloworld/helloworld.pro
+++ b/examples/helloworld/helloworld.pro
@@ -1,29 +1,21 @@
 TEMPLATE=app
 
-tizen {
-    QMAKE_LFLAGS+=-pie -rdynamic
-    TARGET=QtHelloWorld.exe
-} else {
-    TARGET=QtHelloWorld
-}
-
-#under /opt/usr/apps/$APPID application will be installed
-#you also need to add this in tizen/qt.conf file in Prefix entry
-APPID=QtHelloWrl
+TARGET=QtHelloWorld
 
 QT += qml quick
 
 OTHER_FILES += \
     main.qml \
-    tizen/qt.conf
+    manifest.xml
 
 SOURCES += \
     main.cpp
 
 RESOURCES += helloworld-default.qrc
 
-tizen: RESOURCES += helloworld-tizen.qrc
-
-
-
-
+tizen {
+    tizen_shared.files = shared/res
+    CONFIG += TIZEN_STANDALONE_PACKAGE
+    TIZEN_BUNDLED_QT_LIBS=Qt5Core Qt5DBus Qt5Qml Qt5Quick Qt5Widgets Qt5Gui Qt5Network
+    load(tizen_app)
+}

diff --git a/examples/helloworld/main.cpp b/examples/helloworld/main.cpp
index f9d0e10..82046a2 100644 (file)
--- a/examples/helloworld/main.cpp
+++ b/examples/helloworld/main.cpp
@@ -27,23 +27,25 @@
 
 #include <QGuiApplication>
 #include <QQuickWindow>
-#include <QtDebug>
 #include <QtGlobal>
 #include <QQmlApplicationEngine>
-#include <QScreen>
 #include <QQuickItem>
+
 extern "C" int OspMain(int argc, char *argv[])
 {
+
 #ifdef Q_OS_TIZEN_SIMULATOR
-    qputenv("QML_BAD_GUI_RENDER_LOOP","1");
+    qputenv("QSG_RENDER_LOOP","windows");
 #endif
     qputenv("QT_QUICK_CONTROLS_STYLE","Tizen");
     QGuiApplication app(argc,argv);
 
     QQmlApplicationEngine engine(QUrl("qrc:///main.qml"));
-    QQuickWindow *window = qobject_cast<QQuickWindow *>(engine.rootObjects().at(0));
+    QQuickWindow *window = 0;
+    if (engine.rootObjects().count() > 0)
+        window = qobject_cast<QQuickWindow *>(engine.rootObjects().at(0));
     if (window) {
-        window->setIcon(QIcon(":/images/mainmenu.png"));
+        window->setIcon(QIcon(":/icons/mainmenu.png"));
         window->show();
         return app.exec();
     } else {

diff --git a/examples/helloworld/main.qml b/examples/helloworld/main.qml
index 50c09a8..414ca43 100644 (file)
--- a/examples/helloworld/main.qml
+++ b/examples/helloworld/main.qml
@@ -57,5 +57,4 @@ ApplicationWindow {
 
         backAction.onTriggered: Qt.quit()
     }
-
 }

diff --git a/examples/helloworld/manifest.xml b/examples/helloworld/manifest.xml
new file mode 100644 (file)
index 0000000..cc8c4f2
--- /dev/null
+++ b/examples/helloworld/manifest.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<Manifest xmlns="http://schemas.tizen.org/2012/12/manifest">
+    <Id>8Gan0fwnPB</Id>
+    <Version>1.0.0</Version>
+    <Type>C++App</Type>
+    <Requirements/>
+    <Apps>
+        <ApiVersion>2.2</ApiVersion>
+        <Privileges/>
+        <UiApp Main="True" MenuIconVisible="True" Name="QtHelloWorld" LaunchingHistoryVisible="True">
+            <UiScalability CoordinateSystem="Logical" LogicalCoordinate="720" BaseScreenSize="Normal"/>
+            <UiTheme SystemTheme="White"/>
+            <DisplayNames>
+                <DisplayName Locale="eng-GB">QtHelloWorld</DisplayName>
+            </DisplayNames>
+            <Icons>
+                <Icon Section="MainMenu">mainmenu.png</Icon>
+            </Icons>
+            <LaunchConditions/>
+        </UiApp>
+    </Apps>
+</Manifest>

diff --git a/examples/helloworld/images/mainmenu.png b/examples/helloworld/shared/res/screen-density-xhigh/mainmenu.png
similarity index 100%
rename from examples/helloworld/images/mainmenu.png
rename to examples/helloworld/shared/res/screen-density-xhigh/mainmenu.png

diff --git a/examples/helloworld/tizen/qt.conf b/examples/helloworld/tizen/qt.conf
deleted file mode 100644 (file)
index df71e82..0000000
--- a/examples/helloworld/tizen/qt.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[Paths]
-Prefix=/opt/usr/apps/QtHelloWrl
-Libraries=lib
-Binaries=bin
-Plugins=data/plugins
-Qml2Imports=data/qml

diff --git a/examples/sensor-checker/main.cpp b/examples/sensor-checker/main.cpp
index ebc2e85..034d160 100644 (file)
--- a/examples/sensor-checker/main.cpp
+++ b/examples/sensor-checker/main.cpp
@@ -35,7 +35,7 @@
 extern "C" int OspMain(int argc, char *argv[])
 {
 #ifdef Q_OS_TIZEN_SIMULATOR
-    qputenv("QML_BAD_GUI_RENDER_LOOP","1");
+    qputenv("QSG_RENDER_LOOP","windows");
 #endif
     qputenv("QT_QUICK_CONTROLS_STYLE","Tizen");
     QGuiApplication app(argc,argv);

diff --git a/examples/sensor-checker/manifest.xml b/examples/sensor-checker/manifest.xml
new file mode 100644 (file)
index 0000000..478b641
--- /dev/null
+++ b/examples/sensor-checker/manifest.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<Manifest xmlns="http://schemas.tizen.org/2012/12/manifest">
+    <Id>QtSensorsC</Id>
+    <Version>1.0.0</Version>
+    <Type>C++App</Type>
+    <Requirements/>
+    <Apps>
+        <ApiVersion>2.2</ApiVersion>
+        <Privileges/>
+        <UiApp Main="True" MenuIconVisible="True" Name="QtSensorChecker" LaunchingHistoryVisible="True">
+            <UiScalability CoordinateSystem="Logical" LogicalCoordinate="720" BaseScreenSize="Normal"/>
+            <UiTheme SystemTheme="White"/>
+            <DisplayNames>
+                <DisplayName Locale="eng-GB">Qt Sensors</DisplayName>
+            </DisplayNames>
+            <Icons>
+                <Icon Section="MainMenu">mainmenu.png</Icon>
+            </Icons>
+            <LaunchConditions/>
+        </UiApp>
+    </Apps>
+</Manifest>

diff --git a/examples/sensor-checker/sensor-checker-default.qrc b/examples/sensor-checker/sensor-checker-default.qrc
index 7e51f44..64d653c 100644 (file)
--- a/examples/sensor-checker/sensor-checker-default.qrc
+++ b/examples/sensor-checker/sensor-checker-default.qrc
@@ -2,6 +2,6 @@
     <qresource prefix="/">
         <file>main.qml</file>
         <file>content/SensorInformationItem.qml</file>
-        <file>images/mainmenu.png</file>
+        <file alias="images/mainmenu.png">shared/res/screen-density-xhigh/mainmenu.png</file>
     </qresource>
 </RCC>

diff --git a/examples/sensor-checker/sensor-checker.pro b/examples/sensor-checker/sensor-checker.pro
index 43fcc79..ffc6576 100644 (file)
--- a/examples/sensor-checker/sensor-checker.pro
+++ b/examples/sensor-checker/sensor-checker.pro
@@ -1,27 +1,25 @@
 TEMPLATE=app
 
-tizen {
-    QMAKE_LFLAGS+=-pie -rdynamic
-    TARGET=QtSensorChecker.exe
-} else {
-    TARGET=QtSensorChecker
-}
+TARGET=QtSensorChecker
 
 QT += qml quick
 
 OTHER_FILES += \
     main.qml \
-    tizen/qt.conf \
-    content/SensorInformationItem.qml
+    content/SensorInformationItem.qml \
+    manifest.xml
 
 SOURCES += \
     main.cpp
 
-
 RESOURCES += sensor-checker-default.qrc
 
-tizen: RESOURCES += sensor-checker-tizen.qrc
-
+tizen {
+    tizen_shared.files = shared/res
+    CONFIG += TIZEN_STANDALONE_PACKAGE
+    TIZEN_BUNDLED_QT_LIBS=Qt5Core Qt5DBus Qt5Qml Qt5Quick Qt5Widgets Qt5Gui Qt5Network Qt5Sensors
+    load(tizen_app)
+}
 
 
 

diff --git a/examples/sensor-checker/images/mainmenu.png b/examples/sensor-checker/shared/res/screen-density-xhigh/mainmenu.png
similarity index 100%
rename from examples/sensor-checker/images/mainmenu.png
rename to examples/sensor-checker/shared/res/screen-density-xhigh/mainmenu.png

diff --git a/examples/sensor-checker/tizen/qt.conf b/examples/sensor-checker/tizen/qt.conf
deleted file mode 100644 (file)
index 1020361..0000000
--- a/examples/sensor-checker/tizen/qt.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[Paths]
-Prefix=/opt/usr/apps/QtSensorsC
-Libraries=lib
-Binaries=bin
-Plugins=data/plugins
-Qml2Imports=data/qml

diff --git a/examples/touch/main.cpp b/examples/touch/main.cpp
index e0f25c1..0d5fe39 100644 (file)
--- a/examples/touch/main.cpp
+++ b/examples/touch/main.cpp
@@ -35,7 +35,7 @@
 extern "C" int OspMain(int argc, char *argv[])
 {
 #ifdef Q_OS_TIZEN_SIMULATOR
-    qputenv("QML_BAD_GUI_RENDER_LOOP","1");
+    qputenv("QSG_RENDER_LOOP","windows");
 #endif
     qputenv("QT_QUICK_CONTROLS_STYLE","Tizen");
     QGuiApplication app(argc,argv);

diff --git a/examples/touch/manifest.xml b/examples/touch/manifest.xml
new file mode 100644 (file)
index 0000000..71f2fbe
--- /dev/null
+++ b/examples/touch/manifest.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<Manifest xmlns="http://schemas.tizen.org/2012/12/manifest">
+    <Id>QtControls</Id>
+    <Version>1.0.0</Version>
+    <Type>C++App</Type>
+    <Requirements/>
+    <Apps>
+        <ApiVersion>2.2</ApiVersion>
+        <Privileges/>
+        <UiApp Main="True" MenuIconVisible="True" Name="QtControls" LaunchingHistoryVisible="True">
+            <UiScalability CoordinateSystem="Logical" LogicalCoordinate="720" BaseScreenSize="Normal"/>
+            <UiTheme SystemTheme="White"/>
+            <DisplayNames>
+                <DisplayName Locale="eng-GB">Qt Controls</DisplayName>
+            </DisplayNames>
+            <Icons>
+                <Icon Section="MainMenu">mainmenu.png</Icon>
+            </Icons>
+            <LaunchConditions/>
+        </UiApp>
+    </Apps>
+</Manifest>

diff --git a/examples/touch/images/mainmenu.png b/examples/touch/shared/res/screen-density-xhigh/mainmenu.png
similarity index 100%
rename from examples/touch/images/mainmenu.png
rename to examples/touch/shared/res/screen-density-xhigh/mainmenu.png

diff --git a/examples/touch/tizen/qt.conf b/examples/touch/tizen/qt.conf
deleted file mode 100644 (file)
index 7b3b93b..0000000
--- a/examples/touch/tizen/qt.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[Paths]
-Prefix=/opt/usr/apps/QtControls
-Libraries=lib
-Binaries=bin
-Plugins=data/plugins
-Qml2Imports=data/qml

diff --git a/examples/touch/touch-default.qrc b/examples/touch/touch-default.qrc
index 8c2da2c..e9d53b4 100644 (file)
--- a/examples/touch/touch-default.qrc
+++ b/examples/touch/touch-default.qrc
@@ -23,6 +23,6 @@
         <file>content/DateTimeEditPage.qml</file>
         <file>content/PageCurl.qml</file>
         <file>content/ConfigurationPage.qml</file>
-        <file>images/mainmenu.png</file>
+        <file alias="images/mainmenu.png">shared/res/screen-density-xhigh/mainmenu.png</file>
     </qresource>
 </RCC>

diff --git a/examples/touch/touch.pro b/examples/touch/touch.pro
index 02bfa4e..4ccffc8 100644 (file)
--- a/examples/touch/touch.pro
+++ b/examples/touch/touch.pro
@@ -1,11 +1,7 @@
 TEMPLATE=app
 
-tizen {
-    QMAKE_LFLAGS+=-pie -rdynamic
-    TARGET=QtControls.exe
-} else {
-    TARGET=QtControls
-}
+TARGET=QtControls
+
 QT += qml quick
 
 OTHER_FILES += \
@@ -22,7 +18,8 @@ OTHER_FILES += \
     content/DateTimeEditPage.qml\
     content/PageCurl.qml \
     content/ConfigurationPage.qml \
-    tizen/qt.conf
+    tizen/qt.conf \
+    manifest.xml
 
 
 SOURCES += \
@@ -30,5 +27,9 @@ SOURCES += \
 
 RESOURCES += touch-default.qrc
 
-tizen: RESOURCES += touch-tizen.qrc
-
+tizen {
+    tizen_shared.files = shared/res
+    CONFIG += TIZEN_STANDALONE_PACKAGE
+    TIZEN_BUNDLED_QT_LIBS=Qt5Core Qt5DBus Qt5Qml Qt5Quick Qt5Widgets Qt5Gui Qt5Network
+    load(tizen_app)
+}

diff --git a/qtquickcontrols-tizen.pro b/qtquickcontrols-tizen.pro
index 99c9135..58c33f2 100644 (file)
--- a/qtquickcontrols-tizen.pro
+++ b/qtquickcontrols-tizen.pro
@@ -1,3 +1 @@
-#load(qt_parts)
-TEMPLATE=subdirs
-SUBDIRS += src examples tools
+load(qt_parts)