summaryrefslogtreecommitdiffstats
path: root/examples/tutorials
diff options
context:
space:
mode:
authorhjk <[email protected]>2012-05-09 17:56:47 +0200
committerQt by Nokia <[email protected]>2012-05-10 09:16:35 +0200
commit7f2c22e8910f43728f13d76aa2c50c29a19f3ee0 (patch)
treeaaef16c1747d5d1d5e1985affaa2b39795728763 /examples/tutorials
parent5f43422ddf38e48f56b2ef39ee19bec2cb430ac4 (diff)
gettingStarted, part 3-5: sanitize parameter names and compile fix
Change-Id: I12795439de71a41728f98b3d3438324664b27a0f Reviewed-by: Friedemann Kleint <[email protected]>
Diffstat (limited to 'examples/tutorials')
-rw-r--r--examples/tutorials/gettingStarted/gsQt/part3/main.cpp4
-rw-r--r--examples/tutorials/gettingStarted/gsQt/part3/part3.pro1
-rw-r--r--examples/tutorials/gettingStarted/gsQt/part4/main.cpp4
-rw-r--r--examples/tutorials/gettingStarted/gsQt/part4/part4.pro1
-rw-r--r--examples/tutorials/gettingStarted/gsQt/part5/main.cpp4
-rw-r--r--examples/tutorials/gettingStarted/gsQt/part5/part5.pro1
6 files changed, 9 insertions, 6 deletions
diff --git a/examples/tutorials/gettingStarted/gsQt/part3/main.cpp b/examples/tutorials/gettingStarted/gsQt/part3/main.cpp
index 4967f6db2fd..db3eba7e4ae 100644
--- a/examples/tutorials/gettingStarted/gsQt/part3/main.cpp
+++ b/examples/tutorials/gettingStarted/gsQt/part3/main.cpp
@@ -83,9 +83,9 @@ void Notepad::quit()
qApp->quit();
}
-int main(int argv, char **args)
+int main(int argc, char **argv)
{
- QApplication app(argv, args);
+ QApplication app(argc, argv);
Notepad notepad;
notepad.show();
diff --git a/examples/tutorials/gettingStarted/gsQt/part3/part3.pro b/examples/tutorials/gettingStarted/gsQt/part3/part3.pro
index d194acb2e20..c89f95fbfa6 100644
--- a/examples/tutorials/gettingStarted/gsQt/part3/part3.pro
+++ b/examples/tutorials/gettingStarted/gsQt/part3/part3.pro
@@ -1,4 +1,5 @@
+QT += widgets
SOURCES = main.cpp
# install
diff --git a/examples/tutorials/gettingStarted/gsQt/part4/main.cpp b/examples/tutorials/gettingStarted/gsQt/part4/main.cpp
index ca4e7dcbfbf..f5ec5bea5ec 100644
--- a/examples/tutorials/gettingStarted/gsQt/part4/main.cpp
+++ b/examples/tutorials/gettingStarted/gsQt/part4/main.cpp
@@ -94,9 +94,9 @@ void Notepad::save()
}
-int main(int argv, char **args)
+int main(int argc, char **argv)
{
- QApplication app(argv, args);
+ QApplication app(argc, argv);
Notepad notepad;
notepad.show();
diff --git a/examples/tutorials/gettingStarted/gsQt/part4/part4.pro b/examples/tutorials/gettingStarted/gsQt/part4/part4.pro
index 3de03accc00..94c7abdf39f 100644
--- a/examples/tutorials/gettingStarted/gsQt/part4/part4.pro
+++ b/examples/tutorials/gettingStarted/gsQt/part4/part4.pro
@@ -1,4 +1,5 @@
+QT += widgets
SOURCES = main.cpp
# install
diff --git a/examples/tutorials/gettingStarted/gsQt/part5/main.cpp b/examples/tutorials/gettingStarted/gsQt/part5/main.cpp
index 6d87ca7ba69..25ee5d0fbb1 100644
--- a/examples/tutorials/gettingStarted/gsQt/part5/main.cpp
+++ b/examples/tutorials/gettingStarted/gsQt/part5/main.cpp
@@ -120,9 +120,9 @@ void Notepad::save()
}
}
-int main(int argv, char **args)
+int main(int argc, char **argv)
{
- QApplication app(argv, args);
+ QApplication app(argc, argv);
Notepad notepad;
notepad.show();
diff --git a/examples/tutorials/gettingStarted/gsQt/part5/part5.pro b/examples/tutorials/gettingStarted/gsQt/part5/part5.pro
index 711cac212ac..4631449e714 100644
--- a/examples/tutorials/gettingStarted/gsQt/part5/part5.pro
+++ b/examples/tutorials/gettingStarted/gsQt/part5/part5.pro
@@ -1,4 +1,5 @@
+QT += widgets
SOURCES = main.cpp
# install