diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-10 15:50:55 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-10 15:50:55 (GMT) |
| commit | 1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed (patch) | |
| tree | c22f6a63c2911d52ecc11aec8662d2f682d6afda /examples | |
| parent | 492f1f4267074525e33fb8571c12d520e92163a6 (diff) | |
| parent | b7af368e86874d71ffc9071c9ef009814d6a3467 (diff) | |
| download | Qt-1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed.zip Qt-1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed.tar.gz Qt-1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/dbus/dbus-chat/chat_adaptor.h | 3 | ||||
| -rw-r--r-- | examples/dbus/remotecontrolledcar/car/car_adaptor.h | 3 | ||||
| -rw-r--r-- | examples/draganddrop/draggabletext/dragwidget.cpp | 2 | ||||
| -rw-r--r-- | examples/multimedia/audioinput/audioinput.cpp | 3 | ||||
| -rw-r--r-- | examples/multimedia/audiooutput/audiooutput.cpp | 3 |
5 files changed, 13 insertions, 1 deletions
diff --git a/examples/dbus/dbus-chat/chat_adaptor.h b/examples/dbus/dbus-chat/chat_adaptor.h index 831c4f5..47b7f8f 100644 --- a/examples/dbus/dbus-chat/chat_adaptor.h +++ b/examples/dbus/dbus-chat/chat_adaptor.h @@ -54,12 +54,15 @@ #include <QtCore/QObject> #include <QtDBus/QtDBus> + +QT_BEGIN_NAMESPACE class QByteArray; template<class T> class QList; template<class Key, class Value> class QMap; class QString; class QStringList; class QVariant; +QT_END_NAMESPACE /* * Adaptor class for interface com.trolltech.chat diff --git a/examples/dbus/remotecontrolledcar/car/car_adaptor.h b/examples/dbus/remotecontrolledcar/car/car_adaptor.h index d109883..d16972e 100644 --- a/examples/dbus/remotecontrolledcar/car/car_adaptor.h +++ b/examples/dbus/remotecontrolledcar/car/car_adaptor.h @@ -54,12 +54,15 @@ #include <QtCore/QObject> #include <QtDBus/QtDBus> + +QT_BEGIN_NAMESPACE class QByteArray; template<class T> class QList; template<class Key, class Value> class QMap; class QString; class QStringList; class QVariant; +QT_END_NAMESPACE /* * Adaptor class for interface com.trolltech.Examples.CarInterface diff --git a/examples/draganddrop/draggabletext/dragwidget.cpp b/examples/draganddrop/draggabletext/dragwidget.cpp index 0ada3ac..1fd40be 100644 --- a/examples/draganddrop/draggabletext/dragwidget.cpp +++ b/examples/draganddrop/draggabletext/dragwidget.cpp @@ -82,7 +82,7 @@ DragWidget::DragWidget(QWidget *parent) void DragWidget::dragEnterEvent(QDragEnterEvent *event) { if (event->mimeData()->hasText()) { - if (children().contains(event->source())) { + if (event->source() == this) { event->setDropAction(Qt::MoveAction); event->accept(); } else { diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp index 8cc9948..fbf4dc4 100644 --- a/examples/multimedia/audioinput/audioinput.cpp +++ b/examples/multimedia/audioinput/audioinput.cpp @@ -213,6 +213,9 @@ InputTest::InputTest() if(format.sampleSize() != 16) { qWarning()<<"audio device doesn't support 16 bit samples, example cannot run"; + audioInput = 0; + button->setDisabled(true); + button2->setDisabled(true); return; } diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index 0c57f4d..b44accd 100644 --- a/examples/multimedia/audiooutput/audiooutput.cpp +++ b/examples/multimedia/audiooutput/audiooutput.cpp @@ -179,6 +179,9 @@ AudioTest::AudioTest() if(settings.sampleSize() != 16) { qWarning()<<"audio device doesn't support 16 bit samples, example cannot run"; + button->setDisabled(true); + button2->setDisabled(true); + audioOutput = 0; return; } |