From ac1fee88d2a99d04bbb7a3820e76eb68c2138019 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 2 Mar 2011 13:44:28 -0600 Subject: Remove moved examples/demos --- demos/demos.pro | 2 -- demos/embedded/embedded.pro | 20 -------------------- 2 files changed, 22 deletions(-) (limited to 'demos') diff --git a/demos/demos.pro b/demos/demos.pro index fe8b416ba9..cbee2b2f42 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 f67ac56152..e9a448b1e3 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 -- cgit v1.2.3