gettingStarted: sanitize parameter names and compile fix for Qt 5

Change-Id: I3f30ccee89b8add8718a9a36f0f16fa7b2e9bad1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/examples/tutorials/gettingStarted/gsQt/part1/main.cpp b/examples/tutorials/gettingStarted/gsQt/part1/main.cpp
index fb45689..6557d05 100644 (file)
--- a/examples/tutorials/gettingStarted/gsQt/part1/main.cpp
+++ b/examples/tutorials/gettingStarted/gsQt/part1/main.cpp
@@ -40,10 +40,9 @@
 
 #include <QtWidgets>
 
-
-int main(int argv, char **args)
+int main(int argc, char *argv[])
 {
-    QApplication app(argv, args);
+    QApplication app(argc, argv);
 
     QTextEdit textEdit;
     textEdit.show();

diff --git a/examples/tutorials/gettingStarted/gsQt/part1/part1.pro b/examples/tutorials/gettingStarted/gsQt/part1/part1.pro
index f52a633..b3fd65a 100644 (file)
--- a/examples/tutorials/gettingStarted/gsQt/part1/part1.pro
+++ b/examples/tutorials/gettingStarted/gsQt/part1/part1.pro
@@ -1,3 +1,5 @@
+
+QT += widgets
 SOURCES = main.cpp
 
 # install

diff --git a/examples/tutorials/gettingStarted/gsQt/part2/main.cpp b/examples/tutorials/gettingStarted/gsQt/part2/main.cpp
index 93f14a2..996c314 100644 (file)
--- a/examples/tutorials/gettingStarted/gsQt/part2/main.cpp
+++ b/examples/tutorials/gettingStarted/gsQt/part2/main.cpp
@@ -40,9 +40,9 @@
 
 #include <QtWidgets>
 
-int main(int argv, char **args)
+int main(int argc, char *argv[])
 {
-    QApplication app(argv, args);
+    QApplication app(argc, argv);
 
     QTextEdit textEdit;
     QPushButton quitButton("&Quit");

diff --git a/examples/tutorials/gettingStarted/gsQt/part2/part2.pro b/examples/tutorials/gettingStarted/gsQt/part2/part2.pro
index 383c3ce..81fb0e9 100644 (file)
--- a/examples/tutorials/gettingStarted/gsQt/part2/part2.pro
+++ b/examples/tutorials/gettingStarted/gsQt/part2/part2.pro
@@ -1,4 +1,5 @@
 
+QT += widgets
 SOURCES = main.cpp
 
 # install