diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-15 23:21:11 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-15 23:21:11 (GMT) |
| commit | d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04 (patch) | |
| tree | 5326031090ee5921eaf5c3259153194ddc352afc /demos | |
| parent | 45c13a0064281d0e2b9a10c7dfb0cef7f3b6720f (diff) | |
| parent | 669afa2337ad5791502fe3af2e3de648cb60ea9b (diff) | |
| download | Qt-d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04.zip Qt-d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04.tar.gz Qt-d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/deform/main.cpp | 3 | ||||
| -rw-r--r-- | demos/embedded/anomaly/src/Main.cpp | 3 | ||||
| -rw-r--r-- | demos/embedded/embeddedsvgviewer/main.cpp | 3 | ||||
| -rw-r--r-- | demos/embedded/flightinfo/flightinfo.pro | 2 | ||||
| -rw-r--r-- | demos/embedded/lightmaps/lightmaps.pro | 2 | ||||
| -rw-r--r-- | demos/embedded/weatherinfo/weatherinfo.pro | 2 | ||||
| -rw-r--r-- | demos/pathstroke/main.cpp | 3 |
7 files changed, 15 insertions, 3 deletions
diff --git a/demos/deform/main.cpp b/demos/deform/main.cpp index cb92a21..6110a76 100644 --- a/demos/deform/main.cpp +++ b/demos/deform/main.cpp @@ -68,5 +68,8 @@ int main(int argc, char **argv) else deformWidget.show(); +#ifdef QT_KEYPAD_NAVIGATION + QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); +#endif return app.exec(); } diff --git a/demos/embedded/anomaly/src/Main.cpp b/demos/embedded/anomaly/src/Main.cpp index f9610d3..cf32420 100644 --- a/demos/embedded/anomaly/src/Main.cpp +++ b/demos/embedded/anomaly/src/Main.cpp @@ -67,5 +67,8 @@ int main(int argc, char *argv[]) app.setStyle("windows"); #endif +#ifdef QT_KEYPAD_NAVIGATION + QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); +#endif return app.exec(); } diff --git a/demos/embedded/embeddedsvgviewer/main.cpp b/demos/embedded/embeddedsvgviewer/main.cpp index 10c7d76..9c91fb7 100644 --- a/demos/embedded/embeddedsvgviewer/main.cpp +++ b/demos/embedded/embeddedsvgviewer/main.cpp @@ -64,5 +64,8 @@ int main(int argc, char** argv) viewer.showFullScreen(); +#ifdef QT_KEYPAD_NAVIGATION + QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); +#endif return app.exec(); } diff --git a/demos/embedded/flightinfo/flightinfo.pro b/demos/embedded/flightinfo/flightinfo.pro index 461c701..2f36cb8 100644 --- a/demos/embedded/flightinfo/flightinfo.pro +++ b/demos/embedded/flightinfo/flightinfo.pro @@ -9,6 +9,6 @@ symbian { include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) TARGET.UID3 = 0xA000CF74 HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h - LIBS += -lesock -lconnmon + LIBS += -lesock -lconnmon -linsock TARGET.CAPABILITY = NetworkServices } diff --git a/demos/embedded/lightmaps/lightmaps.pro b/demos/embedded/lightmaps/lightmaps.pro index 137183a..d4168b1 100644 --- a/demos/embedded/lightmaps/lightmaps.pro +++ b/demos/embedded/lightmaps/lightmaps.pro @@ -6,7 +6,7 @@ symbian { include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) TARGET.UID3 = 0xA000CF75 HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h - LIBS += -lesock -lconnmon + LIBS += -lesock -lconnmon -linsock TARGET.CAPABILITY = NetworkServices TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/demos/embedded/weatherinfo/weatherinfo.pro b/demos/embedded/weatherinfo/weatherinfo.pro index 0a579b0..7bff6e9 100644 --- a/demos/embedded/weatherinfo/weatherinfo.pro +++ b/demos/embedded/weatherinfo/weatherinfo.pro @@ -8,6 +8,6 @@ symbian { include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) TARGET.UID3 = 0xA000CF77 HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h - LIBS += -lesock -lconnmon + LIBS += -lesock -lconnmon -linsock TARGET.CAPABILITY = NetworkServices } diff --git a/demos/pathstroke/main.cpp b/demos/pathstroke/main.cpp index 7c4ad83..60520f1 100644 --- a/demos/pathstroke/main.cpp +++ b/demos/pathstroke/main.cpp @@ -65,5 +65,8 @@ int main(int argc, char **argv) else pathStrokeWidget.show(); +#ifdef QT_KEYPAD_NAVIGATION + QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); +#endif return app.exec(); } |