summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-10-18 09:54:31 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-18 15:47:49 +0200
commit87274e272d2a854563066489e20d019b4e6320de (patch)
treed01e71403a41db3ca2b83599fcc7036d79d7a13e
parent08e24858607d1b1483fb1faa54effa957501cfbb (diff)
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>
-rw-r--r--examples/animation/animatedtiles/animatedtiles.pro5
-rw-r--r--examples/animation/animatedtiles/main.cpp4
-rw-r--r--examples/animation/appchooser/appchooser.pro5
-rw-r--r--examples/animation/appchooser/main.cpp4
-rw-r--r--examples/animation/easing/easing.pro5
-rw-r--r--examples/animation/easing/main.cpp6
-rw-r--r--examples/animation/easing/window.cpp4
-rw-r--r--examples/animation/moveblocks/main.cpp5
-rw-r--r--examples/animation/moveblocks/moveblocks.pro5
-rw-r--r--examples/animation/states/main.cpp4
-rw-r--r--examples/animation/states/states.pro5
-rw-r--r--examples/animation/stickman/main.cpp25
-rw-r--r--examples/animation/stickman/stickman.pro5
-rw-r--r--examples/dbus/complexpingpong/complexping.pro3
-rw-r--r--examples/dbus/complexpingpong/complexpong.pro3
-rw-r--r--examples/dbus/dbus-chat/dbus-chat.pro3
-rw-r--r--examples/dbus/dbus.pro2
-rw-r--r--examples/dbus/listnames/listnames.pro3
-rw-r--r--examples/dbus/pingpong/ping.pro3
-rw-r--r--examples/dbus/pingpong/pong.pro3
-rw-r--r--examples/dbus/remotecontrolledcar/car/car.pro3
-rw-r--r--examples/dbus/remotecontrolledcar/controller/controller.pro3
-rw-r--r--examples/dbus/remotecontrolledcar/remotecontrolledcar.pro2
-rw-r--r--examples/desktop/desktop.pro2
-rw-r--r--examples/desktop/screenshot/screenshot.pro4
-rw-r--r--examples/dialogs/classwizard/classwizard.pro4
-rw-r--r--examples/dialogs/configdialog/configdialog.pro4
-rw-r--r--examples/dialogs/dialogs.pro4
-rw-r--r--examples/dialogs/extension/extension.pro2
-rw-r--r--examples/dialogs/extension/finddialog.cpp35
-rw-r--r--examples/dialogs/extension/main.cpp4
-rw-r--r--examples/dialogs/findfiles/findfiles.pro2
-rw-r--r--examples/dialogs/findfiles/main.cpp4
-rw-r--r--examples/dialogs/findfiles/window.cpp9
-rw-r--r--examples/dialogs/licensewizard/licensewizard.cpp2
-rw-r--r--examples/dialogs/licensewizard/licensewizard.pro4
-rw-r--r--examples/dialogs/sipdialog/sipdialog.pro4
-rw-r--r--examples/dialogs/standarddialogs/dialog.cpp12
-rw-r--r--examples/dialogs/standarddialogs/main.cpp4
-rw-r--r--examples/dialogs/standarddialogs/standarddialogs.pro2
-rw-r--r--examples/dialogs/tabdialog/main.cpp4
-rw-r--r--examples/dialogs/tabdialog/tabdialog.pro4
-rw-r--r--examples/dialogs/trivialwizard/trivialwizard.cpp4
-rw-r--r--examples/dialogs/trivialwizard/trivialwizard.pro3
-rw-r--r--examples/draganddrop/draganddrop.pro1
-rw-r--r--examples/draganddrop/draggableicons/draggableicons.pro5
-rw-r--r--examples/draganddrop/draggableicons/dragwidget.cpp3
-rw-r--r--examples/draganddrop/draggableicons/main.cpp4
-rw-r--r--examples/draganddrop/draggabletext/draggabletext.pro7
-rw-r--r--examples/draganddrop/draggabletext/main.cpp4
-rw-r--r--examples/draganddrop/dropsite/dropsite.pro4
-rw-r--r--examples/draganddrop/fridgemagnets/dragwidget.cpp6
-rw-r--r--examples/draganddrop/fridgemagnets/fridgemagnets.pro6
-rw-r--r--examples/draganddrop/fridgemagnets/main.cpp4
-rw-r--r--examples/draganddrop/puzzle/main.cpp4
-rw-r--r--examples/draganddrop/puzzle/mainwindow.cpp4
-rw-r--r--examples/draganddrop/puzzle/puzzle.pro8
-rw-r--r--examples/effects/blurpicker/blurpicker.cpp3
-rw-r--r--examples/effects/blurpicker/blurpicker.pro2
-rw-r--r--examples/effects/blurpicker/main.cpp4
-rw-r--r--examples/effects/fademessage/fademessage.cpp4
-rw-r--r--examples/effects/fademessage/fademessage.pro2
-rw-r--r--examples/effects/fademessage/main.cpp4
-rw-r--r--examples/effects/lighting/lighting.cpp3
-rw-r--r--examples/effects/lighting/lighting.pro2
-rw-r--r--examples/effects/lighting/main.cpp4
-rw-r--r--examples/embedded/digiflip/digiflip.cpp16
-rw-r--r--examples/embedded/digiflip/digiflip.pro5
-rw-r--r--examples/embedded/embedded.pro1
-rw-r--r--examples/embedded/flickable/flickable.pro5
-rw-r--r--examples/embedded/flickable/main.cpp4
-rw-r--r--examples/embedded/flightinfo/flightinfo.cpp10
-rw-r--r--examples/embedded/flightinfo/flightinfo.pro6
-rw-r--r--examples/embedded/lightmaps/lightmaps.cpp5
-rw-r--r--examples/embedded/lightmaps/lightmaps.pro7
-rw-r--r--examples/embedded/lightmaps/main.cpp7
-rw-r--r--examples/embedded/lightmaps/mapzoom.cpp8
-rw-r--r--examples/embedded/raycasting/raycasting.cpp4
-rw-r--r--examples/embedded/raycasting/raycasting.pro5
-rw-r--r--examples/embedded/styleexample/styleexample.pro4
-rw-r--r--examples/examples.pro17
-rw-r--r--examples/gestures/imagegestures/imagegestures.pro9
-rw-r--r--examples/graphicsview/anchorlayout/anchorlayout.pro2
-rw-r--r--examples/graphicsview/anchorlayout/main.cpp4
-rw-r--r--examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro6
-rw-r--r--examples/graphicsview/basicgraphicslayouts/main.cpp4
-rw-r--r--examples/graphicsview/boxes/glextensions.h2
-rw-r--r--examples/graphicsview/chip/chip.pro1
-rw-r--r--examples/graphicsview/collidingmice/collidingmice.pro7
-rw-r--r--examples/graphicsview/collidingmice/main.cpp4
-rw-r--r--examples/graphicsview/diagramscene/diagramscene.pro4
-rw-r--r--examples/graphicsview/dragdroprobot/dragdroprobot.pro2
-rw-r--r--examples/graphicsview/dragdroprobot/main.cpp7
-rw-r--r--examples/graphicsview/elasticnodes/elasticnodes.pro7
-rw-r--r--examples/graphicsview/elasticnodes/graphwidget.cpp2
-rw-r--r--examples/graphicsview/elasticnodes/main.cpp7
-rw-r--r--examples/graphicsview/elasticnodes/node.cpp12
-rw-r--r--examples/graphicsview/embeddeddialogs/embeddeddialogs.pro1
-rw-r--r--examples/graphicsview/flowlayout/flowlayout.pro2
-rw-r--r--examples/graphicsview/flowlayout/main.cpp4
-rw-r--r--examples/graphicsview/graphicsview.pro6
-rw-r--r--examples/graphicsview/padnavigator/main.cpp4
-rw-r--r--examples/graphicsview/padnavigator/padnavigator.pro8
-rw-r--r--examples/graphicsview/simpleanchorlayout/main.cpp6
-rw-r--r--examples/graphicsview/simpleanchorlayout/simpleanchorlayout.pro2
-rw-r--r--examples/graphicsview/weatheranchorlayout/main.cpp8
-rw-r--r--examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro2
-rw-r--r--examples/ipc/ipc.pro2
-rw-r--r--examples/ipc/localfortuneclient/client.cpp4
-rw-r--r--examples/ipc/localfortuneclient/client.h8
-rw-r--r--examples/ipc/localfortuneclient/localfortuneclient.pro4
-rw-r--r--examples/ipc/localfortuneclient/main.cpp4
-rw-r--r--examples/ipc/localfortuneserver/localfortuneserver.pro2
-rw-r--r--examples/ipc/localfortuneserver/main.cpp4
-rw-r--r--examples/ipc/localfortuneserver/server.cpp4
-rw-r--r--examples/ipc/localfortuneserver/server.h8
-rw-r--r--examples/ipc/sharedmemory/sharedmemory.pro4
-rw-r--r--examples/itemviews/addressbook/addressbook.pro6
-rw-r--r--examples/itemviews/addressbook/main.cpp4
-rw-r--r--examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro2
-rw-r--r--examples/itemviews/basicsortfiltermodel/main.cpp4
-rw-r--r--examples/itemviews/basicsortfiltermodel/window.cpp33
-rw-r--r--examples/itemviews/basicsortfiltermodel/window.h6
-rw-r--r--examples/itemviews/chart/chart.pro7
-rw-r--r--examples/itemviews/chart/main.cpp4
-rw-r--r--examples/itemviews/coloreditorfactory/coloreditorfactory.pro4
-rw-r--r--examples/itemviews/coloreditorfactory/main.cpp4
-rw-r--r--examples/itemviews/combowidgetmapper/combowidgetmapper.pro2
-rw-r--r--examples/itemviews/combowidgetmapper/main.cpp4
-rw-r--r--examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro2
-rw-r--r--examples/itemviews/customsortfiltermodel/main.cpp4
-rw-r--r--examples/itemviews/customsortfiltermodel/window.cpp38
-rw-r--r--examples/itemviews/customsortfiltermodel/window.h6
-rw-r--r--examples/itemviews/dirview/dirview.pro2
-rw-r--r--examples/itemviews/dirview/main.cpp4
-rw-r--r--examples/itemviews/editabletreemodel/editabletreemodel.pro2
-rw-r--r--examples/itemviews/editabletreemodel/main.cpp4
-rw-r--r--examples/itemviews/editabletreemodel/mainwindow.cpp4
-rw-r--r--examples/itemviews/fetchmore/fetchmore.pro2
-rw-r--r--examples/itemviews/fetchmore/main.cpp4
-rw-r--r--examples/itemviews/frozencolumn/frozencolumn.pro2
-rw-r--r--examples/itemviews/frozencolumn/main.cpp6
-rw-r--r--examples/itemviews/interview/interview.pro1
-rw-r--r--examples/itemviews/itemviews.pro2
-rw-r--r--examples/itemviews/pixelator/main.cpp4
-rw-r--r--examples/itemviews/pixelator/pixelator.pro2
-rw-r--r--examples/itemviews/puzzle/main.cpp4
-rw-r--r--examples/itemviews/puzzle/mainwindow.cpp4
-rw-r--r--examples/itemviews/puzzle/puzzle.pro2
-rw-r--r--examples/itemviews/simpledommodel/main.cpp6
-rw-r--r--examples/itemviews/simpledommodel/simpledommodel.pro2
-rw-r--r--examples/itemviews/simpletreemodel/main.cpp4
-rw-r--r--examples/itemviews/simpletreemodel/simpletreemodel.pro2
-rw-r--r--examples/itemviews/simplewidgetmapper/main.cpp4
-rw-r--r--examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro2
-rw-r--r--examples/itemviews/spinboxdelegate/main.cpp4
-rw-r--r--examples/itemviews/spinboxdelegate/spinboxdelegate.pro4
-rw-r--r--examples/itemviews/spreadsheet/spreadsheet.pro1
-rw-r--r--examples/itemviews/stardelegate/main.cpp4
-rw-r--r--examples/itemviews/stardelegate/stardelegate.pro4
-rw-r--r--examples/ja_JP/linguist/hellotr/hellotr.pro2
-rw-r--r--examples/layouts/basiclayouts/basiclayouts.pro4
-rw-r--r--examples/layouts/basiclayouts/main.cpp4
-rw-r--r--examples/layouts/borderlayout/borderlayout.pro2
-rw-r--r--examples/layouts/borderlayout/main.cpp4
-rw-r--r--examples/layouts/dynamiclayouts/dialog.cpp4
-rw-r--r--examples/layouts/dynamiclayouts/dialog.h4
-rw-r--r--examples/layouts/dynamiclayouts/dynamiclayouts.pro4
-rw-r--r--examples/layouts/dynamiclayouts/main.cpp4
-rw-r--r--examples/layouts/flowlayout/flowlayout.pro2
-rw-r--r--examples/layouts/flowlayout/main.cpp4
-rw-r--r--examples/layouts/layouts.pro2
-rw-r--r--examples/linguist/arrowpad/arrowpad.pro4
-rw-r--r--examples/linguist/hellotr/hellotr.pro4
-rw-r--r--examples/linguist/linguist.pro2
-rw-r--r--examples/linguist/trollprint/trollprint.pro4
-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
-rw-r--r--examples/network/bearermonitor/bearermonitor.cpp3
-rw-r--r--examples/network/bearermonitor/bearermonitor.h10
-rw-r--r--examples/network/bearermonitor/bearermonitor.pro8
-rw-r--r--examples/network/blockingfortuneclient/blockingclient.cpp40
-rw-r--r--examples/network/blockingfortuneclient/blockingclient.h5
-rw-r--r--examples/network/blockingfortuneclient/blockingfortuneclient.pro8
-rw-r--r--examples/network/blockingfortuneclient/main.cpp4
-rw-r--r--examples/network/broadcastreceiver/broadcastreceiver.pro5
-rw-r--r--examples/network/broadcastreceiver/main.cpp4
-rw-r--r--examples/network/broadcastreceiver/receiver.cpp14
-rw-r--r--examples/network/broadcastreceiver/receiver.h4
-rw-r--r--examples/network/broadcastsender/broadcastsender.pro6
-rw-r--r--examples/network/broadcastsender/main.cpp4
-rw-r--r--examples/network/download/download.pro3
-rw-r--r--examples/network/downloadmanager/downloadmanager.pro3
-rw-r--r--examples/network/fortuneclient/fortuneclient.pro11
-rw-r--r--examples/network/fortuneclient/main.cpp5
-rw-r--r--examples/network/fortuneserver/fortuneserver.pro12
-rw-r--r--examples/network/fortuneserver/main.cpp4
-rw-r--r--examples/network/googlesuggest/googlesuggest.pro4
-rw-r--r--examples/network/http/http.pro6
-rw-r--r--examples/network/http/httpwindow.cpp19
-rw-r--r--examples/network/http/httpwindow.h10
-rw-r--r--examples/network/http/main.cpp11
-rw-r--r--examples/network/loopback/dialog.cpp35
-rw-r--r--examples/network/loopback/dialog.h5
-rw-r--r--examples/network/loopback/loopback.pro6
-rw-r--r--examples/network/loopback/main.cpp4
-rw-r--r--examples/network/multicastreceiver/multicastreceiver.pro1
-rw-r--r--examples/network/multicastsender/multicastsender.pro1
-rw-r--r--examples/network/network-chat/main.cpp5
-rw-r--r--examples/network/network-chat/network-chat.pro9
-rw-r--r--examples/network/network-chat/peermanager.cpp4
-rw-r--r--examples/network/network.pro3
-rw-r--r--examples/network/qftp/ftpwindow.cpp15
-rw-r--r--examples/network/qftp/main.cpp14
-rw-r--r--examples/network/qftp/qftp.pro11
-rw-r--r--examples/network/securesocketclient/main.cpp4
-rw-r--r--examples/network/securesocketclient/securesocketclient.pro7
-rw-r--r--examples/network/securesocketclient/sslclient.cpp6
-rw-r--r--examples/network/threadedfortuneserver/dialog.cpp14
-rw-r--r--examples/network/threadedfortuneserver/main.cpp4
-rw-r--r--examples/network/threadedfortuneserver/threadedfortuneserver.pro7
-rw-r--r--examples/network/torrent/torrent.pro4
-rw-r--r--examples/opengl/2dpainting/2dpainting.pro3
-rw-r--r--examples/opengl/cube/cube.pro3
-rw-r--r--examples/opengl/framebufferobject2/framebufferobject2.pro4
-rw-r--r--examples/opengl/grabber/grabber.pro4
-rw-r--r--examples/opengl/hellogl/hellogl.pro4
-rw-r--r--examples/opengl/hellogl_es2/glwidget.cpp2
-rw-r--r--examples/opengl/hellogl_es2/hellogl_es2.pro2
-rw-r--r--examples/opengl/opengl.pro2
-rw-r--r--examples/opengl/overpainting/overpainting.pro4
-rw-r--r--examples/opengl/pbuffers/pbuffers.pro4
-rw-r--r--examples/opengl/pbuffers2/pbuffers2.pro4
-rw-r--r--examples/opengl/samplebuffers/samplebuffers.pro4
-rw-r--r--examples/opengl/textures/textures.pro3
-rw-r--r--examples/painting/affine/affine.pro6
-rw-r--r--examples/painting/basicdrawing/basicdrawing.pro7
-rw-r--r--examples/painting/basicdrawing/main.cpp4
-rw-r--r--examples/painting/basicdrawing/window.cpp7
-rw-r--r--examples/painting/composition/composition.cpp22
-rw-r--r--examples/painting/composition/composition.h6
-rw-r--r--examples/painting/composition/composition.pro1
-rw-r--r--examples/painting/concentriccircles/concentriccircles.pro5
-rw-r--r--examples/painting/concentriccircles/main.cpp4
-rw-r--r--examples/painting/deform/deform.pro5
-rw-r--r--examples/painting/fontsampler/fontsampler.pro2
-rw-r--r--examples/painting/fontsampler/main.cpp4
-rw-r--r--examples/painting/fontsampler/mainwindow.cpp7
-rw-r--r--examples/painting/gradients/gradients.pro1
-rw-r--r--examples/painting/imagecomposition/imagecomposer.cpp7
-rw-r--r--examples/painting/imagecomposition/imagecomposition.pro5
-rw-r--r--examples/painting/imagecomposition/main.cpp4
-rw-r--r--examples/painting/painterpaths/main.cpp4
-rw-r--r--examples/painting/painterpaths/painterpaths.pro7
-rw-r--r--examples/painting/painterpaths/window.cpp10
-rw-r--r--examples/painting/painting.pro2
-rw-r--r--examples/painting/pathstroke/pathstroke.pro4
-rw-r--r--examples/painting/shared/arthurwidgets.cpp12
-rw-r--r--examples/painting/shared/shared.pri3
-rw-r--r--examples/painting/shared/shared.pro5
-rw-r--r--examples/painting/transformations/main.cpp4
-rw-r--r--examples/painting/transformations/transformations.pro9
-rw-r--r--examples/qtconcurrent/imagescaling/imagescaling.pro2
-rw-r--r--examples/qtconcurrent/imagescaling/main.cpp8
-rw-r--r--examples/qtconcurrent/map/main.cpp4
-rw-r--r--examples/qtconcurrent/map/map.pro2
-rw-r--r--examples/qtconcurrent/progressdialog/main.cpp4
-rw-r--r--examples/qtconcurrent/progressdialog/progressdialog.pro2
-rw-r--r--examples/qtconcurrent/qtconcurrent.pro2
-rw-r--r--examples/qtconcurrent/runfunction/main.cpp4
-rw-r--r--examples/qtconcurrent/runfunction/runfunction.pro2
-rw-r--r--examples/qtconcurrent/wordcount/main.cpp8
-rw-r--r--examples/qtconcurrent/wordcount/wordcount.pro2
-rw-r--r--examples/qtestlib/qtestlib.pro2
-rw-r--r--examples/qtestlib/tutorial1/tutorial1.pro9
-rw-r--r--examples/qtestlib/tutorial2/tutorial2.pro9
-rw-r--r--examples/qtestlib/tutorial3/tutorial3.pro9
-rw-r--r--examples/qtestlib/tutorial4/tutorial4.pro9
-rw-r--r--examples/qtestlib/tutorial5/containers.cpp4
-rw-r--r--examples/qtestlib/tutorial5/tutorial5.pro9
-rw-r--r--examples/qws/dbscreen/dbscreen.pro3
-rw-r--r--examples/qws/framebuffer/framebuffer.pro3
-rw-r--r--examples/qws/mousecalibration/mousecalibration.pro4
-rw-r--r--examples/qws/simpledecoration/simpledecoration.pro4
-rw-r--r--examples/qws/svgalib/svgalib.pro4
-rw-r--r--examples/richtext/calendar/calendar.pro3
-rw-r--r--examples/richtext/calendar/main.cpp6
-rw-r--r--examples/richtext/calendar/mainwindow.cpp4
-rw-r--r--examples/richtext/orderform/detailsdialog.cpp30
-rw-r--r--examples/richtext/orderform/main.cpp6
-rw-r--r--examples/richtext/orderform/orderform.pro2
-rw-r--r--examples/richtext/richtext.pro2
-rw-r--r--examples/richtext/syntaxhighlighter/main.cpp6
-rw-r--r--examples/richtext/syntaxhighlighter/syntaxhighlighter.pro2
-rw-r--r--examples/richtext/textedit/textedit.cpp2
-rw-r--r--examples/richtext/textedit/textedit.pro1
-rw-r--r--examples/scroller/graphicsview/main.cpp6
-rw-r--r--examples/sql/books/books.pro1
-rw-r--r--examples/sql/cachedtable/cachedtable.pro2
-rw-r--r--examples/sql/cachedtable/main.cpp4
-rw-r--r--examples/sql/drilldown/drilldown.pro8
-rw-r--r--examples/sql/drilldown/main.cpp4
-rw-r--r--examples/sql/drilldown/view.cpp12
-rw-r--r--examples/sql/masterdetail/main.cpp4
-rw-r--r--examples/sql/masterdetail/mainwindow.cpp4
-rw-r--r--examples/sql/masterdetail/masterdetail.pro10
-rw-r--r--examples/sql/querymodel/main.cpp13
-rw-r--r--examples/sql/querymodel/querymodel.pro2
-rw-r--r--examples/sql/relationaltablemodel/relationaltablemodel.cpp4
-rw-r--r--examples/sql/relationaltablemodel/relationaltablemodel.pro2
-rw-r--r--examples/sql/sql.pro8
-rw-r--r--examples/sql/sqlbrowser/sqlbrowser.pro1
-rw-r--r--examples/sql/sqlwidgetmapper/main.cpp4
-rw-r--r--examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro2
-rw-r--r--examples/sql/tablemodel/tablemodel.cpp12
-rw-r--r--examples/sql/tablemodel/tablemodel.pro2
-rw-r--r--examples/statemachine/eventtransitions/eventtransitions.pro2
-rw-r--r--examples/statemachine/eventtransitions/main.cpp4
-rw-r--r--examples/statemachine/factorial/factorial.pro3
-rw-r--r--examples/statemachine/pingpong/pingpong.pro3
-rw-r--r--examples/statemachine/rogue/main.cpp4
-rw-r--r--examples/statemachine/rogue/rogue.pro2
-rw-r--r--examples/statemachine/rogue/window.cpp4
-rw-r--r--examples/statemachine/rogue/window.h5
-rw-r--r--examples/statemachine/trafficlight/main.cpp9
-rw-r--r--examples/statemachine/trafficlight/trafficlight.pro2
-rw-r--r--examples/statemachine/twowaybutton/main.cpp6
-rw-r--r--examples/statemachine/twowaybutton/twowaybutton.pro2
-rw-r--r--examples/threads/mandelbrot/main.cpp4
-rw-r--r--examples/threads/mandelbrot/mandelbrot.pro4
-rw-r--r--examples/threads/mandelbrot/mandelbrotwidget.cpp16
-rw-r--r--examples/threads/mandelbrot/mandelbrotwidget.h26
-rw-r--r--examples/threads/queuedcustomtype/main.cpp4
-rw-r--r--examples/threads/queuedcustomtype/queuedcustomtype.pro2
-rw-r--r--examples/threads/semaphores/semaphores.cpp29
-rw-r--r--examples/threads/semaphores/semaphores.pro2
-rw-r--r--examples/threads/threads.pro2
-rw-r--r--examples/threads/waitconditions/waitconditions.cpp46
-rw-r--r--examples/threads/waitconditions/waitconditions.pro2
-rw-r--r--examples/tools/codecs/codecs.pro4
-rw-r--r--examples/tools/completer/completer.pro4
-rw-r--r--examples/tools/contiguouscache/contiguouscache.pro4
-rw-r--r--examples/tools/customcompleter/customcompleter.pro4
-rw-r--r--examples/tools/customtype/customtype.pro4
-rw-r--r--examples/tools/customtypesending/customtypesending.pro4
-rw-r--r--examples/tools/echoplugin/echoplugin.pro2
-rw-r--r--examples/tools/echoplugin/echowindow/echowindow.pro4
-rw-r--r--examples/tools/echoplugin/plugin/plugin.pro11
-rw-r--r--examples/tools/i18n/i18n.pro4
-rw-r--r--examples/tools/inputpanel/inputpanel.pro4
-rw-r--r--examples/tools/plugandpaint/plugandpaint.pro13
-rw-r--r--examples/tools/plugandpaintplugins/basictools/basictools.pro2
-rw-r--r--examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro3
-rw-r--r--examples/tools/plugandpaintplugins/plugandpaintplugins.pro2
-rw-r--r--examples/tools/regexp/regexp.pro4
-rw-r--r--examples/tools/settingseditor/mainwindow.cpp4
-rw-r--r--examples/tools/settingseditor/settingseditor.pro4
-rw-r--r--examples/tools/styleplugin/plugin/plugin.pro3
-rw-r--r--examples/tools/styleplugin/styleplugin.pro2
-rw-r--r--examples/tools/styleplugin/stylewindow/stylewindow.pro2
-rw-r--r--examples/tools/tools.pro2
-rw-r--r--examples/tools/treemodelcompleter/treemodelcompleter.pro4
-rw-r--r--examples/tools/undo/undo.pro1
-rw-r--r--examples/tools/undoframework/undoframework.pro4
-rw-r--r--examples/touch/dials/dials.pro4
-rw-r--r--examples/touch/fingerpaint/fingerpaint.pro4
-rw-r--r--examples/touch/knobs/knobs.pro4
-rw-r--r--examples/touch/pinchzoom/pinchzoom.pro4
-rw-r--r--examples/tutorials/addressbook-fr/part1/part1.pro4
-rw-r--r--examples/tutorials/addressbook-fr/part2/part2.pro4
-rw-r--r--examples/tutorials/addressbook-fr/part3/part3.pro4
-rw-r--r--examples/tutorials/addressbook-fr/part4/part4.pro4
-rw-r--r--examples/tutorials/addressbook-fr/part5/part5.pro4
-rw-r--r--examples/tutorials/addressbook-fr/part6/part6.pro4
-rw-r--r--examples/tutorials/addressbook-fr/part7/part7.pro4
-rw-r--r--examples/tutorials/addressbook/addressbook.pro2
-rw-r--r--examples/tutorials/addressbook/part1/part1.pro4
-rw-r--r--examples/tutorials/addressbook/part2/part2.pro4
-rw-r--r--examples/tutorials/addressbook/part3/part3.pro4
-rw-r--r--examples/tutorials/addressbook/part4/part4.pro4
-rw-r--r--examples/tutorials/addressbook/part5/part5.pro4
-rw-r--r--examples/tutorials/addressbook/part6/part6.pro4
-rw-r--r--examples/tutorials/addressbook/part7/part7.pro4
-rw-r--r--[-rwxr-xr-x]examples/tutorials/modelview/1_readonly/1_readonly.pro4
-rw-r--r--[-rwxr-xr-x]examples/tutorials/modelview/2_formatting/2_formatting.pro4
-rw-r--r--[-rwxr-xr-x]examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro4
-rw-r--r--[-rwxr-xr-x]examples/tutorials/modelview/4_headers/4_headers.pro4
-rw-r--r--[-rwxr-xr-x]examples/tutorials/modelview/5_edit/5_edit.pro4
-rw-r--r--[-rwxr-xr-x]examples/tutorials/modelview/6_treeview/6_treeview.pro4
-rw-r--r--[-rwxr-xr-x]examples/tutorials/modelview/7_selections/7_selections.pro4
-rw-r--r--[-rwxr-xr-x]examples/tutorials/modelview/modelview.pro2
-rw-r--r--[-rwxr-xr-x]examples/tutorials/threads/clock/clock.pro1
-rw-r--r--[-rwxr-xr-x]examples/tutorials/threads/helloconcurrent/helloconcurrent.pro1
-rw-r--r--[-rwxr-xr-x]examples/tutorials/threads/hellothread/hellothread.pro1
-rw-r--r--[-rwxr-xr-x]examples/tutorials/threads/hellothreadpool/hellothreadpool.pro1
-rw-r--r--[-rwxr-xr-x]examples/tutorials/threads/movedobject/movedobject.pro1
-rw-r--r--examples/tutorials/widgets/childwidget/childwidget.pro4
-rw-r--r--examples/tutorials/widgets/nestedlayouts/nestedlayouts.pro4
-rw-r--r--examples/tutorials/widgets/toplevel/toplevel.pro4
-rw-r--r--examples/tutorials/widgets/windowlayout/windowlayout.pro4
-rw-r--r--examples/widgets/analogclock/analogclock.pro5
-rw-r--r--examples/widgets/analogclock/main.cpp4
-rw-r--r--examples/widgets/applicationicon/applicationicon.pro19
-rw-r--r--examples/widgets/applicationicon/main.cpp4
-rw-r--r--examples/widgets/calculator/calculator.cpp4
-rw-r--r--examples/widgets/calculator/calculator.pro5
-rw-r--r--examples/widgets/calculator/main.cpp4
-rw-r--r--examples/widgets/calendarwidget/calendarwidget.pro9
-rw-r--r--examples/widgets/charactermap/charactermap.pro4
-rw-r--r--examples/widgets/codeeditor/codeeditor.pro4
-rw-r--r--examples/widgets/codeeditor/main.cpp4
-rw-r--r--examples/widgets/digitalclock/digitalclock.pro2
-rw-r--r--examples/widgets/digitalclock/main.cpp4
-rw-r--r--examples/widgets/elidedlabel/elidedlabel.pro13
-rw-r--r--examples/widgets/elidedlabel/testwidget.cpp3
-rw-r--r--examples/widgets/groupbox/groupbox.pro4
-rw-r--r--examples/widgets/groupbox/main.cpp4
-rw-r--r--examples/widgets/icons/icons.pro4
-rw-r--r--examples/widgets/icons/main.cpp4
-rw-r--r--examples/widgets/imageviewer/imageviewer.pro5
-rw-r--r--examples/widgets/imageviewer/main.cpp4
-rw-r--r--examples/widgets/lineedits/lineedits.pro9
-rw-r--r--examples/widgets/lineedits/main.cpp4
-rw-r--r--examples/widgets/maemovibration/buttonwidget.cpp66
-rw-r--r--examples/widgets/maemovibration/buttonwidget.h64
-rw-r--r--examples/widgets/maemovibration/data/48x48/maemovibration.pngbin2406 -> 0 bytes
-rw-r--r--examples/widgets/maemovibration/data/64x64/maemovibration.pngbin2989 -> 0 bytes
-rw-r--r--examples/widgets/maemovibration/data/maemovibration.desktop12
-rw-r--r--examples/widgets/maemovibration/data/maemovibration.service3
-rw-r--r--examples/widgets/maemovibration/maemovibration.pro52
-rw-r--r--examples/widgets/maemovibration/main.cpp84
-rw-r--r--examples/widgets/maemovibration/mcevibrator.cpp119
-rw-r--r--examples/widgets/maemovibration/mcevibrator.h71
-rw-r--r--examples/widgets/movie/main.cpp4
-rw-r--r--examples/widgets/movie/movie.pro4
-rw-r--r--examples/widgets/orientation/mainwindow.cpp3
-rw-r--r--examples/widgets/orientation/orientation.pro4
-rw-r--r--examples/widgets/scribble/main.cpp4
-rw-r--r--examples/widgets/scribble/scribble.pro2
-rw-r--r--examples/widgets/shapedclock/main.cpp4
-rw-r--r--examples/widgets/shapedclock/shapedclock.pro7
-rw-r--r--examples/widgets/sliders/main.cpp4
-rw-r--r--examples/widgets/sliders/sliders.pro4
-rw-r--r--examples/widgets/softkeys/softkeys.pro5
-rw-r--r--examples/widgets/spinboxes/main.cpp4
-rw-r--r--examples/widgets/spinboxes/spinboxes.pro4
-rw-r--r--examples/widgets/styles/styles.pro4
-rw-r--r--examples/widgets/stylesheet/main.cpp4
-rw-r--r--examples/widgets/stylesheet/stylesheet.pro4
-rw-r--r--examples/widgets/symbianvibration/main.cpp54
-rw-r--r--examples/widgets/symbianvibration/mainwindow.cpp63
-rw-r--r--examples/widgets/symbianvibration/mainwindow.h63
-rw-r--r--examples/widgets/symbianvibration/symbianvibration.pro39
-rw-r--r--examples/widgets/symbianvibration/vibrationsurface.cpp157
-rw-r--r--examples/widgets/symbianvibration/vibrationsurface.h71
-rw-r--r--examples/widgets/symbianvibration/xqvibra.cpp210
-rw-r--r--examples/widgets/symbianvibration/xqvibra.h101
-rw-r--r--examples/widgets/symbianvibration/xqvibra_p.cpp171
-rw-r--r--examples/widgets/symbianvibration/xqvibra_p.h79
-rw-r--r--examples/widgets/tablet/main.cpp6
-rw-r--r--examples/widgets/tablet/tablet.pro4
-rw-r--r--examples/widgets/tetrix/main.cpp4
-rw-r--r--examples/widgets/tetrix/tetrix.pro5
-rw-r--r--examples/widgets/tooltips/main.cpp4
-rw-r--r--examples/widgets/tooltips/tooltips.pro2
-rw-r--r--examples/widgets/validators/main.cpp4
-rw-r--r--examples/widgets/validators/validators.pro4
-rw-r--r--examples/widgets/widgets.pro17
-rw-r--r--examples/widgets/wiggly/main.cpp3
-rw-r--r--examples/widgets/wiggly/wiggly.pro7
-rw-r--r--examples/widgets/windowflags/main.cpp4
-rw-r--r--examples/widgets/windowflags/windowflags.pro4
-rw-r--r--examples/xml/dombookmarks/dombookmarks.pro10
-rw-r--r--examples/xml/dombookmarks/main.cpp4
-rw-r--r--examples/xml/dombookmarks/mainwindow.cpp18
-rw-r--r--examples/xml/htmlinfo/htmlinfo.pro10
-rw-r--r--examples/xml/rsslisting/main.cpp4
-rw-r--r--examples/xml/rsslisting/rsslisting.cpp19
-rw-r--r--examples/xml/rsslisting/rsslisting.h13
-rw-r--r--examples/xml/rsslisting/rsslisting.pro13
-rw-r--r--examples/xml/saxbookmarks/main.cpp4
-rw-r--r--examples/xml/saxbookmarks/mainwindow.cpp9
-rw-r--r--examples/xml/saxbookmarks/saxbookmarks.pro10
-rw-r--r--examples/xml/streambookmarks/main.cpp3
-rw-r--r--examples/xml/streambookmarks/mainwindow.cpp18
-rw-r--r--examples/xml/streambookmarks/streambookmarks.pro8
-rw-r--r--examples/xml/xml.pro3
-rw-r--r--examples/xml/xmlstreamlint/xmlstreamlint.pro3
501 files changed, 26 insertions, 4019 deletions
diff --git a/examples/animation/animatedtiles/animatedtiles.pro b/examples/animation/animatedtiles/animatedtiles.pro
index 791bbf6a22..1bba99449c 100644
--- a/examples/animation/animatedtiles/animatedtiles.pro
+++ b/examples/animation/animatedtiles/animatedtiles.pro
@@ -7,9 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animatedtiles.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/animatedtiles
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000D7D1
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/animation/animatedtiles/main.cpp b/examples/animation/animatedtiles/main.cpp
index c59c981cb1..55dbd39ec1 100644
--- a/examples/animation/animatedtiles/main.cpp
+++ b/examples/animation/animatedtiles/main.cpp
@@ -210,11 +210,7 @@ int main(int argc, char **argv)
view->setBackgroundBrush(bgPix);
view->setCacheMode(QGraphicsView::CacheBackground);
view->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
-#ifdef Q_OS_SYMBIAN
- view->showMaximized();
-#else
view->show();
-#endif
QStateMachine states;
states.addState(rootState);
diff --git a/examples/animation/appchooser/appchooser.pro b/examples/animation/appchooser/appchooser.pro
index 3969b551e9..158a0eca9f 100644
--- a/examples/animation/appchooser/appchooser.pro
+++ b/examples/animation/appchooser/appchooser.pro
@@ -7,9 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS appchooser.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/appchooser
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000E3F5
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/animation/appchooser/main.cpp b/examples/animation/appchooser/main.cpp
index 873054ce5f..55068c6a67 100644
--- a/examples/animation/appchooser/main.cpp
+++ b/examples/animation/appchooser/main.cpp
@@ -164,12 +164,8 @@ int main(int argc, char **argv)
machine.setInitialState(group);
machine.start();
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
- window.showMaximized();
-#else
window.resize(300, 300);
window.show();
-#endif
return app.exec();
}
diff --git a/examples/animation/easing/easing.pro b/examples/animation/easing/easing.pro
index b26ce30083..155d17d9b9 100644
--- a/examples/animation/easing/easing.pro
+++ b/examples/animation/easing/easing.pro
@@ -13,10 +13,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS easing.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/easing
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000E3F6
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/animation/easing/main.cpp b/examples/animation/easing/main.cpp
index 0d63a3136e..7936810812 100644
--- a/examples/animation/easing/main.cpp
+++ b/examples/animation/easing/main.cpp
@@ -47,14 +47,8 @@ int main(int argc, char **argv)
QApplication app(argc, argv);
Window w;
-#if defined(Q_OS_SYMBIAN)
- w.showMaximized();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- w.show();
-#else
w.resize(400, 400);
w.show();
-#endif
return app.exec();
}
diff --git a/examples/animation/easing/window.cpp b/examples/animation/easing/window.cpp
index 869bca4798..208acd04fc 100644
--- a/examples/animation/easing/window.cpp
+++ b/examples/animation/easing/window.cpp
@@ -42,11 +42,7 @@
Window::Window(QWidget *parent)
: QWidget(parent),
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
- m_iconSize(32, 32)
-#else
m_iconSize(64, 64)
-#endif
{
m_ui.setupUi(this);
QButtonGroup *buttonGroup = findChild<QButtonGroup *>(); // ### workaround for uic in 4.4
diff --git a/examples/animation/moveblocks/main.cpp b/examples/animation/moveblocks/main.cpp
index 24e5f051d7..a5aba4549a 100644
--- a/examples/animation/moveblocks/main.cpp
+++ b/examples/animation/moveblocks/main.cpp
@@ -310,13 +310,8 @@ int main(int argc, char **argv)
machine.start();
//![9]
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
- window.showMaximized();
- window.fitInView(scene.sceneRect() );
-#else
window.resize(300, 300);
window.show();
-#endif
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
diff --git a/examples/animation/moveblocks/moveblocks.pro b/examples/animation/moveblocks/moveblocks.pro
index b82370dff6..7c242e31e6 100644
--- a/examples/animation/moveblocks/moveblocks.pro
+++ b/examples/animation/moveblocks/moveblocks.pro
@@ -6,9 +6,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS moveblocks.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/moveblocks
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000E3F7
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/animation/states/main.cpp b/examples/animation/states/main.cpp
index f37c2bdbbf..891254e069 100644
--- a/examples/animation/states/main.cpp
+++ b/examples/animation/states/main.cpp
@@ -277,11 +277,7 @@ int main(int argc, char *argv[])
GraphicsView view(&scene);
-#if defined(Q_OS_SYMBIAN)
- view.showMaximized();
-#else
view.show();
-#endif
return app.exec();
}
diff --git a/examples/animation/states/states.pro b/examples/animation/states/states.pro
index 5c0d28163b..adf0e8d58c 100644
--- a/examples/animation/states/states.pro
+++ b/examples/animation/states/states.pro
@@ -7,9 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/states
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000E3F8
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/animation/stickman/main.cpp b/examples/animation/stickman/main.cpp
index c5c3eb316b..208d346c5c 100644
--- a/examples/animation/stickman/main.cpp
+++ b/examples/animation/stickman/main.cpp
@@ -56,11 +56,6 @@ int main(int argc, char **argv)
StickMan *stickMan = new StickMan;
stickMan->setDrawSticks(false);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- RectButton *buttonJump = new RectButton("Jump"); buttonJump->setPos(100, 125);
- RectButton *buttonDance = new RectButton("Dance"); buttonDance->setPos(100, 200);
- RectButton *buttonChill = new RectButton("Chill"); buttonChill->setPos(100, 275);
-#else
QGraphicsTextItem *textItem = new QGraphicsTextItem();
textItem->setHtml("<font color=\"white\"><b>Stickman</b>"
"<p>"
@@ -77,18 +72,11 @@ int main(int argc, char **argv)
qreal w = textItem->boundingRect().width();
QRectF stickManBoundingRect = stickMan->mapToScene(stickMan->boundingRect()).boundingRect();
textItem->setPos(-w / 2.0, stickManBoundingRect.bottom() + 25.0);
-#endif
QGraphicsScene scene;
scene.addItem(stickMan);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- scene.addItem(buttonJump);
- scene.addItem(buttonDance);
- scene.addItem(buttonChill);
-#else
scene.addItem(textItem);
-#endif
scene.setBackgroundBrush(Qt::black);
GraphicsView view;
@@ -101,28 +89,15 @@ int main(int argc, char **argv)
view.resize(sceneRect.width() + 100, sceneRect.height() + 100);
view.setSceneRect(sceneRect);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- view.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- view.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- view.showMaximized();
- view.fitInView(scene.sceneRect(), Qt::KeepAspectRatio);
-#else
view.show();
view.setFocus();
-#endif
LifeCycle cycle(stickMan, &view);
cycle.setDeathAnimation(":/animations/dead");
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- cycle.addActivity(":/animations/jumping", Qt::Key_J, buttonJump, SIGNAL(clicked()));
- cycle.addActivity(":/animations/dancing", Qt::Key_D, buttonDance, SIGNAL(clicked()));
- cycle.addActivity(":/animations/chilling", Qt::Key_C, buttonChill, SIGNAL(clicked()));
-#else
cycle.addActivity(":/animations/jumping", Qt::Key_J);
cycle.addActivity(":/animations/dancing", Qt::Key_D);
cycle.addActivity(":/animations/chilling", Qt::Key_C);
-#endif
cycle.start();
diff --git a/examples/animation/stickman/stickman.pro b/examples/animation/stickman/stickman.pro
index 340a502c90..43aaec113d 100644
--- a/examples/animation/stickman/stickman.pro
+++ b/examples/animation/stickman/stickman.pro
@@ -20,9 +20,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/stickman
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000E3F9
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/dbus/complexpingpong/complexping.pro b/examples/dbus/complexpingpong/complexping.pro
index c84ef081e4..bc45e99c7b 100644
--- a/examples/dbus/complexpingpong/complexping.pro
+++ b/examples/dbus/complexpingpong/complexping.pro
@@ -14,7 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/complexpingpong/complexpong.pro b/examples/dbus/complexpingpong/complexpong.pro
index a9ca7cab94..0934740185 100644
--- a/examples/dbus/complexpingpong/complexpong.pro
+++ b/examples/dbus/complexpingpong/complexpong.pro
@@ -14,7 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/dbus-chat/dbus-chat.pro b/examples/dbus/dbus-chat/dbus-chat.pro
index 3009045e78..e1a3539cf3 100644
--- a/examples/dbus/dbus-chat/dbus-chat.pro
+++ b/examples/dbus/dbus-chat/dbus-chat.pro
@@ -17,8 +17,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/chat
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro
index b3c05597d4..12b39e2f43 100644
--- a/examples/dbus/dbus.pro
+++ b/examples/dbus/dbus.pro
@@ -14,6 +14,4 @@ sources.files = *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus
INSTALLS += sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/dbus/listnames/listnames.pro b/examples/dbus/listnames/listnames.pro
index dc9c26e8c7..a863bbc83d 100644
--- a/examples/dbus/listnames/listnames.pro
+++ b/examples/dbus/listnames/listnames.pro
@@ -14,7 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/listnames
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/pingpong/ping.pro b/examples/dbus/pingpong/ping.pro
index 9d3f2da84b..533371c2ce 100644
--- a/examples/dbus/pingpong/ping.pro
+++ b/examples/dbus/pingpong/ping.pro
@@ -15,7 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/pingpong/pong.pro b/examples/dbus/pingpong/pong.pro
index f82be77191..37a5a5c404 100644
--- a/examples/dbus/pingpong/pong.pro
+++ b/examples/dbus/pingpong/pong.pro
@@ -15,7 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/remotecontrolledcar/car/car.pro b/examples/dbus/remotecontrolledcar/car/car.pro
index 7ae919ceca..761181a782 100644
--- a/examples/dbus/remotecontrolledcar/car/car.pro
+++ b/examples/dbus/remotecontrolledcar/car/car.pro
@@ -18,8 +18,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xml
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/car
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.pro b/examples/dbus/remotecontrolledcar/controller/controller.pro
index 5e8a82e8a0..36983e0c54 100644
--- a/examples/dbus/remotecontrolledcar/controller/controller.pro
+++ b/examples/dbus/remotecontrolledcar/controller/controller.pro
@@ -19,8 +19,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/controller
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
index 2959170c89..2638f917d6 100644
--- a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
+++ b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
@@ -7,6 +7,4 @@ sources.files = *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar
INSTALLS += sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/desktop/desktop.pro b/examples/desktop/desktop.pro
index 02d3ec8888..fc232088e0 100644
--- a/examples/desktop/desktop.pro
+++ b/examples/desktop/desktop.pro
@@ -8,6 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/desktop/screenshot/screenshot.pro b/examples/desktop/screenshot/screenshot.pro
index 1402ad42b9..e9f53f7450 100644
--- a/examples/desktop/screenshot/screenshot.pro
+++ b/examples/desktop/screenshot/screenshot.pro
@@ -8,9 +8,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS screenshot.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/screenshot
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/dialogs/classwizard/classwizard.pro b/examples/dialogs/classwizard/classwizard.pro
index 6dd1cac37c..d50ba675af 100644
--- a/examples/dialogs/classwizard/classwizard.pro
+++ b/examples/dialogs/classwizard/classwizard.pro
@@ -9,9 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/classwizard
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/dialogs/configdialog/configdialog.pro b/examples/dialogs/configdialog/configdialog.pro
index 51a7f457d7..643c2a238f 100644
--- a/examples/dialogs/configdialog/configdialog.pro
+++ b/examples/dialogs/configdialog/configdialog.pro
@@ -11,11 +11,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/configdialog
INSTALLS += target sources
-symbian: CONFIG += qt_example
wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
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/dialogs/dialogs.pro b/examples/dialogs/dialogs.pro
index 47444c10f1..a59e480efa 100644
--- a/examples/dialogs/dialogs.pro
+++ b/examples/dialogs/dialogs.pro
@@ -5,7 +5,7 @@ SUBDIRS = classwizard \
tabdialog \
trivialwizard
-!symbian:!wince*: SUBDIRS += licensewizard \
+!wince*: SUBDIRS += licensewizard \
extension \
findfiles
@@ -16,6 +16,4 @@ sources.files = README *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs
INSTALLS += sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/dialogs/extension/extension.pro b/examples/dialogs/extension/extension.pro
index 5511f37150..7e11dda4ab 100644
--- a/examples/dialogs/extension/extension.pro
+++ b/examples/dialogs/extension/extension.pro
@@ -8,7 +8,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/extension
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/dialogs/extension/finddialog.cpp b/examples/dialogs/extension/finddialog.cpp
index 0e797edf81..6edaa06594 100644
--- a/examples/dialogs/extension/finddialog.cpp
+++ b/examples/dialogs/extension/finddialog.cpp
@@ -74,42 +74,11 @@ FindDialog::FindDialog(QWidget *parent)
//! [2]
//! [3]
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
- // Create menu
- QMenu *menu = new QMenu(this);
-
- // Create Find menu item
- menu->addAction(tr("Find"));
-
- // Create More menu item
- QAction *moreAction = menu->addAction(tr("More"));
- moreAction->setCheckable(true);
-
- // Create Options CBA
- QAction *optionAction = new QAction(tr("Options"), this);
-
- // Set defined menu into Options button
- optionAction->setMenu(menu);
- optionAction->setSoftKeyRole(QAction::PositiveSoftKey);
- addAction(optionAction);
-
- // Connect More menu item to setVisible slot
- connect(moreAction, SIGNAL(triggered(bool)), extension, SLOT(setVisible(bool)));
-
- // Create Exit CBA
- QAction *backSoftKeyAction = new QAction(QString(tr("Exit")), this);
- backSoftKeyAction->setSoftKeyRole(QAction::NegativeSoftKey);
-
- // Exit button closes the application
- connect(backSoftKeyAction, SIGNAL(triggered()), qApp, SLOT(quit()));
- addAction(backSoftKeyAction);
-#else
buttonBox = new QDialogButtonBox(Qt::Vertical);
buttonBox->addButton(findButton, QDialogButtonBox::ActionRole);
buttonBox->addButton(moreButton, QDialogButtonBox::ActionRole);
connect(moreButton, SIGNAL(toggled(bool)), extension, SLOT(setVisible(bool)));
-#endif
QVBoxLayout *extensionLayout = new QVBoxLayout;
extensionLayout->setMargin(0);
@@ -130,13 +99,9 @@ FindDialog::FindDialog(QWidget *parent)
leftLayout->addWidget(fromStartCheckBox);
QGridLayout *mainLayout = new QGridLayout;
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_SIMULATOR)
mainLayout->setSizeConstraint(QLayout::SetFixedSize);
-#endif
mainLayout->addLayout(leftLayout, 0, 0);
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_SIMULATOR)
mainLayout->addWidget(buttonBox, 0, 1);
-#endif
mainLayout->addWidget(extension, 1, 0, 1, 2);
mainLayout->setRowStretch(2, 1);
diff --git a/examples/dialogs/extension/main.cpp b/examples/dialogs/extension/main.cpp
index 9937b6d0b5..b54c1293d1 100644
--- a/examples/dialogs/extension/main.cpp
+++ b/examples/dialogs/extension/main.cpp
@@ -47,11 +47,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
FindDialog dialog;
-#ifdef Q_OS_SYMBIAN
- dialog.showMaximized();
-#else
dialog.show();
-#endif
return app.exec();
}
diff --git a/examples/dialogs/findfiles/findfiles.pro b/examples/dialogs/findfiles/findfiles.pro
index c19d47e271..51d1c0eed1 100644
--- a/examples/dialogs/findfiles/findfiles.pro
+++ b/examples/dialogs/findfiles/findfiles.pro
@@ -8,6 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/findfiles
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/dialogs/findfiles/main.cpp b/examples/dialogs/findfiles/main.cpp
index c5a324a452..f2079f511b 100644
--- a/examples/dialogs/findfiles/main.cpp
+++ b/examples/dialogs/findfiles/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Window window;
-#ifdef Q_OS_SYMBIAN
- window.showMaximized();
-#else
window.show();
-#endif
return app.exec();
}
diff --git a/examples/dialogs/findfiles/window.cpp b/examples/dialogs/findfiles/window.cpp
index d2ffd0988e..d0515399d4 100644
--- a/examples/dialogs/findfiles/window.cpp
+++ b/examples/dialogs/findfiles/window.cpp
@@ -77,9 +77,7 @@ Window::Window(QWidget *parent)
setLayout(mainLayout);
setWindowTitle(tr("Find Files"));
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_SIMULATOR)
resize(700, 300);
-#endif
}
//! [1]
@@ -193,11 +191,7 @@ void Window::showFiles(const QStringList &files)
filesTable->setItem(row, 1, sizeItem);
}
filesFoundLabel->setText(tr("%1 file(s) found").arg(files.size()) +
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
- (" (Select file to open it)"));
-#else
(" (Double click on a file to open it)"));
-#endif
filesFoundLabel->setWordWrap(true);
}
//! [8]
@@ -218,9 +212,6 @@ QComboBox *Window::createComboBox(const QString &text)
comboBox->setEditable(true);
comboBox->addItem(text);
comboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- comboBox->setMinimumContentsLength(3);
-#endif
return comboBox;
}
//! [10]
diff --git a/examples/dialogs/licensewizard/licensewizard.cpp b/examples/dialogs/licensewizard/licensewizard.cpp
index 1c9587161b..a1599145de 100644
--- a/examples/dialogs/licensewizard/licensewizard.cpp
+++ b/examples/dialogs/licensewizard/licensewizard.cpp
@@ -60,7 +60,7 @@ LicenseWizard::LicenseWizard(QWidget *parent)
//! [2]
//! [3]
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
//! [3] //! [4]
setWizardStyle(ModernStyle);
#endif
diff --git a/examples/dialogs/licensewizard/licensewizard.pro b/examples/dialogs/licensewizard/licensewizard.pro
index 20b533644e..c61325772e 100644
--- a/examples/dialogs/licensewizard/licensewizard.pro
+++ b/examples/dialogs/licensewizard/licensewizard.pro
@@ -9,9 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/licensewizard
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/dialogs/sipdialog/sipdialog.pro b/examples/dialogs/sipdialog/sipdialog.pro
index cea038ede3..72db93f646 100644
--- a/examples/dialogs/sipdialog/sipdialog.pro
+++ b/examples/dialogs/sipdialog/sipdialog.pro
@@ -8,12 +8,8 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/sipdialog
INSTALLS += target sources
-symbian: CONFIG += qt_example
wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
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/dialogs/standarddialogs/dialog.cpp b/examples/dialogs/standarddialogs/dialog.cpp
index 28fdaaad80..4566da3969 100644
--- a/examples/dialogs/standarddialogs/dialog.cpp
+++ b/examples/dialogs/standarddialogs/dialog.cpp
@@ -184,19 +184,7 @@ Dialog::Dialog(QWidget *parent)
layout->addWidget(errorButton, 14, 0);
layout->addWidget(errorLabel, 14, 1);
layout->addWidget(native, 15, 0);
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- QWidget *widget = new QWidget;
- widget->setLayout(layout);
-
- QScrollArea *scrollArea = new QScrollArea(this);
- scrollArea->setWidget(widget);
-
- QHBoxLayout *mainLayout = new QHBoxLayout;
- mainLayout->addWidget(scrollArea);
- setLayout(mainLayout);
-#else
setLayout(layout);
-#endif
setWindowTitle(tr("Standard Dialogs"));
}
diff --git a/examples/dialogs/standarddialogs/main.cpp b/examples/dialogs/standarddialogs/main.cpp
index 5dbf2cf910..11b6f50a0e 100644
--- a/examples/dialogs/standarddialogs/main.cpp
+++ b/examples/dialogs/standarddialogs/main.cpp
@@ -56,11 +56,7 @@ int main(int argc, char *argv[])
app.installTranslator(translator);
Dialog dialog;
-#ifdef Q_OS_SYMBIAN
- dialog.showMaximized();
-#else
dialog.show();
-#endif
return app.exec();
}
diff --git a/examples/dialogs/standarddialogs/standarddialogs.pro b/examples/dialogs/standarddialogs/standarddialogs.pro
index 59cd79f413..cbcb4d7302 100644
--- a/examples/dialogs/standarddialogs/standarddialogs.pro
+++ b/examples/dialogs/standarddialogs/standarddialogs.pro
@@ -8,8 +8,6 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/standarddialogs
INSTALLS += target sources
-symbian: CONFIG += qt_example
wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/dialogs/tabdialog/main.cpp b/examples/dialogs/tabdialog/main.cpp
index 6c83aa0b80..879b16d21e 100644
--- a/examples/dialogs/tabdialog/main.cpp
+++ b/examples/dialogs/tabdialog/main.cpp
@@ -53,11 +53,7 @@ int main(int argc, char *argv[])
fileName = ".";
TabDialog tabdialog(fileName);
-#ifdef Q_OS_SYMBIAN
- tabdialog.showMaximized();
-#else
tabdialog.show();
-#endif
return app.exec();
}
diff --git a/examples/dialogs/tabdialog/tabdialog.pro b/examples/dialogs/tabdialog/tabdialog.pro
index 4e01a68b96..66ac14daf2 100644
--- a/examples/dialogs/tabdialog/tabdialog.pro
+++ b/examples/dialogs/tabdialog/tabdialog.pro
@@ -8,9 +8,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/tabdialog
INSTALLS += target sources
-symbian: CONFIG += qt_example
wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
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/dialogs/trivialwizard/trivialwizard.cpp b/examples/dialogs/trivialwizard/trivialwizard.cpp
index df7d4e6559..5e3ef97694 100644
--- a/examples/dialogs/trivialwizard/trivialwizard.cpp
+++ b/examples/dialogs/trivialwizard/trivialwizard.cpp
@@ -128,11 +128,7 @@ int main(int argc, char *argv[])
wizard.addPage(createConclusionPage());
wizard.setWindowTitle("Trivial Wizard");
-#ifdef Q_OS_SYMBIAN
- wizard.showMaximized();
-#else
wizard.show();
-#endif
return app.exec();
}
diff --git a/examples/dialogs/trivialwizard/trivialwizard.pro b/examples/dialogs/trivialwizard/trivialwizard.pro
index b2a285e95a..26d488d99d 100644
--- a/examples/dialogs/trivialwizard/trivialwizard.pro
+++ b/examples/dialogs/trivialwizard/trivialwizard.pro
@@ -6,8 +6,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/trivialwizard
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/draganddrop/draganddrop.pro b/examples/draganddrop/draganddrop.pro
index 6759520ddc..a209ae31e4 100644
--- a/examples/draganddrop/draganddrop.pro
+++ b/examples/draganddrop/draganddrop.pro
@@ -6,7 +6,6 @@ SUBDIRS = draggableicons \
puzzle
wince*: SUBDIRS -= dropsite
-symbian: SUBDIRS -= dropsite
# install
sources.files = README *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop
diff --git a/examples/draganddrop/draggableicons/draggableicons.pro b/examples/draganddrop/draggableicons/draggableicons.pro
index 792de0a73c..9f4156135f 100644
--- a/examples/draganddrop/draggableicons/draggableicons.pro
+++ b/examples/draganddrop/draggableicons/draggableicons.pro
@@ -9,9 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/draggableicons
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000C615
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/draganddrop/draggableicons/dragwidget.cpp b/examples/draganddrop/draggableicons/dragwidget.cpp
index e465e8ada5..7a788dfa47 100644
--- a/examples/draganddrop/draggableicons/dragwidget.cpp
+++ b/examples/draganddrop/draggableicons/dragwidget.cpp
@@ -46,10 +46,7 @@
DragWidget::DragWidget(QWidget *parent)
: QFrame(parent)
{
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
-#else
setMinimumSize(200, 200);
-#endif
setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
setAcceptDrops(true);
diff --git a/examples/draganddrop/draggableicons/main.cpp b/examples/draganddrop/draggableicons/main.cpp
index a6ade67651..7a80b92a8a 100644
--- a/examples/draganddrop/draggableicons/main.cpp
+++ b/examples/draganddrop/draggableicons/main.cpp
@@ -55,11 +55,7 @@ int main(int argc, char *argv[])
mainWidget.setLayout(horizontalLayout);
mainWidget.setWindowTitle(QObject::tr("Draggable Icons"));
-#ifdef Q_OS_SYMBIAN
- mainWidget.showMaximized();
-#else
mainWidget.show();
-#endif
return app.exec();
}
diff --git a/examples/draganddrop/draggabletext/draggabletext.pro b/examples/draganddrop/draggabletext/draggabletext.pro
index 38c20663a2..1fd8e5ce6e 100644
--- a/examples/draganddrop/draggabletext/draggabletext.pro
+++ b/examples/draganddrop/draggabletext/draggabletext.pro
@@ -11,10 +11,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.txt *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/draggabletext
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000CF64
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
-simulator: warning(This example might not fully work on Simulator platform)
+
diff --git a/examples/draganddrop/draggabletext/main.cpp b/examples/draganddrop/draggabletext/main.cpp
index 0ae794b280..4d0a121337 100644
--- a/examples/draganddrop/draggabletext/main.cpp
+++ b/examples/draganddrop/draggabletext/main.cpp
@@ -47,10 +47,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
DragWidget window;
-#ifdef Q_OS_SYMBIAN
- window.showMaximized();
-#else
window.show();
-#endif
return app.exec();
}
diff --git a/examples/draganddrop/dropsite/dropsite.pro b/examples/draganddrop/dropsite/dropsite.pro
index c725992f26..8198b19e79 100644
--- a/examples/draganddrop/dropsite/dropsite.pro
+++ b/examples/draganddrop/dropsite/dropsite.pro
@@ -10,9 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/dropsite
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/draganddrop/fridgemagnets/dragwidget.cpp b/examples/draganddrop/fridgemagnets/dragwidget.cpp
index 3dcd406174..44b377ab89 100644
--- a/examples/draganddrop/fridgemagnets/dragwidget.cpp
+++ b/examples/draganddrop/fridgemagnets/dragwidget.cpp
@@ -65,11 +65,7 @@ DragWidget::DragWidget(QWidget *parent)
wordLabel->show();
wordLabel->setAttribute(Qt::WA_DeleteOnClose);
x += wordLabel->width() + 2;
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- if (x >= 345) {
-#else
if (x >= 245) {
-#endif
x = 5;
y += wordLabel->height() + 2;
}
@@ -78,12 +74,10 @@ DragWidget::DragWidget(QWidget *parent)
//! [1]
//! [2]
- #ifndef Q_WS_S60
//Fridge magnets is used for demoing Qt on S60 and themed backgrounds look better than white
QPalette newPalette = palette();
newPalette.setColor(QPalette::Window, Qt::white);
setPalette(newPalette);
- #endif
setMinimumSize(400, qMax(200, y));
setWindowTitle(tr("Fridge Magnets"));
diff --git a/examples/draganddrop/fridgemagnets/fridgemagnets.pro b/examples/draganddrop/fridgemagnets/fridgemagnets.pro
index 481fffd5fe..2bbfdf0b3a 100644
--- a/examples/draganddrop/fridgemagnets/fridgemagnets.pro
+++ b/examples/draganddrop/fridgemagnets/fridgemagnets.pro
@@ -11,11 +11,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/fridgemagnets
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000C610
- CONFIG += qt_example
-}
-
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/draganddrop/fridgemagnets/main.cpp b/examples/draganddrop/fridgemagnets/main.cpp
index 623e6d2718..ae2ecb4bde 100644
--- a/examples/draganddrop/fridgemagnets/main.cpp
+++ b/examples/draganddrop/fridgemagnets/main.cpp
@@ -51,15 +51,11 @@ int main(int argc, char *argv[])
#endif
DragWidget window;
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- window.showMaximized();
-#else
bool smallScreen = QApplication::arguments().contains("-small-screen");
if (smallScreen)
window.showFullScreen();
else
window.show();
-#endif
return app.exec();
}
diff --git a/examples/draganddrop/puzzle/main.cpp b/examples/draganddrop/puzzle/main.cpp
index b432ddc40e..60341948ab 100644
--- a/examples/draganddrop/puzzle/main.cpp
+++ b/examples/draganddrop/puzzle/main.cpp
@@ -49,10 +49,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
MainWindow window;
window.openImage(":/images/example.jpg");
-#ifdef Q_OS_SYMBIAN
- window.showMaximized();
-#else
window.show();
-#endif
return app.exec();
}
diff --git a/examples/draganddrop/puzzle/mainwindow.cpp b/examples/draganddrop/puzzle/mainwindow.cpp
index c00892a098..800213e442 100644
--- a/examples/draganddrop/puzzle/mainwindow.cpp
+++ b/examples/draganddrop/puzzle/mainwindow.cpp
@@ -138,11 +138,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 PiecesList(puzzleWidget->pieceSize(), this);
diff --git a/examples/draganddrop/puzzle/puzzle.pro b/examples/draganddrop/puzzle/puzzle.pro
index d084827a45..7c69a41a39 100644
--- a/examples/draganddrop/puzzle/puzzle.pro
+++ b/examples/draganddrop/puzzle/puzzle.pro
@@ -15,17 +15,9 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/puzzle
INSTALLS += target sources
-symbian:{
- TARGET.UID3 = 0xA000CF65
- CONFIG += qt_example
- addFile.files = example.jpg
- addFile.path = .
- DEPLOYMENT += addFile
-}
wince*: {
addFile.files = example.jpg
addFile.path = .
DEPLOYMENT += addFile
}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/effects/blurpicker/blurpicker.cpp b/examples/effects/blurpicker/blurpicker.cpp
index 5883c741be..00771a5818 100644
--- a/examples/effects/blurpicker/blurpicker.cpp
+++ b/examples/effects/blurpicker/blurpicker.cpp
@@ -139,9 +139,6 @@ void BlurPicker::keyPressEvent(QKeyEvent *event)
void BlurPicker::resizeEvent(QResizeEvent */*event*/)
{
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- fitInView(sceneRect(), Qt::KeepAspectRatio);
-#endif
}
void BlurPicker::mousePressEvent(QMouseEvent *event)
diff --git a/examples/effects/blurpicker/blurpicker.pro b/examples/effects/blurpicker/blurpicker.pro
index ca651b8858..c477ea6e39 100644
--- a/examples/effects/blurpicker/blurpicker.pro
+++ b/examples/effects/blurpicker/blurpicker.pro
@@ -9,5 +9,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/blurpicker
INSTALLS += target sources
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
diff --git a/examples/effects/blurpicker/main.cpp b/examples/effects/blurpicker/main.cpp
index 5138fccfcf..2fbe1f139f 100644
--- a/examples/effects/blurpicker/main.cpp
+++ b/examples/effects/blurpicker/main.cpp
@@ -48,12 +48,8 @@ int main(int argc, char **argv)
BlurPicker blurPicker;
blurPicker.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Application Picker"));
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- blurPicker.showMaximized();
-#else
blurPicker.setFixedSize(400, 300);
blurPicker.show();
-#endif
return app.exec();
}
diff --git a/examples/effects/fademessage/fademessage.cpp b/examples/effects/fademessage/fademessage.cpp
index b6e94e5e2e..27d84b52bc 100644
--- a/examples/effects/fademessage/fademessage.cpp
+++ b/examples/effects/fademessage/fademessage.cpp
@@ -124,9 +124,5 @@ void FadeMessage::setupScene()
connect(press, SIGNAL(clicked()), SLOT(togglePopup()));
m_scene.addWidget(press);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
- press->move(200, 210);
-#else
press->move(300, 500);
-#endif
}
diff --git a/examples/effects/fademessage/fademessage.pro b/examples/effects/fademessage/fademessage.pro
index 261bee42f9..c40ee76a2c 100644
--- a/examples/effects/fademessage/fademessage.pro
+++ b/examples/effects/fademessage/fademessage.pro
@@ -12,8 +12,6 @@ sources.files = $$SOURCES \
fademessage.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/fademessage
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
QT += widgets
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/effects/fademessage/main.cpp b/examples/effects/fademessage/main.cpp
index 8c72a458b0..83d6d8eab8 100644
--- a/examples/effects/fademessage/main.cpp
+++ b/examples/effects/fademessage/main.cpp
@@ -48,12 +48,8 @@ int main(int argc, char **argv)
FadeMessage widget;
widget.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Popup Message with Effect"));
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
- widget.showMaximized();
-#else
widget.setFixedSize(400, 600);
widget.show();
-#endif
return app.exec();
}
diff --git a/examples/effects/lighting/lighting.cpp b/examples/effects/lighting/lighting.cpp
index 4532fafe25..3c9fed7ec7 100644
--- a/examples/effects/lighting/lighting.cpp
+++ b/examples/effects/lighting/lighting.cpp
@@ -136,7 +136,4 @@ void Lighting::animate()
void Lighting::resizeEvent(QResizeEvent */*event*/)
{
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- fitInView(sceneRect(), Qt::KeepAspectRatio);
-#endif
}
diff --git a/examples/effects/lighting/lighting.pro b/examples/effects/lighting/lighting.pro
index 1876a7b3af..16be936b26 100644
--- a/examples/effects/lighting/lighting.pro
+++ b/examples/effects/lighting/lighting.pro
@@ -8,6 +8,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/lighting
INSTALLS += target sources
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
diff --git a/examples/effects/lighting/main.cpp b/examples/effects/lighting/main.cpp
index fff3d73f2a..69063a5672 100644
--- a/examples/effects/lighting/main.cpp
+++ b/examples/effects/lighting/main.cpp
@@ -48,12 +48,8 @@ int main(int argc, char **argv)
Lighting lighting;
lighting.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Lighting and Shadows"));
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- lighting.showMaximized();
-#else
lighting.resize(640, 480);
lighting.show();
-#endif
return app.exec();
}
diff --git a/examples/embedded/digiflip/digiflip.cpp b/examples/embedded/digiflip/digiflip.cpp
index 38501d3ecc..dfe8432631 100644
--- a/examples/embedded/digiflip/digiflip.cpp
+++ b/examples/embedded/digiflip/digiflip.cpp
@@ -117,10 +117,6 @@ protected:
QPixmap drawDigits(int n, const QRect &rect) {
int scaleFactor = 2;
-#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
- if (rect.height() > 240)
- scaleFactor = 1;
-#endif
QString str = QString::number(n);
if (str.length() == 1)
@@ -192,10 +188,8 @@ protected:
void paintFlip() {
QPainter p(this);
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_WINCE_WM)
p.setRenderHint(QPainter::SmoothPixmapTransform, true);
p.setRenderHint(QPainter::Antialiasing, true);
-#endif
p.fillRect(rect(), Qt::black);
int hw = width() / 2;
@@ -319,16 +313,10 @@ public:
connect(slideAction, SIGNAL(triggered()), SLOT(chooseSlide()));
connect(flipAction, SIGNAL(triggered()), SLOT(chooseFlip()));
connect(rotateAction, SIGNAL(triggered()), SLOT(chooseRotate()));
-#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
- menuBar()->addAction(slideAction);
- menuBar()->addAction(flipAction);
- menuBar()->addAction(rotateAction);
-#else
addAction(slideAction);
addAction(flipAction);
addAction(rotateAction);
setContextMenuPolicy(Qt::ActionsContextMenu);
-#endif
}
void updateTime() {
@@ -414,12 +402,8 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
DigiFlip time;
-#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
- time.showMaximized();
-#else
time.resize(320, 240);
time.show();
-#endif
return app.exec();
}
diff --git a/examples/embedded/digiflip/digiflip.pro b/examples/embedded/digiflip/digiflip.pro
index cd64f7cba6..29e215008d 100644
--- a/examples/embedded/digiflip/digiflip.pro
+++ b/examples/embedded/digiflip/digiflip.pro
@@ -1,10 +1,5 @@
SOURCES = digiflip.cpp
-symbian {
- TARGET.UID3 = 0xA000CF72
- CONFIG += qt_example
-}
-
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/digiflip
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/digiflip
diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro
index 8670fcb3a5..fbdfe2e908 100644
--- a/examples/embedded/embedded.pro
+++ b/examples/embedded/embedded.pro
@@ -9,5 +9,4 @@ sources.files = README *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded
INSTALLS += sources
-symbian: CONFIG += qt_demo
QT += widgets widgets
diff --git a/examples/embedded/flickable/flickable.pro b/examples/embedded/flickable/flickable.pro
index d31e7eba14..82b39acce1 100644
--- a/examples/embedded/flickable/flickable.pro
+++ b/examples/embedded/flickable/flickable.pro
@@ -1,11 +1,6 @@
SOURCES = flickable.cpp main.cpp
HEADERS = flickable.h
-symbian {
- TARGET.UID3 = 0xA000CF73
- CONFIG += qt_example
-}
-
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flickable
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flickable
diff --git a/examples/embedded/flickable/main.cpp b/examples/embedded/flickable/main.cpp
index 5ecc0c10df..9f86281317 100644
--- a/examples/embedded/flickable/main.cpp
+++ b/examples/embedded/flickable/main.cpp
@@ -222,12 +222,8 @@ int main(int argc, char *argv[])
ColorList list;
list.setWindowTitle("Kinetic Scrolling");
-#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
- list.showMaximized();
-#else
list.resize(320, 320);
list.show();
-#endif
return app.exec();
}
diff --git a/examples/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp
index 592357cab4..c0beb9ea8c 100644
--- a/examples/embedded/flightinfo/flightinfo.cpp
+++ b/examples/embedded/flightinfo/flightinfo.cpp
@@ -126,16 +126,10 @@ public:
connect(randomAction, SIGNAL(triggered()), SLOT(randomFlight()));
connect(&m_manager, SIGNAL(finished(QNetworkReply*)),
this, SLOT(handleNetworkData(QNetworkReply*)));
-#if defined(Q_OS_SYMBIAN)
- menuBar()->addAction(searchTodayAction);
- menuBar()->addAction(searchYesterdayAction);
- menuBar()->addAction(randomAction);
-#else
addAction(searchTodayAction);
addAction(searchYesterdayAction);
addAction(randomAction);
setContextMenuPolicy(Qt::ActionsContextMenu);
-#endif
}
private slots:
@@ -388,12 +382,8 @@ int main(int argc, char **argv)
QApplication app(argc, argv);
FlightInfo w;
-#if defined(Q_OS_SYMBIAN)
- w.showMaximized();
-#else
w.resize(360, 504);
w.show();
-#endif
return app.exec();
}
diff --git a/examples/embedded/flightinfo/flightinfo.pro b/examples/embedded/flightinfo/flightinfo.pro
index 89a7265d41..a7a4fcec5a 100644
--- a/examples/embedded/flightinfo/flightinfo.pro
+++ b/examples/embedded/flightinfo/flightinfo.pro
@@ -5,12 +5,6 @@ FORMS += form.ui
RESOURCES = flightinfo.qrc
QT += network widgets
-symbian {
- TARGET.UID3 = 0xA000CF74
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flightinfo
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flightinfo
diff --git a/examples/embedded/lightmaps/lightmaps.cpp b/examples/embedded/lightmaps/lightmaps.cpp
index 2489ddc840..2b97abacd8 100644
--- a/examples/embedded/lightmaps/lightmaps.cpp
+++ b/examples/embedded/lightmaps/lightmaps.cpp
@@ -122,11 +122,6 @@ void LightMaps::paintEvent(QPaintEvent *event)
p.begin(this);
m_normalMap->render(&p, event->rect());
p.setPen(Qt::black);
-#if defined(Q_OS_SYMBIAN)
- QFont font = p.font();
- font.setPixelSize(13);
- p.setFont(font);
-#endif
p.drawText(rect(), Qt::AlignBottom | Qt::TextWordWrap,
"Map data CCBYSA 2009 OpenStreetMap.org contributors");
p.end();
diff --git a/examples/embedded/lightmaps/lightmaps.pro b/examples/embedded/lightmaps/lightmaps.pro
index 1f638b5398..92ef6b9410 100644
--- a/examples/embedded/lightmaps/lightmaps.pro
+++ b/examples/embedded/lightmaps/lightmaps.pro
@@ -8,13 +8,6 @@ SOURCES = lightmaps.cpp \
slippymap.cpp
QT += network widgets
-symbian {
- TARGET.UID3 = 0xA000CF75
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
- TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-}
-
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/lightmaps
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/lightmaps
diff --git a/examples/embedded/lightmaps/main.cpp b/examples/embedded/lightmaps/main.cpp
index 85f74e638e..999c355f25 100644
--- a/examples/embedded/lightmaps/main.cpp
+++ b/examples/embedded/lightmaps/main.cpp
@@ -44,20 +44,13 @@
int main(int argc, char **argv)
{
-#if defined(Q_WS_X11)
- QApplication::setGraphicsSystem("raster");
-#endif
QApplication app(argc, argv);
app.setApplicationName("LightMaps");
MapZoom w;
-#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
- w.showMaximized();
-#else
w.resize(600, 450);
w.show();
-#endif
return app.exec();
}
diff --git a/examples/embedded/lightmaps/mapzoom.cpp b/examples/embedded/lightmaps/mapzoom.cpp
index 225c54c2a6..c1b43f07c7 100644
--- a/examples/embedded/lightmaps/mapzoom.cpp
+++ b/examples/embedded/lightmaps/mapzoom.cpp
@@ -64,13 +64,6 @@ MapZoom::MapZoom()
connect(nightModeAction, SIGNAL(triggered()), map, SLOT(toggleNightMode()));
connect(osmAction, SIGNAL(triggered()), SLOT(aboutOsm()));
-#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
- menuBar()->addAction(osloAction);
- menuBar()->addAction(berlinAction);
- menuBar()->addAction(jakartaAction);
- menuBar()->addAction(nightModeAction);
- menuBar()->addAction(osmAction);
-#else
QMenu *menu = menuBar()->addMenu(tr("&Options"));
menu->addAction(osloAction);
menu->addAction(berlinAction);
@@ -78,7 +71,6 @@ MapZoom::MapZoom()
menu->addSeparator();
menu->addAction(nightModeAction);
menu->addAction(osmAction);
-#endif
QNetworkConfigurationManager manager;
if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
diff --git a/examples/embedded/raycasting/raycasting.cpp b/examples/embedded/raycasting/raycasting.cpp
index 0a50fb0419..f2de58a1c1 100644
--- a/examples/embedded/raycasting/raycasting.cpp
+++ b/examples/embedded/raycasting/raycasting.cpp
@@ -380,12 +380,8 @@ int main(int argc, char **argv)
Raycasting w;
w.setWindowTitle("Raycasting");
-#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
- w.showMaximized();
-#else
w.resize(640, 480);
w.show();
-#endif
return app.exec();
}
diff --git a/examples/embedded/raycasting/raycasting.pro b/examples/embedded/raycasting/raycasting.pro
index 181eadf74c..9c562d446c 100644
--- a/examples/embedded/raycasting/raycasting.pro
+++ b/examples/embedded/raycasting/raycasting.pro
@@ -2,11 +2,6 @@ TEMPLATE = app
SOURCES = raycasting.cpp
RESOURCES += raycasting.qrc
-symbian {
- TARGET.UID3 = 0xA000CF76
- CONFIG += qt_example
-}
-
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/raycasting
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/raycasting
diff --git a/examples/embedded/styleexample/styleexample.pro b/examples/embedded/styleexample/styleexample.pro
index 5b1273e6aa..3cd4d0a3c0 100644
--- a/examples/embedded/styleexample/styleexample.pro
+++ b/examples/embedded/styleexample/styleexample.pro
@@ -11,8 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/styleexample
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A63F
- CONFIG += qt_example
-}
QT += widgets widgets
diff --git a/examples/examples.pro b/examples/examples.pro
index 93f4b6180f..763ff4e17e 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -31,22 +31,9 @@ SUBDIRS = \
gestures
}
-symbian: SUBDIRS = \
- graphicsview \
- itemviews \
- network \
- painting \
- widgets \
- draganddrop \
- mainwindows \
- sql \
- animation \
- gestures \
- xml
-
qpa:SUBDIRS += qpa
-wince*|symbian|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded
+wince*|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded
embedded:SUBDIRS += qws
contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib
@@ -60,6 +47,4 @@ sources.files = README *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]
INSTALLS += sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/gestures/imagegestures/imagegestures.pro b/examples/gestures/imagegestures/imagegestures.pro
index 03fd2e8ff3..70825adf12 100644
--- a/examples/gestures/imagegestures/imagegestures.pro
+++ b/examples/gestures/imagegestures/imagegestures.pro
@@ -15,12 +15,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/gestures/imagegestures
INSTALLS += target \
sources
-symbian {
- TARGET.UID3 = 0xA000D7D0
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
-maemo5: warning(This example does not work on Maemo platform)
-simulator: warning(This example does not work on Simulator platform)
+
diff --git a/examples/graphicsview/anchorlayout/anchorlayout.pro b/examples/graphicsview/anchorlayout/anchorlayout.pro
index abe55f2ef6..7b18a621db 100644
--- a/examples/graphicsview/anchorlayout/anchorlayout.pro
+++ b/examples/graphicsview/anchorlayout/anchorlayout.pro
@@ -9,7 +9,5 @@ INSTALLS += target sources
TARGET = anchorlayout
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/graphicsview/anchorlayout/main.cpp b/examples/graphicsview/anchorlayout/main.cpp
index f9f93fb961..d19dd38f74 100644
--- a/examples/graphicsview/anchorlayout/main.cpp
+++ b/examples/graphicsview/anchorlayout/main.cpp
@@ -123,11 +123,7 @@ int main(int argc, char **argv)
scene.setBackgroundBrush(Qt::darkGreen);
QGraphicsView view(&scene);
-#if defined(Q_WS_S60)
- view.showMaximized();
-#else
view.show();
-#endif
return app.exec();
}
diff --git a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
index 88fa8182ab..202c8d87a0 100644
--- a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
+++ b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
@@ -11,10 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES basicgraphicslayouts.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/basicgraphicslayouts
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A645
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/graphicsview/basicgraphicslayouts/main.cpp b/examples/graphicsview/basicgraphicslayouts/main.cpp
index 4a9e8f91b4..5edd130403 100644
--- a/examples/graphicsview/basicgraphicslayouts/main.cpp
+++ b/examples/graphicsview/basicgraphicslayouts/main.cpp
@@ -51,12 +51,8 @@ int main(int argc, char **argv)
Window *window = new Window;
scene.addItem(window);
QGraphicsView view(&scene);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- view.showMaximized();
-#else
view.resize(600, 600);
view.show();
-#endif
return app.exec();
}
diff --git a/examples/graphicsview/boxes/glextensions.h b/examples/graphicsview/boxes/glextensions.h
index 54de548cd7..f9c5dbcaa9 100644
--- a/examples/graphicsview/boxes/glextensions.h
+++ b/examples/graphicsview/boxes/glextensions.h
@@ -69,7 +69,7 @@ glMapBuffer
glUnmapBuffer
*/
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
# ifndef APIENTRYP
# ifdef APIENTRY
# define APIENTRYP APIENTRY *
diff --git a/examples/graphicsview/chip/chip.pro b/examples/graphicsview/chip/chip.pro
index 5bf1b88164..94a461a99e 100644
--- a/examples/graphicsview/chip/chip.pro
+++ b/examples/graphicsview/chip/chip.pro
@@ -18,4 +18,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/chip
INSTALLS += target sources
-symbian: CONFIG += qt_example
diff --git a/examples/graphicsview/collidingmice/collidingmice.pro b/examples/graphicsview/collidingmice/collidingmice.pro
index 1c1c2683cf..d8346023ba 100644
--- a/examples/graphicsview/collidingmice/collidingmice.pro
+++ b/examples/graphicsview/collidingmice/collidingmice.pro
@@ -13,10 +13,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS collidingmice.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/collidingmice
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A643
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
-simulator: warning(This example might not fully work on Simulator platform)
+
diff --git a/examples/graphicsview/collidingmice/main.cpp b/examples/graphicsview/collidingmice/main.cpp
index 561887995e..5bba2756ce 100644
--- a/examples/graphicsview/collidingmice/main.cpp
+++ b/examples/graphicsview/collidingmice/main.cpp
@@ -79,12 +79,8 @@ int main(int argc, char **argv)
view.setDragMode(QGraphicsView::ScrollHandDrag);
//! [5] //! [6]
view.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Colliding Mice"));
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- view.showMaximized();
-#else
view.resize(400, 300);
view.show();
-#endif
QTimer timer;
QObject::connect(&timer, SIGNAL(timeout()), &scene, SLOT(advance()));
diff --git a/examples/graphicsview/diagramscene/diagramscene.pro b/examples/graphicsview/diagramscene/diagramscene.pro
index 99cd4dea78..e45f4a894b 100644
--- a/examples/graphicsview/diagramscene/diagramscene.pro
+++ b/examples/graphicsview/diagramscene/diagramscene.pro
@@ -18,10 +18,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS diagramscene.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/diagramscene
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)
diff --git a/examples/graphicsview/dragdroprobot/dragdroprobot.pro b/examples/graphicsview/dragdroprobot/dragdroprobot.pro
index db5d94a600..3e33bad2f9 100644
--- a/examples/graphicsview/dragdroprobot/dragdroprobot.pro
+++ b/examples/graphicsview/dragdroprobot/dragdroprobot.pro
@@ -17,8 +17,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dragdroprobot.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/dragdroprobot
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/graphicsview/dragdroprobot/main.cpp b/examples/graphicsview/dragdroprobot/main.cpp
index 9b6f95c7a2..c90aef0599 100644
--- a/examples/graphicsview/dragdroprobot/main.cpp
+++ b/examples/graphicsview/dragdroprobot/main.cpp
@@ -55,9 +55,6 @@ public:
protected:
virtual void resizeEvent(QResizeEvent *)
{
-#if defined(Q_OS_SYMBIAN)
- fitInView(sceneRect(), Qt::KeepAspectRatio);
-#endif
}
};
@@ -90,11 +87,7 @@ int main(int argc, char **argv)
view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
view.setBackgroundBrush(QColor(230, 200, 167));
view.setWindowTitle("Drag and Drop Robot");
-#if defined(Q_OS_SYMBIAN)
- view.showMaximized();
-#else
view.show();
-#endif
return app.exec();
}
diff --git a/examples/graphicsview/elasticnodes/elasticnodes.pro b/examples/graphicsview/elasticnodes/elasticnodes.pro
index 6b591a8c66..2a61809457 100644
--- a/examples/graphicsview/elasticnodes/elasticnodes.pro
+++ b/examples/graphicsview/elasticnodes/elasticnodes.pro
@@ -17,11 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS elasticnodes.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/elasticnodes
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A642
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
-
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/graphicsview/elasticnodes/graphwidget.cpp b/examples/graphicsview/elasticnodes/graphwidget.cpp
index 48a9784c54..6c54ca2381 100644
--- a/examples/graphicsview/elasticnodes/graphwidget.cpp
+++ b/examples/graphicsview/elasticnodes/graphwidget.cpp
@@ -203,7 +203,6 @@ void GraphWidget::drawBackground(QPainter *painter, const QRectF &rect)
painter->setBrush(Qt::NoBrush);
painter->drawRect(sceneRect);
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5)
// Text
QRectF textRect(sceneRect.left() + 4, sceneRect.top() + 4,
sceneRect.width() - 4, sceneRect.height() - 4);
@@ -218,7 +217,6 @@ void GraphWidget::drawBackground(QPainter *painter, const QRectF &rect)
painter->drawText(textRect.translated(2, 2), message);
painter->setPen(Qt::black);
painter->drawText(textRect, message);
-#endif
}
//! [6]
diff --git a/examples/graphicsview/elasticnodes/main.cpp b/examples/graphicsview/elasticnodes/main.cpp
index 9eb8ba11be..1c04057d1e 100644
--- a/examples/graphicsview/elasticnodes/main.cpp
+++ b/examples/graphicsview/elasticnodes/main.cpp
@@ -52,13 +52,6 @@ int main(int argc, char **argv)
QMainWindow mainWindow;
mainWindow.setCentralWidget(widget);
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
- mainWindow.menuBar()->addAction("Shuffle", widget, SLOT(shuffle()));
- mainWindow.menuBar()->addAction("Zoom In", widget, SLOT(zoomIn()));
- mainWindow.menuBar()->addAction("Zoom Out", widget, SLOT(zoomOut()));
- mainWindow.showMaximized();
-#else
mainWindow.show();
-#endif
return app.exec();
}
diff --git a/examples/graphicsview/elasticnodes/node.cpp b/examples/graphicsview/elasticnodes/node.cpp
index b345f83640..076d8232a1 100644
--- a/examples/graphicsview/elasticnodes/node.cpp
+++ b/examples/graphicsview/elasticnodes/node.cpp
@@ -141,16 +141,9 @@ bool Node::advance()
//! [8]
QRectF Node::boundingRect() const
{
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
- // Add some extra space around the circle for easier touching with finger
- qreal adjust = 30;
- return QRectF( -10 - adjust, -10 - adjust,
- 20 + adjust * 2, 20 + adjust * 2);
-#else
qreal adjust = 2;
return QRectF( -10 - adjust, -10 - adjust,
23 + adjust, 23 + adjust);
-#endif
}
//! [8]
@@ -158,12 +151,7 @@ QRectF Node::boundingRect() const
QPainterPath Node::shape() const
{
QPainterPath path;
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
- // Add some extra space around the circle for easier touching with finger
- path.addEllipse( -40, -40, 80, 80);
-#else
path.addEllipse(-10, -10, 20, 20);
-#endif
return path;
}
//! [9]
diff --git a/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro b/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
index 1f4ef91946..6244df4b68 100644
--- a/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
+++ b/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
@@ -17,4 +17,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/embeddeddialogs
INSTALLS += target sources
QT += widgets
-symbian: CONFIG += qt_example
diff --git a/examples/graphicsview/flowlayout/flowlayout.pro b/examples/graphicsview/flowlayout/flowlayout.pro
index f8d1e4871f..8d1f7b85ff 100644
--- a/examples/graphicsview/flowlayout/flowlayout.pro
+++ b/examples/graphicsview/flowlayout/flowlayout.pro
@@ -9,6 +9,4 @@ HEADERS += flowlayout.h window.h
SOURCES += flowlayout.cpp main.cpp window.cpp
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/graphicsview/flowlayout/main.cpp b/examples/graphicsview/flowlayout/main.cpp
index 8f5a0faede..88bbb79d4c 100644
--- a/examples/graphicsview/flowlayout/main.cpp
+++ b/examples/graphicsview/flowlayout/main.cpp
@@ -50,12 +50,8 @@ int main(int argc, char **argv)
Window *w = new Window;
scene.addItem(w);
-#if defined(Q_OS_SYMBIAN)
- view->showMaximized();
-#else
view->resize(400, 300);
view->show();
-#endif
return app.exec();
}
diff --git a/examples/graphicsview/graphicsview.pro b/examples/graphicsview/graphicsview.pro
index a9aeb0d17f..6b7de527c6 100644
--- a/examples/graphicsview/graphicsview.pro
+++ b/examples/graphicsview/graphicsview.pro
@@ -5,9 +5,7 @@ SUBDIRS = \
embeddeddialogs \
collidingmice \
padnavigator \
- basicgraphicslayouts
-
-!symbian: SUBDIRS += \
+ basicgraphicslayouts \
diagramscene \
dragdroprobot \
flowlayout \
@@ -27,6 +25,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/graphicsview/padnavigator/main.cpp b/examples/graphicsview/padnavigator/main.cpp
index 9a397c783a..4cdf71c8e6 100644
--- a/examples/graphicsview/padnavigator/main.cpp
+++ b/examples/graphicsview/padnavigator/main.cpp
@@ -49,11 +49,7 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(padnavigator);
PadNavigator navigator(QSize(3, 3));
-#if defined(Q_OS_SYMBIAN)
- navigator.showMaximized();
-#else
navigator.show();
-#endif
return app.exec();
}
//! [0]
diff --git a/examples/graphicsview/padnavigator/padnavigator.pro b/examples/graphicsview/padnavigator/padnavigator.pro
index f0287f1f86..2c1d043a92 100644
--- a/examples/graphicsview/padnavigator/padnavigator.pro
+++ b/examples/graphicsview/padnavigator/padnavigator.pro
@@ -25,11 +25,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/padnavigator
INSTALLS += target sources
CONFIG += console
-
-symbian {
- TARGET.UID3 = 0xA000A644
- CONFIG += qt_example
-}
-maemo5: CONFIG += qt_example
-
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/graphicsview/simpleanchorlayout/main.cpp b/examples/graphicsview/simpleanchorlayout/main.cpp
index ff1ac2ba59..a909552f6a 100644
--- a/examples/graphicsview/simpleanchorlayout/main.cpp
+++ b/examples/graphicsview/simpleanchorlayout/main.cpp
@@ -127,14 +127,8 @@ int main(int argc, char *argv[])
view->setScene(scene);
view->setWindowTitle(QApplication::translate("simpleanchorlayout", "Simple Anchor Layout"));
-#if defined(Q_OS_SYMBIAN)
- view->showMaximized();
-#elif defined(Q_WS_MAEMO_5)
- view-show();
-#else
view->resize(360, 320);
view->show();
-#endif
return app.exec();
}
diff --git a/examples/graphicsview/simpleanchorlayout/simpleanchorlayout.pro b/examples/graphicsview/simpleanchorlayout/simpleanchorlayout.pro
index 80cc3a1a24..b044d4e91c 100644
--- a/examples/graphicsview/simpleanchorlayout/simpleanchorlayout.pro
+++ b/examples/graphicsview/simpleanchorlayout/simpleanchorlayout.pro
@@ -9,6 +9,4 @@ INSTALLS += target sources
TARGET = simpleanchorlayout
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/graphicsview/weatheranchorlayout/main.cpp b/examples/graphicsview/weatheranchorlayout/main.cpp
index b1f2c724a1..e87756b664 100644
--- a/examples/graphicsview/weatheranchorlayout/main.cpp
+++ b/examples/graphicsview/weatheranchorlayout/main.cpp
@@ -190,10 +190,7 @@ int main(int argc, char **argv)
QApplication app(argc, argv);
QGraphicsScene scene;
-#if defined(Q_OS_SYMBIAN)
-#else
scene.setSceneRect(0, 0, 800, 480);
-#endif
// pixmaps widgets
PixmapWidget *title = new PixmapWidget(QPixmap(":/images/title.jpg"));
@@ -268,13 +265,8 @@ int main(int argc, char **argv)
// QGV setup
scene.addItem(w);
scene.setBackgroundBrush(Qt::white);
-#if defined(Q_OS_SYMBIAN)
- GraphicsView *view = new GraphicsView(&scene, w);
- view->showMaximized();
-#else
QGraphicsView *view = new QGraphicsView(&scene);
view->show();
-#endif
return app.exec();
}
diff --git a/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro b/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro
index 5f1dfd38e1..4c2fdc60de 100644
--- a/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro
+++ b/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro
@@ -13,6 +13,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/weatheranchorlayout
INSTALLS += target sources
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/ipc/ipc.pro b/examples/ipc/ipc.pro
index 3c07ce9af8..d7b4fbb28e 100644
--- a/examples/ipc/ipc.pro
+++ b/examples/ipc/ipc.pro
@@ -8,6 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS ipc.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc
INSTALLS += sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/ipc/localfortuneclient/client.cpp b/examples/ipc/localfortuneclient/client.cpp
index 2884fac7a7..e637cce3c9 100644
--- a/examples/ipc/localfortuneclient/client.cpp
+++ b/examples/ipc/localfortuneclient/client.cpp
@@ -44,11 +44,7 @@
#include "client.h"
Client::Client(QWidget *parent)
-#ifdef Q_WS_MAEMO_5
- : QWidget(parent)
-#else
: QDialog(parent)
-#endif
{
hostLabel = new QLabel(tr("&Server name:"));
hostLineEdit = new QLineEdit("fortune");
diff --git a/examples/ipc/localfortuneclient/client.h b/examples/ipc/localfortuneclient/client.h
index b0f0e36189..30dc482a4a 100644
--- a/examples/ipc/localfortuneclient/client.h
+++ b/examples/ipc/localfortuneclient/client.h
@@ -41,11 +41,7 @@
#ifndef CLIENT_H
#define CLIENT_H
-#ifdef Q_WS_MAEMO_5
-#include <QWidget>
-#else
#include <QDialog>
-#endif
#include <qlocalsocket.h>
@@ -57,11 +53,7 @@ class QPushButton;
class QLocalSocket;
QT_END_NAMESPACE
-#ifdef Q_WS_MAEMO_5
-class Client : public QWidget
-#else
class Client : public QDialog
-#endif
{
Q_OBJECT
diff --git a/examples/ipc/localfortuneclient/localfortuneclient.pro b/examples/ipc/localfortuneclient/localfortuneclient.pro
index bace9574cf..ee46a06bfb 100644
--- a/examples/ipc/localfortuneclient/localfortuneclient.pro
+++ b/examples/ipc/localfortuneclient/localfortuneclient.pro
@@ -9,9 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneclient.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/localfortuneclient
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/ipc/localfortuneclient/main.cpp b/examples/ipc/localfortuneclient/main.cpp
index 8e6feeba72..557ca3add0 100644
--- a/examples/ipc/localfortuneclient/main.cpp
+++ b/examples/ipc/localfortuneclient/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Client client;
-#if defined(Q_WS_S60)
- client.showMaximized();
-#else
client.show();
-#endif
return app.exec();
}
diff --git a/examples/ipc/localfortuneserver/localfortuneserver.pro b/examples/ipc/localfortuneserver/localfortuneserver.pro
index 4c55f3b11d..4deda4571c 100644
--- a/examples/ipc/localfortuneserver/localfortuneserver.pro
+++ b/examples/ipc/localfortuneserver/localfortuneserver.pro
@@ -9,7 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneserver.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/localfortuneserver
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/ipc/localfortuneserver/main.cpp b/examples/ipc/localfortuneserver/main.cpp
index fc0c698156..ebae3fdd23 100644
--- a/examples/ipc/localfortuneserver/main.cpp
+++ b/examples/ipc/localfortuneserver/main.cpp
@@ -49,11 +49,7 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Server server;
-#if defined(Q_WS_S60)
- server.showMaximized();
-#else
server.show();
-#endif
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
return app.exec();
}
diff --git a/examples/ipc/localfortuneserver/server.cpp b/examples/ipc/localfortuneserver/server.cpp
index e68e5de457..684c81fc92 100644
--- a/examples/ipc/localfortuneserver/server.cpp
+++ b/examples/ipc/localfortuneserver/server.cpp
@@ -48,11 +48,7 @@
#include <qlocalsocket.h>
Server::Server(QWidget *parent)
-#ifdef Q_WS_MAEMO_5
- : QWidget(parent)
-#else
: QDialog(parent)
-#endif
{
statusLabel = new QLabel;
statusLabel->setWordWrap(true);
diff --git a/examples/ipc/localfortuneserver/server.h b/examples/ipc/localfortuneserver/server.h
index 313862cfaa..5f00ba4d2d 100644
--- a/examples/ipc/localfortuneserver/server.h
+++ b/examples/ipc/localfortuneserver/server.h
@@ -41,11 +41,7 @@
#ifndef SERVER_H
#define SERVER_H
-#ifdef Q_WS_MAEMO_5
-#include <QWidget>
-#else
#include <QDialog>
-#endif
QT_BEGIN_NAMESPACE
class QLabel;
@@ -53,11 +49,7 @@ class QPushButton;
class QLocalServer;
QT_END_NAMESPACE
-#ifdef Q_WS_MAEMO_5
-class Server : public QWidget
-#else
class Server : public QDialog
-#endif
{
Q_OBJECT
diff --git a/examples/ipc/sharedmemory/sharedmemory.pro b/examples/ipc/sharedmemory/sharedmemory.pro
index 7c5b5dcd29..d11e16e4c6 100644
--- a/examples/ipc/sharedmemory/sharedmemory.pro
+++ b/examples/ipc/sharedmemory/sharedmemory.pro
@@ -12,10 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/sharedmemory
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
-maemo5: warning(This example does not work on Maemo platform)
simulator: warning(This example does not work on Simulator platform)
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)
diff --git a/examples/ja_JP/linguist/hellotr/hellotr.pro b/examples/ja_JP/linguist/hellotr/hellotr.pro
index ab51bc8082..b7dd21514a 100644
--- a/examples/ja_JP/linguist/hellotr/hellotr.pro
+++ b/examples/ja_JP/linguist/hellotr/hellotr.pro
@@ -10,6 +10,4 @@ sources.files = $$SOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/hellotr
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/layouts/basiclayouts/basiclayouts.pro b/examples/layouts/basiclayouts/basiclayouts.pro
index 7751e139e7..b2c4ad896f 100644
--- a/examples/layouts/basiclayouts/basiclayouts.pro
+++ b/examples/layouts/basiclayouts/basiclayouts.pro
@@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/basiclayouts
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/layouts/basiclayouts/main.cpp b/examples/layouts/basiclayouts/main.cpp
index 6b6077546f..767cf0f168 100644
--- a/examples/layouts/basiclayouts/main.cpp
+++ b/examples/layouts/basiclayouts/main.cpp
@@ -46,11 +46,7 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Dialog dialog;
-#if defined(Q_OS_SYMBIAN)
- dialog.showMaximized();
-#else
dialog.show();
-#endif
return app.exec();
}
diff --git a/examples/layouts/borderlayout/borderlayout.pro b/examples/layouts/borderlayout/borderlayout.pro
index 76a939daa4..6727af60d7 100644
--- a/examples/layouts/borderlayout/borderlayout.pro
+++ b/examples/layouts/borderlayout/borderlayout.pro
@@ -10,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/borderlayout
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/layouts/borderlayout/main.cpp b/examples/layouts/borderlayout/main.cpp
index 4a43828d45..f2079f511b 100644
--- a/examples/layouts/borderlayout/main.cpp
+++ b/examples/layouts/borderlayout/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/layouts/dynamiclayouts/dialog.cpp b/examples/layouts/dynamiclayouts/dialog.cpp
index d07903d8aa..6e4f1efebc 100644
--- a/examples/layouts/dynamiclayouts/dialog.cpp
+++ b/examples/layouts/dynamiclayouts/dialog.cpp
@@ -43,11 +43,7 @@
#include "dialog.h"
Dialog::Dialog(QWidget *parent)
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- : QWidget(parent)
-#else
: QDialog(parent)
-#endif
{
createRotableGroupBox();
createOptionsGroupBox();
diff --git a/examples/layouts/dynamiclayouts/dialog.h b/examples/layouts/dynamiclayouts/dialog.h
index 3ada992858..f40d160363 100644
--- a/examples/layouts/dynamiclayouts/dialog.h
+++ b/examples/layouts/dynamiclayouts/dialog.h
@@ -54,11 +54,7 @@ class QLabel;
class QPushButton;
QT_END_NAMESPACE
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
-class Dialog : public QWidget
-#else
class Dialog : public QDialog
-#endif
{
Q_OBJECT
diff --git a/examples/layouts/dynamiclayouts/dynamiclayouts.pro b/examples/layouts/dynamiclayouts/dynamiclayouts.pro
index f6ab7791aa..3cc4c084a5 100644
--- a/examples/layouts/dynamiclayouts/dynamiclayouts.pro
+++ b/examples/layouts/dynamiclayouts/dynamiclayouts.pro
@@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/dynamiclayouts
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/layouts/dynamiclayouts/main.cpp b/examples/layouts/dynamiclayouts/main.cpp
index c30db12bb5..03ac9ad84c 100644
--- a/examples/layouts/dynamiclayouts/main.cpp
+++ b/examples/layouts/dynamiclayouts/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Dialog dialog;
-#if defined(Q_OS_SYMBIAN)
- dialog.showMaximized();
-#else
dialog.show();
-#endif
return app.exec();
}
diff --git a/examples/layouts/flowlayout/flowlayout.pro b/examples/layouts/flowlayout/flowlayout.pro
index f59c4bc835..4ac0a43c26 100644
--- a/examples/layouts/flowlayout/flowlayout.pro
+++ b/examples/layouts/flowlayout/flowlayout.pro
@@ -10,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/flowlayout
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/layouts/flowlayout/main.cpp b/examples/layouts/flowlayout/main.cpp
index 4a43828d45..f2079f511b 100644
--- a/examples/layouts/flowlayout/main.cpp
+++ b/examples/layouts/flowlayout/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/layouts/layouts.pro b/examples/layouts/layouts.pro
index f1940c1421..8299052d4f 100644
--- a/examples/layouts/layouts.pro
+++ b/examples/layouts/layouts.pro
@@ -9,6 +9,4 @@ sources.files = README *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts
INSTALLS += sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/linguist/arrowpad/arrowpad.pro b/examples/linguist/arrowpad/arrowpad.pro
index 8181ee07cb..a897587473 100644
--- a/examples/linguist/arrowpad/arrowpad.pro
+++ b/examples/linguist/arrowpad/arrowpad.pro
@@ -15,10 +15,6 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/arrowpad
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/linguist/hellotr/hellotr.pro b/examples/linguist/hellotr/hellotr.pro
index 0a3ed48dfb..0cd06995fe 100644
--- a/examples/linguist/hellotr/hellotr.pro
+++ b/examples/linguist/hellotr/hellotr.pro
@@ -10,10 +10,6 @@ sources.files = $$SOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/hellotr
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/linguist/linguist.pro b/examples/linguist/linguist.pro
index 416a6e6c9d..aa50f03be5 100644
--- a/examples/linguist/linguist.pro
+++ b/examples/linguist/linguist.pro
@@ -8,6 +8,4 @@ sources.files = README *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist
INSTALLS += sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/linguist/trollprint/trollprint.pro b/examples/linguist/trollprint/trollprint.pro
index 0588424ff7..5c7d7ffc0f 100644
--- a/examples/linguist/trollprint/trollprint.pro
+++ b/examples/linguist/trollprint/trollprint.pro
@@ -11,10 +11,6 @@ sources.files = $$SOURCES $$HEADERS $$TRANSLATIONS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/trollprint
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/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)
diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp
index 43ae8e9027..a543c937c6 100644
--- a/examples/network/bearermonitor/bearermonitor.cpp
+++ b/examples/network/bearermonitor/bearermonitor.cpp
@@ -63,9 +63,6 @@ BearerMonitor::BearerMonitor(QWidget *parent)
delete tabWidget->currentWidget();
sessionGroup->hide();
#endif
-#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE) || defined(MAEMO_UI) || defined(Q_WS_SIMULATOR)
- setWindowState(Qt::WindowMaximized);
-#endif
updateConfigurations();
onlineStateChanged(!manager.allConfigurations(QNetworkConfiguration::Active).isEmpty());
QNetworkConfiguration defaultConfiguration = manager.defaultConfiguration();
diff --git a/examples/network/bearermonitor/bearermonitor.h b/examples/network/bearermonitor/bearermonitor.h
index f4dbf81dee..c4199d6230 100644
--- a/examples/network/bearermonitor/bearermonitor.h
+++ b/examples/network/bearermonitor/bearermonitor.h
@@ -43,13 +43,7 @@
#include <qnetworkconfigmanager.h>
#include <qnetworksession.h>
-#if defined (Q_OS_SYMBIAN) || defined(Q_OS_WINCE) || defined(Q_WS_SIMULATOR)
-#include "ui_bearermonitor_240_320.h"
-#elif defined(MAEMO_UI)
-#include "ui_bearermonitor_maemo.h"
-#else
#include "ui_bearermonitor_640_480.h"
-#endif
QT_USE_NAMESPACE
@@ -72,7 +66,7 @@ private slots:
void onlineStateChanged(bool isOnline);
-#if defined(Q_OS_WIN) || defined(Q_WS_SIMULATOR)
+#if defined(Q_OS_WIN)
void registerNetwork();
void unregisterNetwork();
#endif
@@ -81,9 +75,7 @@ private slots:
void createSessionFor(QTreeWidgetItem *item);
void createNewSession();
-#ifndef MAEMO_UI
void deleteSession();
-#endif
void performScan();
private:
diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro
index 8b2b33affb..3486bc1b5c 100644
--- a/examples/network/bearermonitor/bearermonitor.pro
+++ b/examples/network/bearermonitor/bearermonitor.pro
@@ -23,11 +23,3 @@ wince*:LIBS += -lws2
CONFIG += console
-symbian: {
- TARGET.CAPABILITY = NetworkServices ReadUserData
- 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)
diff --git a/examples/network/blockingfortuneclient/blockingclient.cpp b/examples/network/blockingfortuneclient/blockingclient.cpp
index 0491433d56..8867e25678 100644
--- a/examples/network/blockingfortuneclient/blockingclient.cpp
+++ b/examples/network/blockingfortuneclient/blockingclient.cpp
@@ -68,10 +68,6 @@ BlockingClient::BlockingClient(QWidget *parent)
portLineEdit = new QLineEdit;
portLineEdit->setValidator(new QIntValidator(1, 65535, this));
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- Qt::InputMethodHint hints = Qt::ImhDigitsOnly;
- portLineEdit->setInputMethodHints(hints);
-#endif
hostLabel->setBuddy(hostLineEdit);
portLabel->setBuddy(portLineEdit);
@@ -80,23 +76,6 @@ BlockingClient::BlockingClient(QWidget *parent)
"Fortune Server example as well."));
statusLabel->setWordWrap(true);
-#ifdef Q_OS_SYMBIAN
- QMenu *menu = new QMenu(this);
- fortuneAction = menu->addAction(tr("Get Fortune"));
- fortuneAction->setVisible(false);
-
- QAction *optionsAction = new QAction(tr("Options"), this);
- optionsAction->setMenu(menu);
- optionsAction->setSoftKeyRole(QAction::PositiveSoftKey);
- addAction(optionsAction);
-
- exitAction = new QAction(tr("Exit"), this);
- exitAction->setSoftKeyRole(QAction::NegativeSoftKey);
- addAction(exitAction);
-
- connect(fortuneAction, SIGNAL(triggered()), this, SLOT(requestNewFortune()));
- connect(exitAction, SIGNAL(triggered()), this, SLOT(close()));
-#else
getFortuneButton = new QPushButton(tr("Get Fortune"));
getFortuneButton->setDefault(true);
getFortuneButton->setEnabled(false);
@@ -109,7 +88,6 @@ BlockingClient::BlockingClient(QWidget *parent)
connect(getFortuneButton, SIGNAL(clicked()), this, SLOT(requestNewFortune()));
connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
-#endif
connect(hostLineEdit, SIGNAL(textChanged(QString)),
this, SLOT(enableGetFortuneButton()));
@@ -129,9 +107,7 @@ BlockingClient::BlockingClient(QWidget *parent)
mainLayout->addWidget(portLabel, 1, 0);
mainLayout->addWidget(portLineEdit, 1, 1);
mainLayout->addWidget(statusLabel, 2, 0, 1, 2);
-#ifndef Q_OS_SYMBIAN
mainLayout->addWidget(buttonBox, 3, 0, 1, 2);
-#endif
setLayout(mainLayout);
setWindowTitle(tr("Blocking Fortune Client"));
@@ -141,11 +117,7 @@ BlockingClient::BlockingClient(QWidget *parent)
//! [2]
void BlockingClient::requestNewFortune()
{
-#ifdef Q_OS_SYMBIAN
- fortuneAction->setVisible(false);
-#else
getFortuneButton->setEnabled(false);
-#endif
thread.requestNewFortune(hostLineEdit->text(),
portLineEdit->text().toInt());
}
@@ -163,11 +135,7 @@ void BlockingClient::showFortune(const QString &nextFortune)
//! [4]
currentFortune = nextFortune;
statusLabel->setText(currentFortune);
-#ifdef Q_OS_SYMBIAN
- fortuneAction->setVisible(true);
-#else
getFortuneButton->setEnabled(true);
-#endif
}
//! [4]
@@ -192,19 +160,11 @@ void BlockingClient::displayError(int socketError, const QString &message)
.arg(message));
}
-#ifdef Q_OS_SYMBIAN
- fortuneAction->setVisible(true);
-#else
getFortuneButton->setEnabled(true);
-#endif
}
void BlockingClient::enableGetFortuneButton()
{
bool enable(!hostLineEdit->text().isEmpty() && !portLineEdit->text().isEmpty());
-#ifdef Q_OS_SYMBIAN
- fortuneAction->setVisible(enable);
-#else
getFortuneButton->setEnabled(enable);
-#endif
}
diff --git a/examples/network/blockingfortuneclient/blockingclient.h b/examples/network/blockingfortuneclient/blockingclient.h
index 83ff93b228..99b97f13c5 100644
--- a/examples/network/blockingfortuneclient/blockingclient.h
+++ b/examples/network/blockingfortuneclient/blockingclient.h
@@ -73,14 +73,9 @@ private:
QLineEdit *hostLineEdit;
QLineEdit *portLineEdit;
QLabel *statusLabel;
-#ifdef Q_OS_SYMBIAN
- QAction *fortuneAction;
- QAction *exitAction;
-#else
QPushButton *getFortuneButton;
QPushButton *quitButton;
QDialogButtonBox *buttonBox;
-#endif
FortuneThread thread;
QString currentFortune;
diff --git a/examples/network/blockingfortuneclient/blockingfortuneclient.pro b/examples/network/blockingfortuneclient/blockingfortuneclient.pro
index 3fe6f7c7ab..c8689b39fb 100644
--- a/examples/network/blockingfortuneclient/blockingfortuneclient.pro
+++ b/examples/network/blockingfortuneclient/blockingfortuneclient.pro
@@ -13,11 +13,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blockingfortuneclient.pr
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/blockingfortuneclient
INSTALLS += target sources
-symbian: {
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-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/network/blockingfortuneclient/main.cpp b/examples/network/blockingfortuneclient/main.cpp
index 97ce59fdb3..b67464089b 100644
--- a/examples/network/blockingfortuneclient/main.cpp
+++ b/examples/network/blockingfortuneclient/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
BlockingClient client;
-#ifdef Q_OS_SYMBIAN
- client.showMaximized();
-#else
client.show();
-#endif
return app.exec();
}
diff --git a/examples/network/broadcastreceiver/broadcastreceiver.pro b/examples/network/broadcastreceiver/broadcastreceiver.pro
index bc6b0ee55a..712da4931f 100644
--- a/examples/network/broadcastreceiver/broadcastreceiver.pro
+++ b/examples/network/broadcastreceiver/broadcastreceiver.pro
@@ -11,8 +11,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastreceiver.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/broadcastreceiver
INSTALLS += target sources
-symbian: {
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-maemo5: CONFIG += qt_example
diff --git a/examples/network/broadcastreceiver/main.cpp b/examples/network/broadcastreceiver/main.cpp
index 80d0bba869..748f4b5de1 100644
--- a/examples/network/broadcastreceiver/main.cpp
+++ b/examples/network/broadcastreceiver/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Receiver receiver;
-#ifdef Q_OS_SYMBIAN
- receiver.showMaximized();
-#else
receiver.show();
-#endif
return app.exec();
}
diff --git a/examples/network/broadcastreceiver/receiver.cpp b/examples/network/broadcastreceiver/receiver.cpp
index e0830283a9..6a49046c91 100644
--- a/examples/network/broadcastreceiver/receiver.cpp
+++ b/examples/network/broadcastreceiver/receiver.cpp
@@ -49,13 +49,7 @@ Receiver::Receiver(QWidget *parent)
statusLabel = new QLabel(tr("Listening for broadcasted messages"));
statusLabel->setWordWrap(true);
-#ifdef Q_OS_SYMBIAN
- quitAction = new QAction(tr("Exit"), this);
- quitAction->setSoftKeyRole(QAction::NegativeSoftKey);
- addAction(quitAction);
-#else
quitButton = new QPushButton(tr("&Quit"));
-#endif
//! [0]
udpSocket = new QUdpSocket(this);
@@ -66,13 +60,6 @@ Receiver::Receiver(QWidget *parent)
connect(udpSocket, SIGNAL(readyRead()),
this, SLOT(processPendingDatagrams()));
//! [1]
-#ifdef Q_OS_SYMBIAN
- connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-
- QVBoxLayout *mainLayout = new QVBoxLayout;
- mainLayout->addWidget(statusLabel);
- setLayout(mainLayout);
-#else
connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
QHBoxLayout *buttonLayout = new QHBoxLayout;
@@ -84,7 +71,6 @@ Receiver::Receiver(QWidget *parent)
mainLayout->addWidget(statusLabel);
mainLayout->addLayout(buttonLayout);
setLayout(mainLayout);
-#endif
setWindowTitle(tr("Broadcast Receiver"));
}
diff --git a/examples/network/broadcastreceiver/receiver.h b/examples/network/broadcastreceiver/receiver.h
index 3084da1e26..7a282d2253 100644
--- a/examples/network/broadcastreceiver/receiver.h
+++ b/examples/network/broadcastreceiver/receiver.h
@@ -62,11 +62,7 @@ private slots:
private:
QLabel *statusLabel;
-#ifdef Q_OS_SYMBIAN
- QAction *quitAction;
-#else
QPushButton *quitButton;
-#endif
QUdpSocket *udpSocket;
};
diff --git a/examples/network/broadcastsender/broadcastsender.pro b/examples/network/broadcastsender/broadcastsender.pro
index 0944164e7c..40f173f3e7 100644
--- a/examples/network/broadcastsender/broadcastsender.pro
+++ b/examples/network/broadcastsender/broadcastsender.pro
@@ -10,9 +10,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/broadcastsender
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastsender.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/broadcastsender
INSTALLS += target sources
-
-symbian: {
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-maemo5: CONFIG += qt_example
diff --git a/examples/network/broadcastsender/main.cpp b/examples/network/broadcastsender/main.cpp
index 88be21d2d8..7c70255aec 100644
--- a/examples/network/broadcastsender/main.cpp
+++ b/examples/network/broadcastsender/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Sender sender;
-#ifdef Q_OS_SYMBIAN
- sender.showMaximized();
-#else
sender.show();
-#endif
return app.exec();
}
diff --git a/examples/network/download/download.pro b/examples/network/download/download.pro
index a3b270d252..7c53044f69 100644
--- a/examples/network/download/download.pro
+++ b/examples/network/download/download.pro
@@ -17,8 +17,5 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/download
INSTALLS += target sources
-symbian: CONFIG += qt_example
-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/network/downloadmanager/downloadmanager.pro b/examples/network/downloadmanager/downloadmanager.pro
index 2f83f41afc..6b7e4f8757 100644
--- a/examples/network/downloadmanager/downloadmanager.pro
+++ b/examples/network/downloadmanager/downloadmanager.pro
@@ -18,8 +18,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/downloadmanager
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
OTHER_FILES += \
debian/changelog \
@@ -28,5 +26,4 @@ OTHER_FILES += \
debian/copyright \
debian/README \
debian/rules
-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/network/fortuneclient/fortuneclient.pro b/examples/network/fortuneclient/fortuneclient.pro
index b5cb3b4390..b8d311b891 100644
--- a/examples/network/fortuneclient/fortuneclient.pro
+++ b/examples/network/fortuneclient/fortuneclient.pro
@@ -10,14 +10,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneclient
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fortuneclient.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneclient
INSTALLS += target sources
-
-symbian {
- CONFIG += qt_example
- TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData"
- TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-}
-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/network/fortuneclient/main.cpp b/examples/network/fortuneclient/main.cpp
index bf3cec187f..f6c459ee90 100644
--- a/examples/network/fortuneclient/main.cpp
+++ b/examples/network/fortuneclient/main.cpp
@@ -45,11 +45,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Client client;
-#ifdef Q_OS_SYMBIAN
- // Make application better looking and more usable on small screen
- client.showMaximized();
-#else
client.show();
-#endif
return client.exec();
}
diff --git a/examples/network/fortuneserver/fortuneserver.pro b/examples/network/fortuneserver/fortuneserver.pro
index ed865e4ca5..ac7e82f63b 100644
--- a/examples/network/fortuneserver/fortuneserver.pro
+++ b/examples/network/fortuneserver/fortuneserver.pro
@@ -10,15 +10,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneserver
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fortuneserver.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneserver
INSTALLS += target sources
-
-symbian {
- TARGET.UID3 = 0xA000E406
- CONFIG += qt_example
- TARGET.CAPABILITY = "NetworkServices ReadUserData"
- TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-}
-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/network/fortuneserver/main.cpp b/examples/network/fortuneserver/main.cpp
index 74f182e8d8..6c0e9ee9f3 100644
--- a/examples/network/fortuneserver/main.cpp
+++ b/examples/network/fortuneserver/main.cpp
@@ -49,11 +49,7 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Server server;
-#ifdef Q_OS_SYMBIAN
- server.showMaximized();
-#else
server.show();
-#endif
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
return server.exec();
}
diff --git a/examples/network/googlesuggest/googlesuggest.pro b/examples/network/googlesuggest/googlesuggest.pro
index 97866f6f32..b5ff5f16f1 100644
--- a/examples/network/googlesuggest/googlesuggest.pro
+++ b/examples/network/googlesuggest/googlesuggest.pro
@@ -8,9 +8,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/googlesuggest
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/network/http/http.pro b/examples/network/http/http.pro
index 6f4b7be076..8349de4622 100644
--- a/examples/network/http/http.pro
+++ b/examples/network/http/http.pro
@@ -11,9 +11,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/http
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS http.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/http
INSTALLS += target sources
-
-symbian: {
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-maemo5: CONFIG += qt_example
diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp
index 77c1e314c7..082dc910ca 100644
--- a/examples/network/http/httpwindow.cpp
+++ b/examples/network/http/httpwindow.cpp
@@ -45,11 +45,7 @@
#include "ui_authenticationdialog.h"
HttpWindow::HttpWindow(QWidget *parent)
-#ifdef Q_WS_MAEMO_5
- : QWidget(parent)
-#else
: QDialog(parent)
-#endif
{
#ifndef QT_NO_OPENSSL
urlLineEdit = new QLineEdit("https://qt.nokia.com/");
@@ -72,9 +68,7 @@ HttpWindow::HttpWindow(QWidget *parent)
buttonBox->addButton(downloadButton, QDialogButtonBox::ActionRole);
buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
-#ifndef Q_WS_MAEMO_5
progressDialog = new QProgressDialog(this);
-#endif
connect(urlLineEdit, SIGNAL(textChanged(QString)),
this, SLOT(enableDownloadButton()));
@@ -85,9 +79,7 @@ HttpWindow::HttpWindow(QWidget *parent)
connect(&qnam, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
this, SLOT(sslErrors(QNetworkReply*,QList<QSslError>)));
#endif
-#ifndef Q_WS_MAEMO_5
connect(progressDialog, SIGNAL(canceled()), this, SLOT(cancelDownload()));
-#endif
connect(downloadButton, SIGNAL(clicked()), this, SLOT(downloadFile()));
connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
@@ -145,10 +137,8 @@ void HttpWindow::downloadFile()
return;
}
-#ifndef Q_WS_MAEMO_5
progressDialog->setWindowTitle(tr("HTTP"));
progressDialog->setLabelText(tr("Downloading %1.").arg(fileName));
-#endif
downloadButton->setEnabled(false);
// schedule the request
@@ -174,15 +164,11 @@ void HttpWindow::httpFinished()
file = 0;
}
reply->deleteLater();
-#ifndef Q_WS_MAEMO_5
progressDialog->hide();
-#endif
return;
}
-#ifndef Q_WS_MAEMO_5
progressDialog->hide();
-#endif
file->flush();
file->close();
@@ -233,13 +219,8 @@ void HttpWindow::updateDataReadProgress(qint64 bytesRead, qint64 totalBytes)
if (httpRequestAborted)
return;
-#ifndef Q_WS_MAEMO_5
progressDialog->setMaximum(totalBytes);
progressDialog->setValue(bytesRead);
-#else
- Q_UNUSED(bytesRead);
- Q_UNUSED(totalBytes);
-#endif
}
void HttpWindow::enableDownloadButton()
diff --git a/examples/network/http/httpwindow.h b/examples/network/http/httpwindow.h
index 8bbe1a261a..0ec87af48a 100644
--- a/examples/network/http/httpwindow.h
+++ b/examples/network/http/httpwindow.h
@@ -41,11 +41,7 @@
#ifndef HTTPWINDOW_H
#define HTTPWINDOW_H
-#ifdef Q_WS_MAEMO_5
-#include <QWidget>
-#else
#include <QDialog>
-#endif
#include <QNetworkAccessManager>
#include <QUrl>
@@ -63,11 +59,7 @@ class QNetworkReply;
QT_END_NAMESPACE
-#ifdef Q_WS_MAEMO_5
-class HttpWindow : public QWidget
-#else
class HttpWindow : public QDialog
-#endif
{
Q_OBJECT
@@ -92,9 +84,7 @@ private:
QLabel *statusLabel;
QLabel *urlLabel;
QLineEdit *urlLineEdit;
-#ifndef Q_WS_MAEMO_5
QProgressDialog *progressDialog;
-#endif
QPushButton *downloadButton;
QPushButton *quitButton;
QDialogButtonBox *buttonBox;
diff --git a/examples/network/http/main.cpp b/examples/network/http/main.cpp
index e4f157476c..ae20f6f41c 100644
--- a/examples/network/http/main.cpp
+++ b/examples/network/http/main.cpp
@@ -47,20 +47,9 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
-#if defined(Q_OS_SYMBIAN)
- // Change current directory from default private to c:\data
- // in order that user can access the downloaded content
- QDir::setCurrent("c:\\data");
-#elif defined(Q_WS_MAEMO_5)
- QDir::setCurrent("/home/user");
-#endif
HttpWindow httpWin;
-#if defined(Q_OS_SYMBIAN)
- httpWin.showMaximized();
-#else
httpWin.show();
-#endif
return app.exec();
}
diff --git a/examples/network/loopback/dialog.cpp b/examples/network/loopback/dialog.cpp
index f9a51268b7..34fc999dcc 100644
--- a/examples/network/loopback/dialog.cpp
+++ b/examples/network/loopback/dialog.cpp
@@ -43,11 +43,7 @@
#include "dialog.h"
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
static const int TotalBytes = 50 * 1024 * 1024;
-#else
-static const int TotalBytes = 5 * 1024 * 1024;
-#endif
static const int PayloadSize = 64 * 1024; // 64 KB
Dialog::Dialog(QWidget *parent)
@@ -58,22 +54,6 @@ Dialog::Dialog(QWidget *parent)
serverProgressBar = new QProgressBar;
serverStatusLabel = new QLabel(tr("Server ready"));
-#ifdef Q_OS_SYMBIAN
- QMenu *menu = new QMenu(this);
-
- QAction *optionsAction = new QAction(tr("Options"), this);
- optionsAction->setSoftKeyRole(QAction::PositiveSoftKey);
- optionsAction->setMenu(menu);
- addAction(optionsAction);
-
- startAction = menu->addAction(tr("Start"), this, SLOT(start()));
-
- quitAction = new QAction(tr("Exit"), this);
- quitAction->setSoftKeyRole(QAction::NegativeSoftKey);
- addAction(quitAction);
-
- connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-#else
startButton = new QPushButton(tr("&Start"));
quitButton = new QPushButton(tr("&Quit"));
@@ -83,7 +63,6 @@ Dialog::Dialog(QWidget *parent)
connect(startButton, SIGNAL(clicked()), this, SLOT(start()));
connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
-#endif
connect(&tcpServer, SIGNAL(newConnection()),
this, SLOT(acceptConnection()));
connect(&tcpClient, SIGNAL(connected()), this, SLOT(startTransfer()));
@@ -99,9 +78,7 @@ Dialog::Dialog(QWidget *parent)
mainLayout->addWidget(serverStatusLabel);
mainLayout->addStretch(1);
mainLayout->addSpacing(10);
-#ifndef Q_OS_SYMBIAN
mainLayout->addWidget(buttonBox);
-#endif
setLayout(mainLayout);
setWindowTitle(tr("Loopback"));
@@ -109,11 +86,7 @@ Dialog::Dialog(QWidget *parent)
void Dialog::start()
{
-#ifdef Q_OS_SYMBIAN
- startAction->setVisible(false);
-#else
startButton->setEnabled(false);
-#endif
#ifndef QT_NO_CURSOR
QApplication::setOverrideCursor(Qt::WaitCursor);
@@ -169,11 +142,7 @@ void Dialog::updateServerProgress()
if (bytesReceived == TotalBytes) {
tcpServerConnection->close();
-#ifdef Q_OS_SYMBIAN
- startAction->setVisible(true);
-#else
startButton->setEnabled(true);
-#endif
#ifndef QT_NO_CURSOR
QApplication::restoreOverrideCursor();
#endif
@@ -210,11 +179,7 @@ void Dialog::displayError(QAbstractSocket::SocketError socketError)
serverProgressBar->reset();
clientStatusLabel->setText(tr("Client ready"));
serverStatusLabel->setText(tr("Server ready"));
-#ifdef Q_OS_SYMBIAN
- startAction->setVisible(true);
-#else
startButton->setEnabled(true);
-#endif
#ifndef QT_NO_CURSOR
QApplication::restoreOverrideCursor();
#endif
diff --git a/examples/network/loopback/dialog.h b/examples/network/loopback/dialog.h
index b48c090d3f..8261b2279a 100644
--- a/examples/network/loopback/dialog.h
+++ b/examples/network/loopback/dialog.h
@@ -76,14 +76,9 @@ private:
QLabel *clientStatusLabel;
QLabel *serverStatusLabel;
-#ifdef Q_OS_SYMBIAN
- QAction *startAction;
- QAction *quitAction;
-#else
QPushButton *startButton;
QPushButton *quitButton;
QDialogButtonBox *buttonBox;
-#endif
QTcpServer tcpServer;
QTcpSocket tcpClient;
diff --git a/examples/network/loopback/loopback.pro b/examples/network/loopback/loopback.pro
index c96868fb40..760a366d54 100644
--- a/examples/network/loopback/loopback.pro
+++ b/examples/network/loopback/loopback.pro
@@ -10,9 +10,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/loopback
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS loopback.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/loopback
INSTALLS += target sources
-
-symbian: {
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-maemo5: CONFIG += qt_example
diff --git a/examples/network/loopback/main.cpp b/examples/network/loopback/main.cpp
index 7f26fd4357..03ac9ad84c 100644
--- a/examples/network/loopback/main.cpp
+++ b/examples/network/loopback/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Dialog dialog;
-#ifdef Q_OS_SYMBIAN
- dialog.showMaximized();
-#else
dialog.show();
-#endif
return app.exec();
}
diff --git a/examples/network/multicastreceiver/multicastreceiver.pro b/examples/network/multicastreceiver/multicastreceiver.pro
index caeca7ff46..9f0ba09dc7 100644
--- a/examples/network/multicastreceiver/multicastreceiver.pro
+++ b/examples/network/multicastreceiver/multicastreceiver.pro
@@ -11,4 +11,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multicastreceiver.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/multicastreceiver
INSTALLS += target sources
-symbian: CONFIG += qt_example
diff --git a/examples/network/multicastsender/multicastsender.pro b/examples/network/multicastsender/multicastsender.pro
index a0cdc61eab..bc49b3eca3 100644
--- a/examples/network/multicastsender/multicastsender.pro
+++ b/examples/network/multicastsender/multicastsender.pro
@@ -9,4 +9,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multicastsender.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/multicastsender
INSTALLS += target sources
-symbian: CONFIG += qt_example
diff --git a/examples/network/network-chat/main.cpp b/examples/network/network-chat/main.cpp
index a126172b74..94a4dacae8 100644
--- a/examples/network/network-chat/main.cpp
+++ b/examples/network/network-chat/main.cpp
@@ -88,11 +88,6 @@ int main(int argc, char *argv[])
}
ChatDialog dialog;
-#ifdef Q_OS_SYMBIAN
- // Make application better looking and more usable on small screen
- dialog.showMaximized();
-#else
dialog.show();
-#endif
return app.exec();
}
diff --git a/examples/network/network-chat/network-chat.pro b/examples/network/network-chat/network-chat.pro
index f6650f1d40..49b32aa356 100644
--- a/examples/network/network-chat/network-chat.pro
+++ b/examples/network/network-chat/network-chat.pro
@@ -18,13 +18,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network-chat.pro *.chat
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/network-chat
INSTALLS += target sources
-symbian {
- CONFIG += qt_example
- LIBS += -lcharconv
- TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData"
- TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-}
-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/network/network-chat/peermanager.cpp b/examples/network/network-chat/peermanager.cpp
index 0e5bd1724e..a0374e7e7e 100644
--- a/examples/network/network-chat/peermanager.cpp
+++ b/examples/network/network-chat/peermanager.cpp
@@ -69,11 +69,7 @@ PeerManager::PeerManager(Client *client)
}
if (username.isEmpty())
-#ifndef Q_OS_SYMBIAN
username = "unknown";
-#else
- username = "QtS60";
-#endif
updateAddresses();
serverPort = 0;
diff --git a/examples/network/network.pro b/examples/network/network.pro
index 90079f9b50..f12a6a1d47 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -27,13 +27,10 @@ SUBDIRS = \
contains(QT_CONFIG, openssl-linked):SUBDIRS += securesocketclient
}
-symbian: SUBDIRS = qftp
# install
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network
INSTALLS += sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/network/qftp/ftpwindow.cpp b/examples/network/qftp/ftpwindow.cpp
index 1c0d057c66..b0d2e5d9d8 100644
--- a/examples/network/qftp/ftpwindow.cpp
+++ b/examples/network/qftp/ftpwindow.cpp
@@ -51,10 +51,6 @@ FtpWindow::FtpWindow(QWidget *parent)
ftpServerLabel->setBuddy(ftpServerLineEdit);
statusLabel = new QLabel(tr("Please enter the name of an FTP server."));
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- // Use word wrapping to fit the text on screen
- statusLabel->setWordWrap( true );
-#endif
fileList = new QTreeWidget;
fileList->setEnabled(false);
@@ -93,22 +89,11 @@ FtpWindow::FtpWindow(QWidget *parent)
QHBoxLayout *topLayout = new QHBoxLayout;
topLayout->addWidget(ftpServerLabel);
topLayout->addWidget(ftpServerLineEdit);
-#ifndef Q_OS_SYMBIAN
topLayout->addWidget(cdToParentButton);
topLayout->addWidget(connectButton);
-#else
- // Make app better lookin on small screen
- QHBoxLayout *topLayout2 = new QHBoxLayout;
- topLayout2->addWidget(cdToParentButton);
- topLayout2->addWidget(connectButton);
-#endif
QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addLayout(topLayout);
-#ifdef Q_OS_SYMBIAN
- // Make app better lookin on small screen
- mainLayout->addLayout(topLayout2);
-#endif
mainLayout->addWidget(fileList);
mainLayout->addWidget(statusLabel);
mainLayout->addWidget(buttonBox);
diff --git a/examples/network/qftp/main.cpp b/examples/network/qftp/main.cpp
index f6eb2d4db2..15689b5a55 100644
--- a/examples/network/qftp/main.cpp
+++ b/examples/network/qftp/main.cpp
@@ -41,26 +41,12 @@
#include <QApplication>
#include "ftpwindow.h"
-#ifdef Q_OS_SYMBIAN
-#include <QDir>
-#include <QDesktopWidget>
-#endif
int main(int argc, char *argv[])
{
Q_INIT_RESOURCE(ftp);
-#ifdef Q_OS_SYMBIAN
- // Change current directory from default private to c:\data
- // in order that user can access the downloaded content
- QDir::setCurrent( "c:\\data" );
-#endif
QApplication app(argc, argv);
FtpWindow ftpWin;
-#ifdef Q_OS_SYMBIAN
- // Make application better looking and more usable on small screen
- ftpWin.showMaximized();
-#else
ftpWin.show();
-#endif
return ftpWin.exec();
}
diff --git a/examples/network/qftp/qftp.pro b/examples/network/qftp/qftp.pro
index f0efe630b9..c554b37a03 100644
--- a/examples/network/qftp/qftp.pro
+++ b/examples/network/qftp/qftp.pro
@@ -11,14 +11,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/qftp
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/qftp
INSTALLS += target sources
-
-symbian {
- TARGET.UID3 = 0xA000A648
- CONFIG += qt_example
- INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
- TARGET.CAPABILITY="NetworkServices ReadUserData WriteUserData"
-}
-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/network/securesocketclient/main.cpp b/examples/network/securesocketclient/main.cpp
index ca50f31dcf..c15534b523 100644
--- a/examples/network/securesocketclient/main.cpp
+++ b/examples/network/securesocketclient/main.cpp
@@ -56,11 +56,7 @@ int main(int argc, char **argv)
}
SslClient client;
-#ifdef Q_OS_SYMBIAN
- client.showMaximized();
-#else
client.show();
-#endif
return app.exec();
}
diff --git a/examples/network/securesocketclient/securesocketclient.pro b/examples/network/securesocketclient/securesocketclient.pro
index 94c01cd757..39da4750af 100644
--- a/examples/network/securesocketclient/securesocketclient.pro
+++ b/examples/network/securesocketclient/securesocketclient.pro
@@ -15,10 +15,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.jpg images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/securesocketclient
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000CF67
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-maemo5: CONFIG += qt_example
-
diff --git a/examples/network/securesocketclient/sslclient.cpp b/examples/network/securesocketclient/sslclient.cpp
index 9d6af86813..8d862c4c56 100644
--- a/examples/network/securesocketclient/sslclient.cpp
+++ b/examples/network/securesocketclient/sslclient.cpp
@@ -192,9 +192,6 @@ void SslClient::sslErrors(const QList<QSslError> &errors)
ui.sslErrorList->addItem(error.errorString());
executingDialog = true;
-#ifdef Q_OS_SYMBIAN
- errorDialog.showMaximized();
-#endif
if (errorDialog.exec() == QDialog::Accepted)
socket->ignoreSslErrors();
executingDialog = false;
@@ -208,9 +205,6 @@ void SslClient::displayCertificateInfo()
{
CertificateInfo *info = new CertificateInfo(this);
info->setCertificateChain(socket->peerCertificateChain());
-#ifdef Q_OS_SYMBIAN
- info->showMaximized();
-#endif
info->exec();
info->deleteLater();
}
diff --git a/examples/network/threadedfortuneserver/dialog.cpp b/examples/network/threadedfortuneserver/dialog.cpp
index e62076130d..2340a6bc5a 100644
--- a/examples/network/threadedfortuneserver/dialog.cpp
+++ b/examples/network/threadedfortuneserver/dialog.cpp
@@ -51,14 +51,8 @@ Dialog::Dialog(QWidget *parent)
{
statusLabel = new QLabel;
statusLabel->setWordWrap(true);
-#ifdef Q_OS_SYMBIAN
- QAction *quitAction = new QAction(tr("Exit"), this);
- quitAction->setSoftKeyRole(QAction::NegativeSoftKey);
- addAction(quitAction);
-#else
quitButton = new QPushButton(tr("Quit"));
quitButton->setAutoDefault(false);
-#endif
if (!server.listen()) {
QMessageBox::critical(this, tr("Threaded Fortune Server"),
@@ -85,13 +79,6 @@ Dialog::Dialog(QWidget *parent)
"Run the Fortune Client example now.")
.arg(ipAddress).arg(server.serverPort()));
-#ifdef Q_OS_SYMBIAN
- connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-
- QVBoxLayout *mainLayout = new QVBoxLayout;
- mainLayout->addWidget(statusLabel);
- setLayout(mainLayout);
-#else
connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
QHBoxLayout *buttonLayout = new QHBoxLayout;
@@ -103,6 +90,5 @@ Dialog::Dialog(QWidget *parent)
mainLayout->addWidget(statusLabel);
mainLayout->addLayout(buttonLayout);
setLayout(mainLayout);
-#endif
setWindowTitle(tr("Threaded Fortune Server"));
}
diff --git a/examples/network/threadedfortuneserver/main.cpp b/examples/network/threadedfortuneserver/main.cpp
index 1e245e9e01..0bf75aa18c 100644
--- a/examples/network/threadedfortuneserver/main.cpp
+++ b/examples/network/threadedfortuneserver/main.cpp
@@ -49,11 +49,7 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Dialog dialog;
-#ifdef Q_OS_SYMBIAN
- dialog.showMaximized();
-#else
dialog.show();
-#endif
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
return app.exec();
}
diff --git a/examples/network/threadedfortuneserver/threadedfortuneserver.pro b/examples/network/threadedfortuneserver/threadedfortuneserver.pro
index 1b4cd598a2..8520ed43e4 100644
--- a/examples/network/threadedfortuneserver/threadedfortuneserver.pro
+++ b/examples/network/threadedfortuneserver/threadedfortuneserver.pro
@@ -15,11 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threadedfortuneserver.pr
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/threadedfortuneserver
INSTALLS += target sources
-symbian: {
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-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/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro
index b2da8b6b56..36bc795faf 100644
--- a/examples/network/torrent/torrent.pro
+++ b/examples/network/torrent/torrent.pro
@@ -38,9 +38,5 @@ sources.files += icons forms 3rdparty
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/torrent
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/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro
index 5d361bc1bf..d481289451 100644
--- a/examples/opengl/2dpainting/2dpainting.pro
+++ b/examples/opengl/2dpainting/2dpainting.pro
@@ -16,8 +16,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2dpainting.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/2dpainting
INSTALLS += target sources
-symbian: CONFIG += qt_example
-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/opengl/cube/cube.pro b/examples/opengl/cube/cube.pro
index 652812b718..ef6f526067 100644
--- a/examples/opengl/cube/cube.pro
+++ b/examples/opengl/cube/cube.pro
@@ -33,8 +33,5 @@ contains(QT_CONFIG, opengl) {
message(OpenGL support is not available.)
}
-symbian: CONFIG += qt_example
-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/opengl/framebufferobject2/framebufferobject2.pro b/examples/opengl/framebufferobject2/framebufferobject2.pro
index d3fce133fa..f835e88a68 100644
--- a/examples/opengl/framebufferobject2/framebufferobject2.pro
+++ b/examples/opengl/framebufferobject2/framebufferobject2.pro
@@ -10,9 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES framebufferobject2.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/framebufferobject2
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 does not work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/opengl/grabber/grabber.pro b/examples/opengl/grabber/grabber.pro
index 6a73201cd2..6eebfdb738 100644
--- a/examples/opengl/grabber/grabber.pro
+++ b/examples/opengl/grabber/grabber.pro
@@ -11,9 +11,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grabber.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/grabber
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 does not work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/opengl/hellogl/hellogl.pro b/examples/opengl/hellogl/hellogl.pro
index 82372c5d98..7b61ef4b3b 100644
--- a/examples/opengl/hellogl/hellogl.pro
+++ b/examples/opengl/hellogl/hellogl.pro
@@ -16,9 +16,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl
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 does not work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/opengl/hellogl_es2/glwidget.cpp b/examples/opengl/hellogl_es2/glwidget.cpp
index 90c322bdec..9cb14b20d5 100644
--- a/examples/opengl/hellogl_es2/glwidget.cpp
+++ b/examples/opengl/hellogl_es2/glwidget.cpp
@@ -57,9 +57,7 @@ GLWidget::GLWidget(QWidget *parent)
setAttribute(Qt::WA_NoSystemBackground);
setAutoBufferSwap(false);
m_showBubbles = true;
-#ifndef Q_WS_QWS
setMinimumSize(300, 250);
-#endif
}
GLWidget::~GLWidget()
diff --git a/examples/opengl/hellogl_es2/hellogl_es2.pro b/examples/opengl/hellogl_es2/hellogl_es2.pro
index 2eef986ed2..d5bc7ba0a5 100644
--- a/examples/opengl/hellogl_es2/hellogl_es2.pro
+++ b/examples/opengl/hellogl_es2/hellogl_es2.pro
@@ -25,7 +25,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es2.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es2
INSTALLS += target sources
-symbian: CONFIG += qt_example
maemo5 {
# Debian package name may not contain numbers or special characters
@@ -34,5 +33,4 @@ 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/opengl/opengl.pro b/examples/opengl/opengl.pro
index 5502ee270a..a5d5dbcfaf 100644
--- a/examples/opengl/opengl.pro
+++ b/examples/opengl/opengl.pro
@@ -33,6 +33,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS opengl.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/opengl/overpainting/overpainting.pro b/examples/opengl/overpainting/overpainting.pro
index 1584c3c3d4..926024ad5b 100644
--- a/examples/opengl/overpainting/overpainting.pro
+++ b/examples/opengl/overpainting/overpainting.pro
@@ -21,9 +21,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/overpainting
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 does not work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/opengl/pbuffers/pbuffers.pro b/examples/opengl/pbuffers/pbuffers.pro
index 3264be3cef..431ad7a241 100644
--- a/examples/opengl/pbuffers/pbuffers.pro
+++ b/examples/opengl/pbuffers/pbuffers.pro
@@ -17,9 +17,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/pbuffers
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 does not work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/opengl/pbuffers2/pbuffers2.pro b/examples/opengl/pbuffers2/pbuffers2.pro
index 9b30d793b8..bc3b7bb692 100644
--- a/examples/opengl/pbuffers2/pbuffers2.pro
+++ b/examples/opengl/pbuffers2/pbuffers2.pro
@@ -19,9 +19,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES pbuffers2.pro *.png *.svg
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/pbuffers2
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 does not work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/opengl/samplebuffers/samplebuffers.pro b/examples/opengl/samplebuffers/samplebuffers.pro
index d8f9ff1cd7..a903a0b99c 100644
--- a/examples/opengl/samplebuffers/samplebuffers.pro
+++ b/examples/opengl/samplebuffers/samplebuffers.pro
@@ -9,9 +9,5 @@ sources.files = $$SOURCES $$HEADERS samplebuffers.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/samplebuffers
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 does not work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/opengl/textures/textures.pro b/examples/opengl/textures/textures.pro
index d8941b3890..5da023fb2a 100644
--- a/examples/opengl/textures/textures.pro
+++ b/examples/opengl/textures/textures.pro
@@ -12,8 +12,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS textures.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/textures
INSTALLS += target sources
-symbian: CONFIG += qt_example
-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/painting/affine/affine.pro b/examples/painting/affine/affine.pro
index 1441811851..80f966e59d 100644
--- a/examples/painting/affine/affine.pro
+++ b/examples/painting/affine/affine.pro
@@ -18,12 +18,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/affine
INSTALLS += target sources
-symbian {
- CONFIG += qt_example
-}
-
-maemo5: CONFIG += qt_example
-
wince*: {
DEPLOYMENT_PLUGIN += qjpeg
}
diff --git a/examples/painting/basicdrawing/basicdrawing.pro b/examples/painting/basicdrawing/basicdrawing.pro
index 0e9c699698..0e0328e61f 100644
--- a/examples/painting/basicdrawing/basicdrawing.pro
+++ b/examples/painting/basicdrawing/basicdrawing.pro
@@ -11,11 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basicdrawing.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/basicdrawing
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A649
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
-
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/painting/basicdrawing/main.cpp b/examples/painting/basicdrawing/main.cpp
index aa839f68cc..6662742166 100644
--- a/examples/painting/basicdrawing/main.cpp
+++ b/examples/painting/basicdrawing/main.cpp
@@ -48,10 +48,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/painting/basicdrawing/window.cpp b/examples/painting/basicdrawing/window.cpp
index 6f750c45d1..949f4c8179 100644
--- a/examples/painting/basicdrawing/window.cpp
+++ b/examples/painting/basicdrawing/window.cpp
@@ -74,11 +74,7 @@ Window::Window()
//! [2]
penWidthSpinBox = new QSpinBox;
penWidthSpinBox->setRange(0, 20);
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- penWidthSpinBox->setSpecialValueText(tr("0"));
-#else
penWidthSpinBox->setSpecialValueText(tr("0 (cosmetic pen)"));
-#endif
penWidthLabel = new QLabel(tr("Pen &Width:"));
penWidthLabel->setBuddy(penWidthSpinBox);
@@ -172,9 +168,6 @@ Window::Window()
//! [9]
QGridLayout *mainLayout = new QGridLayout;
//! [9] //! [10]
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- mainLayout->setSizeConstraint(QLayout::SetNoConstraint);
-#endif
mainLayout->setColumnStretch(0, 1);
mainLayout->setColumnStretch(3, 1);
mainLayout->addWidget(renderArea, 0, 0, 1, 4);
diff --git a/examples/painting/composition/composition.cpp b/examples/painting/composition/composition.cpp
index b3f810b26c..e376d90733 100644
--- a/examples/painting/composition/composition.cpp
+++ b/examples/painting/composition/composition.cpp
@@ -239,13 +239,8 @@ CompositionRenderer::CompositionRenderer(QWidget *parent)
{
m_animation_enabled = true;
m_animationTimer = startTimer(animationInterval);
-#ifdef Q_WS_QWS
- m_image = QPixmap(":res/composition/flower.jpg");
- m_image.setAlphaChannel(QPixmap(":res/composition/flower_alpha.jpg"));
-#else
m_image = QImage(":res/composition/flower.jpg");
m_image.setAlphaChannel(QImage(":res/composition/flower_alpha.jpg"));
-#endif
m_circle_alpha = 127;
m_circle_hue = 255;
m_current_object = NoObject;
@@ -324,11 +319,7 @@ void CompositionRenderer::drawBase(QPainter &p)
p.setPen(Qt::NoPen);
p.setRenderHint(QPainter::SmoothPixmapTransform);
-#ifdef Q_WS_QWS
- p.drawPixmap(rect(), m_image);
-#else
p.drawImage(rect(), m_image);
-#endif
}
void CompositionRenderer::drawSource(QPainter &p)
@@ -456,37 +447,24 @@ void CompositionRenderer::paint(QPainter *painter)
{
// using a QImage
if (m_buffer.size() != size()) {
-#ifdef Q_WS_QWS
- m_base_buffer = QPixmap(size());
- m_base_buffer.fill(Qt::transparent);
-#else
m_buffer = QImage(size(), QImage::Format_ARGB32_Premultiplied);
m_base_buffer = QImage(size(), QImage::Format_ARGB32_Premultiplied);
m_base_buffer.fill(0);
-#endif
QPainter p(&m_base_buffer);
drawBase(p);
}
-#ifdef Q_WS_QWS
- m_buffer = m_base_buffer;
-#else
memcpy(m_buffer.bits(), m_base_buffer.bits(), m_buffer.byteCount());
-#endif
{
QPainter p(&m_buffer);
drawSource(p);
}
-#ifdef Q_WS_QWS
- painter->drawPixmap(0, 0, m_buffer);
-#else
painter->drawImage(0, 0, m_buffer);
-#endif
}
}
diff --git a/examples/painting/composition/composition.h b/examples/painting/composition/composition.h
index 86e8f5c0df..73d49bf227 100644
--- a/examples/painting/composition/composition.h
+++ b/examples/painting/composition/composition.h
@@ -161,15 +161,9 @@ private:
QPainter::CompositionMode m_composition_mode;
-#ifdef Q_WS_QWS
- QPixmap m_image;
- QPixmap m_buffer;
- QPixmap m_base_buffer;
-#else
QImage m_image;
QImage m_buffer;
QImage m_base_buffer;
-#endif
int m_circle_alpha;
int m_circle_hue;
diff --git a/examples/painting/composition/composition.pro b/examples/painting/composition/composition.pro
index c8e5ab0af3..8641109cc0 100644
--- a/examples/painting/composition/composition.pro
+++ b/examples/painting/composition/composition.pro
@@ -17,7 +17,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition
INSTALLS += target sources
-symbian: CONFIG += qt_example
win32-msvc* {
QMAKE_CXXFLAGS += /Zm500
diff --git a/examples/painting/concentriccircles/concentriccircles.pro b/examples/painting/concentriccircles/concentriccircles.pro
index a889673014..0f87b991ed 100644
--- a/examples/painting/concentriccircles/concentriccircles.pro
+++ b/examples/painting/concentriccircles/concentriccircles.pro
@@ -10,10 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS concentriccircles.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/concentriccircles
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A64A
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/painting/concentriccircles/main.cpp b/examples/painting/concentriccircles/main.cpp
index 4a43828d45..f2079f511b 100644
--- a/examples/painting/concentriccircles/main.cpp
+++ b/examples/painting/concentriccircles/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/painting/deform/deform.pro b/examples/painting/deform/deform.pro
index 2bfc5d32cd..bd704507c5 100644
--- a/examples/painting/deform/deform.pro
+++ b/examples/painting/deform/deform.pro
@@ -17,8 +17,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform
INSTALLS += target sources
-
-symbian {
- TARGET.UID3 = 0xA000A63D
- CONFIG += qt_example
-}
diff --git a/examples/painting/fontsampler/fontsampler.pro b/examples/painting/fontsampler/fontsampler.pro
index 63892a319a..539fc4894b 100644
--- a/examples/painting/fontsampler/fontsampler.pro
+++ b/examples/painting/fontsampler/fontsampler.pro
@@ -9,6 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fontsampler.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/fontsampler
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets printsupport
-maemo5: CONFIG += qt_example
diff --git a/examples/painting/fontsampler/main.cpp b/examples/painting/fontsampler/main.cpp
index dffe80348a..01c8adae53 100644
--- a/examples/painting/fontsampler/main.cpp
+++ b/examples/painting/fontsampler/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/painting/fontsampler/mainwindow.cpp b/examples/painting/fontsampler/mainwindow.cpp
index 9efd307f88..ad0ce55ede 100644
--- a/examples/painting/fontsampler/mainwindow.cpp
+++ b/examples/painting/fontsampler/mainwindow.cpp
@@ -50,9 +50,6 @@ MainWindow::MainWindow(QWidget *parent)
{
setupUi(this);
-#if defined(Q_OS_SYMBIAN)
- addDockWidget(Qt::BottomDockWidgetArea, dockWidget);
-#endif
sampleSizes << 32 << 24 << 16 << 14 << 12 << 8 << 4 << 2 << 1;
markedCount = 0;
@@ -147,11 +144,7 @@ void MainWindow::showFont(QTreeWidgetItem *item)
QString oldText = textEdit->toPlainText().trimmed();
bool modified = textEdit->document()->isModified();
textEdit->clear();
-#if defined(Q_OS_SYMBIAN)
- textEdit->document()->setDefaultFont(QFont(family, 10, weight, italic));
-#else
textEdit->document()->setDefaultFont(QFont(family, 32, weight, italic));
-#endif
QTextCursor cursor = textEdit->textCursor();
QTextBlockFormat blockFormat;
diff --git a/examples/painting/gradients/gradients.pro b/examples/painting/gradients/gradients.pro
index 66f19c0801..4d3efe1255 100644
--- a/examples/painting/gradients/gradients.pro
+++ b/examples/painting/gradients/gradients.pro
@@ -17,4 +17,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients
INSTALLS += target sources
-symbian: CONFIG += qt_example
diff --git a/examples/painting/imagecomposition/imagecomposer.cpp b/examples/painting/imagecomposition/imagecomposer.cpp
index e0173ff6d6..fee4f2a338 100644
--- a/examples/painting/imagecomposition/imagecomposer.cpp
+++ b/examples/painting/imagecomposition/imagecomposer.cpp
@@ -43,11 +43,7 @@
#include "imagecomposer.h"
//! [0]
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
-static const QSize resultSize(50, 50);
-#else
static const QSize resultSize(200, 200);
-#endif
//! [0]
//! [1]
@@ -108,10 +104,7 @@ ImageComposer::ImageComposer()
mainLayout->addWidget(destinationButton, 0, 2, 3, 1);
mainLayout->addWidget(equalLabel, 1, 3);
mainLayout->addWidget(resultLabel, 0, 4, 3, 1);
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
-#else
mainLayout->setSizeConstraint(QLayout::SetFixedSize);
-#endif
setLayout(mainLayout);
//! [4]
diff --git a/examples/painting/imagecomposition/imagecomposition.pro b/examples/painting/imagecomposition/imagecomposition.pro
index e8841ea770..edf434f5d2 100644
--- a/examples/painting/imagecomposition/imagecomposition.pro
+++ b/examples/painting/imagecomposition/imagecomposition.pro
@@ -9,10 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES images *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/imagecomposition
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A64B
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/painting/imagecomposition/main.cpp b/examples/painting/imagecomposition/main.cpp
index f97a3ff7ef..e70fa5fae9 100644
--- a/examples/painting/imagecomposition/main.cpp
+++ b/examples/painting/imagecomposition/main.cpp
@@ -49,11 +49,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
ImageComposer composer;
-#if defined(Q_OS_SYMBIAN)
- composer.showMaximized();
-#else
composer.show();
-#endif
return app.exec();
}
//! [0]
diff --git a/examples/painting/painterpaths/main.cpp b/examples/painting/painterpaths/main.cpp
index 4a43828d45..f2079f511b 100644
--- a/examples/painting/painterpaths/main.cpp
+++ b/examples/painting/painterpaths/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/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro
index 6ead35fe5a..c988ba26e0 100644
--- a/examples/painting/painterpaths/painterpaths.pro
+++ b/examples/painting/painterpaths/painterpaths.pro
@@ -3,7 +3,7 @@ HEADERS = renderarea.h \
SOURCES = main.cpp \
renderarea.cpp \
window.cpp
-unix:!mac:!symbian:!vxworks:!integrity:LIBS += -lm
+unix:!mac:!vxworks:!integrity:LIBS += -lm
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/painterpaths
@@ -11,10 +11,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painterpaths.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/painterpaths
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A64C
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/painting/painterpaths/window.cpp b/examples/painting/painterpaths/window.cpp
index 1139ad0258..641d3597ed 100644
--- a/examples/painting/painterpaths/window.cpp
+++ b/examples/painting/painterpaths/window.cpp
@@ -130,14 +130,12 @@ Window::Window()
//! [9]
//! [10]
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_SIMULATOR)
renderAreas.push_back(new RenderArea(rectPath));
renderAreas.push_back(new RenderArea(roundRectPath));
renderAreas.push_back(new RenderArea(ellipsePath));
renderAreas.push_back(new RenderArea(piePath));
renderAreas.push_back(new RenderArea(polygonPath));
renderAreas.push_back(new RenderArea(groupPath));
-#endif
renderAreas.push_back(new RenderArea(textPath));
renderAreas.push_back(new RenderArea(bezierPath));
renderAreas.push_back(new RenderArea(starPath));
@@ -211,18 +209,12 @@ Window::Window()
//! [16] //! [17]
QGridLayout *topLayout = new QGridLayout;
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- topLayout->setSizeConstraint(QLayout::SetNoConstraint);
-#endif
int i=0;
for(QList<RenderArea*>::iterator it = renderAreas.begin(); it != renderAreas.end(); it++, i++)
topLayout->addWidget(*it, i / 3, i % 3);
QGridLayout *mainLayout = new QGridLayout;
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- mainLayout->setSizeConstraint(QLayout::SetNoConstraint);
-#endif
mainLayout->addLayout(topLayout, 0, 0, 1, 4);
mainLayout->addWidget(fillRuleLabel, 1, 0);
mainLayout->addWidget(fillRuleComboBox, 1, 1, 1, 3);
@@ -234,10 +226,8 @@ Window::Window()
mainLayout->addWidget(penWidthSpinBox, 3, 1, 1, 3);
mainLayout->addWidget(penColorLabel, 4, 0);
mainLayout->addWidget(penColorComboBox, 4, 1, 1, 3);
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_SIMULATOR)
mainLayout->addWidget(rotationAngleLabel, 5, 0);
mainLayout->addWidget(rotationAngleSpinBox, 5, 1, 1, 3);
-#endif
setLayout(mainLayout);
//! [17]
diff --git a/examples/painting/painting.pro b/examples/painting/painting.pro
index 263cc7326b..927d94006b 100644
--- a/examples/painting/painting.pro
+++ b/examples/painting/painting.pro
@@ -18,9 +18,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
examples_affine.subdir = affine
examples_composition.subdir = composition
diff --git a/examples/painting/pathstroke/pathstroke.pro b/examples/painting/pathstroke/pathstroke.pro
index d3f6596390..60a5cd75ca 100644
--- a/examples/painting/pathstroke/pathstroke.pro
+++ b/examples/painting/pathstroke/pathstroke.pro
@@ -18,7 +18,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A63E
- CONFIG += qt_example
-}
diff --git a/examples/painting/shared/arthurwidgets.cpp b/examples/painting/shared/arthurwidgets.cpp
index c1abc4bbe7..6a0183288c 100644
--- a/examples/painting/shared/arthurwidgets.cpp
+++ b/examples/painting/shared/arthurwidgets.cpp
@@ -108,11 +108,7 @@ void ArthurFrame::enableOpenGL(bool use_opengl)
void ArthurFrame::paintEvent(QPaintEvent *e)
{
-#ifdef Q_WS_QWS
- static QPixmap *static_image = 0;
-#else
static QImage *static_image = 0;
-#endif
QPainter painter;
if (preferImage()
#ifdef QT_OPENGL_SUPPORT
@@ -121,11 +117,7 @@ void ArthurFrame::paintEvent(QPaintEvent *e)
) {
if (!static_image || static_image->size() != size()) {
delete static_image;
-#ifdef Q_WS_QWS
- static_image = new QPixmap(size());
-#else
static_image = new QImage(size(), QImage::Format_RGB32);
-#endif
}
painter.begin(static_image);
@@ -197,11 +189,7 @@ void ArthurFrame::paintEvent(QPaintEvent *e)
) {
painter.end();
painter.begin(this);
-#ifdef Q_WS_QWS
- painter.drawPixmap(e->rect(), *static_image, e->rect());
-#else
painter.drawImage(e->rect(), *static_image, e->rect());
-#endif
}
#ifdef QT_OPENGL_SUPPORT
diff --git a/examples/painting/shared/shared.pri b/examples/painting/shared/shared.pri
index fb7b04c0be..2d6b3c78f9 100644
--- a/examples/painting/shared/shared.pri
+++ b/examples/painting/shared/shared.pri
@@ -16,6 +16,5 @@ contains(CONFIG, debug_and_release_target) {
hpux-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
hpuxi-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
-symbian:LIBS += -ldemo_shared.lib
-!hpuxi-acc*:!hpux-acc*:!symbian:LIBS += -ldemo_shared
+!hpuxi-acc*:!hpux-acc*:LIBS += -ldemo_shared
diff --git a/examples/painting/shared/shared.pro b/examples/painting/shared/shared.pro
index 8fc58ae814..212f3a20d7 100644
--- a/examples/painting/shared/shared.pro
+++ b/examples/painting/shared/shared.pro
@@ -32,8 +32,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/shared
INSTALLS += sources
!cross_compile:INSTALLS += target
-
-symbian {
- TARGET.UID3 = 0xA000A63C
- CONFIG += qt_demo
-}
diff --git a/examples/painting/transformations/main.cpp b/examples/painting/transformations/main.cpp
index 4a43828d45..f2079f511b 100644
--- a/examples/painting/transformations/main.cpp
+++ b/examples/painting/transformations/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/painting/transformations/transformations.pro b/examples/painting/transformations/transformations.pro
index 2e76a13c5f..a261c53371 100644
--- a/examples/painting/transformations/transformations.pro
+++ b/examples/painting/transformations/transformations.pro
@@ -10,13 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS transformations.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/transformations
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A64D
- 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/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro
index cb931c7bfb..c5cf5c96d7 100644
--- a/examples/qtconcurrent/imagescaling/imagescaling.pro
+++ b/examples/qtconcurrent/imagescaling/imagescaling.pro
@@ -12,10 +12,8 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/imagescaling
INSTALLS += target sources
-symbian: CONFIG += qt_example
wince*: DEPLOYMENT_PLUGIN += qgif qjpeg qtiff
QT += widgets
-maemo5: CONFIG += qt_example
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtconcurrent/imagescaling/main.cpp b/examples/qtconcurrent/imagescaling/main.cpp
index 963422fcb7..bca840810a 100644
--- a/examples/qtconcurrent/imagescaling/main.cpp
+++ b/examples/qtconcurrent/imagescaling/main.cpp
@@ -48,11 +48,7 @@ int main(int argc, char *argv[])
QApplication app(argc,argv);
Images imageView;
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
- imageView.showMaximized();
-#else
imageView.show();
-#endif
return app.exec();
}
@@ -67,11 +63,7 @@ int main(int argc, char *argv[])
QLabel *label = new QLabel(text);
label->setWordWrap(true);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
- label->showMaximized();
-#else
label->show();
-#endif
qDebug() << text;
app.exec();
diff --git a/examples/qtconcurrent/map/main.cpp b/examples/qtconcurrent/map/main.cpp
index 76b14476f3..a3618b4e59 100644
--- a/examples/qtconcurrent/map/main.cpp
+++ b/examples/qtconcurrent/map/main.cpp
@@ -83,11 +83,7 @@ int main(int argc, char *argv[])
QLabel *label = new QLabel(text);
label->setWordWrap(true);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
- label->showMaximized();
-#else
label->show();
-#endif
qDebug() << text;
app.exec();
diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro
index b5976d6273..978eae44b9 100644
--- a/examples/qtconcurrent/map/map.pro
+++ b/examples/qtconcurrent/map/map.pro
@@ -13,8 +13,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/map
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtconcurrent/progressdialog/main.cpp b/examples/qtconcurrent/progressdialog/main.cpp
index 8473d05716..956d059911 100644
--- a/examples/qtconcurrent/progressdialog/main.cpp
+++ b/examples/qtconcurrent/progressdialog/main.cpp
@@ -98,11 +98,7 @@ int main(int argc, char *argv[])
QLabel *label = new QLabel(text);
label->setWordWrap(true);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
- label->showMaximized();
-#else
label->show();
-#endif
qDebug() << text;
app.exec();
diff --git a/examples/qtconcurrent/progressdialog/progressdialog.pro b/examples/qtconcurrent/progressdialog/progressdialog.pro
index 506a572aa3..fbc239d199 100644
--- a/examples/qtconcurrent/progressdialog/progressdialog.pro
+++ b/examples/qtconcurrent/progressdialog/progressdialog.pro
@@ -12,8 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/progressdialog
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro
index a1594a26a9..e4a366d9bb 100644
--- a/examples/qtconcurrent/qtconcurrent.pro
+++ b/examples/qtconcurrent/qtconcurrent.pro
@@ -14,6 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/qtconcurrent/runfunction/main.cpp b/examples/qtconcurrent/runfunction/main.cpp
index 86fdf80aa4..f369ee8417 100644
--- a/examples/qtconcurrent/runfunction/main.cpp
+++ b/examples/qtconcurrent/runfunction/main.cpp
@@ -74,11 +74,7 @@ int main(int argc, char *argv[])
QLabel *label = new QLabel(text);
label->setWordWrap(true);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
- label->showMaximized();
-#else
label->show();
-#endif
qDebug() << text;
app.exec();
diff --git a/examples/qtconcurrent/runfunction/runfunction.pro b/examples/qtconcurrent/runfunction/runfunction.pro
index 80495e1db2..d41b88e2b0 100644
--- a/examples/qtconcurrent/runfunction/runfunction.pro
+++ b/examples/qtconcurrent/runfunction/runfunction.pro
@@ -12,8 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/runfunction
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtconcurrent/wordcount/main.cpp b/examples/qtconcurrent/wordcount/main.cpp
index 56be795c60..25ded55f50 100644
--- a/examples/qtconcurrent/wordcount/main.cpp
+++ b/examples/qtconcurrent/wordcount/main.cpp
@@ -124,11 +124,7 @@ int main(int argc, char** argv)
{
QApplication app(argc, argv);
qDebug() << "finding files...";
-#ifdef Q_WS_MAEMO_5
- QStringList files = findFiles("/usr/", QStringList() << "*.sh");
-#else
QStringList files = findFiles("../../", QStringList() << "*.cpp" << "*.h");
-#endif
qDebug() << files.count() << "files";
qDebug() << "warmup";
@@ -172,11 +168,7 @@ int main(int argc, char *argv[])
QLabel *label = new QLabel(text);
label->setWordWrap(true);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
- label->showMaximized();
-#else
label->show();
-#endif
qDebug() << text;
app.exec();
diff --git a/examples/qtconcurrent/wordcount/wordcount.pro b/examples/qtconcurrent/wordcount/wordcount.pro
index 2980792da1..ee4887c0f1 100644
--- a/examples/qtconcurrent/wordcount/wordcount.pro
+++ b/examples/qtconcurrent/wordcount/wordcount.pro
@@ -12,8 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/wordcount
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtestlib/qtestlib.pro b/examples/qtestlib/qtestlib.pro
index 025c2b5b9e..ac7c290420 100644
--- a/examples/qtestlib/qtestlib.pro
+++ b/examples/qtestlib/qtestlib.pro
@@ -7,6 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtestlib.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/qtestlib/tutorial1/tutorial1.pro b/examples/qtestlib/tutorial1/tutorial1.pro
index ee3d12a1b0..04bd515a1d 100644
--- a/examples/qtestlib/tutorial1/tutorial1.pro
+++ b/examples/qtestlib/tutorial1/tutorial1.pro
@@ -7,13 +7,4 @@ sources.files = $$SOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial1
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000C60B
- 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/qtestlib/tutorial2/tutorial2.pro b/examples/qtestlib/tutorial2/tutorial2.pro
index d19be2e243..e3cfd10d4e 100644
--- a/examples/qtestlib/tutorial2/tutorial2.pro
+++ b/examples/qtestlib/tutorial2/tutorial2.pro
@@ -7,13 +7,4 @@ sources.files = $$SOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial2
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000C60C
- 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/qtestlib/tutorial3/tutorial3.pro b/examples/qtestlib/tutorial3/tutorial3.pro
index 344b97f481..f9ea8be753 100644
--- a/examples/qtestlib/tutorial3/tutorial3.pro
+++ b/examples/qtestlib/tutorial3/tutorial3.pro
@@ -7,13 +7,4 @@ sources.files = $$SOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial3
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000C60D
- 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/qtestlib/tutorial4/tutorial4.pro b/examples/qtestlib/tutorial4/tutorial4.pro
index 17fa04cf83..cf0e317128 100644
--- a/examples/qtestlib/tutorial4/tutorial4.pro
+++ b/examples/qtestlib/tutorial4/tutorial4.pro
@@ -7,13 +7,4 @@ sources.files = $$SOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial4
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000C60E
- 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/qtestlib/tutorial5/containers.cpp b/examples/qtestlib/tutorial5/containers.cpp
index b96ba31cc3..345f9e9c43 100644
--- a/examples/qtestlib/tutorial5/containers.cpp
+++ b/examples/qtestlib/tutorial5/containers.cpp
@@ -132,11 +132,7 @@ struct Large { // A "large" item type
};
// Symbian devices typically have limited memory
-#ifdef Q_OS_SYMBIAN
-# define LARGE_MAX_SIZE 2000
-#else
# define LARGE_MAX_SIZE 20000
-#endif
class tst_vector_vs_std : public QObject
{
diff --git a/examples/qtestlib/tutorial5/tutorial5.pro b/examples/qtestlib/tutorial5/tutorial5.pro
index 42afe4204c..950996c8cb 100644
--- a/examples/qtestlib/tutorial5/tutorial5.pro
+++ b/examples/qtestlib/tutorial5/tutorial5.pro
@@ -7,13 +7,4 @@ sources.files = $$SOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial5
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000C60F
- 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/qws/dbscreen/dbscreen.pro b/examples/qws/dbscreen/dbscreen.pro
index 08d6c41e96..e20e3e1b55 100644
--- a/examples/qws/dbscreen/dbscreen.pro
+++ b/examples/qws/dbscreen/dbscreen.pro
@@ -10,7 +10,4 @@ SOURCES = dbscreendriverplugin.cpp \
dbscreen.cpp
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qws/framebuffer/framebuffer.pro b/examples/qws/framebuffer/framebuffer.pro
index 1d3235087f..1043917a68 100644
--- a/examples/qws/framebuffer/framebuffer.pro
+++ b/examples/qws/framebuffer/framebuffer.pro
@@ -11,8 +11,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qws/framebuffer
INSTALLS += target sources
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qws/mousecalibration/mousecalibration.pro b/examples/qws/mousecalibration/mousecalibration.pro
index 5637e735bc..fb91216422 100644
--- a/examples/qws/mousecalibration/mousecalibration.pro
+++ b/examples/qws/mousecalibration/mousecalibration.pro
@@ -11,9 +11,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qws/mousecalibration
INSTALLS += target sources
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
-maemo5: warning(This example might not fully work on Maemo platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qws/simpledecoration/simpledecoration.pro b/examples/qws/simpledecoration/simpledecoration.pro
index e26ffd5ad0..274b87af2b 100644
--- a/examples/qws/simpledecoration/simpledecoration.pro
+++ b/examples/qws/simpledecoration/simpledecoration.pro
@@ -12,9 +12,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qws/simpledecoration
INSTALLS += target sources
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
-maemo5: warning(This example might not fully work on Maemo platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qws/svgalib/svgalib.pro b/examples/qws/svgalib/svgalib.pro
index 7d21b181dd..7058750bb3 100644
--- a/examples/qws/svgalib/svgalib.pro
+++ b/examples/qws/svgalib/svgalib.pro
@@ -18,9 +18,5 @@ SOURCES = svgalibscreen.cpp \
svgalibplugin.cpp
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
-maemo5: warning(This example might not fully work on Maemo platform)
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/richtext/calendar/calendar.pro b/examples/richtext/calendar/calendar.pro
index 265e0e94f6..f65e8852bd 100644
--- a/examples/richtext/calendar/calendar.pro
+++ b/examples/richtext/calendar/calendar.pro
@@ -3,7 +3,6 @@ SOURCES = main.cpp \
mainwindow.cpp
# App cannot be with name "calendar" in Symbian due to same named system component.
-symbian: TARGET = calendarapp
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/calendar
@@ -11,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendar.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/calendar
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/richtext/calendar/main.cpp b/examples/richtext/calendar/main.cpp
index fa94aa3ff2..808f72480b 100644
--- a/examples/richtext/calendar/main.cpp
+++ b/examples/richtext/calendar/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) || defined(Q_WS_SIMULATOR)
- window.show();
-#else
window.resize(640, 256);
window.show();
-#endif
return app.exec();
}
diff --git a/examples/richtext/calendar/mainwindow.cpp b/examples/richtext/calendar/mainwindow.cpp
index ff65b7e890..c8cb833078 100644
--- a/examples/richtext/calendar/mainwindow.cpp
+++ b/examples/richtext/calendar/mainwindow.cpp
@@ -82,11 +82,7 @@ MainWindow::MainWindow()
this, SLOT(setFontSize(int)));
//! [3]
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
- fontSizeSpinBox->setValue(4);
-#else
fontSizeSpinBox->setValue(10);
-#endif
//! [4]
QHBoxLayout *controlsLayout = new QHBoxLayout;
diff --git a/examples/richtext/orderform/detailsdialog.cpp b/examples/richtext/orderform/detailsdialog.cpp
index 8f54bb2615..ba395ec2bb 100644
--- a/examples/richtext/orderform/detailsdialog.cpp
+++ b/examples/richtext/orderform/detailsdialog.cpp
@@ -53,13 +53,8 @@ DetailsDialog::DetailsDialog(const QString &title, QWidget *parent)
nameEdit = new QLineEdit;
addressEdit = new QTextEdit;
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
- offersCheckBox = new QCheckBox(tr("Send information about\n"
- "products and special offers"));
-#else
offersCheckBox = new QCheckBox(tr("Send information about products and "
"special offers"));
-#endif
setupItemsTable();
@@ -71,30 +66,6 @@ DetailsDialog::DetailsDialog(const QString &title, QWidget *parent)
//! [0]
//! [1]
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- QWidget *widgetSubscriber = new QWidget;
- QGridLayout *subscriberLayout = new QGridLayout;
- subscriberLayout->addWidget(nameLabel, 0, 0);
- subscriberLayout->addWidget(nameEdit, 0, 1);
- subscriberLayout->addWidget(addressLabel, 1, 0);
- subscriberLayout->addWidget(addressEdit, 1, 1);
- subscriberLayout->addWidget(offersCheckBox, 2, 0, 1, 2);
- widgetSubscriber->setLayout(subscriberLayout);
-
- QWidget *widgetOrder = new QWidget;
- QVBoxLayout *orderLayout = new QVBoxLayout;
- orderLayout->addWidget(itemsTable);
- widgetOrder->setLayout(orderLayout);
-
- QTabWidget *tabWidget = new QTabWidget;
- tabWidget->addTab(widgetSubscriber, "Subscriber");
- tabWidget->addTab(widgetOrder, "Order");
-
- QVBoxLayout *mainLayout = new QVBoxLayout;
- mainLayout->addWidget(tabWidget);
- mainLayout->addWidget(buttonBox);
- setLayout(mainLayout);
-#else
QGridLayout *mainLayout = new QGridLayout;
mainLayout->addWidget(nameLabel, 0, 0);
mainLayout->addWidget(nameEdit, 0, 1);
@@ -104,7 +75,6 @@ DetailsDialog::DetailsDialog(const QString &title, QWidget *parent)
mainLayout->addWidget(offersCheckBox, 2, 1, 1, 2);
mainLayout->addWidget(buttonBox, 3, 0, 1, 3);
setLayout(mainLayout);
-#endif
setWindowTitle(title);
}
diff --git a/examples/richtext/orderform/main.cpp b/examples/richtext/orderform/main.cpp
index 7aff81d6ad..eb8155fd9a 100644
--- a/examples/richtext/orderform/main.cpp
+++ b/examples/richtext/orderform/main.cpp
@@ -47,14 +47,8 @@ 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) || defined(Q_WS_SIMULATOR)
- windows.show();
-#else
window.resize(640, 480);
window.show();
-#endif
window.createSample();
return app.exec();
}
diff --git a/examples/richtext/orderform/orderform.pro b/examples/richtext/orderform/orderform.pro
index 729f66c873..999b55cb96 100644
--- a/examples/richtext/orderform/orderform.pro
+++ b/examples/richtext/orderform/orderform.pro
@@ -10,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS orderform.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/orderform
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets printsupport
-maemo5: CONFIG += qt_example
diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro
index 8b36c4ba42..053f2be3c2 100644
--- a/examples/richtext/richtext.pro
+++ b/examples/richtext/richtext.pro
@@ -10,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS richtext.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/richtext/syntaxhighlighter/main.cpp b/examples/richtext/syntaxhighlighter/main.cpp
index e0e5e4f407..eecfb12bdc 100644
--- a/examples/richtext/syntaxhighlighter/main.cpp
+++ b/examples/richtext/syntaxhighlighter/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) || defined(Q_WS_SIMULATOR)
- window.show();
-#else
window.resize(640, 512);
window.show();
-#endif
return app.exec();
}
diff --git a/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
index 9abd82f40a..0f9b447a74 100644
--- a/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
+++ b/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
@@ -10,7 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS syntaxhighlighter.pro ex
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/syntaxhighlighter
INSTALLS += target sources
-symbian: CONFIG += qt_example
wince*: {
addFiles.files = main.cpp mainwindow.cpp
@@ -18,5 +17,4 @@ wince*: {
DEPLOYMENT += addFiles
}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/richtext/textedit/textedit.cpp b/examples/richtext/textedit/textedit.cpp
index e765f58b23..d76d9dec2d 100644
--- a/examples/richtext/textedit/textedit.cpp
+++ b/examples/richtext/textedit/textedit.cpp
@@ -67,7 +67,7 @@
#include <QPrintPreviewDialog>
#include <QMimeData>
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
const QString rsrcPath = ":/images/mac";
#else
const QString rsrcPath = ":/images/win";
diff --git a/examples/richtext/textedit/textedit.pro b/examples/richtext/textedit/textedit.pro
index b364a00f98..ffbf9a7222 100644
--- a/examples/richtext/textedit/textedit.pro
+++ b/examples/richtext/textedit/textedit.pro
@@ -20,4 +20,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/textedit
INSTALLS += target sources
QT += widgets printsupport
-symbian: CONFIG += qt_example
diff --git a/examples/scroller/graphicsview/main.cpp b/examples/scroller/graphicsview/main.cpp
index 8f0019a82e..ec92f031e1 100644
--- a/examples/scroller/graphicsview/main.cpp
+++ b/examples/scroller/graphicsview/main.cpp
@@ -281,12 +281,8 @@ int main(int argc, char *argv[])
QApplication a(argc, argv);
bool touch = (a.arguments().contains(QLatin1String("--touch")));
MainWindow mw(touch);
-#ifdef Q_WS_S60
- mw.showMaximized();
-#else
mw.show();
-#endif
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
mw.raise();
#endif
return a.exec();
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
diff --git a/examples/statemachine/eventtransitions/eventtransitions.pro b/examples/statemachine/eventtransitions/eventtransitions.pro
index 374ef3a72f..8a9d84e646 100644
--- a/examples/statemachine/eventtransitions/eventtransitions.pro
+++ b/examples/statemachine/eventtransitions/eventtransitions.pro
@@ -7,7 +7,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/eventtransitions
INSTALLS += target sources
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/statemachine/eventtransitions/main.cpp b/examples/statemachine/eventtransitions/main.cpp
index 291c1d441d..e202f5e0f7 100644
--- a/examples/statemachine/eventtransitions/main.cpp
+++ b/examples/statemachine/eventtransitions/main.cpp
@@ -108,11 +108,7 @@ int main(int argc, char **argv)
QApplication app(argc, argv);
Window window;
window.resize(300, 300);
-#if defined(Q_OS_SYMBIAN)
- window.showMaximized();
-#else
window.show();
-#endif
return app.exec();
}
diff --git a/examples/statemachine/factorial/factorial.pro b/examples/statemachine/factorial/factorial.pro
index 6fbfd8e598..fe3dd23e87 100644
--- a/examples/statemachine/factorial/factorial.pro
+++ b/examples/statemachine/factorial/factorial.pro
@@ -10,7 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS factorial.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/factorial
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/statemachine/pingpong/pingpong.pro b/examples/statemachine/pingpong/pingpong.pro
index e15f593d84..1cfddaf282 100644
--- a/examples/statemachine/pingpong/pingpong.pro
+++ b/examples/statemachine/pingpong/pingpong.pro
@@ -10,7 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pingpong.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/pingpong
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/statemachine/rogue/main.cpp b/examples/statemachine/rogue/main.cpp
index 2939e4a7c5..b52b55fccf 100644
--- a/examples/statemachine/rogue/main.cpp
+++ b/examples/statemachine/rogue/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/statemachine/rogue/rogue.pro b/examples/statemachine/rogue/rogue.pro
index 001f3e44a3..4ed132db06 100644
--- a/examples/statemachine/rogue/rogue.pro
+++ b/examples/statemachine/rogue/rogue.pro
@@ -10,6 +10,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/rogue
INSTALLS += target sources
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
diff --git a/examples/statemachine/rogue/window.cpp b/examples/statemachine/rogue/window.cpp
index fa62362ecc..d5c06608c1 100644
--- a/examples/statemachine/rogue/window.cpp
+++ b/examples/statemachine/rogue/window.cpp
@@ -63,11 +63,7 @@ Window::Window()
}
}
}
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
- font.setPointSize(5);
-#else
font.setPointSize(12);
-#endif
setFont(font);
//![1]
diff --git a/examples/statemachine/rogue/window.h b/examples/statemachine/rogue/window.h
index bdadad463d..025ec79600 100644
--- a/examples/statemachine/rogue/window.h
+++ b/examples/statemachine/rogue/window.h
@@ -49,13 +49,8 @@ class QStateMachine;
class QTransition;
QT_END_NAMESPACE
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
-#define WIDTH 43
-#define HEIGHT 14
-#else
#define WIDTH 35
#define HEIGHT 20
-#endif
//![0]
class Window : public QWidget
diff --git a/examples/statemachine/trafficlight/main.cpp b/examples/statemachine/trafficlight/main.cpp
index 353dfb721e..9b10360ae2 100644
--- a/examples/statemachine/trafficlight/main.cpp
+++ b/examples/statemachine/trafficlight/main.cpp
@@ -88,9 +88,6 @@ public:
: QWidget(parent)
{
QVBoxLayout *vbox = new QVBoxLayout(this);
-#ifdef Q_WS_MAEMO_5
- vbox->setContentsMargins(320, 0, 320, 0);
-#endif
m_red = new LightWidget(Qt::red);
vbox->addWidget(m_red);
m_yellow = new LightWidget(Qt::yellow);
@@ -177,14 +174,8 @@ int main(int argc, char **argv)
QApplication app(argc, argv);
TrafficLight widget;
-#if defined(Q_OS_SYMBIAN)
- widget.showMaximized();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- widget.show();
-#else
widget.resize(110, 300);
widget.show();
-#endif
return app.exec();
}
diff --git a/examples/statemachine/trafficlight/trafficlight.pro b/examples/statemachine/trafficlight/trafficlight.pro
index 9ea94f75f0..5bc0cdaef5 100644
--- a/examples/statemachine/trafficlight/trafficlight.pro
+++ b/examples/statemachine/trafficlight/trafficlight.pro
@@ -7,6 +7,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/trafficlight
INSTALLS += target sources
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
diff --git a/examples/statemachine/twowaybutton/main.cpp b/examples/statemachine/twowaybutton/main.cpp
index 3956c2e1c4..a6c7000446 100644
--- a/examples/statemachine/twowaybutton/main.cpp
+++ b/examples/statemachine/twowaybutton/main.cpp
@@ -74,14 +74,8 @@ int main(int argc, char **argv)
//! [4]
//! [5]
-#if defined(Q_OS_SYMBIAN)
- button.showMaximized();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- button.show();
-#else
button.resize(100, 50);
button.show();
-#endif
return app.exec();
}
//! [5]
diff --git a/examples/statemachine/twowaybutton/twowaybutton.pro b/examples/statemachine/twowaybutton/twowaybutton.pro
index 3b37be7d9e..ffbd982845 100644
--- a/examples/statemachine/twowaybutton/twowaybutton.pro
+++ b/examples/statemachine/twowaybutton/twowaybutton.pro
@@ -7,6 +7,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/twowaybutton
INSTALLS += target sources
QT += widgets
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
diff --git a/examples/threads/mandelbrot/main.cpp b/examples/threads/mandelbrot/main.cpp
index 5211c2051c..610534d4a3 100644
--- a/examples/threads/mandelbrot/main.cpp
+++ b/examples/threads/mandelbrot/main.cpp
@@ -47,11 +47,7 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
MandelbrotWidget widget;
-#if defined(Q_WS_S60)
- widget.showMaximized();
-#else
widget.show();
-#endif
return app.exec();
}
//! [0]
diff --git a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro
index 0e053af072..dc2ab6973b 100644
--- a/examples/threads/mandelbrot/mandelbrot.pro
+++ b/examples/threads/mandelbrot/mandelbrot.pro
@@ -4,7 +4,7 @@ SOURCES = main.cpp \
mandelbrotwidget.cpp \
renderthread.cpp
-unix:!mac:!symbian:!vxworks:!integrity:LIBS += -lm
+unix:!mac:!vxworks:!integrity:LIBS += -lm
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/mandelbrot
@@ -12,6 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mandelbrot.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/mandelbrot
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/threads/mandelbrot/mandelbrotwidget.cpp b/examples/threads/mandelbrot/mandelbrotwidget.cpp
index 7cee70f547..0db19a71c6 100644
--- a/examples/threads/mandelbrot/mandelbrotwidget.cpp
+++ b/examples/threads/mandelbrot/mandelbrotwidget.cpp
@@ -74,20 +74,6 @@ MandelbrotWidget::MandelbrotWidget(QWidget *parent)
#endif
resize(550, 400);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- ZoomButton *zoomIn = new ZoomButton(tr("Zoom In"), ZoomInFactor, this);
- ZoomButton *zoomOut = new ZoomButton(tr("Zoom Out"), ZoomOutFactor, this);
-
- QGridLayout *layout = new QGridLayout(this);
- layout->addWidget(zoomIn, 0, 1);
- layout->addWidget(zoomOut, 1, 1);
- layout->setColumnStretch(0, 10);
- layout->setRowStretch(2, 10);
- setLayout(layout);
-
- connect(zoomIn, SIGNAL(zoom(double)), this, SLOT(zoom(double)));
- connect(zoomOut, SIGNAL(zoom(double)), this, SLOT(zoom(double)));
-#endif
}
//! [1]
@@ -129,7 +115,6 @@ void MandelbrotWidget::paintEvent(QPaintEvent * /* event */)
}
//! [8] //! [9]
-#if !defined(Q_WS_S60) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_SIMULATOR)
QString text = tr("Use mouse wheel or the '+' and '-' keys to zoom. "
"Press and hold left mouse button to scroll.");
QFontMetrics metrics = painter.fontMetrics();
@@ -142,7 +127,6 @@ void MandelbrotWidget::paintEvent(QPaintEvent * /* event */)
painter.setPen(Qt::white);
painter.drawText((width() - textWidth) / 2,
metrics.leading() + metrics.ascent(), text);
-#endif
}
//! [9]
diff --git a/examples/threads/mandelbrot/mandelbrotwidget.h b/examples/threads/mandelbrot/mandelbrotwidget.h
index 53bbeb6469..ead394cc6a 100644
--- a/examples/threads/mandelbrot/mandelbrotwidget.h
+++ b/examples/threads/mandelbrot/mandelbrotwidget.h
@@ -45,32 +45,6 @@
#include <QWidget>
#include "renderthread.h"
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
-#include <QPushButton>
-
-class ZoomButton : public QPushButton
-{
- Q_OBJECT
-public:
- ZoomButton(const QString &text, double zoomFactor, QWidget *parent = NULL)
- : QPushButton(text, parent), m_ZoomFactor(zoomFactor)
- {
- connect(this, SIGNAL(clicked()), this, SLOT(handleClick()));
- }
-
-signals:
- void zoom(double zoomFactor);
-
-private slots:
- void handleClick()
- {
- emit zoom(m_ZoomFactor);
- }
-
-private:
- const double m_ZoomFactor;
-};
-#endif
//! [0]
class MandelbrotWidget : public QWidget
diff --git a/examples/threads/queuedcustomtype/main.cpp b/examples/threads/queuedcustomtype/main.cpp
index 356352a326..d70a88a095 100644
--- a/examples/threads/queuedcustomtype/main.cpp
+++ b/examples/threads/queuedcustomtype/main.cpp
@@ -119,11 +119,7 @@ int main(int argc, char *argv[])
qsrand(QTime::currentTime().elapsed());
Window window;
-#if defined(Q_WS_S60)
- window.showMaximized();
-#else
window.show();
-#endif
window.loadImage(createImage(256, 256));
//! [main finish]
diff --git a/examples/threads/queuedcustomtype/queuedcustomtype.pro b/examples/threads/queuedcustomtype/queuedcustomtype.pro
index 415f4f14dd..a2da59e55f 100644
--- a/examples/threads/queuedcustomtype/queuedcustomtype.pro
+++ b/examples/threads/queuedcustomtype/queuedcustomtype.pro
@@ -13,6 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mandelbrot.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
diff --git a/examples/threads/semaphores/semaphores.cpp b/examples/threads/semaphores/semaphores.cpp
index 3632895c61..9b818f394e 100644
--- a/examples/threads/semaphores/semaphores.cpp
+++ b/examples/threads/semaphores/semaphores.cpp
@@ -44,11 +44,7 @@
#include <stdlib.h>
//! [0]
-#ifdef Q_WS_S60
-const int DataSize = 300;
-#else
const int DataSize = 100000;
-#endif
const int BufferSize = 8192;
char buffer[BufferSize];
@@ -84,14 +80,8 @@ public:
{
for (int i = 0; i < DataSize; ++i) {
usedBytes.acquire();
- #ifdef Q_WS_S60
- QString text(buffer[i % BufferSize]);
- freeBytes.release();
- emit stringConsumed(text);
- #else
fprintf(stderr, "%c", buffer[i % BufferSize]);
freeBytes.release();
- #endif
}
fprintf(stderr, "\n");
}
@@ -108,24 +98,6 @@ protected:
int main(int argc, char *argv[])
//! [5] //! [6]
{
-#ifdef Q_WS_S60
- // Self made console for Symbian
- QApplication app(argc, argv);
- QPlainTextEdit console;
- console.setReadOnly(true);
- console.setTextInteractionFlags(Qt::NoTextInteraction);
- console.showMaximized();
-
- Producer producer;
- Consumer consumer;
-
- QObject::connect(&consumer, SIGNAL(stringConsumed(const QString&)), &console, SLOT(insertPlainText(QString)), Qt::BlockingQueuedConnection);
-
- producer.start();
- consumer.start();
-
- app.exec();
-#else
QCoreApplication app(argc, argv);
Producer producer;
Consumer consumer;
@@ -134,7 +106,6 @@ int main(int argc, char *argv[])
producer.wait();
consumer.wait();
return 0;
-#endif
}
//! [6]
diff --git a/examples/threads/semaphores/semaphores.pro b/examples/threads/semaphores/semaphores.pro
index 96ab3a525f..98159bb69c 100644
--- a/examples/threads/semaphores/semaphores.pro
+++ b/examples/threads/semaphores/semaphores.pro
@@ -10,7 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS semaphores.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/semaphores
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/threads/threads.pro b/examples/threads/threads.pro
index 9bdf900f5b..2a8cfb0fc2 100644
--- a/examples/threads/threads.pro
+++ b/examples/threads/threads.pro
@@ -10,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threads.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/threads/waitconditions/waitconditions.cpp b/examples/threads/waitconditions/waitconditions.cpp
index 0063db5b91..36c358308a 100644
--- a/examples/threads/waitconditions/waitconditions.cpp
+++ b/examples/threads/waitconditions/waitconditions.cpp
@@ -44,11 +44,7 @@
#include <stdlib.h>
//! [0]
-#ifdef Q_WS_S60
-const int DataSize = 300;
-#else
const int DataSize = 100000;
-#endif
const int BufferSize = 8192;
char buffer[BufferSize];
@@ -107,11 +103,7 @@ public:
bufferNotEmpty.wait(&mutex);
mutex.unlock();
- #ifdef Q_WS_S60
- emit stringConsumed(QString(buffer[i % BufferSize]));
- #else
fprintf(stderr, "%c", buffer[i % BufferSize]);
- #endif
mutex.lock();
--numUsedBytes;
@@ -126,48 +118,11 @@ signals:
};
//! [4]
-#ifdef Q_WS_S60
-class PlainTextEdit : public QPlainTextEdit
-{
- Q_OBJECT
-public:
- PlainTextEdit(QWidget *parent = NULL) : QPlainTextEdit(parent), producer(NULL), consumer(NULL)
- {
- setTextInteractionFlags(Qt::NoTextInteraction);
-
- producer = new Producer(this);
- consumer = new Consumer(this);
-
- QObject::connect(consumer, SIGNAL(stringConsumed(const QString &)), SLOT(insertPlainText(const QString &)), Qt::BlockingQueuedConnection);
-
- QTimer::singleShot(0, this, SLOT(startThreads()));
- }
-
-protected:
- Producer *producer;
- Consumer *consumer;
-
-protected slots:
- void startThreads()
- {
- producer->start();
- consumer->start();
- }
-};
-#endif
//! [5]
int main(int argc, char *argv[])
//! [5] //! [6]
{
-#ifdef Q_WS_S60
- QApplication app(argc, argv);
-
- PlainTextEdit console;
- console.showMaximized();
-
- return app.exec();
-#else
QCoreApplication app(argc, argv);
Producer producer;
Consumer consumer;
@@ -176,7 +131,6 @@ int main(int argc, char *argv[])
producer.wait();
consumer.wait();
return 0;
-#endif
}
//! [6]
diff --git a/examples/threads/waitconditions/waitconditions.pro b/examples/threads/waitconditions/waitconditions.pro
index e326afa081..6a3d63b641 100644
--- a/examples/threads/waitconditions/waitconditions.pro
+++ b/examples/threads/waitconditions/waitconditions.pro
@@ -18,7 +18,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS waitconditions.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/waitconditions
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
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)
diff --git a/examples/touch/dials/dials.pro b/examples/touch/dials/dials.pro
index 0836c741ab..1279098b86 100644
--- a/examples/touch/dials/dials.pro
+++ b/examples/touch/dials/dials.pro
@@ -8,9 +8,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/dials
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/touch/fingerpaint/fingerpaint.pro b/examples/touch/fingerpaint/fingerpaint.pro
index 2d11eb7da7..dc9e84696d 100644
--- a/examples/touch/fingerpaint/fingerpaint.pro
+++ b/examples/touch/fingerpaint/fingerpaint.pro
@@ -11,9 +11,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/fingerpaint
INSTALLS += target sources
QT += widgets printsupport
-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/touch/knobs/knobs.pro b/examples/touch/knobs/knobs.pro
index caa3af098c..a87bec9b25 100644
--- a/examples/touch/knobs/knobs.pro
+++ b/examples/touch/knobs/knobs.pro
@@ -8,9 +8,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/knobs
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/touch/pinchzoom/pinchzoom.pro b/examples/touch/pinchzoom/pinchzoom.pro
index f4145dbdfd..5e27befd3b 100644
--- a/examples/touch/pinchzoom/pinchzoom.pro
+++ b/examples/touch/pinchzoom/pinchzoom.pro
@@ -16,9 +16,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/pinchzoom
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/tutorials/addressbook-fr/part1/part1.pro b/examples/tutorials/addressbook-fr/part1/part1.pro
index 9d99ec6852..f04c8ff10d 100644
--- a/examples/tutorials/addressbook-fr/part1/part1.pro
+++ b/examples/tutorials/addressbook-fr/part1/part1.pro
@@ -9,9 +9,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part1
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/tutorials/addressbook-fr/part2/part2.pro b/examples/tutorials/addressbook-fr/part2/part2.pro
index faa54f8b51..46f811676a 100644
--- a/examples/tutorials/addressbook-fr/part2/part2.pro
+++ b/examples/tutorials/addressbook-fr/part2/part2.pro
@@ -9,9 +9,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part2
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/tutorials/addressbook-fr/part3/part3.pro b/examples/tutorials/addressbook-fr/part3/part3.pro
index 1f01b8ac29..d76baaae5d 100644
--- a/examples/tutorials/addressbook-fr/part3/part3.pro
+++ b/examples/tutorials/addressbook-fr/part3/part3.pro
@@ -9,9 +9,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part3
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/tutorials/addressbook-fr/part4/part4.pro b/examples/tutorials/addressbook-fr/part4/part4.pro
index 312f183c74..1684d5e5f4 100644
--- a/examples/tutorials/addressbook-fr/part4/part4.pro
+++ b/examples/tutorials/addressbook-fr/part4/part4.pro
@@ -9,9 +9,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part4
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/tutorials/addressbook-fr/part5/part5.pro b/examples/tutorials/addressbook-fr/part5/part5.pro
index 34f9b56d7f..1978068cc7 100644
--- a/examples/tutorials/addressbook-fr/part5/part5.pro
+++ b/examples/tutorials/addressbook-fr/part5/part5.pro
@@ -11,9 +11,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part5
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/tutorials/addressbook-fr/part6/part6.pro b/examples/tutorials/addressbook-fr/part6/part6.pro
index 81ec20fffe..b5ec9569a8 100644
--- a/examples/tutorials/addressbook-fr/part6/part6.pro
+++ b/examples/tutorials/addressbook-fr/part6/part6.pro
@@ -11,9 +11,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part6
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/tutorials/addressbook-fr/part7/part7.pro b/examples/tutorials/addressbook-fr/part7/part7.pro
index 921c313654..0b8ba50969 100644
--- a/examples/tutorials/addressbook-fr/part7/part7.pro
+++ b/examples/tutorials/addressbook-fr/part7/part7.pro
@@ -11,9 +11,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part7
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/tutorials/addressbook/addressbook.pro b/examples/tutorials/addressbook/addressbook.pro
index 09972a92cc..51438698da 100644
--- a/examples/tutorials/addressbook/addressbook.pro
+++ b/examples/tutorials/addressbook/addressbook.pro
@@ -7,6 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS addressbook.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/tutorials/addressbook/part1/part1.pro b/examples/tutorials/addressbook/part1/part1.pro
index ba236a146d..67f9f3db20 100644
--- a/examples/tutorials/addressbook/part1/part1.pro
+++ b/examples/tutorials/addressbook/part1/part1.pro
@@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part1
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/tutorials/addressbook/part2/part2.pro b/examples/tutorials/addressbook/part2/part2.pro
index fc8ba7b148..26e2e270fa 100644
--- a/examples/tutorials/addressbook/part2/part2.pro
+++ b/examples/tutorials/addressbook/part2/part2.pro
@@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part2
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/tutorials/addressbook/part3/part3.pro b/examples/tutorials/addressbook/part3/part3.pro
index 38c1d6ea4b..5a5d78ed73 100644
--- a/examples/tutorials/addressbook/part3/part3.pro
+++ b/examples/tutorials/addressbook/part3/part3.pro
@@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part3
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/tutorials/addressbook/part4/part4.pro b/examples/tutorials/addressbook/part4/part4.pro
index 9ca4efb124..5b3462c65a 100644
--- a/examples/tutorials/addressbook/part4/part4.pro
+++ b/examples/tutorials/addressbook/part4/part4.pro
@@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part4
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/tutorials/addressbook/part5/part5.pro b/examples/tutorials/addressbook/part5/part5.pro
index 7d6279557f..84757b2455 100644
--- a/examples/tutorials/addressbook/part5/part5.pro
+++ b/examples/tutorials/addressbook/part5/part5.pro
@@ -10,10 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part5
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/tutorials/addressbook/part6/part6.pro b/examples/tutorials/addressbook/part6/part6.pro
index c9fcb87d91..c6be890e91 100644
--- a/examples/tutorials/addressbook/part6/part6.pro
+++ b/examples/tutorials/addressbook/part6/part6.pro
@@ -10,10 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part6
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/tutorials/addressbook/part7/part7.pro b/examples/tutorials/addressbook/part7/part7.pro
index a9183443ff..9cee4c94db 100644
--- a/examples/tutorials/addressbook/part7/part7.pro
+++ b/examples/tutorials/addressbook/part7/part7.pro
@@ -10,10 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part7
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/tutorials/modelview/1_readonly/1_readonly.pro b/examples/tutorials/modelview/1_readonly/1_readonly.pro
index e794f192be..d8b496030d 100755..100644
--- a/examples/tutorials/modelview/1_readonly/1_readonly.pro
+++ b/examples/tutorials/modelview/1_readonly/1_readonly.pro
@@ -14,10 +14,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 1_readonly.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/1_readonly
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/tutorials/modelview/2_formatting/2_formatting.pro b/examples/tutorials/modelview/2_formatting/2_formatting.pro
index 9065100a3c..2b567969de 100755..100644
--- a/examples/tutorials/modelview/2_formatting/2_formatting.pro
+++ b/examples/tutorials/modelview/2_formatting/2_formatting.pro
@@ -13,10 +13,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2_formatting.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/2_formatting
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/tutorials/modelview/3_changingmodel/3_changingmodel.pro b/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro
index 58070a5b57..2649168f4d 100755..100644
--- a/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro
+++ b/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro
@@ -13,10 +13,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 3_changingmodel.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/3_changingmodel
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/tutorials/modelview/4_headers/4_headers.pro b/examples/tutorials/modelview/4_headers/4_headers.pro
index 819daabdfa..308cb2878c 100755..100644
--- a/examples/tutorials/modelview/4_headers/4_headers.pro
+++ b/examples/tutorials/modelview/4_headers/4_headers.pro
@@ -13,10 +13,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 4_headers.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/4_headers
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/tutorials/modelview/5_edit/5_edit.pro b/examples/tutorials/modelview/5_edit/5_edit.pro
index bab5d49bce..cd55a0b8f4 100755..100644
--- a/examples/tutorials/modelview/5_edit/5_edit.pro
+++ b/examples/tutorials/modelview/5_edit/5_edit.pro
@@ -15,10 +15,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 5_edit.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/5_edit
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/tutorials/modelview/6_treeview/6_treeview.pro b/examples/tutorials/modelview/6_treeview/6_treeview.pro
index 3dfc324512..21ea5d9552 100755..100644
--- a/examples/tutorials/modelview/6_treeview/6_treeview.pro
+++ b/examples/tutorials/modelview/6_treeview/6_treeview.pro
@@ -10,10 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 6_treeview.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/6_treeview
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/tutorials/modelview/7_selections/7_selections.pro b/examples/tutorials/modelview/7_selections/7_selections.pro
index 1b666d2484..c1e4b1553d 100755..100644
--- a/examples/tutorials/modelview/7_selections/7_selections.pro
+++ b/examples/tutorials/modelview/7_selections/7_selections.pro
@@ -10,10 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 7_selections.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/7_selections
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/tutorials/modelview/modelview.pro b/examples/tutorials/modelview/modelview.pro
index 10ac8ae77f..4a7e4a344e 100755..100644
--- a/examples/tutorials/modelview/modelview.pro
+++ b/examples/tutorials/modelview/modelview.pro
@@ -13,6 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS modelview.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/tutorials/threads/clock/clock.pro b/examples/tutorials/threads/clock/clock.pro
index f59413346d..b07c84a627 100755..100644
--- a/examples/tutorials/threads/clock/clock.pro
+++ b/examples/tutorials/threads/clock/clock.pro
@@ -10,6 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS clock.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/clock
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
diff --git a/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro b/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro
index 4ee3585687..fb3cd0b394 100755..100644
--- a/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro
+++ b/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro
@@ -11,6 +11,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS helloconcurrent.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/helloconcurrent
INSTALLS += target sources
-symbian: CONFIG += qt_example
diff --git a/examples/tutorials/threads/hellothread/hellothread.pro b/examples/tutorials/threads/hellothread/hellothread.pro
index efe4e931f8..877bb10c39 100755..100644
--- a/examples/tutorials/threads/hellothread/hellothread.pro
+++ b/examples/tutorials/threads/hellothread/hellothread.pro
@@ -13,5 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellothread.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/hellothread
INSTALLS += target sources
-symbian: CONFIG += qt_example
diff --git a/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro b/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro
index 320ba53f27..8539f38f45 100755..100644
--- a/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro
+++ b/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro
@@ -11,7 +11,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellothreadpool.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/hellothreadpool
INSTALLS += target sources
-symbian: CONFIG += qt_example
diff --git a/examples/tutorials/threads/movedobject/movedobject.pro b/examples/tutorials/threads/movedobject/movedobject.pro
index f40ab0c012..c7fd608c7e 100755..100644
--- a/examples/tutorials/threads/movedobject/movedobject.pro
+++ b/examples/tutorials/threads/movedobject/movedobject.pro
@@ -15,5 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS movedobject.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/movedobject
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
diff --git a/examples/tutorials/widgets/childwidget/childwidget.pro b/examples/tutorials/widgets/childwidget/childwidget.pro
index 4efc1432c2..eda5ba83a0 100644
--- a/examples/tutorials/widgets/childwidget/childwidget.pro
+++ b/examples/tutorials/widgets/childwidget/childwidget.pro
@@ -7,9 +7,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets/childwidget
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/tutorials/widgets/nestedlayouts/nestedlayouts.pro b/examples/tutorials/widgets/nestedlayouts/nestedlayouts.pro
index a5601552d9..60b9498868 100644
--- a/examples/tutorials/widgets/nestedlayouts/nestedlayouts.pro
+++ b/examples/tutorials/widgets/nestedlayouts/nestedlayouts.pro
@@ -7,9 +7,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets/nestedlayouts
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/tutorials/widgets/toplevel/toplevel.pro b/examples/tutorials/widgets/toplevel/toplevel.pro
index a86d05b46c..cbee1b9bab 100644
--- a/examples/tutorials/widgets/toplevel/toplevel.pro
+++ b/examples/tutorials/widgets/toplevel/toplevel.pro
@@ -7,9 +7,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets/toplevel
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/tutorials/widgets/windowlayout/windowlayout.pro b/examples/tutorials/widgets/windowlayout/windowlayout.pro
index 08613201dc..39a32f5f8c 100644
--- a/examples/tutorials/widgets/windowlayout/windowlayout.pro
+++ b/examples/tutorials/widgets/windowlayout/windowlayout.pro
@@ -7,9 +7,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets/windowlayout
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/widgets/analogclock/analogclock.pro b/examples/widgets/analogclock/analogclock.pro
index c8e1dc916d..a2641150e2 100644
--- a/examples/widgets/analogclock/analogclock.pro
+++ b/examples/widgets/analogclock/analogclock.pro
@@ -8,10 +8,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS analogclock.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/analogclock
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A64F
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/widgets/analogclock/main.cpp b/examples/widgets/analogclock/main.cpp
index 040fbb0265..0f31f07573 100644
--- a/examples/widgets/analogclock/main.cpp
+++ b/examples/widgets/analogclock/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
AnalogClock clock;
-#if defined(Q_OS_SYMBIAN)
- clock.showMaximized();
-#else
clock.show();
-#endif
return app.exec();
}
diff --git a/examples/widgets/applicationicon/applicationicon.pro b/examples/widgets/applicationicon/applicationicon.pro
index dd4ace3993..6b14644e12 100644
--- a/examples/widgets/applicationicon/applicationicon.pro
+++ b/examples/widgets/applicationicon/applicationicon.pro
@@ -9,22 +9,3 @@ SOURCES += main.cpp
OTHER_FILES += applicationicon.svg \
applicationicon.png \
applicationicon.desktop
-
-symbian {
- CONFIG += qt_example
- # override icon
- ICON = applicationicon.svg
- TARGET.UID3 = 0xe9f919ee
- TARGET.EPOCSTACKSIZE = 0x14000
- TARGET.EPOCHEAPSIZE = 0x020000 0x800000
-}
-
-maemo5 {
- CONFIG += qt_example
-
- # override icon from maemo5pkgrules.pri
- icon.files = $${TARGET}.png
-}
-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/widgets/applicationicon/main.cpp b/examples/widgets/applicationicon/main.cpp
index 24bc747d18..0573383620 100644
--- a/examples/widgets/applicationicon/main.cpp
+++ b/examples/widgets/applicationicon/main.cpp
@@ -45,10 +45,6 @@ int main(int argc, char *argv[])
{
QApplication a(argc, argv);
QLabel label(QObject::tr("Hello, world!"));
-#if defined(Q_WS_S60)
- label.showMaximized();
-#else
label.show();
-#endif
return a.exec();
}
diff --git a/examples/widgets/calculator/calculator.cpp b/examples/widgets/calculator/calculator.cpp
index acdb319952..1e5db2f0b2 100644
--- a/examples/widgets/calculator/calculator.cpp
+++ b/examples/widgets/calculator/calculator.cpp
@@ -98,11 +98,7 @@ Calculator::Calculator(QWidget *parent)
//! [5]
QGridLayout *mainLayout = new QGridLayout;
//! [5] //! [6]
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- mainLayout->setSizeConstraint(QLayout::SetNoConstraint);
-#else
mainLayout->setSizeConstraint(QLayout::SetFixedSize);
-#endif
mainLayout->addWidget(display, 0, 0, 1, 6);
mainLayout->addWidget(backspaceButton, 1, 0, 1, 2);
mainLayout->addWidget(clearButton, 1, 2, 1, 2);
diff --git a/examples/widgets/calculator/calculator.pro b/examples/widgets/calculator/calculator.pro
index f1e110dfd2..d237871e0d 100644
--- a/examples/widgets/calculator/calculator.pro
+++ b/examples/widgets/calculator/calculator.pro
@@ -10,10 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calculator.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/calculator
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000C602
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/widgets/calculator/main.cpp b/examples/widgets/calculator/main.cpp
index 3974f801b1..0038aa10dd 100644
--- a/examples/widgets/calculator/main.cpp
+++ b/examples/widgets/calculator/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Calculator calc;
-#if defined(Q_OS_SYMBIAN)
- calc.showMaximized();
-#else
calc.show();
-#endif
return app.exec();
}
diff --git a/examples/widgets/calendarwidget/calendarwidget.pro b/examples/widgets/calendarwidget/calendarwidget.pro
index 6e664cf353..3c75fb6a33 100644
--- a/examples/widgets/calendarwidget/calendarwidget.pro
+++ b/examples/widgets/calendarwidget/calendarwidget.pro
@@ -8,13 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendarwidget.pro resou
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/calendarwidget
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000C603
- 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/widgets/charactermap/charactermap.pro b/examples/widgets/charactermap/charactermap.pro
index 4baaac1b31..0a9d6e7b5c 100644
--- a/examples/widgets/charactermap/charactermap.pro
+++ b/examples/widgets/charactermap/charactermap.pro
@@ -10,10 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS charactermap.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/charactermap
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/widgets/codeeditor/codeeditor.pro b/examples/widgets/codeeditor/codeeditor.pro
index caee3f7ca1..ec38770cc6 100644
--- a/examples/widgets/codeeditor/codeeditor.pro
+++ b/examples/widgets/codeeditor/codeeditor.pro
@@ -8,8 +8,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/codeeditor
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)
diff --git a/examples/widgets/codeeditor/main.cpp b/examples/widgets/codeeditor/main.cpp
index 8a893244df..1bce70e03f 100644
--- a/examples/widgets/codeeditor/main.cpp
+++ b/examples/widgets/codeeditor/main.cpp
@@ -48,11 +48,7 @@ int main(int argv, char **args)
CodeEditor editor;
editor.setWindowTitle(QObject::tr("Code Editor Example"));
-#if defined(Q_OS_SYMBIAN)
- editor.showMaximized();
-#else
editor.show();
-#endif
return app.exec();
}
diff --git a/examples/widgets/digitalclock/digitalclock.pro b/examples/widgets/digitalclock/digitalclock.pro
index 9df216e855..c0ad11e146 100644
--- a/examples/widgets/digitalclock/digitalclock.pro
+++ b/examples/widgets/digitalclock/digitalclock.pro
@@ -8,6 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS digitalclock.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/digitalclock
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/widgets/digitalclock/main.cpp b/examples/widgets/digitalclock/main.cpp
index d022918b2c..c43162bade 100644
--- a/examples/widgets/digitalclock/main.cpp
+++ b/examples/widgets/digitalclock/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
DigitalClock clock;
-#if defined(Q_OS_SYMBIAN)
- clock.showMaximized();
-#else
clock.show();
-#endif
return app.exec();
}
diff --git a/examples/widgets/elidedlabel/elidedlabel.pro b/examples/widgets/elidedlabel/elidedlabel.pro
index 30c308cd7e..1e391d9a5d 100644
--- a/examples/widgets/elidedlabel/elidedlabel.pro
+++ b/examples/widgets/elidedlabel/elidedlabel.pro
@@ -16,16 +16,3 @@ HEADERS += \
CONFIG += mobility
MOBILITY =
-
-symbian {
- TARGET.UID3 = 0xE2728354 # randomly generated
- TARGET.EPOCSTACKSIZE = 0x14000
- TARGET.EPOCHEAPSIZE = 0x020000 0x800000
- 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/widgets/elidedlabel/testwidget.cpp b/examples/widgets/elidedlabel/testwidget.cpp
index a915de1875..72c5170d97 100644
--- a/examples/widgets/elidedlabel/testwidget.cpp
+++ b/examples/widgets/elidedlabel/testwidget.cpp
@@ -118,9 +118,6 @@ TestWidget::TestWidget(QWidget *parent):
//! [4]
//! [5]
-#ifdef Q_WS_MAEMO_5
- setAttribute(Qt::WA_Maemo5AutoOrientation, true);
-#endif
}
//! [5]
diff --git a/examples/widgets/groupbox/groupbox.pro b/examples/widgets/groupbox/groupbox.pro
index 361c037d24..07c0ed8818 100644
--- a/examples/widgets/groupbox/groupbox.pro
+++ b/examples/widgets/groupbox/groupbox.pro
@@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS groupbox.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/groupbox
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/widgets/groupbox/main.cpp b/examples/widgets/groupbox/main.cpp
index 4a43828d45..f2079f511b 100644
--- a/examples/widgets/groupbox/main.cpp
+++ b/examples/widgets/groupbox/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/widgets/icons/icons.pro b/examples/widgets/icons/icons.pro
index 17c09f354f..8b0831117c 100644
--- a/examples/widgets/icons/icons.pro
+++ b/examples/widgets/icons/icons.pro
@@ -14,7 +14,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS icons.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/icons
INSTALLS += target sources
-symbian: CONFIG += qt_example
wince*: {
imageFiles.files = images/*
@@ -26,8 +25,5 @@ wince*: {
DEPLOYMENT += imageFiles
}
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/widgets/icons/main.cpp b/examples/widgets/icons/main.cpp
index c1ba2bda40..923c1f8514 100644
--- a/examples/widgets/icons/main.cpp
+++ b/examples/widgets/icons/main.cpp
@@ -46,10 +46,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/widgets/imageviewer/imageviewer.pro b/examples/widgets/imageviewer/imageviewer.pro
index 939d60a208..e3fea079bd 100644
--- a/examples/widgets/imageviewer/imageviewer.pro
+++ b/examples/widgets/imageviewer/imageviewer.pro
@@ -8,17 +8,12 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS imageviewer.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/imageviewer
INSTALLS += target sources
-symbian: CONFIG += qt_example
#Symbian has built-in component named imageviewer so we use different target
-symbian: TARGET = imageviewerexample
wince*: {
DEPLOYMENT_PLUGIN += qjpeg qmng qgif
}
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/widgets/imageviewer/main.cpp b/examples/widgets/imageviewer/main.cpp
index 8d1a068c5a..55a362a622 100644
--- a/examples/widgets/imageviewer/main.cpp
+++ b/examples/widgets/imageviewer/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
ImageViewer imageViewer;
-#if defined(Q_OS_SYMBIAN)
- imageViewer.showMaximized();
-#else
imageViewer.show();
-#endif
return app.exec();
}
diff --git a/examples/widgets/lineedits/lineedits.pro b/examples/widgets/lineedits/lineedits.pro
index 484ffde462..01d4b2f1b7 100644
--- a/examples/widgets/lineedits/lineedits.pro
+++ b/examples/widgets/lineedits/lineedits.pro
@@ -8,13 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS lineedits.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/lineedits
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000C604
- 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/widgets/lineedits/main.cpp b/examples/widgets/lineedits/main.cpp
index 4a43828d45..f2079f511b 100644
--- a/examples/widgets/lineedits/main.cpp
+++ b/examples/widgets/lineedits/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/widgets/maemovibration/buttonwidget.cpp b/examples/widgets/maemovibration/buttonwidget.cpp
deleted file mode 100644
index d56d7a5160..0000000000
--- a/examples/widgets/maemovibration/buttonwidget.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "buttonwidget.h"
-#include <QSignalMapper>
-#include <QGridLayout>
-#include <QPushButton>
-
-//! [0]
-ButtonWidget::ButtonWidget(QStringList texts, QWidget *parent)
- : QWidget(parent)
-{
- signalMapper = new QSignalMapper(this);
-
- QGridLayout *gridLayout = new QGridLayout;
- for (int i = 0; i < texts.size(); ++i) {
- QPushButton *button = new QPushButton(texts[i]);
- connect(button, SIGNAL(clicked()), signalMapper, SLOT(map()));
- signalMapper->setMapping(button, texts[i]);
- gridLayout->addWidget(button, i / 2, i % 2);
- }
-
- connect(signalMapper, SIGNAL(mapped(const QString &)),
- this, SIGNAL(clicked(const QString &)));
-
- setLayout(gridLayout);
-}
-//! [0]
-
diff --git a/examples/widgets/maemovibration/buttonwidget.h b/examples/widgets/maemovibration/buttonwidget.h
deleted file mode 100644
index 3068825212..0000000000
--- a/examples/widgets/maemovibration/buttonwidget.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef BUTTONWIDGET_H
-#define BUTTONWIDGET_H
-
-#include <QWidget>
-#include <QSignalMapper>
-
-//! [0]
-class ButtonWidget : public QWidget
-{
- Q_OBJECT
-
-public:
- ButtonWidget(QStringList texts, QWidget *parent = 0);
-
-signals:
- void clicked(const QString &text);
-
-private:
- QSignalMapper *signalMapper;
-};
-//! [0]
-
-#endif // BUTTONWIDGET_H
-
diff --git a/examples/widgets/maemovibration/data/48x48/maemovibration.png b/examples/widgets/maemovibration/data/48x48/maemovibration.png
deleted file mode 100644
index f32e9ced99..0000000000
--- a/examples/widgets/maemovibration/data/48x48/maemovibration.png
+++ /dev/null
Binary files differ
diff --git a/examples/widgets/maemovibration/data/64x64/maemovibration.png b/examples/widgets/maemovibration/data/64x64/maemovibration.png
deleted file mode 100644
index f09cf7c3c6..0000000000
--- a/examples/widgets/maemovibration/data/64x64/maemovibration.png
+++ /dev/null
Binary files differ
diff --git a/examples/widgets/maemovibration/data/maemovibration.desktop b/examples/widgets/maemovibration/data/maemovibration.desktop
deleted file mode 100644
index a88ed4e0aa..0000000000
--- a/examples/widgets/maemovibration/data/maemovibration.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Name=Maemo Vibration
-Exec=/usr/bin/maemovibration
-Icon=maemovibration
-X-HildonDesk-ShowInToolbar=true
-X-Window-Icon=maemovibration
-X-Window-Icon-Dimmed=maemovibration
-X-Osso-Type=application/x-executable
-X-Osso-Service=com.nokia.maemovibration
diff --git a/examples/widgets/maemovibration/data/maemovibration.service b/examples/widgets/maemovibration/data/maemovibration.service
deleted file mode 100644
index 1fab19f35c..0000000000
--- a/examples/widgets/maemovibration/data/maemovibration.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.maemovibration
-Exec=/usr/bin/maemovibration
diff --git a/examples/widgets/maemovibration/maemovibration.pro b/examples/widgets/maemovibration/maemovibration.pro
deleted file mode 100644
index 5c645dd369..0000000000
--- a/examples/widgets/maemovibration/maemovibration.pro
+++ /dev/null
@@ -1,52 +0,0 @@
-TARGET = maemovibration
-HEADERS += buttonwidget.h mcevibrator.h
-SOURCES += main.cpp buttonwidget.cpp mcevibrator.cpp
-
-# All generated files goes same directory
-OBJECTS_DIR = build
-MOC_DIR = build
-UI_DIR = build
-DESTDIR = build
-
-TEMPLATE = app
-CONFIG += debug
-QT=core gui
-
-maemo5 {
- QT += dbus
- CONFIG += link_pkgconfig
- PKG_CONFIG += mce
- INSTALLS += target
- target.path = /usr/bin/
-
- INSTALLS += desktop
- desktop.path = /usr/share/applications/hildon
- desktop.files = data/maemovibration.desktop
-
- INSTALLS += service
- service.path = /usr/share/dbus-1/services
- service.files = data/maemovibration.service
-
- INSTALLS += icon64
- icon64.path = /usr/share/icons/hicolor/64x64/apps
- icon64.files = data/64x64/maemovibration.png
-
- #
- # Targets for debian source and binary package creation
- #
- debian-src.commands = dpkg-buildpackage -S -r -us -uc -d
- debian-bin.commands = dpkg-buildpackage -b -r -uc -d
- debian-all.depends = debian-src debian-bin
-
- #
- # Clean all but Makefile
- #
- compiler_clean.commands = -$(DEL_FILE) $(TARGET)
-
- QMAKE_EXTRA_TARGETS += debian-all debian-src debian-bin compiler_clean
-}
-
-!maemo5 {
- error(The Maemo Vibration Example only works for the maemo target!)
-}
-
diff --git a/examples/widgets/maemovibration/main.cpp b/examples/widgets/maemovibration/main.cpp
deleted file mode 100644
index fbac37478a..0000000000
--- a/examples/widgets/maemovibration/main.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "buttonwidget.h"
-#include "mcevibrator.h"
-
-#include <QtDebug>
-#include <QApplication>
-#include <QFile>
-#include <QTextStream>
-#include <QMessageBox>
-#include <QTextStream>
-
-#include <cstdlib>
-
-//! [0]
-int main(int argc, char *argv[])
-{
- QApplication a(argc, argv);
- QString path = MceVibrator::defaultMceFilePath;
-
- QFile file(path);
- QStringList names;
- if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
- QTextStream stream(&file);
- names = MceVibrator::parsePatternNames(stream);
- file.close();
- }
-
- if (names.isEmpty()){
- qDebug() << "Could not read vibration pattern names from " << path;
- a.exit(-1);
- }
-//! [0]
-
-//! [1]
- ButtonWidget buttonWidget(names);
- MceVibrator vibrator;
- QObject::connect(&buttonWidget, SIGNAL(clicked(const QString &)),
- &vibrator, SLOT(vibrate(const QString &)));
- buttonWidget.show();
-
- return a.exec();
-}
-//! [1]
-
diff --git a/examples/widgets/maemovibration/mcevibrator.cpp b/examples/widgets/maemovibration/mcevibrator.cpp
deleted file mode 100644
index fcae1dc5d2..0000000000
--- a/examples/widgets/maemovibration/mcevibrator.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "mcevibrator.h"
-
-#include <QStringList>
-#include <QDebug>
-#include <QDBusConnection>
-#include <QDBusMessage>
-
-#include <mce/dbus-names.h>
-
-const char MceVibrator::defaultMceFilePath[] = "/etc/mce/mce.ini";
-
-//! [5]
-static void checkError(QDBusMessage &msg)
-{
- if (msg.type() == QDBusMessage::ErrorMessage)
- qDebug() << msg.errorName() << msg.errorMessage();
-}
-//! [5]
-
-//! [0]
-MceVibrator::MceVibrator(QObject *parent) :
- QObject(parent),
- mceInterface(MCE_SERVICE, MCE_REQUEST_PATH, MCE_REQUEST_IF,
- QDBusConnection::systemBus())
-{
- QDBusMessage reply = mceInterface.call(MCE_ENABLE_VIBRATOR);
- checkError(reply);
-}
-//! [0]
-
-//! [3]
-MceVibrator::~MceVibrator()
-{
- deactivate(lastPatternName);
- QDBusMessage reply = mceInterface.call(MCE_DISABLE_VIBRATOR);
- checkError(reply);
-}
-//! [3]
-
-//! [1]
-void MceVibrator::vibrate(const QString &patternName)
-{
- deactivate(lastPatternName);
- lastPatternName = patternName;
- QDBusMessage reply = mceInterface.call(MCE_ACTIVATE_VIBRATOR_PATTERN, patternName);
- checkError(reply);
-}
-//! [1]
-
-//! [2]
-void MceVibrator::deactivate(const QString &patternName)
-{
- if (!patternName.isNull()) {
- QDBusMessage reply = mceInterface.call(MCE_DEACTIVATE_VIBRATOR_PATTERN, patternName);
- checkError(reply);
- }
-}
-//! [2]
-
-//! [4]
-QStringList MceVibrator::parsePatternNames(QTextStream &stream)
-{
- QStringList result;
- QString line;
-
- do {
- line = stream.readLine();
- if (line.startsWith(QLatin1String("VibratorPatterns="))) {
- QString values = line.section('=', 1);
- result = values.split(';');
- break;
- }
- } while (!line.isNull());
-
- return result;
-}
-//! [4]
-
diff --git a/examples/widgets/maemovibration/mcevibrator.h b/examples/widgets/maemovibration/mcevibrator.h
deleted file mode 100644
index fae99be035..0000000000
--- a/examples/widgets/maemovibration/mcevibrator.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef MCEVIBRATOR_H
-#define MCEVIBRATOR_H
-
-#include <QObject>
-#include <QTextStream>
-#include <QDBusInterface>
-
-//! [0]
-class MceVibrator : public QObject
-{
- Q_OBJECT
-public:
- explicit MceVibrator(QObject *parent = 0);
- ~MceVibrator();
-
- static const char defaultMceFilePath[];
- static QStringList parsePatternNames(QTextStream &stream);
-
-public slots:
- void vibrate(const QString &patternName);
-
-private:
- void deactivate(const QString &patternName);
-
- QDBusInterface mceInterface;
- QString lastPatternName;
-};
-//! [0]
-
-#endif // MCEVIBRATOR_H
-
diff --git a/examples/widgets/movie/main.cpp b/examples/widgets/movie/main.cpp
index b9a1c69914..c686eec157 100644
--- a/examples/widgets/movie/main.cpp
+++ b/examples/widgets/movie/main.cpp
@@ -47,10 +47,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
MoviePlayer player;
player.show();
-#if defined(Q_OS_SYMBIAN)
- player.showMaximized();
-#else
player.show();
-#endif
return app.exec();
}
diff --git a/examples/widgets/movie/movie.pro b/examples/widgets/movie/movie.pro
index 5657efa3c1..eb70d6d0b6 100644
--- a/examples/widgets/movie/movie.pro
+++ b/examples/widgets/movie/movie.pro
@@ -8,7 +8,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES movie.pro animation.mng
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/movie
INSTALLS += target sources
-symbian: CONFIG += qt_example
wince*: {
addFiles.files += *.mng
@@ -18,8 +17,5 @@ wince*: {
}
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/widgets/orientation/mainwindow.cpp b/examples/widgets/orientation/mainwindow.cpp
index 246a79dc72..74f1803261 100644
--- a/examples/widgets/orientation/mainwindow.cpp
+++ b/examples/widgets/orientation/mainwindow.cpp
@@ -69,9 +69,6 @@ MainWindow::MainWindow(QWidget *parent) :
//! [1]
//! [2]
-#ifdef Q_WS_MAEMO_5
- setAttribute(Qt::WA_Maemo5AutoOrientation, true);
-#endif
}
//! [2]
diff --git a/examples/widgets/orientation/orientation.pro b/examples/widgets/orientation/orientation.pro
index 91560a3b38..2334cb0005 100644
--- a/examples/widgets/orientation/orientation.pro
+++ b/examples/widgets/orientation/orientation.pro
@@ -22,9 +22,5 @@ FORMS += \
RESOURCES += \
images.qrc
-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/widgets/scribble/main.cpp b/examples/widgets/scribble/main.cpp
index dffe80348a..01c8adae53 100644
--- a/examples/widgets/scribble/main.cpp
+++ b/examples/widgets/scribble/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/widgets/scribble/scribble.pro b/examples/widgets/scribble/scribble.pro
index ef11636efd..1bccb9be62 100644
--- a/examples/widgets/scribble/scribble.pro
+++ b/examples/widgets/scribble/scribble.pro
@@ -10,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS scribble.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/scribble
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets printsupport
-maemo5: CONFIG += qt_example
diff --git a/examples/widgets/shapedclock/main.cpp b/examples/widgets/shapedclock/main.cpp
index f5e9718d4f..9b7f951a48 100644
--- a/examples/widgets/shapedclock/main.cpp
+++ b/examples/widgets/shapedclock/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
ShapedClock clock;
-#if defined(Q_OS_SYMBIAN)
- clock.showMaximized();
-#else
clock.show();
-#endif
return app.exec();
}
diff --git a/examples/widgets/shapedclock/shapedclock.pro b/examples/widgets/shapedclock/shapedclock.pro
index d7ab454ac7..5bc1cb8706 100644
--- a/examples/widgets/shapedclock/shapedclock.pro
+++ b/examples/widgets/shapedclock/shapedclock.pro
@@ -8,12 +8,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS shapedclock.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/shapedclock
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000C605
- 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/widgets/sliders/main.cpp b/examples/widgets/sliders/main.cpp
index 4a43828d45..f2079f511b 100644
--- a/examples/widgets/sliders/main.cpp
+++ b/examples/widgets/sliders/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/widgets/sliders/sliders.pro b/examples/widgets/sliders/sliders.pro
index 7361ba1ed3..b0438072ec 100644
--- a/examples/widgets/sliders/sliders.pro
+++ b/examples/widgets/sliders/sliders.pro
@@ -10,10 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sliders.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/sliders
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/widgets/softkeys/softkeys.pro b/examples/widgets/softkeys/softkeys.pro
index e0be830b4d..5473069bb1 100644
--- a/examples/widgets/softkeys/softkeys.pro
+++ b/examples/widgets/softkeys/softkeys.pro
@@ -9,10 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS softkeys.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/softkeys
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000CF6B
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/widgets/spinboxes/main.cpp b/examples/widgets/spinboxes/main.cpp
index 4a43828d45..f2079f511b 100644
--- a/examples/widgets/spinboxes/main.cpp
+++ b/examples/widgets/spinboxes/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/widgets/spinboxes/spinboxes.pro b/examples/widgets/spinboxes/spinboxes.pro
index 11d5aa1d41..e19e33178d 100644
--- a/examples/widgets/spinboxes/spinboxes.pro
+++ b/examples/widgets/spinboxes/spinboxes.pro
@@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spinboxes.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/spinboxes
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/widgets/styles/styles.pro b/examples/widgets/styles/styles.pro
index a3d0e92ee8..fef1dc6084 100644
--- a/examples/widgets/styles/styles.pro
+++ b/examples/widgets/styles/styles.pro
@@ -13,10 +13,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styles.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/styles
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/widgets/stylesheet/main.cpp b/examples/widgets/stylesheet/main.cpp
index 6259969f2d..2c05ee950d 100644
--- a/examples/widgets/stylesheet/main.cpp
+++ b/examples/widgets/stylesheet/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/widgets/stylesheet/stylesheet.pro b/examples/widgets/stylesheet/stylesheet.pro
index 7d699a654f..4d609a9210 100644
--- a/examples/widgets/stylesheet/stylesheet.pro
+++ b/examples/widgets/stylesheet/stylesheet.pro
@@ -13,10 +13,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images layouts qss
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/stylesheet
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/widgets/symbianvibration/main.cpp b/examples/widgets/symbianvibration/main.cpp
deleted file mode 100644
index c6e0abbd3b..0000000000
--- a/examples/widgets/symbianvibration/main.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui/QApplication>
-#include "mainwindow.h"
-
-int main(int argc, char *argv[])
-{
- QApplication a(argc, argv);
- MainWindow w;
-#if defined(Q_WS_S60)
- w.showMaximized();
-#else
- w.show();
-#endif
- return a.exec();
-}
diff --git a/examples/widgets/symbianvibration/mainwindow.cpp b/examples/widgets/symbianvibration/mainwindow.cpp
deleted file mode 100644
index d43877cda7..0000000000
--- a/examples/widgets/symbianvibration/mainwindow.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui/QMenuBar>
-#include "mainwindow.h"
-#include "vibrationsurface.h"
-#include "xqvibra.h"
-
-//! [0]
-MainWindow::MainWindow(QWidget *parent)
- : QMainWindow(parent)
-{
- vibra = new XQVibra(this);
- setCentralWidget(new VibrationSurface(vibra, this));
- menuBar()->addAction(tr("Vibrate"), this, SLOT(vibrate()));
-}
-//! [0]
-
-//! [1]
-void MainWindow::vibrate()
-{
- vibra->setIntensity(75);
- vibra->start(2500);
-}
-//! [1]
-
diff --git a/examples/widgets/symbianvibration/mainwindow.h b/examples/widgets/symbianvibration/mainwindow.h
deleted file mode 100644
index c555cc5e4e..0000000000
--- a/examples/widgets/symbianvibration/mainwindow.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QtGui/QMainWindow>
-class XQVibra;
-
-//! [0]
-class MainWindow : public QMainWindow
-{
- Q_OBJECT
-
-public:
- MainWindow(QWidget *parent = 0);
-
-private slots:
- void vibrate();
-
-private:
- XQVibra *vibra;
-};
-//! [0]
-
-#endif // MAINWINDOW_H
diff --git a/examples/widgets/symbianvibration/symbianvibration.pro b/examples/widgets/symbianvibration/symbianvibration.pro
deleted file mode 100644
index d99b76d9e1..0000000000
--- a/examples/widgets/symbianvibration/symbianvibration.pro
+++ /dev/null
@@ -1,39 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2010-06-14T10:09:27
-#
-#-------------------------------------------------
-
-QT += core gui
-
-TARGET = symbianvibration
-TEMPLATE = app
-
-
-SOURCES += main.cpp\
- mainwindow.cpp \
- vibrationsurface.cpp \
- xqvibra.cpp \
- xqvibra_p.cpp
-
-HEADERS += mainwindow.h \
- vibrationsurface.h \
- xqvibra.h \
- xqvibra_p.h
-
-CONFIG += mobility
-MOBILITY =
-
-symbian {
- TARGET.UID3 = 0xecf47018
- # TARGET.CAPABILITY +=
- TARGET.EPOCSTACKSIZE = 0x14000
- TARGET.EPOCHEAPSIZE = 0x020000 0x800000
- LIBS += -lhwrmvibraclient
- include($$PWD/../../symbianpkgrules.pri)
-}
-
-!symbian {
- error(The Symbian Vibration Example only works for the Symbian target!)
-}
-
diff --git a/examples/widgets/symbianvibration/vibrationsurface.cpp b/examples/widgets/symbianvibration/vibrationsurface.cpp
deleted file mode 100644
index e06241d179..0000000000
--- a/examples/widgets/symbianvibration/vibrationsurface.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "vibrationsurface.h"
-#include <QtGui/QPainter>
-#include <QtCore/QLine>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QScreen>
-#include <QtCore/QRect>
-#include <QtGui/QColor>
-
-#include "xqvibra.h"
-
-//! [4]
-const int NumberOfLevels = 10;
-const double IntensityFactor = XQVibra::MaxIntensity / NumberOfLevels;
-//! [4]
-
-VibrationSurface::VibrationSurface(XQVibra *vibra, QWidget *parent) :
- QWidget(parent),
- vibra(vibra),
- lastIntensity(0)
-{
-}
-
-//! [0]
-void VibrationSurface::mousePressEvent(QMouseEvent *event)
-{
- applyIntensity(event->x(), event->y());
- vibra->start();
-}
-//! [0]
-
-//! [1]
-void VibrationSurface::mouseMoveEvent(QMouseEvent *event)
-{
- applyIntensity(event->x(), event->y());
-}
-//! [1]
-
-//! [2]
-void VibrationSurface::mouseReleaseEvent(QMouseEvent *)
-{
- vibra->stop();
-}
-//! [2]
-
-//! [5]
-void VibrationSurface::paintEvent(QPaintEvent *)
-{
- QPainter painter(this);
- QRect rect = geometry();
- int dx = 0, dy = 0;
-
- if (height() > width()) {
- dy = height() / NumberOfLevels;
- rect.setHeight(dy);
- } else {
- dx = width() / NumberOfLevels;
- rect.setWidth(dx);
- }
-//! [5]
-//! [6]
- for (int i = 0; i < NumberOfLevels; i++) {
- int x = i * dx;
- int y = i * dy;
- int intensity = getIntensity(x, y);
- QColor color = QColor(40, 80, 10).lighter(100 + intensity);
-
- rect.moveTo(x, y);
- painter.fillRect(rect, color);
- painter.setPen(color.darker());
- painter.drawText(rect, Qt::AlignCenter, QString::number(intensity));
- }
-}
-//! [6]
-
-//! [7]
-int VibrationSurface::getIntensity(int x, int y)
-{
- int level;
- int coord;
-
- if (height() > width()) {
- level = height() / NumberOfLevels;
- coord = y;
- } else {
- level = width() / NumberOfLevels;
- coord = x;
- }
-
- if (level == 0) {
- return 0;
- }
-//! [7]
-//! [8]
- int intensity = (coord / level + 1) * IntensityFactor;
-
- if (intensity < 0) {
- intensity = 0;
- } else if (intensity > XQVibra::MaxIntensity) {
- intensity = XQVibra::MaxIntensity;
- }
-
- return intensity;
-}
-//! [8]
-
-//! [3]
-void VibrationSurface::applyIntensity(int x, int y)
-{
- int intensity = getIntensity(x, y);
-
- if (intensity != lastIntensity) {
- vibra->setIntensity(intensity);
- lastIntensity = intensity;
- }
-}
-//! [3]
-
diff --git a/examples/widgets/symbianvibration/vibrationsurface.h b/examples/widgets/symbianvibration/vibrationsurface.h
deleted file mode 100644
index 2c4f3e56e1..0000000000
--- a/examples/widgets/symbianvibration/vibrationsurface.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef TOUCHAREA_H
-#define TOUCHAREA_H
-
-#include <QWidget>
-
-class XQVibra;
-
-//! [0]
-class VibrationSurface : public QWidget
-{
- Q_OBJECT
-public:
- explicit VibrationSurface(XQVibra *vibra, QWidget *parent = 0);
-
-protected:
- virtual void mousePressEvent(QMouseEvent *);
- virtual void mouseMoveEvent(QMouseEvent *);
- virtual void mouseReleaseEvent(QMouseEvent *);
- virtual void paintEvent(QPaintEvent *);
-
-private:
-
- int getIntensity(int x, int y);
- void applyIntensity(int x, int y);
-
- XQVibra *vibra;
- int lastIntensity;
-};
-//! [0]
-
-#endif // TOUCHAREA_H
diff --git a/examples/widgets/symbianvibration/xqvibra.cpp b/examples/widgets/symbianvibration/xqvibra.cpp
deleted file mode 100644
index ba1b0b1f05..0000000000
--- a/examples/widgets/symbianvibration/xqvibra.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "xqvibra.h"
-#include "xqvibra_p.h"
-
-/*!
- \class XQVibra
-
- \brief The XQVibra class is used to control the device's vibra. The XQVibra
- class provides also information of vibration setting in the user profile.
-
- Example:
- \code
- XQVibra *vibra = new XQVibra(this);
- QPushButton *startButton = new QPushButton(this);
- QPushButton *stopButton = new QPushButton(this);
- connect(startButton, SIGNAL(clicked()), vibra, SLOT(start()));
- connect(stopButton, SIGNAL(clicked()), vibra, SLOT(stop()));
- \endcode
-*/
-
-/*! \var XQVibra::InfiniteDuration
- With this constant vibration can be set to work indefinitely (Note! Depends on the HW)
-*/
-/*! \var XQVibra::MaxIntensity
- Maximum intensity as percentages
-*/
-/*! \var XQVibra::MinIntensity
- Minumum intensity as percentages
-*/
-
-/*!
- Constructs a XQVibra object with the given parent.
- Call error() to get a value of XQVibra::Error that indicates which error occurred during initialisation if any.
- \sa start(), setIntensity(), error()
-*/
-XQVibra::XQVibra(QObject *parent)
- : QObject(parent), d(new XQVibraPrivate(this))
-{
-}
-
-/*!
- Destroys the XQVibra object.
-*/
-XQVibra::~XQVibra()
-{
- delete d;
-}
-
-/*!
- \enum XQVibra::Error
-
- This enum defines the possible errors for a XQVibra object.
-*/
-/*! \var XQVibra::Error XQVibra::NoError
- No error occured.
-*/
-/*! \var XQVibra::Error XQVibra::OutOfMemoryError
- Not enough memory.
-*/
-/*! \var XQVibra::Error XQVibra::ArgumentError
- Duration is invalid.
-*/
-/*! \var XQVibra::Error XQVibra::VibraInUseError
- Vibra is already in used by other client.
-*/
-/*! \var XQVibra::Error XQVibra::HardwareError
- There is a hardware error.
-*/
-/*! \var XQVibra::Error XQVibra::TimeOutError
- Timeout occurred in controlling vibra.
-*/
-/*! \var XQVibra::Error XQVibra::VibraLockedError
- Vibra is locked down because too much continuous use or explicitly blocked by
- for example some vibration sensitive accessory.
-*/
-/*! \var XQVibra::Error XQVibra::AccessDeniedError
- Vibration setting in the user profile is not set.
-*/
-/*! \var XQVibra::Error XQVibra::UnknownError
- Unknown error.
-*/
-
-/*!
- \enum XQVibra::Status
-
- This enum defines the possible statuses of the vibration
-*/
-/*! \var XQVibra::Status XQVibra::StatusNotAllowed
- Vibra is set off in the user profile or status is unknow
-*/
-/*! \var XQVibra::Status XQVibra::StatusOff
- Vibration is non-active
-*/
-/*! \var XQVibra::Status XQVibra::StatusOn
- Vibration is active
-*/
-
-/*!
- Starts vibrating. If duration hasn't been set the vibration continues
- indefinitely unless stopped with stop() function. Calling the start while vibration
- is active the active vibration is interrupted and the new vibration starts immediately.
-
- \param duration Specifies duration how long vibration should last
- \return If false is returned, an error has occurred. Call error() to get a value of
- XQVibra::Error that indicates which error occurred
- \sa stop(), setIntensity(), error()
-*/
-bool XQVibra::start(int duration)
-{
- return d->start(duration);
-}
-
-/*!
- Interrupts the device vibration immediately.
-
- \return If false is returned, an error has occurred. Call error() to get a value of
- XQVibra::Error that indicates which error occurred
- \sa start(), setIntensity(), error()
-*/
-bool XQVibra::stop()
-{
- return d->stop();
-}
-
-/*!
- Sets the intensity of the vibration. Allowed values for the intensity are
- between -100 and 100. 0 means no vibrating. NOTE: The device might have
- hardware-imposed limits on supported vibra intensity values, so actual
- effect might vary between different hardware.
-
- \param intensity Intensity of the vibra in decimals
- \return If false is returned, an error has occurred. Call error() to get a value of
- XQVibra::Error that indicates which error occurred
- \sa error()
-*/
-bool XQVibra::setIntensity(int intensity)
-{
- return d->setIntensity(intensity);
-}
-
-/*!
- Returns the current status of the vibration. This function can be used to check has vibration
- allowed in the user profile.
-
- \return current status
- \sa statusChanged()
-*/
-XQVibra::Status XQVibra::currentStatus() const
-{
- return d->currentStatus();
-}
-
-/*!
- Returns the type of error that occurred if the latest function call failed; otherwise returns NoError
- \return Error code
-*/
-XQVibra::Error XQVibra::error() const
-{
- return d->error();
-}
-
-/*!
- \fn void XQVibra::statusChanged(Status status)
-
- This signal is emitted when the there is a change of the vibration status.
-
- \param status a vibration status
- \sa currentStatus()
-*/
-
-// End of file
diff --git a/examples/widgets/symbianvibration/xqvibra.h b/examples/widgets/symbianvibration/xqvibra.h
deleted file mode 100644
index 7eb8697266..0000000000
--- a/examples/widgets/symbianvibration/xqvibra.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef XQVIBRA_H
-#define XQVIBRA_H
-
-// INCLUDES
-#include <QObject>
-
-// FORWARD DECLARATIONS
-class XQVibraPrivate;
-
-// CLASS DECLARATION
-//! [0]
-class XQVibra : public QObject
-{
- Q_OBJECT
-
-public:
- static const int InfiniteDuration = 0;
- static const int MaxIntensity = 100;
- static const int MinIntensity = -100;
-
- enum Error {
- NoError = 0,
- OutOfMemoryError,
- ArgumentError,
- VibraInUseError,
- HardwareError,
- TimeOutError,
- VibraLockedError,
- AccessDeniedError,
- UnknownError = -1
- };
-
- enum Status {
- StatusNotAllowed = 0,
- StatusOff,
- StatusOn
- };
-
- XQVibra(QObject *parent = 0);
- ~XQVibra();
-
- XQVibra::Status currentStatus() const;
- XQVibra::Error error() const;
-
-Q_SIGNALS:
- void statusChanged(XQVibra::Status status);
-
-public Q_SLOTS:
- bool start(int duration = InfiniteDuration);
- bool stop();
- bool setIntensity(int intensity);
-
-private:
- friend class XQVibraPrivate;
- XQVibraPrivate *d;
-};
-//! [0]
-
-#endif // XQVIBRA_H
-
-// End of file
diff --git a/examples/widgets/symbianvibration/xqvibra_p.cpp b/examples/widgets/symbianvibration/xqvibra_p.cpp
deleted file mode 100644
index 145434c52f..0000000000
--- a/examples/widgets/symbianvibration/xqvibra_p.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "xqvibra_p.h"
-
-const int KDefaultIntensity = 0xFF;
-
-XQVibraPrivate::XQVibraPrivate(XQVibra *vibra)
- : q(vibra), iStatus(XQVibra::StatusOff), iDuration(XQVibra::InfiniteDuration), iIntensity(KDefaultIntensity)
-
-{
- TRAP(iError, iVibra = CHWRMVibra::NewL();)
- QObject::connect(&iTimer, SIGNAL(timeout()), q, SLOT(stop()));
-}
-
-XQVibraPrivate::~XQVibraPrivate()
-{
- delete iVibra;
-}
-
-bool XQVibraPrivate::start(int aDuration)
-{
- iDuration = aDuration;
- TRAP(iError,
- if (iIntensity == KDefaultIntensity) {
- iVibra->StartVibraL(XQVibra::InfiniteDuration);
- } else {
- iVibra->StopVibraL();
- iVibra->StartVibraL(XQVibra::InfiniteDuration, iIntensity);
- }
-
- if (aDuration != XQVibra::InfiniteDuration) {
- iTimer.start(aDuration);
- } else {
- iTimer.stop();
- }
-
- if (iStatus != XQVibra::StatusOn) {
- iStatus = XQVibra::StatusOn;
- emit q->statusChanged(iStatus);
- }
- )
- return (iError == KErrNone);
-}
-
-bool XQVibraPrivate::stop()
-{
- TRAP(iError,
- if (iVibra->VibraStatus() == CHWRMVibra::EVibraStatusOn) {
- iVibra->StopVibraL();
- if (iTimer.isActive()) {
- iTimer.stop();
- }
- }
-
- iStatus = XQVibra::StatusOff;
- emit q->statusChanged(iStatus);
- )
- return (iError == KErrNone);
-}
-
-void XQVibraPrivate::VibraModeChanged(CHWRMVibra::TVibraModeState /*aStatus*/)
-{
- // Implementation isn't needed here because this information isn't used in the public side of the extension
-}
-
-void XQVibraPrivate::VibraStatusChanged(CHWRMVibra::TVibraStatus aStatus)
-{
- if (aStatus == CHWRMVibra::EVibraStatusUnknown ||
- aStatus == CHWRMVibra::EVibraStatusNotAllowed) {
- iStatus = XQVibra::StatusNotAllowed;
- emit q->statusChanged(iStatus);
- }
-
- if (iDuration == XQVibra::InfiniteDuration) {
- if (iStatus != XQVibra::StatusOff) {
- iStatus = XQVibra::StatusOff;
- emit q->statusChanged(iStatus);
- }
- }
-}
-
-bool XQVibraPrivate::setIntensity(int aIntensity)
-{
- TRAP(iError,
- if (aIntensity >= KHWRMVibraMinIntensity && aIntensity <= KHWRMVibraMaxIntensity) {
- iIntensity = aIntensity;
- if (iIntensity == 0 && iStatus == XQVibra::StatusOn) {
- iVibra->StopVibraL();
- } else if (iStatus == XQVibra::StatusOn) {
- iVibra->StopVibraL();
- iVibra->StartVibraL(XQVibra::InfiniteDuration, iIntensity);
- }
- } else {
- User::Leave(KErrArgument);
- }
- )
- return (iError == KErrNone);
-}
-
-XQVibra::Status XQVibraPrivate::currentStatus() const
-{
- if (iVibra->VibraStatus() == CHWRMVibra::EVibraStatusUnknown ||
- iVibra->VibraStatus() == CHWRMVibra::EVibraStatusNotAllowed) {
- return XQVibra::StatusNotAllowed;
- }
- return iStatus;
-}
-
-XQVibra::Error XQVibraPrivate::error() const
-{
- switch (iError) {
- case KErrNone:
- return XQVibra::NoError;
- case KErrNoMemory:
- return XQVibra::OutOfMemoryError;
- case KErrArgument:
- return XQVibra::ArgumentError;
- case KErrInUse:
- return XQVibra::VibraInUseError;
- case KErrGeneral:
- return XQVibra::HardwareError;
- case KErrTimedOut:
- return XQVibra::TimeOutError;
- case KErrLocked:
- return XQVibra::VibraLockedError;
- case KErrAccessDenied:
- return XQVibra::AccessDeniedError;
- default:
- return XQVibra::UnknownError;
- }
-}
-
-// End of file
diff --git a/examples/widgets/symbianvibration/xqvibra_p.h b/examples/widgets/symbianvibration/xqvibra_p.h
deleted file mode 100644
index a8be0193e2..0000000000
--- a/examples/widgets/symbianvibration/xqvibra_p.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef XQVIBRA_P_H
-#define XQVIBRA_P_H
-
-// INCLUDES
-#include "xqvibra.h"
-#include <hwrmvibra.h>
-#include <QTimer>
-
-// CLASS DECLARATION
-class XQVibraPrivate: public CBase, public MHWRMVibraObserver
-{
-
-public:
- XQVibraPrivate(XQVibra *vibra);
- ~XQVibraPrivate();
-
- bool start(int aDuration = XQVibra::InfiniteDuration);
- bool stop();
- bool setIntensity(int aIntensity);
- XQVibra::Status currentStatus() const;
- XQVibra::Error error() const;
-
-private: // From MHWRMVibraObserver
- void VibraModeChanged(CHWRMVibra::TVibraModeState aStatus);
- void VibraStatusChanged(CHWRMVibra::TVibraStatus aStatus);
-
-private:
- XQVibra *q;
- XQVibra::Status iStatus;
- CHWRMVibra *iVibra;
- QTimer iTimer;
- int iDuration;
- int iIntensity;
- int iError;
-};
-
-#endif /*XQVIBRA_P_H*/
-
-// End of file
diff --git a/examples/widgets/tablet/main.cpp b/examples/widgets/tablet/main.cpp
index a7a054a666..40c41bfc9a 100644
--- a/examples/widgets/tablet/main.cpp
+++ b/examples/widgets/tablet/main.cpp
@@ -52,14 +52,8 @@ int main(int argv, char *args[])
app.setCanvas(canvas);
MainWindow mainWindow(canvas);
-#if defined(Q_OS_SYMBIAN)
- mainWindow.showMaximized();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- mainWindow.show();
-#else
mainWindow.resize(500, 500);
mainWindow.show();
-#endif
return app.exec();
}
//! [0]
diff --git a/examples/widgets/tablet/tablet.pro b/examples/widgets/tablet/tablet.pro
index 4788fad2c7..9ad533fc64 100644
--- a/examples/widgets/tablet/tablet.pro
+++ b/examples/widgets/tablet/tablet.pro
@@ -12,10 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tablet.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tablet
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/widgets/tetrix/main.cpp b/examples/widgets/tetrix/main.cpp
index b10764387a..6c30ae5cae 100644
--- a/examples/widgets/tetrix/main.cpp
+++ b/examples/widgets/tetrix/main.cpp
@@ -48,11 +48,7 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
TetrixWindow window;
-#if defined(Q_OS_SYMBIAN)
- window.showMaximized();
-#else
window.show();
-#endif
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
return app.exec();
}
diff --git a/examples/widgets/tetrix/tetrix.pro b/examples/widgets/tetrix/tetrix.pro
index d9fff26fef..6e8a270335 100644
--- a/examples/widgets/tetrix/tetrix.pro
+++ b/examples/widgets/tetrix/tetrix.pro
@@ -12,10 +12,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tetrix.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tetrix
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000C606
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/widgets/tooltips/main.cpp b/examples/widgets/tooltips/main.cpp
index 5fba6cc1d6..893b65da86 100644
--- a/examples/widgets/tooltips/main.cpp
+++ b/examples/widgets/tooltips/main.cpp
@@ -49,10 +49,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
SortingBox sortingBox;
-#if defined(Q_OS_SYMBIAN)
- sortingBox.showMaximized();
-#else
sortingBox.show();
-#endif
return app.exec();
}
diff --git a/examples/widgets/tooltips/tooltips.pro b/examples/widgets/tooltips/tooltips.pro
index d19c1d9bc1..76a6cd00f8 100644
--- a/examples/widgets/tooltips/tooltips.pro
+++ b/examples/widgets/tooltips/tooltips.pro
@@ -11,6 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tooltips.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tooltips
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/widgets/validators/main.cpp b/examples/widgets/validators/main.cpp
index 748a36125d..5e5765e957 100644
--- a/examples/widgets/validators/main.cpp
+++ b/examples/widgets/validators/main.cpp
@@ -128,11 +128,7 @@ int main(int argc, char **argv)
QApplication app(argc, argv);
ValidatorWidget w;
-#if defined(Q_OS_SYMBIAN)
- w.showMaximized();
-#else
w.show();
-#endif
return app.exec();
}
diff --git a/examples/widgets/validators/validators.pro b/examples/widgets/validators/validators.pro
index 406a5f442a..f4cab8edac 100644
--- a/examples/widgets/validators/validators.pro
+++ b/examples/widgets/validators/validators.pro
@@ -20,10 +20,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/validators
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/widgets/widgets.pro b/examples/widgets/widgets.pro
index 232657eabe..51a92bcc29 100644
--- a/examples/widgets/widgets.pro
+++ b/examples/widgets/widgets.pro
@@ -23,20 +23,7 @@ SUBDIRS = analogclock \
tooltips \
validators \
wiggly \
- windowflags \
-
-symbian: SUBDIRS = \
- analogclock \
- calculator \
- calendarwidget \
- lineedits \
- shapedclock \
- symbianvibration \
- tetrix \
- wiggly \
- softkeys
-
-MAEMO5: SUBDIRS += maemovibration
+ windowflags
contains(styles, motif): SUBDIRS += styles
@@ -46,6 +33,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS widgets.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/widgets/wiggly/main.cpp b/examples/widgets/wiggly/main.cpp
index 0b9222864f..c64e352f47 100644
--- a/examples/widgets/wiggly/main.cpp
+++ b/examples/widgets/wiggly/main.cpp
@@ -47,9 +47,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
bool smallScreen = QApplication::arguments().contains("-small-screen");
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_HILDON) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- smallScreen = true;
-#endif
Dialog dialog(0, smallScreen);
diff --git a/examples/widgets/wiggly/wiggly.pro b/examples/widgets/wiggly/wiggly.pro
index 8a1bec3100..6b89cd1769 100644
--- a/examples/widgets/wiggly/wiggly.pro
+++ b/examples/widgets/wiggly/wiggly.pro
@@ -11,10 +11,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/wiggly
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS wiggly.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/wiggly
INSTALLS += target sources
-
-symbian {
- TARGET.UID3 = 0xA000C607
- CONFIG += qt_example
-}
-maemo5: CONFIG += qt_example
-
diff --git a/examples/widgets/windowflags/main.cpp b/examples/widgets/windowflags/main.cpp
index 941a3fadf7..8dd71ed0a5 100644
--- a/examples/widgets/windowflags/main.cpp
+++ b/examples/widgets/windowflags/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
ControllerWindow controller;
-#if defined(Q_OS_SYMBIAN)
- controller.showMaximized();
-#else
controller.show();
-#endif
return app.exec();
}
diff --git a/examples/widgets/windowflags/windowflags.pro b/examples/widgets/windowflags/windowflags.pro
index 9a781cdce3..b063b8ab2c 100644
--- a/examples/widgets/windowflags/windowflags.pro
+++ b/examples/widgets/windowflags/windowflags.pro
@@ -10,10 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windowflags.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/windowflags
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/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(),
diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro
index 7a58ed35a0..bf2387831c 100644
--- a/examples/xml/htmlinfo/htmlinfo.pro
+++ b/examples/xml/htmlinfo/htmlinfo.pro
@@ -5,7 +5,7 @@ RESOURCES = resources.qrc
win32: CONFIG += console
-wince*|symbian:{
+wince*:{
htmlfiles.files = *.html
htmlfiles.path = .
DEPLOYMENT += htmlfiles
@@ -16,11 +16,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/htmlinfo
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.html htmlinfo.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/htmlinfo
INSTALLS += target sources
-
-symbian {
- TARGET.UID3 = 0xA000C609
- CONFIG += qt_example
-}
-maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/xml/rsslisting/main.cpp b/examples/xml/rsslisting/main.cpp
index 7d2b4ca10f..a646c602db 100644
--- a/examples/xml/rsslisting/main.cpp
+++ b/examples/xml/rsslisting/main.cpp
@@ -58,10 +58,6 @@ int main(int argc, char **argv)
{
QApplication app(argc, argv);
RSSListing *rsslisting = new RSSListing;
-#if defined(Q_OS_SYMBIAN)
- rsslisting->showMaximized();
-#else
rsslisting->show();
-#endif
return app.exec();
}
diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/xml/rsslisting/rsslisting.cpp
index ba9ff28072..4fa160f9ed 100644
--- a/examples/xml/rsslisting/rsslisting.cpp
+++ b/examples/xml/rsslisting/rsslisting.cpp
@@ -74,23 +74,6 @@ its operation, and also allows very large data sources to be read.
RSSListing::RSSListing(QWidget *parent)
: QWidget(parent), currentReply(0)
{
-#ifdef Q_OS_SYMBIAN
- // Set Internet Access Point
- QNetworkConfigurationManager manager;
- const bool canStartIAP = manager.capabilities() & QNetworkConfigurationManager::CanStartAndStopInterfaces;
-
- // Is there default access point, use it
- QNetworkConfiguration cfg = manager.defaultConfiguration();
- if (!cfg.isValid() || !canStartIAP) {
- // Available Access Points not found
- QMessageBox::warning(this, "Error", "No access point");
- return;
- }
-
- m_session = new QNetworkSession(cfg);
- m_session->open();
- m_session->waitForOpened();
-#endif
lineEdit = new QLineEdit(this);
lineEdit->setText("http://labs.qt.nokia.com/blogs/feed");
@@ -122,9 +105,7 @@ RSSListing::RSSListing(QWidget *parent)
layout->addWidget(treeWidget);
setWindowTitle(tr("RSS listing example"));
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5)
resize(640,480);
-#endif
}
/*
diff --git a/examples/xml/rsslisting/rsslisting.h b/examples/xml/rsslisting/rsslisting.h
index 49c694092c..22d222e2b9 100644
--- a/examples/xml/rsslisting/rsslisting.h
+++ b/examples/xml/rsslisting/rsslisting.h
@@ -48,15 +48,6 @@
#include <QXmlStreamReader>
#include <QUrl>
-#ifdef Q_OS_SYMBIAN
-// Bearer
-#include <QNetworkConfigurationManager>
-#include <QNetworkSession>
-#include <QPointer>
-
-// QtMobility namespace
-QTM_USE_NAMESPACE
-#endif
QT_BEGIN_NAMESPACE
class QLineEdit;
@@ -95,10 +86,6 @@ private:
QTreeWidget *treeWidget;
QPushButton *fetchButton;
-#ifdef Q_OS_SYMBIAN
- // for bearer management
- QPointer<QNetworkSession> m_session;
-#endif
};
#endif
diff --git a/examples/xml/rsslisting/rsslisting.pro b/examples/xml/rsslisting/rsslisting.pro
index 551be70db7..b0920cc8e7 100644
--- a/examples/xml/rsslisting/rsslisting.pro
+++ b/examples/xml/rsslisting/rsslisting.pro
@@ -7,16 +7,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/rsslisting
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS rsslisting.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/rsslisting
INSTALLS += target sources
-
-symbian {
- CONFIG += qt_example
-
- # For QtMobility
- CONFIG += mobility
- MOBILITY = bearer
-
- # For QtMobility
- TARGET.CAPABILITY = NetworkServices
-}
-
-maemo5: CONFIG += qt_example
diff --git a/examples/xml/saxbookmarks/main.cpp b/examples/xml/saxbookmarks/main.cpp
index 5d70ec89a5..71ce6aec0b 100644
--- a/examples/xml/saxbookmarks/main.cpp
+++ b/examples/xml/saxbookmarks/main.cpp
@@ -46,11 +46,7 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
MainWindow mainWin;
-#if defined(Q_OS_SYMBIAN)
- mainWin.showFullScreen();
-#else
mainWin.show();
-#endif
mainWin.open();
return app.exec();
}
diff --git a/examples/xml/saxbookmarks/mainwindow.cpp b/examples/xml/saxbookmarks/mainwindow.cpp
index 93aae7f906..0f65c1f71c 100644
--- a/examples/xml/saxbookmarks/mainwindow.cpp
+++ b/examples/xml/saxbookmarks/mainwindow.cpp
@@ -65,15 +65,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(),
diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro
index 22d96f5b96..4d2a2800fb 100644
--- a/examples/xml/saxbookmarks/saxbookmarks.pro
+++ b/examples/xml/saxbookmarks/saxbookmarks.pro
@@ -18,13 +18,3 @@ wince*: {
addFiles.path = "\\My Documents"
DEPLOYMENT += addFiles
}
-
-symbian: {
- TARGET.UID3 = 0xA000C60A
- CONFIG += qt_example
- addFiles.files = frank.xbel jennifer.xbel
- addFiles.path = /data/qt/saxbookmarks
- DEPLOYMENT += addFiles
-}
-maemo5: CONFIG += qt_example
-
diff --git a/examples/xml/streambookmarks/main.cpp b/examples/xml/streambookmarks/main.cpp
index d909c01b51..c44e921e82 100644
--- a/examples/xml/streambookmarks/main.cpp
+++ b/examples/xml/streambookmarks/main.cpp
@@ -47,9 +47,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
MainWindow mainWin;
-#ifdef Q_OS_SYMBIAN
- mainWin.showFullScreen();
-#endif
mainWin.show();
mainWin.open();
return app.exec();
diff --git a/examples/xml/streambookmarks/mainwindow.cpp b/examples/xml/streambookmarks/mainwindow.cpp
index 780b2b82d1..ed765995e7 100644
--- a/examples/xml/streambookmarks/mainwindow.cpp
+++ b/examples/xml/streambookmarks/mainwindow.cpp
@@ -68,15 +68,6 @@ MainWindow::MainWindow()
//! [1]
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(),
@@ -112,15 +103,6 @@ void MainWindow::open()
//! [2]
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(),
diff --git a/examples/xml/streambookmarks/streambookmarks.pro b/examples/xml/streambookmarks/streambookmarks.pro
index de9b1ab5a1..3342d5ee35 100644
--- a/examples/xml/streambookmarks/streambookmarks.pro
+++ b/examples/xml/streambookmarks/streambookmarks.pro
@@ -12,11 +12,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/streambookmarks
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS streambookmarks.pro *.xbel
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/streambookmarks
INSTALLS += target sources
-
-symbian: {
- CONFIG += qt_example
- addFiles.sources = frank.xbel jennifer.xbel
- addFiles.path = /data/qt/streambookmarks
- DEPLOYMENT += addFiles
-}
-maemo5: CONFIG += qt_example
diff --git a/examples/xml/xml.pro b/examples/xml/xml.pro
index 3c93131aad..cb28fe31d1 100644
--- a/examples/xml/xml.pro
+++ b/examples/xml/xml.pro
@@ -9,7 +9,6 @@ SUBDIRS = htmlinfo \
streambookmarks
}
-symbian: SUBDIRS = htmlinfo saxbookmarks
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml
@@ -17,6 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xml.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/xml/xmlstreamlint/xmlstreamlint.pro b/examples/xml/xmlstreamlint/xmlstreamlint.pro
index 32e95c5ce5..cfcecf0391 100644
--- a/examples/xml/xmlstreamlint/xmlstreamlint.pro
+++ b/examples/xml/xmlstreamlint/xmlstreamlint.pro
@@ -9,8 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xmlstreamlint.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/xmlstreamlint
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)