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

QtMultimedia: Fix warnings about declarative/quick.

Browse Source 
Change-Id: Ic9323b222641e41dae05cb4b0dccb6531e845676
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-12-05 13:58:30 +01:00
committed by Qt by Nokia
parent 3171081d43
commit a5d2b2ed60
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/declarative-radio/declarative-radio.pro
View File

@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = declarative-radio TARGET = declarative-radio
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += . INCLUDEPATH += .
QT += declarative multimedia QT += declarative quick multimedia
# Input # Input
SOURCES += main.cpp SOURCES += main.cpp

2
examples/declarative-radio/main.cpp
View File

@@ -41,7 +41,7 @@
#include <QGuiApplication> #include <QGuiApplication>
#include <qdeclarative.h> #include <qdeclarative.h>
#include <qquickview.h> #include <QtQuick/qquickview.h>
int main(int argc, char ** argv) int main(int argc, char ** argv)

2
src/imports/multimedia/multimedia.pro
View File

@@ -3,7 +3,7 @@ TARGETPATH = QtMultimedia
include(../qimportbase.pri) include(../qimportbase.pri)
QT += declarative network multimedia-private QT += declarative quick network multimedia-private
DESTDIR = $$QT.multimedia.imports/$$TARGETPATH DESTDIR = $$QT.multimedia.imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH

2
src/imports/multimedia/qdeclarativevideooutput.cpp
View File

@@ -44,7 +44,7 @@
#include "qsgvideonode_i420.h" #include "qsgvideonode_i420.h"
#include "qsgvideonode_rgb.h" #include "qsgvideonode_rgb.h"
#include <QtDeclarative/qquickitem.h> #include <QtQuick/qquickitem.h>
#include <QtMultimedia/QAbstractVideoSurface> #include <QtMultimedia/QAbstractVideoSurface>
#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaservice.h>

2
src/imports/multimedia/qdeclarativevideooutput_p.h
View File

@@ -42,7 +42,7 @@
#ifndef QDECLARATIVEVIDEOOUTPUT_P_H #ifndef QDECLARATIVEVIDEOOUTPUT_P_H
#define QDECLARATIVEVIDEOOUTPUT_P_H #define QDECLARATIVEVIDEOOUTPUT_P_H
#include <qquickitem.h> #include <QtQuick/qquickitem.h>
#include <QtMultimedia/qvideoframe.h> #include <QtMultimedia/qvideoframe.h>
#include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qmediaobject.h>

4
src/imports/multimedia/qsgvideonode_i420.cpp
View File

@@ -40,8 +40,8 @@
****************************************************************************/ ****************************************************************************/
#include "qsgvideonode_i420.h" #include "qsgvideonode_i420.h"
#include <QtCore/qmutex.h> #include <QtCore/qmutex.h>
#include <QtDeclarative/qsgtexturematerial.h> #include <QtQuick/qsgtexturematerial.h>
#include <QtDeclarative/qsgmaterial.h> #include <QtQuick/qsgmaterial.h>
#include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLContext>
#include <QtGui/QOpenGLFunctions> #include <QtGui/QOpenGLFunctions>
#include <QtOpenGL/qglshaderprogram.h> #include <QtOpenGL/qglshaderprogram.h>

2
src/imports/multimedia/qsgvideonode_p.h
View File

@@ -42,7 +42,7 @@
#ifndef QSGVIDEONODE_P_H #ifndef QSGVIDEONODE_P_H
#define QSGVIDEONODE_P_H #define QSGVIDEONODE_P_H
#include <QtDeclarative/qsgnode.h> #include <QtQuick/qsgnode.h>
#include <QtMultimedia/qvideoframe.h> #include <QtMultimedia/qvideoframe.h>
#include <QtMultimedia/qvideosurfaceformat.h> #include <QtMultimedia/qvideosurfaceformat.h>

4
src/imports/multimedia/qsgvideonode_rgb.cpp
View File

@@ -39,8 +39,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include "qsgvideonode_rgb.h" #include "qsgvideonode_rgb.h"
#include <QtDeclarative/qsgtexturematerial.h> #include <QtQuick/qsgtexturematerial.h>
#include <QtDeclarative/qsgmaterial.h> #include <QtQuick/qsgmaterial.h>
#include <QtCore/qmutex.h> #include <QtCore/qmutex.h>
#include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLContext>
#include <QtGui/QOpenGLFunctions> #include <QtGui/QOpenGLFunctions>