From 87274e272d2a854563066489e20d019b4e6320de Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 18 Oct 2011 09:54:31 +0200 Subject: 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 Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81 Reviewed-by: Friedemann Kleint Reviewed-by: Casper van Donderen --- examples/xml/dombookmarks/dombookmarks.pro | 10 ---------- examples/xml/dombookmarks/main.cpp | 4 ---- examples/xml/dombookmarks/mainwindow.cpp | 18 ------------------ 3 files changed, 32 deletions(-) (limited to 'examples/xml/dombookmarks') diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro index 21eb5c071f..9c1746a67f 100644 --- a/examples/xml/dombookmarks/dombookmarks.pro +++ b/examples/xml/dombookmarks/dombookmarks.pro @@ -11,19 +11,9 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dombookmarks.pro *.xbel sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/dombookmarks INSTALLS += target sources -symbian: CONFIG += qt_example - -symbian: { - CONFIG += qt_example - addFiles.sources = frank.xbel jennifer.xbel - addFiles.path = files - DEPLOYMENT += addFiles -} - wince*: { addFiles.files = frank.xbel jennifer.xbel addFiles.path = "\\My Documents" DEPLOYMENT += addFiles } -maemo5: CONFIG += qt_example diff --git a/examples/xml/dombookmarks/main.cpp b/examples/xml/dombookmarks/main.cpp index 6a3bb8c1a9..d23af14af2 100644 --- a/examples/xml/dombookmarks/main.cpp +++ b/examples/xml/dombookmarks/main.cpp @@ -46,11 +46,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); MainWindow mainWin; -#if defined(Q_OS_SYMBIAN) - mainWin.showMaximized(); -#else mainWin.show(); -#endif mainWin.open(); return app.exec(); diff --git a/examples/xml/dombookmarks/mainwindow.cpp b/examples/xml/dombookmarks/mainwindow.cpp index 0c8568332e..0c3ceafc88 100644 --- a/examples/xml/dombookmarks/mainwindow.cpp +++ b/examples/xml/dombookmarks/mainwindow.cpp @@ -59,15 +59,6 @@ MainWindow::MainWindow() void MainWindow::open() { -#if defined(Q_OS_SYMBIAN) - // Look for bookmarks on the same drive where the application is installed to, - // if drive is not read only. QDesktopServices::DataLocation does this check, - // and returns writable drive. - QString bookmarksFolder = - QDesktopServices::storageLocation(QDesktopServices::DataLocation).left(1); - bookmarksFolder.append(":/Data/qt/saxbookmarks"); - QDir::setCurrent(bookmarksFolder); -#endif QString fileName = QFileDialog::getOpenFileName(this, tr("Open Bookmark File"), QDir::currentPath(), @@ -90,15 +81,6 @@ void MainWindow::open() void MainWindow::saveAs() { -#if defined(Q_OS_SYMBIAN) - // Look for bookmarks on the same drive where the application is installed to, - // if drive is not read only. QDesktopServices::DataLocation does this check, - // and returns writable drive. - QString bookmarksFolder = - QDesktopServices::storageLocation(QDesktopServices::DataLocation).left(1); - bookmarksFolder.append(":/Data/qt/saxbookmarks"); - QDir::setCurrent(bookmarksFolder); -#endif QString fileName = QFileDialog::getSaveFileName(this, tr("Save Bookmark File"), QDir::currentPath(), -- cgit v1.2.3