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

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Conflicts:
	src/multimedia/doc/qtmultimedia.qdocconf
	src/plugins/blackberry/mediaplayer/bbmetadata.cpp
	src/plugins/blackberry/mediaplayer/bbmetadata.h
	tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp

Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
This commit is contained in:
Frederik Gladhorn
2013-02-19 17:14:43 +01:00
parent 0ce2cb3ebe 2db2cde0d8
commit d396262bc9
1042 changed files with 65917 additions and 1432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
View File

@@ -2,17 +2,17 @@ CONFIG += testcase
TARGET = tst_qpaintervideosurface
QT += multimedia-private multimediawidgets-private testlib
contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
qtHaveModule(opengl) {
QT += opengl
} else {
DEFINES += QT_NO_OPENGL
}
contains(QT_CONFIG, opengl): QT += opengl
SOURCES += tst_qpaintervideosurface.cpp
QT+=widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = precise ]"):DEFINES+=UBUNTU_PRECISE_PANGOLIN
win32:contains(QT_CONFIG, angle): CONFIG += insignificant_test # QTBUG-28542

2
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Toolkit.