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/painting/fontsampler | |
| 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/painting/fontsampler')
| -rw-r--r-- | examples/painting/fontsampler/fontsampler.pro | 2 | ||||
| -rw-r--r-- | examples/painting/fontsampler/main.cpp | 4 | ||||
| -rw-r--r-- | examples/painting/fontsampler/mainwindow.cpp | 7 |
3 files changed, 0 insertions, 13 deletions
diff --git a/examples/painting/fontsampler/fontsampler.pro b/examples/painting/fontsampler/fontsampler.pro index 63892a319a..539fc4894b 100644 --- a/examples/painting/fontsampler/fontsampler.pro +++ b/examples/painting/fontsampler/fontsampler.pro @@ -9,6 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fontsampler.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/fontsampler INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets printsupport -maemo5: CONFIG += qt_example diff --git a/examples/painting/fontsampler/main.cpp b/examples/painting/fontsampler/main.cpp index dffe80348a..01c8adae53 100644 --- a/examples/painting/fontsampler/main.cpp +++ b/examples/painting/fontsampler/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); MainWindow window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/painting/fontsampler/mainwindow.cpp b/examples/painting/fontsampler/mainwindow.cpp index 9efd307f88..ad0ce55ede 100644 --- a/examples/painting/fontsampler/mainwindow.cpp +++ b/examples/painting/fontsampler/mainwindow.cpp @@ -50,9 +50,6 @@ MainWindow::MainWindow(QWidget *parent) { setupUi(this); -#if defined(Q_OS_SYMBIAN) - addDockWidget(Qt::BottomDockWidgetArea, dockWidget); -#endif sampleSizes << 32 << 24 << 16 << 14 << 12 << 8 << 4 << 2 << 1; markedCount = 0; @@ -147,11 +144,7 @@ void MainWindow::showFont(QTreeWidgetItem *item) QString oldText = textEdit->toPlainText().trimmed(); bool modified = textEdit->document()->isModified(); textEdit->clear(); -#if defined(Q_OS_SYMBIAN) - textEdit->document()->setDefaultFont(QFont(family, 10, weight, italic)); -#else textEdit->document()->setDefaultFont(QFont(family, 32, weight, italic)); -#endif QTextCursor cursor = textEdit->textCursor(); QTextBlockFormat blockFormat; |