diff options
author | axis <qt-info@nokia.com> | 2011-02-22 16:55:30 +0100 |
---|---|---|
committer | axis <qt-info@nokia.com> | 2011-02-24 12:53:11 +0100 |
commit | cdc6a32e5ab626620b003eb7cdb613a305b1d4d1 (patch) | |
tree | 0f5042ae627f66cea5e07dae3446bb540910637a /patches/0039-examples.pro-removed-moved-subdirectories.patch | |
parent | 1b47fe8738a7ef0d357e2b4ac58fbf579700e578 (diff) |
Moved WebKit examples and demos to their own repository.
This was agreed with the WebKit team.
Diffstat (limited to 'patches/0039-examples.pro-removed-moved-subdirectories.patch')
-rw-r--r-- | patches/0039-examples.pro-removed-moved-subdirectories.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/patches/0039-examples.pro-removed-moved-subdirectories.patch b/patches/0039-examples.pro-removed-moved-subdirectories.patch new file mode 100644 index 0000000..5a13222 --- /dev/null +++ b/patches/0039-examples.pro-removed-moved-subdirectories.patch @@ -0,0 +1,36 @@ +From 69acc00d226d00bfb257a9950dce9bcae3abc4a8 Mon Sep 17 00:00:00 2001 +From: Olivier Goffart <olivier.goffart@nokia.com> +Date: Fri, 7 Jan 2011 13:46:25 +0100 +Subject: [PATCH] examples.pro removed moved subdirectories + +--- + qtkernel/examples/examples.pro | 6 ------ + 1 files changed, 0 insertions(+), 6 deletions(-) + +diff --git a/qtkernel/examples/examples.pro b/qtkernel/examples/examples.pro +index 15436d2..5b66020 100644 +--- a/qtkernel/examples/examples.pro ++++ b/qtkernel/examples/examples.pro +@@ -49,9 +49,6 @@ symbian: SUBDIRS = \ + SUBDIRS += multimedia + } + +-contains(QT_CONFIG, script): SUBDIRS += script +- +-contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon + embedded:SUBDIRS += qws + !wince*:!symbian: { + !contains(QT_EDITION, Console):!contains(QT_CONFIG, no-gui):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer +@@ -62,9 +59,6 @@ embedded:SUBDIRS += qws + contains(QT_CONFIG, opengl): SUBDIRS += opengl + contains(QT_CONFIG, openvg): SUBDIRS += openvg + contains(QT_CONFIG, dbus): SUBDIRS += dbus +-contains(QT_CONFIG, declarative): SUBDIRS += declarative +-win32: SUBDIRS += activeqt +-contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns + contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows + contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent + +-- +1.7.3.5 + |