diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-06-17 11:54:16 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-06-17 11:54:16 (GMT) |
| commit | 2b39081bf101e53a70ff056d527dc3dfb8208bf0 (patch) | |
| tree | a8e57489e18dbdd620b8880eda5c8e2d77049a07 /demos/pathstroke/main.cpp | |
| parent | 5e1112ec04dcef671700e326186ca56b790f7e08 (diff) | |
| parent | c390312f8fbea14ac4df0c5185ca814054f448d8 (diff) | |
| download | Qt-2b39081bf101e53a70ff056d527dc3dfb8208bf0.zip Qt-2b39081bf101e53a70ff056d527dc3dfb8208bf0.tar.gz Qt-2b39081bf101e53a70ff056d527dc3dfb8208bf0.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
Diffstat (limited to 'demos/pathstroke/main.cpp')
| -rw-r--r-- | demos/pathstroke/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/demos/pathstroke/main.cpp b/demos/pathstroke/main.cpp index b357f99..ca201d3 100644 --- a/demos/pathstroke/main.cpp +++ b/demos/pathstroke/main.cpp @@ -48,7 +48,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 PathStrokeWidget pathStrokeWidget(smallScreen); QStyle *arthurStyle = new ArthurStyle(); |