slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.

Browse Source 
Remove QDeclarative compatibility module code.

Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-04-24 10:58:04 +02:00
committed by Qt by Nokia
parent e2f5779d2a
commit 5ae3adcfa9
15 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/video/qmlvideo/main.cpp
View File

@@ -42,7 +42,7 @@
#include <QtCore/QStandardPaths>
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtDeclarative/QDeclarativeContext>
#include <QtQml/QQmlContext>
#include <QtGui/QGuiApplication>
#include <QtQuick/QQuickItem>
#include "qmlapplicationviewer.h"

6
examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp
View File

@@ -43,9 +43,9 @@
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtDeclarative/QDeclarativeComponent>
#include <QtDeclarative/QDeclarativeEngine>
#include <QtDeclarative/QDeclarativeContext>
#include <QtQml/QQmlComponent>
#include <QtQml/QQmlEngine>
#include <QtQml/QQmlContext>
#include <QtGui/QGuiApplication>
class QmlApplicationViewerPrivate

2
examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri
View File

@@ -2,7 +2,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $OTHER_FILES *.pro *.pri
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/$${TARGET}
INSTALLS += sources
QT += quick
QT += qml quick
SOURCES += $$PWD/qmlapplicationviewer.cpp
HEADERS += $$PWD/qmlapplicationviewer.h

2
examples/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
View File

@@ -40,7 +40,7 @@
****************************************************************************/
#include "frequencymonitor.h"
#include <QtDeclarative/qdeclarative.h>
#include <QtQml/qqml.h>
void FrequencyMonitor::qmlRegisterType()
{

2
examples/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
View File

@@ -1,5 +1,5 @@
include($$PWD/frequencymonitor.pri)
QT += declarative
QT += qml
SOURCES += $$PWD/frequencymonitordeclarative.cpp
defineTest(frequencyItemAddDeployment) {