summaryrefslogtreecommitdiffstats
path: root/examples/quick/controls/basiclayouts/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-11-27 17:38:12 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-28 16:14:43 +0100
commit1070aeb5521a95039cad3f4536e85e99526a4900 (patch)
tree2b31244780d129053fd30274bc3662be34f45eb4 /examples/quick/controls/basiclayouts/src
parent605f63a1880400a5b540bab60ad68d3612bd71c1 (diff)
Revise main() in examples
Replace the inconvenient QT_QUICK_CONTROLS_EXAMPLE_MAIN macro with a simpler macro that merely defines the actual application type. This way it's easier to do tweaks to main() when for example testing a different application font size. Moreover, browsing the example code becomes more convenient (especially online). Task-number: QTBUG-35083 Change-Id: I8203816a9112bf29b4661baa86bf4a196554db05 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'examples/quick/controls/basiclayouts/src')
-rw-r--r--examples/quick/controls/basiclayouts/src/main.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/examples/quick/controls/basiclayouts/src/main.cpp b/examples/quick/controls/basiclayouts/src/main.cpp
index 57ba57e35..a757f4853 100644
--- a/examples/quick/controls/basiclayouts/src/main.cpp
+++ b/examples/quick/controls/basiclayouts/src/main.cpp
@@ -38,5 +38,12 @@
**
****************************************************************************/
-#include "../../shared/qt_quick_controls_examplemain.h"
-QT_QUICK_CONTROLS_EXAMPLE_MAIN(qrc:/main.qml)
+#include "qtquickcontrolsapplication.h"
+#include <QtQml/QQmlApplicationEngine>
+
+int main(int argc, char *argv[])
+{
+ QtQuickControlsApplication app(argc, argv);
+ QQmlApplicationEngine engine(QUrl("qrc:/main.qml"));
+ return app.exec();
+}