diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-07 00:33:04 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-07 00:33:04 +1000 |
| commit | b83cadfc3a8edb2769981c3774a1b9aee0608ec7 (patch) | |
| tree | 0f8aeca7951a2f396703775a0c511cf6d3429d58 /examples | |
| parent | 6783649cd1b3d50febf74f3d1a24e198973c7b21 (diff) | |
| parent | 40191387a77552b2ba6df547b87de040e126220a (diff) | |
| download | qt4-tools-b83cadfc3a8edb2769981c3774a1b9aee0608ec7.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Close context menus during orientation change.
Have -small-screen enabled in certain examples on Symbian always.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/draganddrop/fridgemagnets/main.cpp | 5 | ||||
| -rw-r--r-- | examples/script/context2d/main.cpp | 5 | ||||
| -rw-r--r-- | examples/widgets/wiggly/main.cpp | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/examples/draganddrop/fridgemagnets/main.cpp b/examples/draganddrop/fridgemagnets/main.cpp index 1166abbcaa..e87ef5b39b 100644 --- a/examples/draganddrop/fridgemagnets/main.cpp +++ b/examples/draganddrop/fridgemagnets/main.cpp @@ -51,7 +51,12 @@ int main(int argc, char *argv[]) #endif DragWidget window; +#ifdef Q_OS_SYMBIAN + bool smallScreen = true; +#else bool smallScreen = QApplication::arguments().contains("-small-screen"); +#endif + if (smallScreen) window.showFullScreen(); else diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp index 3d56910102..20df178869 100644 --- a/examples/script/context2d/main.cpp +++ b/examples/script/context2d/main.cpp @@ -48,7 +48,12 @@ int main(int argc, char **argv) QApplication app(argc, argv); Window win; +#ifdef Q_OS_SYMBIAN + bool smallScreen = true; +#else bool smallScreen = QApplication::arguments().contains("-small-screen"); +#endif + if (!smallScreen) { win.show(); } else { diff --git a/examples/widgets/wiggly/main.cpp b/examples/widgets/wiggly/main.cpp index 91cd1b8c4b..7ba6d3649a 100644 --- a/examples/widgets/wiggly/main.cpp +++ b/examples/widgets/wiggly/main.cpp @@ -45,7 +45,11 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); +#ifdef Q_OS_SYMBIAN + bool smallScreen = true; +#else bool smallScreen = QApplication::arguments().contains("-small-screen"); +#endif Dialog dialog(0, smallScreen); |