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/sql/books/books.pro | 1 - examples/sql/cachedtable/cachedtable.pro | 2 -- examples/sql/cachedtable/main.cpp | 4 ---- examples/sql/drilldown/drilldown.pro | 8 -------- examples/sql/drilldown/main.cpp | 4 ---- examples/sql/drilldown/view.cpp | 12 ------------ examples/sql/masterdetail/main.cpp | 4 ---- examples/sql/masterdetail/mainwindow.cpp | 4 ---- examples/sql/masterdetail/masterdetail.pro | 10 ---------- examples/sql/querymodel/main.cpp | 13 ------------- examples/sql/querymodel/querymodel.pro | 2 -- examples/sql/relationaltablemodel/relationaltablemodel.cpp | 4 ---- examples/sql/relationaltablemodel/relationaltablemodel.pro | 2 -- examples/sql/sql.pro | 8 +++----- examples/sql/sqlbrowser/sqlbrowser.pro | 1 - examples/sql/sqlwidgetmapper/main.cpp | 4 ---- examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro | 2 -- examples/sql/tablemodel/tablemodel.cpp | 12 ------------ examples/sql/tablemodel/tablemodel.pro | 2 -- 19 files changed, 3 insertions(+), 96 deletions(-) (limited to 'examples/sql') diff --git a/examples/sql/books/books.pro b/examples/sql/books/books.pro index 316e2d9372..5a26d179a6 100644 --- a/examples/sql/books/books.pro +++ b/examples/sql/books/books.pro @@ -13,7 +13,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/books INSTALLS += target sources -symbian: CONFIG += qt_example wince*: { CONFIG(debug, debug|release):sqlPlugins.files = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll diff --git a/examples/sql/cachedtable/cachedtable.pro b/examples/sql/cachedtable/cachedtable.pro index 9b89a910d8..48d3d27da9 100644 --- a/examples/sql/cachedtable/cachedtable.pro +++ b/examples/sql/cachedtable/cachedtable.pro @@ -10,5 +10,3 @@ sources.files = $$SOURCES *.h $$RESOURCES $$FORMS cachedtable.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/cachedtable INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/sql/cachedtable/main.cpp b/examples/sql/cachedtable/main.cpp index ecbf565bab..3869f7ad5a 100644 --- a/examples/sql/cachedtable/main.cpp +++ b/examples/sql/cachedtable/main.cpp @@ -51,11 +51,7 @@ int main(int argc, char *argv[]) return 1; TableEditor editor("person"); -#if defined(Q_OS_SYMBIAN) - editor.showMaximized(); -#else editor.show(); -#endif return app.exec(); } //! [0] diff --git a/examples/sql/drilldown/drilldown.pro b/examples/sql/drilldown/drilldown.pro index 8209dd5bd5..a6f593e2f8 100644 --- a/examples/sql/drilldown/drilldown.pro +++ b/examples/sql/drilldown/drilldown.pro @@ -14,11 +14,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/drilldown sources.files = $$SOURCES *.h $$RESOURCES $$FORMS drilldown.pro *.png *.jpg images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/drilldown INSTALLS += target sources - -symbian { - TARGET.UID3 = 0xA000C612 - CONFIG += qt_example -} -maemo5: CONFIG += qt_example - -simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/sql/drilldown/main.cpp b/examples/sql/drilldown/main.cpp index 462eb0face..c38e3439fe 100644 --- a/examples/sql/drilldown/main.cpp +++ b/examples/sql/drilldown/main.cpp @@ -53,11 +53,7 @@ int main(int argc, char *argv[]) return 1; View view("offices", "images"); -#ifndef Q_OS_SYMBIAN view.show(); -#else - view.showMaximized(); -#endif #ifdef QT_KEYPAD_NAVIGATION QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif diff --git a/examples/sql/drilldown/view.cpp b/examples/sql/drilldown/view.cpp index 883b28b094..d0f240be9e 100644 --- a/examples/sql/drilldown/view.cpp +++ b/examples/sql/drilldown/view.cpp @@ -62,12 +62,8 @@ View::View(const QString &offices, const QString &images, QWidget *parent) QGraphicsPixmapItem *logo = scene->addPixmap(QPixmap(":/logo.png")); logo->setPos(30, 515); -#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) setMinimumSize(470, 620); setMaximumSize(470, 620); -#else - setDragMode(QGraphicsView::ScrollHandDrag); -#endif setWindowTitle(tr("Offices World Wide")); } @@ -130,11 +126,7 @@ void View::showInformation(ImageItem *image) window->raise(); window->activateWindow(); } else if (window && !window->isVisible()) { -#ifndef Q_OS_SYMBIAN window->show(); -#else - window->showMaximized(); -#endif } else { InformationWindow *window; window = new InformationWindow(id, officeTable, this); @@ -142,12 +134,8 @@ void View::showInformation(ImageItem *image) connect(window, SIGNAL(imageChanged(int,QString)), this, SLOT(updateImage(int,QString))); -#ifndef Q_OS_SYMBIAN window->move(pos() + QPoint(20, 40)); window->show(); -#else - window->showMaximized(); -#endif informationWindows.append(window); } } diff --git a/examples/sql/masterdetail/main.cpp b/examples/sql/masterdetail/main.cpp index 582910873f..0e2aca5d2e 100644 --- a/examples/sql/masterdetail/main.cpp +++ b/examples/sql/masterdetail/main.cpp @@ -54,10 +54,6 @@ int main(int argc, char *argv[]) QFile *albumDetails = new QFile("albumdetails.xml"); MainWindow window("artists", "albums", albumDetails); -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/sql/masterdetail/mainwindow.cpp b/examples/sql/masterdetail/mainwindow.cpp index 77b869e17c..d00946cb39 100644 --- a/examples/sql/masterdetail/mainwindow.cpp +++ b/examples/sql/masterdetail/mainwindow.cpp @@ -77,10 +77,8 @@ MainWindow::MainWindow(const QString &artistTable, const QString &albumTable, layout->addWidget(artists, 0, 0); layout->addWidget(albums, 1, 0); layout->addWidget(details, 0, 1, 2, 1); -#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) layout->setColumnStretch(1, 1); layout->setColumnMinimumWidth(0, 500); -#endif QWidget *widget = new QWidget; widget->setLayout(layout); @@ -88,9 +86,7 @@ MainWindow::MainWindow(const QString &artistTable, const QString &albumTable, createMenuBar(); showImageLabel(); -#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) resize(850, 400); -#endif setWindowTitle(tr("Music Archive")); } diff --git a/examples/sql/masterdetail/masterdetail.pro b/examples/sql/masterdetail/masterdetail.pro index fcbc642bed..2160ad3c26 100644 --- a/examples/sql/masterdetail/masterdetail.pro +++ b/examples/sql/masterdetail/masterdetail.pro @@ -14,13 +14,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/masterdetail sources.files = $$SOURCES *.h $$RESOURCES $$FORMS masterdetail.pro *.xml images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/masterdetail INSTALLS += target sources - -symbian { - TARGET.UID3 = 0xA000D7CF - CONFIG += qt_example -} -maemo5: CONFIG += qt_example - -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) -simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/sql/querymodel/main.cpp b/examples/sql/querymodel/main.cpp index d001fda866..30b4954026 100644 --- a/examples/sql/querymodel/main.cpp +++ b/examples/sql/querymodel/main.cpp @@ -56,17 +56,12 @@ QTableView* createView(QSqlQueryModel *model, const QString &title = "") { QTableView *view = new QTableView; view->setModel(model); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - Q_UNUSED(title); - view->resizeColumnsToContents(); -#else static int offset = 0; view->setWindowTitle(title); view->move(100 + offset, 100 + offset); offset += 20; view->show(); -#endif return view; } @@ -85,17 +80,9 @@ int main(int argc, char *argv[]) initializeModel(&editableModel); initializeModel(&customModel); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - QTabWidget *tabWidget = new QTabWidget; - tabWidget->addTab(createView(&plainModel), QObject::tr("Plain")); - tabWidget->addTab(createView(&editableModel), QObject::tr("Editable")); - tabWidget->addTab(createView(&customModel), QObject::tr("Custom")); - tabWidget->showMaximized(); -#else createView(&plainModel, QObject::tr("Plain Query Model")); createView(&editableModel, QObject::tr("Editable Query Model")); createView(&customModel, QObject::tr("Custom Query Model")); -#endif return app.exec(); } diff --git a/examples/sql/querymodel/querymodel.pro b/examples/sql/querymodel/querymodel.pro index 8e3db2a768..0a335ae67f 100644 --- a/examples/sql/querymodel/querymodel.pro +++ b/examples/sql/querymodel/querymodel.pro @@ -12,5 +12,3 @@ sources.files = $$SOURCES *.h $$RESOURCES $$FORMS querymodel.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/querymodel INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/sql/relationaltablemodel/relationaltablemodel.cpp b/examples/sql/relationaltablemodel/relationaltablemodel.cpp index 3d8d106ed9..41dbdd2890 100644 --- a/examples/sql/relationaltablemodel/relationaltablemodel.cpp +++ b/examples/sql/relationaltablemodel/relationaltablemodel.cpp @@ -108,11 +108,7 @@ int main(int argc, char *argv[]) initializeModel(&model); QTableView *view = createView(QObject::tr("Relational Table Model"), &model); -#if defined(Q_OS_SYMBIAN) - view->showMaximized(); -#else view->show(); -#endif return app.exec(); } diff --git a/examples/sql/relationaltablemodel/relationaltablemodel.pro b/examples/sql/relationaltablemodel/relationaltablemodel.pro index a8bc4fc7a0..2c741d02f6 100644 --- a/examples/sql/relationaltablemodel/relationaltablemodel.pro +++ b/examples/sql/relationaltablemodel/relationaltablemodel.pro @@ -8,5 +8,3 @@ sources.files = $$SOURCES *.h $$RESOURCES $$FORMS relationaltablemodel.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/relationaltablemodel INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/sql/sql.pro b/examples/sql/sql.pro index 68b54e42ca..68252862ce 100644 --- a/examples/sql/sql.pro +++ b/examples/sql/sql.pro @@ -1,14 +1,14 @@ TEMPLATE = subdirs SUBDIRS = books \ - drilldown -!symbian: SUBDIRS += cachedtable \ + drilldown \ + cachedtable \ relationaltablemodel \ sqlwidgetmapper !wince*: SUBDIRS += masterdetail -!wince*:!symbian: SUBDIRS += \ +!wince*: SUBDIRS += \ querymodel \ tablemodel @@ -23,6 +23,4 @@ sources.files = connection.h sql.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql INSTALLS += sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/sql/sqlbrowser/sqlbrowser.pro b/examples/sql/sqlbrowser/sqlbrowser.pro index 73a17b28e7..d2f1cacc67 100644 --- a/examples/sql/sqlbrowser/sqlbrowser.pro +++ b/examples/sql/sqlbrowser/sqlbrowser.pro @@ -18,7 +18,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/sqlbrowser INSTALLS += target sources -symbian: CONFIG += qt_example wince*: { DEPLOYMENT_PLUGIN += qsqlite diff --git a/examples/sql/sqlwidgetmapper/main.cpp b/examples/sql/sqlwidgetmapper/main.cpp index 9e45edefac..41e756d8ad 100644 --- a/examples/sql/sqlwidgetmapper/main.cpp +++ b/examples/sql/sqlwidgetmapper/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char **argv) { QApplication app(argc, argv); Window window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro b/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro index 6d2f028d66..75256d71c2 100644 --- a/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro +++ b/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro @@ -11,6 +11,4 @@ INSTALLS += target sources wince*: DEPLOYMENT_PLUGIN += qsqlite -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/sql/tablemodel/tablemodel.cpp b/examples/sql/tablemodel/tablemodel.cpp index e1a11d140f..dc246d799e 100644 --- a/examples/sql/tablemodel/tablemodel.cpp +++ b/examples/sql/tablemodel/tablemodel.cpp @@ -58,11 +58,7 @@ QTableView *createView(QSqlTableModel *model, const QString &title = "") { QTableView *view = new QTableView; view->setModel(model); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - Q_UNUSED(title) -#else view->setWindowTitle(title); -#endif return view; } @@ -76,20 +72,12 @@ int main(int argc, char *argv[]) initializeModel(&model); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - QTabWidget *tabWidget = new QTabWidget; - tabWidget->addTab(createView(&model), "View 1"); - tabWidget->addTab(createView(&model), "View 2"); - - tabWidget->showMaximized(); -#else QTableView *view1 = createView(&model, QObject::tr("Table Model (View 1)")); QTableView *view2 = createView(&model, QObject::tr("Table Model (View 2)")); view1->show(); view2->move(view1->x() + view1->width() + 20, view1->y()); view2->show(); -#endif return app.exec(); } diff --git a/examples/sql/tablemodel/tablemodel.pro b/examples/sql/tablemodel/tablemodel.pro index b59507db07..0853f4c8e8 100644 --- a/examples/sql/tablemodel/tablemodel.pro +++ b/examples/sql/tablemodel/tablemodel.pro @@ -8,5 +8,3 @@ sources.files = $$SOURCES *.h $$RESOURCES $$FORMS tablemodel.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/tablemodel INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -- cgit v1.2.3