summaryrefslogtreecommitdiffstats
path: root/examples/mainwindows
diff options
context:
space:
mode:
Diffstat (limited to 'examples/mainwindows')
-rw-r--r--examples/mainwindows/application/application.pro3
-rw-r--r--examples/mainwindows/application/main.cpp4
-rw-r--r--examples/mainwindows/dockwidgets/dockwidgets.pro4
-rw-r--r--examples/mainwindows/mainwindow/mainwindow.cpp4
-rw-r--r--examples/mainwindows/mainwindow/mainwindow.pro1
-rw-r--r--examples/mainwindows/mainwindows.pro2
-rw-r--r--examples/mainwindows/mdi/main.cpp4
-rw-r--r--examples/mainwindows/mdi/mdi.pro3
-rw-r--r--examples/mainwindows/menus/main.cpp4
-rw-r--r--examples/mainwindows/menus/mainwindow.cpp6
-rw-r--r--examples/mainwindows/menus/menus.pro7
-rw-r--r--examples/mainwindows/recentfiles/main.cpp4
-rw-r--r--examples/mainwindows/recentfiles/recentfiles.pro2
-rw-r--r--examples/mainwindows/sdi/main.cpp4
-rw-r--r--examples/mainwindows/sdi/sdi.pro3
15 files changed, 2 insertions, 53 deletions
diff --git a/examples/mainwindows/application/application.pro b/examples/mainwindows/application/application.pro
index f66fa5fb62..ef866a6d5f 100644
--- a/examples/mainwindows/application/application.pro
+++ b/examples/mainwindows/application/application.pro
@@ -11,9 +11,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS application.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/application
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example might not fully work on Symbian platform)
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/mainwindows/application/main.cpp b/examples/mainwindows/application/main.cpp
index 14c7af2bb3..9a9dc9ca76 100644
--- a/examples/mainwindows/application/main.cpp
+++ b/examples/mainwindows/application/main.cpp
@@ -51,11 +51,7 @@ int main(int argc, char *argv[])
app.setOrganizationName("Trolltech");
app.setApplicationName("Application Example");
MainWindow mainWin;
-#if defined(Q_OS_SYMBIAN)
- mainWin.showMaximized();
-#else
mainWin.show();
-#endif
return app.exec();
}
//! [0]
diff --git a/examples/mainwindows/dockwidgets/dockwidgets.pro b/examples/mainwindows/dockwidgets/dockwidgets.pro
index bea8f4ca13..42eab88010 100644
--- a/examples/mainwindows/dockwidgets/dockwidgets.pro
+++ b/examples/mainwindows/dockwidgets/dockwidgets.pro
@@ -9,10 +9,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES dockwidgets.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/dockwidgets
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets printsupport
-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/mainwindows/mainwindow/mainwindow.cpp b/examples/mainwindows/mainwindow/mainwindow.cpp
index ef1485a147..15ee5bd927 100644
--- a/examples/mainwindows/mainwindow/mainwindow.cpp
+++ b/examples/mainwindows/mainwindow/mainwindow.cpp
@@ -75,7 +75,7 @@ static const char * const message =
"<p>Each dock widget contains a colored frame and a context "
"(right-click) menu.</p>"
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
"<p>On Mac OS X, the \"Black\" dock widget has been created as a "
"<em>Drawer</em>, which is a special kind of QDockWidget.</p>"
#endif
@@ -312,7 +312,7 @@ void MainWindow::setupDockWidgets(const QMap<QString, QSize> &customSizeHints)
uint flags;
Qt::DockWidgetArea area;
} sets [] = {
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
{ "Black", 0, Qt::LeftDockWidgetArea },
#else
{ "Black", Qt::Drawer, Qt::LeftDockWidgetArea },
diff --git a/examples/mainwindows/mainwindow/mainwindow.pro b/examples/mainwindows/mainwindow/mainwindow.pro
index afe03a5788..1381c460c2 100644
--- a/examples/mainwindows/mainwindow/mainwindow.pro
+++ b/examples/mainwindows/mainwindow/mainwindow.pro
@@ -15,4 +15,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mainwindow
INSTALLS += target sources
QT += widgets
-symbian: CONFIG += qt_example
diff --git a/examples/mainwindows/mainwindows.pro b/examples/mainwindows/mainwindows.pro
index 69897e3e13..cf8f4b68c9 100644
--- a/examples/mainwindows/mainwindows.pro
+++ b/examples/mainwindows/mainwindows.pro
@@ -15,6 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mainwindows.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/mainwindows/mdi/main.cpp b/examples/mainwindows/mdi/main.cpp
index 4e21e75159..1a10a19619 100644
--- a/examples/mainwindows/mdi/main.cpp
+++ b/examples/mainwindows/mdi/main.cpp
@@ -48,10 +48,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
MainWindow mainWin;
-#if defined(Q_OS_SYMBIAN)
- mainWin.showMaximized();
-#else
mainWin.show();
-#endif
return app.exec();
}
diff --git a/examples/mainwindows/mdi/mdi.pro b/examples/mainwindows/mdi/mdi.pro
index 3112128d9b..a4387fecd6 100644
--- a/examples/mainwindows/mdi/mdi.pro
+++ b/examples/mainwindows/mdi/mdi.pro
@@ -11,9 +11,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mdi.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mdi
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example might not fully work on Symbian platform)
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/mainwindows/menus/main.cpp b/examples/mainwindows/menus/main.cpp
index dffe80348a..01c8adae53 100644
--- a/examples/mainwindows/menus/main.cpp
+++ b/examples/mainwindows/menus/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/mainwindows/menus/mainwindow.cpp b/examples/mainwindows/menus/mainwindow.cpp
index eae4e6e9ec..2a1c3da71d 100644
--- a/examples/mainwindows/menus/mainwindow.cpp
+++ b/examples/mainwindows/menus/mainwindow.cpp
@@ -53,12 +53,8 @@ MainWindow::MainWindow()
QWidget *topFiller = new QWidget;
topFiller->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-#ifdef Q_OS_SYMBIAN
- infoLabel = new QLabel(tr("<i>Choose a menu option</i>"));
-#else
infoLabel = new QLabel(tr("<i>Choose a menu option, or right-click to "
"invoke a context menu</i>"));
-#endif
infoLabel->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
infoLabel->setAlignment(Qt::AlignCenter);
@@ -77,10 +73,8 @@ MainWindow::MainWindow()
createActions();
createMenus();
-#ifndef Q_OS_SYMBIAN
QString message = tr("A context menu is available by right-clicking");
statusBar()->showMessage(message);
-#endif
setWindowTitle(tr("Menus"));
setMinimumSize(160, 160);
diff --git a/examples/mainwindows/menus/menus.pro b/examples/mainwindows/menus/menus.pro
index c004ef73a8..5ed1e0dae5 100644
--- a/examples/mainwindows/menus/menus.pro
+++ b/examples/mainwindows/menus/menus.pro
@@ -8,11 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS menus.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/menus
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000CF66
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
-
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/mainwindows/recentfiles/main.cpp b/examples/mainwindows/recentfiles/main.cpp
index 37891b3983..3bbf0137c1 100644
--- a/examples/mainwindows/recentfiles/main.cpp
+++ b/examples/mainwindows/recentfiles/main.cpp
@@ -48,10 +48,6 @@ int main(int argc, char *argv[])
app.setOrganizationName("Trolltech");
app.setApplicationName("Recent Files Example");
MainWindow *mainWin = new MainWindow;
-#if defined(Q_OS_SYMBIAN)
- mainWin->showMaximized();
-#else
mainWin->show();
-#endif
return app.exec();
}
diff --git a/examples/mainwindows/recentfiles/recentfiles.pro b/examples/mainwindows/recentfiles/recentfiles.pro
index ecc78f245a..5425efc68f 100644
--- a/examples/mainwindows/recentfiles/recentfiles.pro
+++ b/examples/mainwindows/recentfiles/recentfiles.pro
@@ -8,8 +8,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS recentfiles.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/recentfiles
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/mainwindows/sdi/main.cpp b/examples/mainwindows/sdi/main.cpp
index ae3586cffc..0fb8a0388d 100644
--- a/examples/mainwindows/sdi/main.cpp
+++ b/examples/mainwindows/sdi/main.cpp
@@ -49,10 +49,6 @@ int main(int argc, char *argv[])
app.setApplicationName("SDI Example");
app.setOrganizationName("Trolltech");
MainWindow *mainWin = new MainWindow;
-#if defined(Q_OS_SYMBIAN)
- mainWin->showMaximized();
-#else
mainWin->show();
-#endif
return app.exec();
}
diff --git a/examples/mainwindows/sdi/sdi.pro b/examples/mainwindows/sdi/sdi.pro
index c8687614c2..cd5e0f1616 100644
--- a/examples/mainwindows/sdi/sdi.pro
+++ b/examples/mainwindows/sdi/sdi.pro
@@ -9,9 +9,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sdi.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/sdi
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example might not fully work on Symbian platform)
simulator: warning(This example might not fully work on Simulator platform)