summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-07 16:08:38 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-07 16:08:38 (GMT)
commitc6a8f35846df86a87591372d022e54a701591f5b (patch)
tree471f5eb02ccee400c2587e8b3fae55b922d848d1 /examples
parentd4c00ffb6f01a991118388957de831394c8ad9c1 (diff)
parent1dd89b6ad0546f247486b63f72035baf21475b51 (diff)
downloadQt-c6a8f35846df86a87591372d022e54a701591f5b.zip
Qt-c6a8f35846df86a87591372d022e54a701591f5b.tar.gz
Qt-c6a8f35846df86a87591372d022e54a701591f5b.tar.bz2
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'examples')
-rw-r--r--examples/draganddrop/fridgemagnets/main.cpp5
-rw-r--r--examples/script/context2d/main.cpp5
-rw-r--r--examples/widgets/wiggly/main.cpp4
3 files changed, 14 insertions, 0 deletions
diff --git a/examples/draganddrop/fridgemagnets/main.cpp b/examples/draganddrop/fridgemagnets/main.cpp
index 1166abb..e87ef5b 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 3d56910..20df178 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 91cd1b8..7ba6d36 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);