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/itemviews/addressbook/addressbook.pro | 6 ---- examples/itemviews/addressbook/main.cpp | 4 --- .../basicsortfiltermodel/basicsortfiltermodel.pro | 2 -- examples/itemviews/basicsortfiltermodel/main.cpp | 4 --- examples/itemviews/basicsortfiltermodel/window.cpp | 33 ------------------- examples/itemviews/basicsortfiltermodel/window.h | 6 ---- examples/itemviews/chart/chart.pro | 7 +--- examples/itemviews/chart/main.cpp | 4 --- .../coloreditorfactory/coloreditorfactory.pro | 4 --- examples/itemviews/coloreditorfactory/main.cpp | 4 --- .../combowidgetmapper/combowidgetmapper.pro | 2 -- examples/itemviews/combowidgetmapper/main.cpp | 4 --- .../customsortfiltermodel.pro | 2 -- examples/itemviews/customsortfiltermodel/main.cpp | 4 --- .../itemviews/customsortfiltermodel/window.cpp | 38 ---------------------- examples/itemviews/customsortfiltermodel/window.h | 6 ---- examples/itemviews/dirview/dirview.pro | 2 -- examples/itemviews/dirview/main.cpp | 4 --- .../editabletreemodel/editabletreemodel.pro | 2 -- examples/itemviews/editabletreemodel/main.cpp | 4 --- .../itemviews/editabletreemodel/mainwindow.cpp | 4 --- examples/itemviews/fetchmore/fetchmore.pro | 2 -- examples/itemviews/fetchmore/main.cpp | 4 --- examples/itemviews/frozencolumn/frozencolumn.pro | 2 -- examples/itemviews/frozencolumn/main.cpp | 6 ---- examples/itemviews/interview/interview.pro | 1 - examples/itemviews/itemviews.pro | 2 -- examples/itemviews/pixelator/main.cpp | 4 --- examples/itemviews/pixelator/pixelator.pro | 2 -- examples/itemviews/puzzle/main.cpp | 4 --- examples/itemviews/puzzle/mainwindow.cpp | 4 --- examples/itemviews/puzzle/puzzle.pro | 2 -- examples/itemviews/simpledommodel/main.cpp | 6 ---- .../itemviews/simpledommodel/simpledommodel.pro | 2 -- examples/itemviews/simpletreemodel/main.cpp | 4 --- .../itemviews/simpletreemodel/simpletreemodel.pro | 2 -- examples/itemviews/simplewidgetmapper/main.cpp | 4 --- .../simplewidgetmapper/simplewidgetmapper.pro | 2 -- examples/itemviews/spinboxdelegate/main.cpp | 4 --- .../itemviews/spinboxdelegate/spinboxdelegate.pro | 4 --- examples/itemviews/spreadsheet/spreadsheet.pro | 1 - examples/itemviews/stardelegate/main.cpp | 4 --- examples/itemviews/stardelegate/stardelegate.pro | 4 --- 43 files changed, 1 insertion(+), 215 deletions(-) (limited to 'examples/itemviews') diff --git a/examples/itemviews/addressbook/addressbook.pro b/examples/itemviews/addressbook/addressbook.pro index 5eeb601d55..32cbc4ca36 100644 --- a/examples/itemviews/addressbook/addressbook.pro +++ b/examples/itemviews/addressbook/addressbook.pro @@ -15,11 +15,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/addressbook sources.files = $$SOURCES $$HEADERS $$RESOURCES addressbook.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/addressbook INSTALLS += target sources - -symbian { - TARGET.UID3 = 0xA000A646 - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/addressbook/main.cpp b/examples/itemviews/addressbook/main.cpp index 2c01aec78b..0a0ccb7ac8 100644 --- a/examples/itemviews/addressbook/main.cpp +++ b/examples/itemviews/addressbook/main.cpp @@ -46,11 +46,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); MainWindow mw; -#if defined(Q_OS_SYMBIAN) - mw.showMaximized(); -#else mw.show(); -#endif return app.exec(); } //! [0] diff --git a/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro b/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro index a317f44282..75f96e4d48 100644 --- a/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro +++ b/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro @@ -9,6 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/basicsortfiltermodel INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/basicsortfiltermodel/main.cpp b/examples/itemviews/basicsortfiltermodel/main.cpp index 003f6a45f8..8f8a2a7205 100644 --- a/examples/itemviews/basicsortfiltermodel/main.cpp +++ b/examples/itemviews/basicsortfiltermodel/main.cpp @@ -88,10 +88,6 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); Window window; window.setSourceModel(createMailModel(&window)); -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/itemviews/basicsortfiltermodel/window.cpp b/examples/itemviews/basicsortfiltermodel/window.cpp index 9fcd363002..08bdc04009 100644 --- a/examples/itemviews/basicsortfiltermodel/window.cpp +++ b/examples/itemviews/basicsortfiltermodel/window.cpp @@ -89,38 +89,6 @@ Window::Window() connect(sortCaseSensitivityCheckBox, SIGNAL(toggled(bool)), this, SLOT(sortChanged())); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - sourceWidget = new QWidget; - filterWidget = new QWidget; - proxyWidget = new QWidget; - - QHBoxLayout *sourceLayout = new QHBoxLayout; - sourceLayout->addWidget(sourceView); - sourceWidget->setLayout(sourceLayout); - - QGridLayout *filterLayout = new QGridLayout; - filterLayout->addWidget(filterPatternLabel, 1, 0); - filterLayout->addWidget(filterPatternLineEdit, 1, 1, 1, 2); - filterLayout->addWidget(filterSyntaxLabel, 2, 0); - filterLayout->addWidget(filterSyntaxComboBox, 2, 1, 1, 2); - filterLayout->addWidget(filterColumnLabel, 3, 0); - filterLayout->addWidget(filterColumnComboBox, 3, 1, 1, 2); - filterLayout->addWidget(filterCaseSensitivityCheckBox, 4, 0, 1, 2); - filterLayout->addWidget(sortCaseSensitivityCheckBox, 4, 2); - filterWidget->setLayout(filterLayout); - - QHBoxLayout *proxyLayout = new QHBoxLayout; - proxyLayout->addWidget(proxyView); - proxyWidget->setLayout(proxyLayout); - - QVBoxLayout *mainLayout = new QVBoxLayout; - - QTabWidget *tabWidget = new QTabWidget; - tabWidget->addTab(sourceWidget, "Source"); - tabWidget->addTab(filterWidget, "Filters"); - tabWidget->addTab(proxyWidget, "Proxy"); - mainLayout->addWidget(tabWidget); -#else sourceGroupBox = new QGroupBox(tr("Original Model")); proxyGroupBox = new QGroupBox(tr("Sorted/Filtered Model")); @@ -144,7 +112,6 @@ Window::Window() mainLayout->addWidget(sourceGroupBox); mainLayout->addWidget(proxyGroupBox); -#endif setLayout(mainLayout); diff --git a/examples/itemviews/basicsortfiltermodel/window.h b/examples/itemviews/basicsortfiltermodel/window.h index fbdffc3abb..92b5008384 100644 --- a/examples/itemviews/basicsortfiltermodel/window.h +++ b/examples/itemviews/basicsortfiltermodel/window.h @@ -71,14 +71,8 @@ private slots: private: QSortFilterProxyModel *proxyModel; -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - QWidget *sourceWidget; - QWidget *filterWidget; - QWidget *proxyWidget; -#else QGroupBox *sourceGroupBox; QGroupBox *proxyGroupBox; -#endif QTreeView *sourceView; QTreeView *proxyView; QCheckBox *filterCaseSensitivityCheckBox; diff --git a/examples/itemviews/chart/chart.pro b/examples/itemviews/chart/chart.pro index 34d69957c9..310bb85ad7 100644 --- a/examples/itemviews/chart/chart.pro +++ b/examples/itemviews/chart/chart.pro @@ -4,7 +4,7 @@ RESOURCES = chart.qrc SOURCES = main.cpp \ mainwindow.cpp \ pieview.cpp -unix:!mac:!symbian:!vxworks:!integrity:LIBS+= -lm +unix:!mac:!vxworks:!integrity:LIBS+= -lm TARGET.EPOCHEAPSIZE = 0x200000 0x800000 @@ -14,10 +14,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.cht sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/chart INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000A647 - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/chart/main.cpp b/examples/itemviews/chart/main.cpp index 52d8f281c3..936654097f 100644 --- a/examples/itemviews/chart/main.cpp +++ b/examples/itemviews/chart/main.cpp @@ -48,10 +48,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/itemviews/coloreditorfactory/coloreditorfactory.pro b/examples/itemviews/coloreditorfactory/coloreditorfactory.pro index 387efd59aa..07e1296e06 100644 --- a/examples/itemviews/coloreditorfactory/coloreditorfactory.pro +++ b/examples/itemviews/coloreditorfactory/coloreditorfactory.pro @@ -10,9 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/coloreditorfactory INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -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) diff --git a/examples/itemviews/coloreditorfactory/main.cpp b/examples/itemviews/coloreditorfactory/main.cpp index 7690ba9c1d..bbb1d25933 100644 --- a/examples/itemviews/coloreditorfactory/main.cpp +++ b/examples/itemviews/coloreditorfactory/main.cpp @@ -47,11 +47,7 @@ int main(int argv, char **args) QApplication app(argv, args); Window window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/itemviews/combowidgetmapper/combowidgetmapper.pro b/examples/itemviews/combowidgetmapper/combowidgetmapper.pro index 46fce72ec9..9ea1fa0e25 100644 --- a/examples/itemviews/combowidgetmapper/combowidgetmapper.pro +++ b/examples/itemviews/combowidgetmapper/combowidgetmapper.pro @@ -9,5 +9,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/combowidgetmapper INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/combowidgetmapper/main.cpp b/examples/itemviews/combowidgetmapper/main.cpp index 9e45edefac..41e756d8ad 100644 --- a/examples/itemviews/combowidgetmapper/main.cpp +++ b/examples/itemviews/combowidgetmapper/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/itemviews/customsortfiltermodel/customsortfiltermodel.pro b/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro index 05087f9dda..a2288b953c 100644 --- a/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro +++ b/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro @@ -11,6 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/customsortfiltermodel INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/customsortfiltermodel/main.cpp b/examples/itemviews/customsortfiltermodel/main.cpp index e643062ac0..34be2f682b 100644 --- a/examples/itemviews/customsortfiltermodel/main.cpp +++ b/examples/itemviews/customsortfiltermodel/main.cpp @@ -89,11 +89,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); Window window; window.setSourceModel(createMailModel(&window)); -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } //! [0] diff --git a/examples/itemviews/customsortfiltermodel/window.cpp b/examples/itemviews/customsortfiltermodel/window.cpp index 323eef98ce..95b5f581d7 100644 --- a/examples/itemviews/customsortfiltermodel/window.cpp +++ b/examples/itemviews/customsortfiltermodel/window.cpp @@ -59,13 +59,8 @@ Window::Window() QHBoxLayout *sourceLayout = new QHBoxLayout; //! [2] sourceLayout->addWidget(sourceView); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - sourceWidget = new QWidget; - sourceWidget->setLayout(sourceLayout); -#else sourceGroupBox = new QGroupBox(tr("Original Model")); sourceGroupBox->setLayout(sourceLayout); -#endif //! [2] //! [3] @@ -114,26 +109,6 @@ Window::Window() proxyView->setSortingEnabled(true); proxyView->sortByColumn(1, Qt::AscendingOrder); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - QGridLayout *filterLayout = new QGridLayout; - filterLayout->addWidget(filterPatternLabel, 0, 0); - filterLayout->addWidget(filterPatternLineEdit, 0, 1); - filterLayout->addWidget(filterSyntaxComboBox, 0, 2); - filterLayout->addWidget(filterCaseSensitivityCheckBox, 1, 0, 1, 3); - filterLayout->addWidget(fromLabel, 2, 0); - filterLayout->addWidget(fromDateEdit, 2, 1, 1, 2); - filterLayout->addWidget(toLabel, 3, 0); - filterLayout->addWidget(toDateEdit, 3, 1, 1, 2); - - filterWidget = new QWidget; - filterWidget->setLayout(filterLayout); - - QHBoxLayout *proxyLayout = new QHBoxLayout; - proxyLayout->addWidget(proxyView); - - proxyWidget = new QWidget; - proxyWidget->setLayout(proxyLayout); -#else QGridLayout *proxyLayout = new QGridLayout; proxyLayout->addWidget(proxyView, 0, 0, 1, 3); proxyLayout->addWidget(filterPatternLabel, 1, 0); @@ -147,21 +122,9 @@ Window::Window() proxyGroupBox = new QGroupBox(tr("Sorted/Filtered Model")); proxyGroupBox->setLayout(proxyLayout); -#endif //! [5] //! [6] -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - QTabWidget *tabWidget = new QTabWidget; - tabWidget->addTab(sourceWidget, "Original"); - tabWidget->addTab(filterWidget, "Filters"); - tabWidget->addTab(proxyWidget, "Sorted"); - - QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->addWidget(tabWidget); - setLayout(mainLayout); - setWindowTitle(tr("Custom Model")); -#else QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addWidget(sourceGroupBox); mainLayout->addWidget(proxyGroupBox); @@ -169,7 +132,6 @@ Window::Window() setWindowTitle(tr("Custom Sort/Filter Model")); resize(500, 450); -#endif } //! [6] diff --git a/examples/itemviews/customsortfiltermodel/window.h b/examples/itemviews/customsortfiltermodel/window.h index 50ec1f413c..15baffc2c6 100644 --- a/examples/itemviews/customsortfiltermodel/window.h +++ b/examples/itemviews/customsortfiltermodel/window.h @@ -72,14 +72,8 @@ private slots: private: MySortFilterProxyModel *proxyModel; -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5 ) || defined(Q_WS_SIMULATOR) - QWidget *sourceWidget; - QWidget *filterWidget; - QWidget *proxyWidget; -#else QGroupBox *sourceGroupBox; QGroupBox *proxyGroupBox; -#endif QTreeView *sourceView; QTreeView *proxyView; QCheckBox *filterCaseSensitivityCheckBox; diff --git a/examples/itemviews/dirview/dirview.pro b/examples/itemviews/dirview/dirview.pro index 2401ee91dc..825f20c630 100644 --- a/examples/itemviews/dirview/dirview.pro +++ b/examples/itemviews/dirview/dirview.pro @@ -6,6 +6,4 @@ sources.files = $$SOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/dirview INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/dirview/main.cpp b/examples/itemviews/dirview/main.cpp index c15040902c..dbb5b7ae8c 100644 --- a/examples/itemviews/dirview/main.cpp +++ b/examples/itemviews/dirview/main.cpp @@ -55,12 +55,8 @@ int main(int argc, char *argv[]) tree.setSortingEnabled(true); tree.setWindowTitle(QObject::tr("Dir View")); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) - tree.showMaximized(); -#else tree.resize(640, 480); tree.show(); -#endif return app.exec(); } diff --git a/examples/itemviews/editabletreemodel/editabletreemodel.pro b/examples/itemviews/editabletreemodel/editabletreemodel.pro index e844994896..f86298542d 100644 --- a/examples/itemviews/editabletreemodel/editabletreemodel.pro +++ b/examples/itemviews/editabletreemodel/editabletreemodel.pro @@ -15,6 +15,4 @@ sources.files = $$FORMS $$HEADERS $$RESOURCES $$SOURCES *.pro *.txt sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/editabletreemodel INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/editabletreemodel/main.cpp b/examples/itemviews/editabletreemodel/main.cpp index c499bb7454..5a2cc77465 100644 --- a/examples/itemviews/editabletreemodel/main.cpp +++ b/examples/itemviews/editabletreemodel/main.cpp @@ -48,10 +48,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/itemviews/editabletreemodel/mainwindow.cpp b/examples/itemviews/editabletreemodel/mainwindow.cpp index a6a294e71c..3080684e4f 100644 --- a/examples/itemviews/editabletreemodel/mainwindow.cpp +++ b/examples/itemviews/editabletreemodel/mainwindow.cpp @@ -48,10 +48,6 @@ MainWindow::MainWindow(QWidget *parent) { setupUi(this); -#ifdef Q_WS_MAEMO_5 - // Alternating row colors look bad on Maemo - view->setAlternatingRowColors(false); -#endif QStringList headers; headers << tr("Title") << tr("Description"); diff --git a/examples/itemviews/fetchmore/fetchmore.pro b/examples/itemviews/fetchmore/fetchmore.pro index 848a12f3c6..28af7e9ac0 100644 --- a/examples/itemviews/fetchmore/fetchmore.pro +++ b/examples/itemviews/fetchmore/fetchmore.pro @@ -11,5 +11,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/fetchmore INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/fetchmore/main.cpp b/examples/itemviews/fetchmore/main.cpp index c2deca3ff1..aedfd9f8d3 100644 --- a/examples/itemviews/fetchmore/main.cpp +++ b/examples/itemviews/fetchmore/main.cpp @@ -45,10 +45,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/itemviews/frozencolumn/frozencolumn.pro b/examples/itemviews/frozencolumn/frozencolumn.pro index 79eedf787a..34a4a4de8c 100644 --- a/examples/itemviews/frozencolumn/frozencolumn.pro +++ b/examples/itemviews/frozencolumn/frozencolumn.pro @@ -9,5 +9,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/frozencolumn INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/frozencolumn/main.cpp b/examples/itemviews/frozencolumn/main.cpp index 79f8ad4abe..f6aa489d05 100644 --- a/examples/itemviews/frozencolumn/main.cpp +++ b/examples/itemviews/frozencolumn/main.cpp @@ -81,14 +81,8 @@ int main( int argc, char** argv ) FreezeTableWidget *tableView = new FreezeTableWidget(model); tableView->setWindowTitle(QObject::tr("Frozen Column Example")); -#if defined(Q_OS_SYMBIAN) - tableView->showMaximized(); -#elif defined(Q_WS_MAEMO_5) - tableView->show(); -#else tableView->resize(560,680); tableView->show(); -#endif return app.exec(); } diff --git a/examples/itemviews/interview/interview.pro b/examples/itemviews/interview/interview.pro index fec3ec1168..5cd0d1f9fc 100644 --- a/examples/itemviews/interview/interview.pro +++ b/examples/itemviews/interview/interview.pro @@ -17,4 +17,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/interview INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example diff --git a/examples/itemviews/itemviews.pro b/examples/itemviews/itemviews.pro index 3048aa18d6..347c259bc2 100644 --- a/examples/itemviews/itemviews.pro +++ b/examples/itemviews/itemviews.pro @@ -22,6 +22,4 @@ sources.files = README *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews INSTALLS += sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/pixelator/main.cpp b/examples/itemviews/pixelator/main.cpp index 0324b3a3b2..e7f45e3f42 100644 --- a/examples/itemviews/pixelator/main.cpp +++ b/examples/itemviews/pixelator/main.cpp @@ -48,11 +48,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); MainWindow window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif window.openImage(":/images/qt.png"); return app.exec(); } diff --git a/examples/itemviews/pixelator/pixelator.pro b/examples/itemviews/pixelator/pixelator.pro index 91a78aa1f5..7a482a1d31 100644 --- a/examples/itemviews/pixelator/pixelator.pro +++ b/examples/itemviews/pixelator/pixelator.pro @@ -13,6 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/pixelator INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets printsupport -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/puzzle/main.cpp b/examples/itemviews/puzzle/main.cpp index bdba2874f3..60341948ab 100644 --- a/examples/itemviews/puzzle/main.cpp +++ b/examples/itemviews/puzzle/main.cpp @@ -49,10 +49,6 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); MainWindow window; window.openImage(":/images/example.jpg"); -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/itemviews/puzzle/mainwindow.cpp b/examples/itemviews/puzzle/mainwindow.cpp index 9787512cb4..5142de1cb2 100644 --- a/examples/itemviews/puzzle/mainwindow.cpp +++ b/examples/itemviews/puzzle/mainwindow.cpp @@ -125,11 +125,7 @@ void MainWindow::setupWidgets() QFrame *frame = new QFrame; QHBoxLayout *frameLayout = new QHBoxLayout(frame); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR) - puzzleWidget = new PuzzleWidget(260); -#else puzzleWidget = new PuzzleWidget(400); -#endif piecesList = new QListView; piecesList->setDragEnabled(true); diff --git a/examples/itemviews/puzzle/puzzle.pro b/examples/itemviews/puzzle/puzzle.pro index 2f15daf7ca..bcc8ab27b0 100644 --- a/examples/itemviews/puzzle/puzzle.pro +++ b/examples/itemviews/puzzle/puzzle.pro @@ -13,12 +13,10 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/puzzle INSTALLS += target sources -symbian: CONFIG += qt_example wince* { DEPLOYMENT_PLUGIN += qjpeg qgif qtiff } QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/simpledommodel/main.cpp b/examples/itemviews/simpledommodel/main.cpp index 94496f88bb..74a14b0f8c 100644 --- a/examples/itemviews/simpledommodel/main.cpp +++ b/examples/itemviews/simpledommodel/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) - window.show(); -#else window.resize(640, 480); window.show(); -#endif return app.exec(); } diff --git a/examples/itemviews/simpledommodel/simpledommodel.pro b/examples/itemviews/simpledommodel/simpledommodel.pro index 4044ae397d..2d30e71c1a 100644 --- a/examples/itemviews/simpledommodel/simpledommodel.pro +++ b/examples/itemviews/simpledommodel/simpledommodel.pro @@ -14,5 +14,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpledommodel INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/simpletreemodel/main.cpp b/examples/itemviews/simpletreemodel/main.cpp index 15e6bc3e76..1cca36328f 100644 --- a/examples/itemviews/simpletreemodel/main.cpp +++ b/examples/itemviews/simpletreemodel/main.cpp @@ -56,10 +56,6 @@ int main(int argc, char *argv[]) QTreeView view; view.setModel(&model); view.setWindowTitle(QObject::tr("Simple Tree Model")); -#if defined(Q_OS_SYMBIAN) - view.showMaximized(); -#else view.show(); -#endif return app.exec(); } diff --git a/examples/itemviews/simpletreemodel/simpletreemodel.pro b/examples/itemviews/simpletreemodel/simpletreemodel.pro index 336544d9fb..cd4f8af604 100644 --- a/examples/itemviews/simpletreemodel/simpletreemodel.pro +++ b/examples/itemviews/simpletreemodel/simpletreemodel.pro @@ -12,6 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpletreemodel INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/simplewidgetmapper/main.cpp b/examples/itemviews/simplewidgetmapper/main.cpp index 9e45edefac..41e756d8ad 100644 --- a/examples/itemviews/simplewidgetmapper/main.cpp +++ b/examples/itemviews/simplewidgetmapper/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/itemviews/simplewidgetmapper/simplewidgetmapper.pro b/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro index b496064234..3b2fd8b257 100644 --- a/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro +++ b/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro @@ -8,6 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simplewidgetmapper INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/itemviews/spinboxdelegate/main.cpp b/examples/itemviews/spinboxdelegate/main.cpp index 50d2ef1323..e078d7f2df 100644 --- a/examples/itemviews/spinboxdelegate/main.cpp +++ b/examples/itemviews/spinboxdelegate/main.cpp @@ -80,11 +80,7 @@ int main(int argc, char *argv[]) //! [3] tableView.setWindowTitle(QObject::tr("Spin Box Delegate")); -#if defined(Q_OS_SYMBIAN) - tableView.showMaximized(); -#else tableView.show(); -#endif return app.exec(); } //! [3] diff --git a/examples/itemviews/spinboxdelegate/spinboxdelegate.pro b/examples/itemviews/spinboxdelegate/spinboxdelegate.pro index 1859252626..f6416ff936 100644 --- a/examples/itemviews/spinboxdelegate/spinboxdelegate.pro +++ b/examples/itemviews/spinboxdelegate/spinboxdelegate.pro @@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spinboxdelegate INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -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/itemviews/spreadsheet/spreadsheet.pro b/examples/itemviews/spreadsheet/spreadsheet.pro index aaa90e7998..f00dfb4c81 100644 --- a/examples/itemviews/spreadsheet/spreadsheet.pro +++ b/examples/itemviews/spreadsheet/spreadsheet.pro @@ -32,4 +32,3 @@ sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spreadsheet INSTALLS += target sources -symbian: CONFIG += qt_example diff --git a/examples/itemviews/stardelegate/main.cpp b/examples/itemviews/stardelegate/main.cpp index a9d5e96655..78245d005b 100644 --- a/examples/itemviews/stardelegate/main.cpp +++ b/examples/itemviews/stardelegate/main.cpp @@ -100,11 +100,7 @@ int main(int argc, char *argv[]) tableWidget.resizeColumnsToContents(); tableWidget.resize(500, 300); -#if defined(Q_OS_SYMBIAN) - tableWidget.showMaximized(); -#else tableWidget.show(); -#endif return app.exec(); } diff --git a/examples/itemviews/stardelegate/stardelegate.pro b/examples/itemviews/stardelegate/stardelegate.pro index 56679be0a4..915c26a524 100644 --- a/examples/itemviews/stardelegate/stardelegate.pro +++ b/examples/itemviews/stardelegate/stardelegate.pro @@ -12,10 +12,6 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/stardelegate INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example QT += widgets -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) -- cgit v1.2.3