From ac1fee88d2a99d04bbb7a3820e76eb68c2138019 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 2 Mar 2011 13:44:28 -0600 Subject: [PATCH] Remove moved examples/demos --- demos/demos.pro | 2 -- demos/embedded/embedded.pro | 20 -------------------- examples/desktop/desktop.pro | 2 -- examples/draganddrop/draganddrop.pro | 2 -- examples/examples.pro | 2 -- examples/graphicsview/graphicsview.pro | 1 - examples/network/network.pro | 4 ---- examples/opengl/opengl.pro | 5 ----- examples/painting/painting.pro | 2 -- examples/richtext/richtext.pro | 2 -- 10 files changed, 42 deletions(-) diff --git a/demos/demos.pro b/demos/demos.pro index fe8b416ba9b..cbee2b2f427 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -48,8 +48,6 @@ SUBDIRS += demos_boxes mac* && !qpa: SUBDIRS += demos_macmainwindow wince*|symbian|embedded|x11: SUBDIRS += demos_embedded -!contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin - !cross_compile:{ contains(QT_BUILD_PARTS, tools):{ !wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro index f67ac561529..e9a448b1e30 100644 --- a/demos/embedded/embedded.pro +++ b/demos/embedded/embedded.pro @@ -1,28 +1,8 @@ TEMPLATE = subdirs SUBDIRS = styledemo raycasting flickable digiflip -contains(QT_CONFIG, svg) { - SUBDIRS += embeddedsvgviewer \ - desktopservices - fluidlauncher.subdir = fluidlauncher - fluidlauncher.depends = styledemo desktopservices raycasting flickable digiflip lightmaps flightinfo - !vxworks:!qnx:SUBDIRS += fluidlauncher -} - SUBDIRS += lightmaps SUBDIRS += flightinfo -contains(QT_CONFIG, svg) { - SUBDIRS += weatherinfo -} - -contains(QT_CONFIG, webkit) { - SUBDIRS += anomaly -} - -contains(QT_CONFIG, declarative) { - # Qml demos require DEPLOYMENT support. Therefore, only symbian. - symbian:SUBDIRS += qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter -} # install sources.files = README *.pro diff --git a/examples/desktop/desktop.pro b/examples/desktop/desktop.pro index 4bf02df0055..58c7b977fb1 100644 --- a/examples/desktop/desktop.pro +++ b/examples/desktop/desktop.pro @@ -2,8 +2,6 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = screenshot -!symbian:contains(QT_CONFIG, svg): SUBDIRS += systray - # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README diff --git a/examples/draganddrop/draganddrop.pro b/examples/draganddrop/draganddrop.pro index 9cc0e2bd2fc..8f737f1918e 100644 --- a/examples/draganddrop/draganddrop.pro +++ b/examples/draganddrop/draganddrop.pro @@ -5,8 +5,6 @@ SUBDIRS = draggableicons \ fridgemagnets \ puzzle -contains(QT_CONFIG, svg): SUBDIRS += delayedencoding - wince*: SUBDIRS -= dropsite symbian: SUBDIRS -= dropsite # install diff --git a/examples/examples.pro b/examples/examples.pro index ec0c1b02299..8efda7ba140 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -30,8 +30,6 @@ SUBDIRS = \ gestures } -contains(QT_CONFIG, webkit):SUBDIRS += webkit - symbian: SUBDIRS = \ graphicsview \ itemviews \ diff --git a/examples/graphicsview/graphicsview.pro b/examples/graphicsview/graphicsview.pro index 0abbaf9de30..a1458ded91e 100644 --- a/examples/graphicsview/graphicsview.pro +++ b/examples/graphicsview/graphicsview.pro @@ -13,7 +13,6 @@ SUBDIRS = \ simpleanchorlayout \ weatheranchorlayout -contains(QT_CONFIG, qt3support):SUBDIRS += portedcanvas portedasteroids contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot # install diff --git a/examples/network/network.pro b/examples/network/network.pro index 7f32a4ae6fc..09765a622ad 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -20,10 +20,6 @@ SUBDIRS = \ multicastreceiver \ multicastsender - contains(QT_CONFIG, svg) { - SUBDIRS += bearercloud - } - # no QProcess !vxworks:!qnx:SUBDIRS += network-chat diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 7bb5b298f2a..f9ca0bdaf4b 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -19,11 +19,6 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){ framebufferobject2 \ samplebuffers \ textures - - contains(QT_CONFIG, svg) { - SUBDIRS += framebufferobject \ - pbuffers2 - } } # install diff --git a/examples/painting/painting.pro b/examples/painting/painting.pro index ef1f57b3719..4108a64edd3 100644 --- a/examples/painting/painting.pro +++ b/examples/painting/painting.pro @@ -7,8 +7,6 @@ SUBDIRS = basicdrawing \ !wince*:!symbian: SUBDIRS += fontsampler -contains(QT_CONFIG, svg): SUBDIRS += svggenerator svgviewer - # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro index 348f467c1f8..102181ec26a 100644 --- a/examples/richtext/richtext.pro +++ b/examples/richtext/richtext.pro @@ -3,8 +3,6 @@ SUBDIRS = calendar \ orderform \ syntaxhighlighter -contains(QT_CONFIG, svg): SUBDIRS += textobject - # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS richtext.pro README