diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 07:25:01 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 07:25:01 (GMT) |
| commit | 6e6a3dba2336b158bcb3db633f429edc85534b3d (patch) | |
| tree | 65ebeb098fb7feff01ab5bdee833d9de889c9e44 /demos | |
| parent | 606aee01d1f23a5baceb4bd888b2a9d4716fcc34 (diff) | |
| parent | f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b (diff) | |
| download | Qt-6e6a3dba2336b158bcb3db633f429edc85534b3d.zip Qt-6e6a3dba2336b158bcb3db633f429edc85534b3d.tar.gz Qt-6e6a3dba2336b158bcb3db633f429edc85534b3d.tar.bz2 | |
Merge branch 'master' of ../qt into kinetic-declarativeui
Conflicts:
src/gui/widgets/qlinecontrol_p.h
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/embedded/embedded.pro | 5 | ||||
| -rw-r--r-- | demos/qtdemo/xml/examples.xml | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro index 7428b9f..4fd8f9f 100644 --- a/demos/embedded/embedded.pro +++ b/demos/embedded/embedded.pro @@ -2,8 +2,9 @@ TEMPLATE = subdirs SUBDIRS = styledemo contains(QT_CONFIG, svg) { - SUBDIRS += embeddedsvgviewer \ - fluidlauncher + SUBDIRS += embeddedsvgviewer + # no QProcess + !vxworks:!qnx:SUBDIRS += fluidlauncher } # install diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index a81eead..006bfd0 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -246,5 +246,6 @@ <example filename="qobjectxmlmodel" name="QObjectXmlModel" /> <example filename="filetree" name="File Tree" /> <example filename="trafficinfo" name="Traffic Info" /> + <example filename="schema" name="XML Schema Validation" /> </category> </categories> |