diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-05 17:22:19 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-06 05:26:01 +0100 |
| commit | c97f5f8c2e91c1b76d42583efaf232487d490060 (patch) | |
| tree | 533f1142282ebce38bbf7bd4356b4341530f30be /examples | |
| parent | bc7d964a053a3a37a0b286ee17ee15c9ef747c3e (diff) | |
Properly handle the case where QtWidgets is not available.
It does use a config test for now, just to make it clearer. The Mac
backend currently requires widgets, but most of the others should work
without it (just not supporting QVideoWidget/WindowControl).
The QVideoDeviceControl interface was modified to remove the QIcon
usage - it was never implemented.
Unfortunately even the QML examples need widgets for the wrapper
application, and will need to be ported to QtGui based wrapper.
Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pro | 39 | ||||
| -rw-r--r-- | examples/video/video.pro | 14 |
2 files changed, 23 insertions, 30 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 923380eda..ef1cc1147 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,22 +1,27 @@ TEMPLATE = subdirs -SUBDIRS += \ - radio \ - camera \ - slideshow \ - spectrum \ - audiorecorder \ - audiodevices \ - audioinput \ - audiooutput \ - videographicsitem \ - videowidget \ - video \ - player \ +# These examples all need widgets for now (using creator templates that use widgets) +contains(config_test_widgets, yes) { + SUBDIRS += \ + radio \ + camera \ + slideshow \ + spectrum \ + audiorecorder \ + audiodevices \ + audioinput \ + audiooutput \ + videographicsitem \ + videowidget \ + player -contains(QT_CONFIG, declarative) { - disabled:SUBDIRS += declarative-camera - SUBDIRS += declarative-radio + contains(QT_CONFIG, declarative) { + disabled:SUBDIRS += declarative-camera + SUBDIRS += \ + declarative-radio \ + video + } + + QT += widgets } -QT+=widgets diff --git a/examples/video/video.pro b/examples/video/video.pro index 4f911b2b2..a731a3468 100644 --- a/examples/video/video.pro +++ b/examples/video/video.pro @@ -1,15 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += qmlvideo - -# qmlvideofx requires QtOpenGL and ShaderEffectItem (added in Qt 4.7.4) -contains(QT_CONFIG, opengl) { - lessThan(QT_MAJOR_VERSION, 5) { - !lessThan(QT_MAJOR_VERSION, 4) { - SUBDIRS += qmlvideofx - } - } else { - SUBDIRS += qmlvideofx - } -} - +SUBDIRS += qmlvideo qmlvideofx |