diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-10-21 16:27:40 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-10-21 16:29:02 (GMT) |
| commit | d043b59fedc41c774cc68eb49d9900dc6d36f3e5 (patch) | |
| tree | 48dc901b8b5bf81268003f2add1da470b7728099 | |
| parent | bc2de3fbcc3f19c80938bdea17f01aa7da9f055e (diff) | |
| download | Qt-d043b59fedc41c774cc68eb49d9900dc6d36f3e5.zip Qt-d043b59fedc41c774cc68eb49d9900dc6d36f3e5.tar.gz Qt-d043b59fedc41c774cc68eb49d9900dc6d36f3e5.tar.bz2 | |
windowsmobilelify embedded demos
Reviewed-by: aportale
| -rw-r--r-- | demos/embedded/digiflip/digiflip.cpp | 8 | ||||
| -rw-r--r-- | demos/embedded/flickable/main.cpp | 2 | ||||
| -rw-r--r-- | demos/embedded/lightmaps/lightmaps.cpp | 4 | ||||
| -rw-r--r-- | demos/embedded/raycasting/raycasting.cpp | 6 |
4 files changed, 11 insertions, 9 deletions
diff --git a/demos/embedded/digiflip/digiflip.cpp b/demos/embedded/digiflip/digiflip.cpp index 2edb752..9d6265d 100644 --- a/demos/embedded/digiflip/digiflip.cpp +++ b/demos/embedded/digiflip/digiflip.cpp @@ -117,7 +117,7 @@ protected: QPixmap drawDigits(int n, const QRect &rect) { int scaleFactor = 2; -#if defined(Q_OS_SYMBIAN) +#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) if (rect.height() > 240) scaleFactor = 1; #endif @@ -192,7 +192,7 @@ protected: void paintFlip() { QPainter p(this); -#if !defined(Q_OS_SYMBIAN) +#if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_WINCE_WM) p.setRenderHint(QPainter::SmoothPixmapTransform, true); p.setRenderHint(QPainter::Antialiasing, true); #endif @@ -319,7 +319,7 @@ public: connect(slideAction, SIGNAL(triggered()), SLOT(chooseSlide())); connect(flipAction, SIGNAL(triggered()), SLOT(chooseFlip())); connect(rotateAction, SIGNAL(triggered()), SLOT(chooseRotate())); -#if defined(Q_OS_SYMBIAN) +#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) menuBar()->addAction(slideAction); menuBar()->addAction(flipAction); menuBar()->addAction(rotateAction); @@ -414,7 +414,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); DigiFlip time; -#if defined(Q_OS_SYMBIAN) +#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) time.showMaximized(); #else time.resize(320, 240); diff --git a/demos/embedded/flickable/main.cpp b/demos/embedded/flickable/main.cpp index 403085a..eb2c3c0 100644 --- a/demos/embedded/flickable/main.cpp +++ b/demos/embedded/flickable/main.cpp @@ -222,7 +222,7 @@ int main(int argc, char *argv[]) ColorList list; list.setWindowTitle("Kinetic Scrolling"); -#ifdef Q_OS_SYMBIAN +#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) list.showMaximized(); #else list.resize(320, 320); diff --git a/demos/embedded/lightmaps/lightmaps.cpp b/demos/embedded/lightmaps/lightmaps.cpp index 52297d2..ea34ae6 100644 --- a/demos/embedded/lightmaps/lightmaps.cpp +++ b/demos/embedded/lightmaps/lightmaps.cpp @@ -510,7 +510,7 @@ public: connect(nightModeAction, SIGNAL(triggered()), map, SLOT(toggleNightMode())); connect(osmAction, SIGNAL(triggered()), SLOT(aboutOsm())); -#if defined(Q_OS_SYMBIAN) +#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) menuBar()->addAction(osloAction); menuBar()->addAction(berlinAction); menuBar()->addAction(jakartaAction); @@ -568,7 +568,7 @@ int main(int argc, char **argv) MapZoom w; w.setWindowTitle("OpenStreetMap"); -#if defined(Q_OS_SYMBIAN) +#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) w.showMaximized(); #else w.resize(600, 450); diff --git a/demos/embedded/raycasting/raycasting.cpp b/demos/embedded/raycasting/raycasting.cpp index c3b21b6..cb08b51 100644 --- a/demos/embedded/raycasting/raycasting.cpp +++ b/demos/embedded/raycasting/raycasting.cpp @@ -251,7 +251,9 @@ public: protected: void resizeEvent(QResizeEvent*) { -#if defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE_WM) + touchDevice = true; +#elif defined(Q_OS_SYMBIAN) // FIXME: use HAL if (width() > 480 || height() > 480) touchDevice = true; @@ -378,7 +380,7 @@ int main(int argc, char **argv) Raycasting w; w.setWindowTitle("Raycasting"); -#if defined(Q_OS_SYMBIAN) +#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) w.showMaximized(); #else w.resize(640, 480); |