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/tools | |
parent | 08e24858607d1b1483fb1faa54effa957501cfbb (diff) | |
download | qtbase-87274e272d2a854563066489e20d019b4e6320de.tar.gz qtbase-87274e272d2a854563066489e20d019b4e6320de.tar.bz2 qtbase-87274e272d2a854563066489e20d019b4e6320de.zip |
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/tools')
25 files changed, 4 insertions, 95 deletions
diff --git a/examples/tools/codecs/codecs.pro b/examples/tools/codecs/codecs.pro index b906190e0f..7f1ff0f308 100644 --- a/examples/tools/codecs/codecs.pro +++ b/examples/tools/codecs/codecs.pro @@ -10,10 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS encodedfiles codecs.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/codecs 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/tools/completer/completer.pro b/examples/tools/completer/completer.pro index 2077ebd750..67008b5dd2 100644 --- a/examples/tools/completer/completer.pro +++ b/examples/tools/completer/completer.pro @@ -11,10 +11,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS completer.pro resources sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/completer 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/tools/contiguouscache/contiguouscache.pro b/examples/tools/contiguouscache/contiguouscache.pro index c26f32e3d6..ca6d4f4e31 100644 --- a/examples/tools/contiguouscache/contiguouscache.pro +++ b/examples/tools/contiguouscache/contiguouscache.pro @@ -9,9 +9,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/contiguouscache INSTALLS += target sources QT += widgets -symbian: 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/tools/customcompleter/customcompleter.pro b/examples/tools/customcompleter/customcompleter.pro index fe417185b9..fd4a101e88 100644 --- a/examples/tools/customcompleter/customcompleter.pro +++ b/examples/tools/customcompleter/customcompleter.pro @@ -11,10 +11,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customcompleter.pro reso sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/customcompleter 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/tools/customtype/customtype.pro b/examples/tools/customtype/customtype.pro index 6542cf5473..5282de0acb 100644 --- a/examples/tools/customtype/customtype.pro +++ b/examples/tools/customtype/customtype.pro @@ -9,9 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customcompleter.pro reso sources.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter INSTALLS += target sources -symbian: 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/tools/customtypesending/customtypesending.pro b/examples/tools/customtypesending/customtypesending.pro index 4d11497f0b..b86c101577 100644 --- a/examples/tools/customtypesending/customtypesending.pro +++ b/examples/tools/customtypesending/customtypesending.pro @@ -11,9 +11,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customcompleter.pro reso sources.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter INSTALLS += target sources -symbian: 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/tools/echoplugin/echoplugin.pro b/examples/tools/echoplugin/echoplugin.pro index 66a268f4a0..06ef2e1117 100644 --- a/examples/tools/echoplugin/echoplugin.pro +++ b/examples/tools/echoplugin/echoplugin.pro @@ -10,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS echoplugin.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/tools/echoplugin/echowindow/echowindow.pro b/examples/tools/echoplugin/echowindow/echowindow.pro index 65aa594b99..0b7c307f7a 100644 --- a/examples/tools/echoplugin/echowindow/echowindow.pro +++ b/examples/tools/echoplugin/echowindow/echowindow.pro @@ -18,10 +18,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS echowindow.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin/echowindow 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/tools/echoplugin/plugin/plugin.pro b/examples/tools/echoplugin/plugin/plugin.pro index 1d98c67698..2be6de80d1 100644 --- a/examples/tools/echoplugin/plugin/plugin.pro +++ b/examples/tools/echoplugin/plugin/plugin.pro @@ -14,15 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin/plugin INSTALLS += target sources -symbian { - CONFIG += qt_example - TARGET.EPOCALLOWDLLDATA = 1 -} - -symbian:TARGET.EPOCALLOWDLLDATA = 1 QT += widgets -symbian:TARGET.EPOCALLOWDLLDATA = 1 -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/tools/i18n/i18n.pro b/examples/tools/i18n/i18n.pro index e315c981cc..794e010648 100644 --- a/examples/tools/i18n/i18n.pro +++ b/examples/tools/i18n/i18n.pro @@ -25,10 +25,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES translations i18n.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/i18n 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/tools/inputpanel/inputpanel.pro b/examples/tools/inputpanel/inputpanel.pro index 370ac5da54..62e35e9c23 100644 --- a/examples/tools/inputpanel/inputpanel.pro +++ b/examples/tools/inputpanel/inputpanel.pro @@ -14,10 +14,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS inputpanel.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/inputpanel 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/tools/plugandpaint/plugandpaint.pro b/examples/tools/plugandpaint/plugandpaint.pro index d2ab1bad45..935b6b3c06 100644 --- a/examples/tools/plugandpaint/plugandpaint.pro +++ b/examples/tools/plugandpaint/plugandpaint.pro @@ -7,11 +7,8 @@ SOURCES = main.cpp \ mainwindow.cpp \ paintarea.cpp \ plugindialog.cpp -symbian { - LIBS = -lpnp_basictools.lib -} else { - LIBS = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools -} + +LIBS = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { mac:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)_debug @@ -25,10 +22,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugandpaint.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaint 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/tools/plugandpaintplugins/basictools/basictools.pro b/examples/tools/plugandpaintplugins/basictools/basictools.pro index 2b2f45ae60..6175de34a3 100644 --- a/examples/tools/plugandpaintplugins/basictools/basictools.pro +++ b/examples/tools/plugandpaintplugins/basictools/basictools.pro @@ -14,6 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basictools.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaintplugins/basictools INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro index 434de1a5e3..70e7c42c76 100644 --- a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro +++ b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro @@ -14,8 +14,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extrafilters.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaintplugins/extrafilters INSTALLS += target sources -symbian: CONFIG += qt_example -symbian:TARGET.EPOCALLOWDLLDATA = 1 QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/tools/plugandpaintplugins/plugandpaintplugins.pro b/examples/tools/plugandpaintplugins/plugandpaintplugins.pro index deda635b89..5e783df478 100644 --- a/examples/tools/plugandpaintplugins/plugandpaintplugins.pro +++ b/examples/tools/plugandpaintplugins/plugandpaintplugins.pro @@ -8,6 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugandpaintplugins.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaintplugins INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/tools/regexp/regexp.pro b/examples/tools/regexp/regexp.pro index 62ae570ef1..48cd6d362a 100644 --- a/examples/tools/regexp/regexp.pro +++ b/examples/tools/regexp/regexp.pro @@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS regexp.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/regexp 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/tools/settingseditor/mainwindow.cpp b/examples/tools/settingseditor/mainwindow.cpp index 6b875f3a24..fc389cd009 100644 --- a/examples/tools/settingseditor/mainwindow.cpp +++ b/examples/tools/settingseditor/mainwindow.cpp @@ -170,10 +170,10 @@ void MainWindow::createActions() aboutQtAct = new QAction(tr("About &Qt"), this); connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt())); -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC openPropertyListAct->setEnabled(false); #endif -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN openRegistryPathAct->setEnabled(false); #endif } diff --git a/examples/tools/settingseditor/settingseditor.pro b/examples/tools/settingseditor/settingseditor.pro index 788b4def0b..79bcdf5dfe 100644 --- a/examples/tools/settingseditor/settingseditor.pro +++ b/examples/tools/settingseditor/settingseditor.pro @@ -14,10 +14,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS settingseditor.pro inifi sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/settingseditor 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/tools/styleplugin/plugin/plugin.pro b/examples/tools/styleplugin/plugin/plugin.pro index 55ea4e4bba..e5cdbe072b 100644 --- a/examples/tools/styleplugin/plugin/plugin.pro +++ b/examples/tools/styleplugin/plugin/plugin.pro @@ -20,8 +20,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/styleplugin/plugin INSTALLS += target sources -symbian: CONFIG += qt_example -symbian:TARGET.EPOCALLOWDLLDATA = 1 QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/tools/styleplugin/styleplugin.pro b/examples/tools/styleplugin/styleplugin.pro index 6d8c09ffbb..51a5e4ec9f 100644 --- a/examples/tools/styleplugin/styleplugin.pro +++ b/examples/tools/styleplugin/styleplugin.pro @@ -8,6 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styleplugin.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/styleplugin INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/tools/styleplugin/stylewindow/stylewindow.pro b/examples/tools/styleplugin/stylewindow/stylewindow.pro index cdbe9f6553..319e230943 100644 --- a/examples/tools/styleplugin/stylewindow/stylewindow.pro +++ b/examples/tools/styleplugin/stylewindow/stylewindow.pro @@ -16,6 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stylewindow.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/styleplugin/stylewindow INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/tools/tools.pro b/examples/tools/tools.pro index cfab2f9def..da86fb5286 100644 --- a/examples/tools/tools.pro +++ b/examples/tools/tools.pro @@ -24,6 +24,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tools.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/tools/treemodelcompleter/treemodelcompleter.pro b/examples/tools/treemodelcompleter/treemodelcompleter.pro index c64b44be8f..82d8404446 100644 --- a/examples/tools/treemodelcompleter/treemodelcompleter.pro +++ b/examples/tools/treemodelcompleter/treemodelcompleter.pro @@ -11,10 +11,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS treemodelcompleter.pro r sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/treemodelcompleter 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/tools/undo/undo.pro b/examples/tools/undo/undo.pro index ace6e49e8a..bf7dc388ee 100644 --- a/examples/tools/undo/undo.pro +++ b/examples/tools/undo/undo.pro @@ -16,4 +16,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undo INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example diff --git a/examples/tools/undoframework/undoframework.pro b/examples/tools/undoframework/undoframework.pro index a356ce935e..a51a43721e 100644 --- a/examples/tools/undoframework/undoframework.pro +++ b/examples/tools/undoframework/undoframework.pro @@ -15,10 +15,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS undoframework.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undoframework 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) |