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

Needed due to license header patch.

Change-Id: Id7e30490132a7c487687a0a376419e9f9b97ea41

3 files changed, 29 insertions, 18 deletions

diff --git a/config.tests/unix/floatmath/floatmath.pro b/config.tests/unix/floatmath/floatmath.pro
deleted file mode 100644
index 4c785638b2..0000000000
--- a/config.tests/unix/floatmath/floatmath.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = floatmath.cpp
-CONFIG -= x11 qt
-
diff --git a/config.tests/unix/floatmath/floatmath.cpp b/config.tests/unix/gstreamer/gstreamer.cpp
index 4becf2a266..cc61498787 100644
--- a/config.tests/unix/floatmath/floatmath.cpp
+++ b/config.tests/unix/gstreamer/gstreamer.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
-** This file is part of the config.tests of the Qt Toolkit.
+** This file is part of the Qt Toolkit
 **
 ** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
@@ -31,20 +31,12 @@
 **
 ****************************************************************************/
 
-#include <math.h>
+#define GST_USE_UNSTABLE_API
 
-int main(int argc, char **argv)
-{
-    float c = ceilf(1.3f);
-    float f = floorf(1.7f);
-    float s = sinf(3.8);
-    float t = cosf(7.3);
-    float u = sqrtf(8.4);
-    float l = logf(9.2);
+#include <gst/gst.h>
 
-    if (c == 1.0f && f == 2.0f && s == 3.0f && t == 4.0f && u == 5.0f && l == 6.0f)
-        return 0;
-    else
-        return 1;
+int main(int, char**)
+{
+    gst_is_initialized();
+    return 0;
 }
-
diff --git a/config.tests/unix/gstreamer/gstreamer.pro b/config.tests/unix/gstreamer/gstreamer.pro
new file mode 100644
index 0000000000..a5e158fa21
--- /dev/null
+++ b/config.tests/unix/gstreamer/gstreamer.pro
@@ -0,0 +1,22 @@
+SOURCES += gstreamer.cpp
+
+CONFIG += link_pkgconfig
+
+gst-0.10 {
+    PKGCONFIG_PRIVATE += \
+        gstreamer-0.10 \
+        gstreamer-base-0.10 \
+        gstreamer-audio-0.10 \
+        gstreamer-video-0.10 \
+        gstreamer-pbutils-0.10
+} else:gst-1.0 {
+    PKGCONFIG_PRIVATE += \
+        gstreamer-1.0 \
+        gstreamer-base-1.0 \
+        gstreamer-audio-1.0 \
+        gstreamer-video-1.0 \
+        gstreamer-pbutils-1.0
+}
+
+CONFIG -= qt
+