summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@jollamobile.com>2014-05-12 11:52:56 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-12 12:28:44 +0200
commit7e41e842f8c6dccedd124fb0609be1a57c7c095a (patch)
tree614145530876a683e2033d5bdace5d08503103b8 /examples
parent00c072bf0eb25104086eb43e860e038af5f5d340 (diff)
downloadqtmultimedia-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')
-rw-r--r--examples/multimedia/audiorecorder/audiorecorder.cpp4
-rw-r--r--examples/multimedia/audiorecorder/audiorecorder.pro6
-rw-r--r--examples/multimedia/audiorecorder/audiorecorder_small.ui286
-rw-r--r--examples/multimediawidgets/camera/camera.cpp8
-rw-r--r--examples/multimediawidgets/player/main.cpp4
5 files changed, 1 insertions, 307 deletions
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index c77396b0f..2291fed52 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -47,11 +47,7 @@
#include "audiorecorder.h"
#include "qaudiolevel.h"
-#if defined(Q_WS_MAEMO_6)
-#include "ui_audiorecorder_small.h"
-#else
#include "ui_audiorecorder.h"
-#endif
static qreal getPeakValue(const QAudioFormat &format);
static QVector<qreal> getBufferLevels(const QAudioBuffer &buffer);
diff --git a/examples/multimedia/audiorecorder/audiorecorder.pro b/examples/multimedia/audiorecorder/audiorecorder.pro
index 7ea4c6fe2..79d6caf23 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.pro
+++ b/examples/multimedia/audiorecorder/audiorecorder.pro
@@ -14,11 +14,7 @@ SOURCES = \
audiorecorder.cpp \
qaudiolevel.cpp
-maemo*: {
- FORMS += audiorecorder_small.ui
-}else {
- FORMS += audiorecorder.ui
-}
+FORMS += audiorecorder.ui
target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiorecorder
INSTALLS += target
diff --git a/examples/multimedia/audiorecorder/audiorecorder_small.ui b/examples/multimedia/audiorecorder/audiorecorder_small.ui
deleted file mode 100644
index 2030ab963..000000000
--- a/examples/multimedia/audiorecorder/audiorecorder_small.ui
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AudioRecorder</class>
- <widget class="QMainWindow" name="AudioRecorder">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>420</width>
- <height>346</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>MainWindow</string>
- </property>
- <widget class="QWidget" name="centralwidget">
- <layout class="QGridLayout" name="gridLayout_5">
- <item row="0" column="0" colspan="3">
- <widget class="QScrollArea" name="scrollArea">
- <property name="focusPolicy">
- <enum>Qt::ClickFocus</enum>
- </property>
- <property name="widgetResizable">
- <bool>true</bool>
- </property>
- <widget class="QWidget" name="scrollAreaWidgetContents">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>400</width>
- <height>277</height>
- </rect>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <widget class="QWidget" name="widget" native="true">
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="3" column="0">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>Audio Level:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>29</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QRadioButton" name="constantQualityRadioButton">
- <property name="text">
- <string>Quality:</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QRadioButton" name="constantBitrateRadioButton">
- <property name="text">
- <string>Bitrate:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QSlider" name="qualitySlider">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="bitrateBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="0" column="0">
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="3" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>Sample rate:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Audio Codec:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QComboBox" name="containerBox"/>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="audioDeviceBox"/>
- </item>
- <item row="3" column="1">
- <widget class="QComboBox" name="sampleRateBox"/>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="audioCodecBox"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>File Container:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Input Device:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Channels:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QComboBox" name="channelsBox"/>
- </item>
- </layout>
- </item>
- <item row="4" column="0">
- <layout class="QVBoxLayout" name="levelsLayout"/>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QPushButton" name="outputButton">
- <property name="text">
- <string>Output...</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QPushButton" name="recordButton">
- <property name="text">
- <string>Record</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QPushButton" name="pauseButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Pause</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QStatusBar" name="statusbar"/>
- </widget>
- <resources/>
- <connections>
- <connection>
- <sender>constantQualityRadioButton</sender>
- <signal>toggled(bool)</signal>
- <receiver>qualitySlider</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>113</x>
- <y>197</y>
- </hint>
- <hint type="destinationlabel">
- <x>115</x>
- <y>223</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>constantBitrateRadioButton</sender>
- <signal>toggled(bool)</signal>
- <receiver>bitrateBox</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>173</x>
- <y>259</y>
- </hint>
- <hint type="destinationlabel">
- <x>190</x>
- <y>291</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>outputButton</sender>
- <signal>clicked()</signal>
- <receiver>AudioRecorder</receiver>
- <slot>setOutputLocation()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>46</x>
- <y>340</y>
- </hint>
- <hint type="destinationlabel">
- <x>6</x>
- <y>302</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>recordButton</sender>
- <signal>clicked()</signal>
- <receiver>AudioRecorder</receiver>
- <slot>toggleRecord()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>191</x>
- <y>340</y>
- </hint>
- <hint type="destinationlabel">
- <x>113</x>
- <y>317</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>pauseButton</sender>
- <signal>clicked()</signal>
- <receiver>AudioRecorder</receiver>
- <slot>togglePause()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>252</x>
- <y>334</y>
- </hint>
- <hint type="destinationlabel">
- <x>258</x>
- <y>346</y>
- </hint>
- </hints>
- </connection>
- </connections>
- <slots>
- <slot>setOutputLocation()</slot>
- <slot>toggleRecord()</slot>
- <slot>togglePause()</slot>
- </slots>
-</ui>
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;