diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 16:12:25 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 16:12:25 (GMT) |
commit | 372af5d18bb85c41ce336f2bbf72b44646d8a79f (patch) | |
tree | 06c487f426fee92cf01eb8c1601ce44f99ee79ba /examples | |
parent | dfc61f6b59886f7d223722bf149342cdd46581a8 (diff) | |
parent | 83245ed872b6265d872a8ab0235c9dbd1f2daf4b (diff) | |
download | Qt-372af5d18bb85c41ce336f2bbf72b44646d8a79f.zip Qt-372af5d18bb85c41ce336f2bbf72b44646d8a79f.tar.gz Qt-372af5d18bb85c41ce336f2bbf72b44646d8a79f.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Removed a change from the 4.7.0 change log.
Improve look and feel of itemviews on mac
doc: Fixed many broken links.
doc: Fixed many broken links.
update 4.7.0 changes
QPushButton's click area exceeds the button area by far on Mac OS X
QApplication::closeAllWindows() should ignore windows being closed
Examples: Fix compilation with namespace.
Use QApplication::arguments() to check for command line args
Added support for .rc files on VS2010.
Doc: Updating CSS and JS
Docs: added an intro for qml, Quick for Beginners.
Fix crash on exit in native wifi plugin on Vista+ when run in debugger.
Diffstat (limited to 'examples')
-rw-r--r-- | examples/draganddrop/fridgemagnets/main.cpp | 6 | ||||
-rw-r--r-- | examples/script/context2d/main.cpp | 6 | ||||
-rw-r--r-- | examples/widgets/wiggly/main.cpp | 15 |
3 files changed, 9 insertions, 18 deletions
diff --git a/examples/draganddrop/fridgemagnets/main.cpp b/examples/draganddrop/fridgemagnets/main.cpp index 3c517bd..b5a39c0 100644 --- a/examples/draganddrop/fridgemagnets/main.cpp +++ b/examples/draganddrop/fridgemagnets/main.cpp @@ -45,16 +45,14 @@ int main(int argc, char *argv[]) { Q_INIT_RESOURCE(fridgemagnets); - bool smallScreen = false; - for (int i=0; i<argc; i++) - if (QString(argv[i]) == "-small-screen") - smallScreen = true; QApplication app(argc, argv); #ifdef QT_KEYPAD_NAVIGATION QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif DragWidget window; + + bool smallScreen = QApplication::arguments().contains("-small-screen"); if (smallScreen) window.showFullScreen(); else diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp index 95daf2b..8fd68db 100644 --- a/examples/script/context2d/main.cpp +++ b/examples/script/context2d/main.cpp @@ -46,14 +46,10 @@ int main(int argc, char **argv) { Q_INIT_RESOURCE(context2d); - bool smallScreen = false; - for (int i = 0; i < argc; i++) - if (QString(argv[i]) == "-small-screen") - smallScreen = true; - QApplication app(argc, argv); Window win; + bool smallScreen = QApplication::arguments().contains("-small-screen"); if (!smallScreen) { win.show(); } else { diff --git a/examples/widgets/wiggly/main.cpp b/examples/widgets/wiggly/main.cpp index 4a6cd5d..8ad7696 100644 --- a/examples/widgets/wiggly/main.cpp +++ b/examples/widgets/wiggly/main.cpp @@ -46,16 +46,13 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - bool smallScreen = false; - for (int i=0; i<argc; i++) - if (QString(argv[i]) == "-small-screen") - smallScreen = true; - Dialog dialog(0,smallScreen); - if (!smallScreen){ + bool smallScreen = QApplication::arguments().contains("-small-screen"); + + Dialog dialog(0, smallScreen); + + if (!smallScreen) dialog.show(); - } - else{ + else dialog.showFullScreen(); - } return app.exec(); } |