diff options
author | Robin Burchell <robin.burchell@jollamobile.com> | 2014-05-12 11:52:56 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-12 12:28:44 +0200 |
commit | 7e41e842f8c6dccedd124fb0609be1a57c7c095a (patch) | |
tree | 614145530876a683e2033d5bdace5d08503103b8 /examples/multimediawidgets | |
parent | 00c072bf0eb25104086eb43e860e038af5f5d340 (diff) | |
download | qtmultimedia-7e41e842f8c6dccedd124fb0609be1a57c7c095a.tar.gz |
Remove some Q_WS_MAEMO_6 instances from examples.
Some of this stuff no longer worked (setGraphicsSystem..) and generally speaking
it just doesn't make much sense: widgets on Harmattan were never really a
supported platform.
Change-Id: Ia853c6b3297075f32e51d68a05121f700509632d
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'examples/multimediawidgets')
-rw-r--r-- | examples/multimediawidgets/camera/camera.cpp | 8 | ||||
-rw-r--r-- | examples/multimediawidgets/player/main.cpp | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp index abbbf8333..3afe59324 100644 --- a/examples/multimediawidgets/camera/camera.cpp +++ b/examples/multimediawidgets/camera/camera.cpp @@ -53,10 +53,6 @@ #include <QtWidgets> -#if (defined(Q_WS_MAEMO_6)) && QT_VERSION >= 0x040700 -#define HAVE_CAMERA_BUTTONS -#endif - Camera::Camera(QWidget *parent) : QMainWindow(parent), ui(new Ui::Camera), @@ -88,10 +84,6 @@ Camera::Camera(QWidget *parent) : connect(videoDevicesGroup, SIGNAL(triggered(QAction*)), SLOT(updateCameraDevice(QAction*))); connect(ui->captureWidget, SIGNAL(currentChanged(int)), SLOT(updateCaptureMode())); -#ifdef HAVE_CAMERA_BUTTONS - ui->lockButton->hide(); -#endif - setCamera(cameraDevice); } diff --git a/examples/multimediawidgets/player/main.cpp b/examples/multimediawidgets/player/main.cpp index 3009d29e2..60867ce82 100644 --- a/examples/multimediawidgets/player/main.cpp +++ b/examples/multimediawidgets/player/main.cpp @@ -44,10 +44,6 @@ int main(int argc, char *argv[]) { -#ifdef Q_WS_MAEMO_6 - //Meego graphics system conflicts with xvideo during fullscreen transition - QApplication::setGraphicsSystem("raster"); -#endif QApplication app(argc, argv); Player player; |