diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-18 09:54:31 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 15:47:49 +0200 |
commit | 87274e272d2a854563066489e20d019b4e6320de (patch) | |
tree | d01e71403a41db3ca2b83599fcc7036d79d7a13e /examples/richtext/calendar | |
parent | 08e24858607d1b1483fb1faa54effa957501cfbb (diff) |
QtBase examples: Remove Maemo/Symbian-specific code.
- Maemo/Symbian are no longer supported and QWidget-based examples
are no longer supposed to run on mobile platforms, so, remove any
Maemo/Symbian or mobile-specific code from source files and
profiles.
- Remove Maemo/Symbian vibration examples.
- Change Q_WS_MAC/WIN to Q_OS_MAC/WIN where appropriate.
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'examples/richtext/calendar')
-rw-r--r-- | examples/richtext/calendar/calendar.pro | 3 | ||||
-rw-r--r-- | examples/richtext/calendar/main.cpp | 6 | ||||
-rw-r--r-- | examples/richtext/calendar/mainwindow.cpp | 4 |
3 files changed, 0 insertions, 13 deletions
diff --git a/examples/richtext/calendar/calendar.pro b/examples/richtext/calendar/calendar.pro index 265e0e94f6..f65e8852bd 100644 --- a/examples/richtext/calendar/calendar.pro +++ b/examples/richtext/calendar/calendar.pro @@ -3,7 +3,6 @@ SOURCES = main.cpp \ mainwindow.cpp # App cannot be with name "calendar" in Symbian due to same named system component. -symbian: TARGET = calendarapp # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/calendar @@ -11,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendar.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/calendar INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/richtext/calendar/main.cpp b/examples/richtext/calendar/main.cpp index fa94aa3ff2..808f72480b 100644 --- a/examples/richtext/calendar/main.cpp +++ b/examples/richtext/calendar/main.cpp @@ -46,13 +46,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); MainWindow window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - window.show(); -#else window.resize(640, 256); window.show(); -#endif return app.exec(); } diff --git a/examples/richtext/calendar/mainwindow.cpp b/examples/richtext/calendar/mainwindow.cpp index ff65b7e890..c8cb833078 100644 --- a/examples/richtext/calendar/mainwindow.cpp +++ b/examples/richtext/calendar/mainwindow.cpp @@ -82,11 +82,7 @@ MainWindow::MainWindow() this, SLOT(setFontSize(int))); //! [3] -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR) - fontSizeSpinBox->setValue(4); -#else fontSizeSpinBox->setValue(10); -#endif //! [4] QHBoxLayout *controlsLayout = new QHBoxLayout; |