From cc8d9fb85e816fc235c0343b484ff9dec61ed30c Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 9 May 2012 17:11:14 +0200 Subject: gettingStarted: sanitize parameter names and compile fix for Qt 5 Change-Id: I3f30ccee89b8add8718a9a36f0f16fa7b2e9bad1 Reviewed-by: Friedemann Kleint --- examples/tutorials/gettingStarted/gsQt/part1/main.cpp | 5 ++--- examples/tutorials/gettingStarted/gsQt/part1/part1.pro | 2 ++ examples/tutorials/gettingStarted/gsQt/part2/main.cpp | 4 ++-- examples/tutorials/gettingStarted/gsQt/part2/part2.pro | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/tutorials/gettingStarted/gsQt/part1/main.cpp b/examples/tutorials/gettingStarted/gsQt/part1/main.cpp index fb45689cc7..6557d0525f 100644 --- a/examples/tutorials/gettingStarted/gsQt/part1/main.cpp +++ b/examples/tutorials/gettingStarted/gsQt/part1/main.cpp @@ -40,10 +40,9 @@ #include - -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 f52a6331b5..b3fd65a1f8 100644 --- 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 93f14a25bb..996c3149c6 100644 --- a/examples/tutorials/gettingStarted/gsQt/part2/main.cpp +++ b/examples/tutorials/gettingStarted/gsQt/part2/main.cpp @@ -40,9 +40,9 @@ #include -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 383c3ce5ba..81fb0e9ff9 100644 --- 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 -- cgit v1.2.3