Merge branch 'develop'

Change-Id: Ic97fe9c9e7e12acb86a9798326cfff30d09a229b

15 files changed, 28 insertions, 28 deletions

diff --git a/examples/datavisualization/audiolevels/audiolevels.pro b/examples/datavisualization/audiolevels/audiolevels.pro
index 62565b7f..de40e636 100644
--- a/examples/datavisualization/audiolevels/audiolevels.pro
+++ b/examples/datavisualization/audiolevels/audiolevels.pro
@@ -1,5 +1,5 @@
-android|ios {
-    error( "This example is not supported for android or ios." )
+android|ios|winrt {
+    error( "This example is not supported for android, ios, or winrt." )
 }
 
 requires(qtHaveModule(multimedia))
diff --git a/examples/datavisualization/bars/bars.pro b/examples/datavisualization/bars/bars.pro
index b432c0b9..ffb8b0ba 100644
--- a/examples/datavisualization/bars/bars.pro
+++ b/examples/datavisualization/bars/bars.pro
@@ -1,5 +1,5 @@
-android|ios {
-    error( "This example is not supported for android or ios." )
+android|ios|winrt {
+    error( "This example is not supported for android, ios, or winrt." )
 }
 
 !include( ../examples.pri ) {
diff --git a/examples/datavisualization/custominput/custominput.pro b/examples/datavisualization/custominput/custominput.pro
index 4c5526a4..0e11bfab 100644
--- a/examples/datavisualization/custominput/custominput.pro
+++ b/examples/datavisualization/custominput/custominput.pro
@@ -1,5 +1,5 @@
-android|ios {
-    error( "This example is not supported for android or ios." )
+android|ios|winrt {
+    error( "This example is not supported for android, ios, or winrt." )
 }
 
 !include( ../examples.pri ) {
diff --git a/examples/datavisualization/customitems/customitems.pro b/examples/datavisualization/customitems/customitems.pro
index 99582ea6..d366e349 100644
--- a/examples/datavisualization/customitems/customitems.pro
+++ b/examples/datavisualization/customitems/customitems.pro
@@ -1,5 +1,5 @@
-android|ios {
-    error( "This example is not supported for android or ios." )
+android|ios|winrt {
+    error( "This example is not supported for android, ios, or winrt." )
 }
 
 !include( ../examples.pri ) {
diff --git a/examples/datavisualization/customproxy/customproxy.pro b/examples/datavisualization/customproxy/customproxy.pro
index 2f39aae5..454c81e9 100644
--- a/examples/datavisualization/customproxy/customproxy.pro
+++ b/examples/datavisualization/customproxy/customproxy.pro
@@ -1,5 +1,5 @@
-android|ios {
-    error( "This example is not supported for android or ios." )
+android|ios|winrt {
+    error( "This example is not supported for android, ios, or winrt." )
 }
 
 !include( ../examples.pri ) {
diff --git a/examples/datavisualization/datavisualization.pro b/examples/datavisualization/datavisualization.pro
index b6ece48d..f9fce6af 100644
--- a/examples/datavisualization/datavisualization.pro
+++ b/examples/datavisualization/datavisualization.pro
@@ -13,7 +13,7 @@ qtHaveModule(quick) {
                qmlspectrogram
 }
 
-!android:!ios {
+!android:!ios:!winrt {
     SUBDIRS += bars \
                custominput \
                customproxy \
diff --git a/examples/datavisualization/draggableaxes/draggableaxes.pro b/examples/datavisualization/draggableaxes/draggableaxes.pro
index 34db5133..2f21aee6 100644
--- a/examples/datavisualization/draggableaxes/draggableaxes.pro
+++ b/examples/datavisualization/draggableaxes/draggableaxes.pro
@@ -1,5 +1,5 @@
-android|ios {
-    error( "This example is not supported for android or ios." )
+android|ios|winrt {
+    error( "This example is not supported for android, ios, or winrt." )
 }
 
 !include( ../examples.pri ) {
diff --git a/examples/datavisualization/itemmodel/itemmodel.pro b/examples/datavisualization/itemmodel/itemmodel.pro
index d7f52780..3249bb7b 100644
--- a/examples/datavisualization/itemmodel/itemmodel.pro
+++ b/examples/datavisualization/itemmodel/itemmodel.pro
@@ -1,5 +1,5 @@
-android|ios {
-    error( "This example is not supported for android or ios." )
+android|ios|winrt {
+    error( "This example is not supported for android, ios, or winrt." )
 }
 
 !include( ../examples.pri ) {
diff --git a/examples/datavisualization/rotations/rotations.pro b/examples/datavisualization/rotations/rotations.pro
index e4541692..faabc5aa 100644
--- a/examples/datavisualization/rotations/rotations.pro
+++ b/examples/datavisualization/rotations/rotations.pro
@@ -1,5 +1,5 @@
-android|ios {
-    error( "This example is not supported for android or ios." )
+android|ios|winrt {
+    error( "This example is not supported for android, ios, or winrt." )
 }
 
 !include( ../examples.pri ) {
diff --git a/examples/datavisualization/scatter/scatter.pro b/examples/datavisualization/scatter/scatter.pro
index 8e8514b9..1e98d637 100644
--- a/examples/datavisualization/scatter/scatter.pro
+++ b/examples/datavisualization/scatter/scatter.pro
@@ -1,5 +1,5 @@
-android|ios {
-    error( "This example is not supported for android or ios." )
+android|ios|winrt {
+    error( "This example is not supported for android, ios, or winrt." )
 }
 
 !include( ../examples.pri ) {
diff --git a/examples/datavisualization/surface/surface.pro b/examples/datavisualization/surface/surface.pro
index fb70025f..9daf2546 100644
--- a/examples/datavisualization/surface/surface.pro
+++ b/examples/datavisualization/surface/surface.pro
@@ -1,5 +1,5 @@
-android|ios {
-    error( "This example is not supported for android or ios." )
+android|ios|winrt {
+    error( "This example is not supported for android, ios, or winrt." )
 }
 
 !include( ../examples.pri ) {
diff --git a/examples/datavisualization/texturesurface/texturesurface.pro b/examples/datavisualization/texturesurface/texturesurface.pro
index f24c3d17..efef1944 100644
--- a/examples/datavisualization/texturesurface/texturesurface.pro
+++ b/examples/datavisualization/texturesurface/texturesurface.pro
@@ -1,5 +1,5 @@
-android|ios {
-    error( "This example is not supported for android or ios." )
+android|ios|winrt {
+    error( "This example is not supported for android, ios, or winrt." )
 }
 
 !include( ../examples.pri ) {
diff --git a/examples/datavisualization/volumetric/volumetric.pro b/examples/datavisualization/volumetric/volumetric.pro
index fa355692..feb0e6ec 100644
--- a/examples/datavisualization/volumetric/volumetric.pro
+++ b/examples/datavisualization/volumetric/volumetric.pro
@@ -1,5 +1,5 @@
-android|ios {
-    error( "This example is not supported for android or ios." )
+android|ios|winrt {
+    error( "This example is not supported for android, ios, or winrt." )
 }
 
 !include( ../examples.pri ) {
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 37baee8a..fba82282 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -37,7 +37,7 @@
 #include <QtCore/QPointer>
 #include <QtCore/QThread>
 
-#if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID)
+#if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && !defined(Q_OS_WINRT)
 #define USE_SHARED_CONTEXT
 #endif
 
diff --git a/tests/tests.pro b/tests/tests.pro
index ccecd486..ef28a0da 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -18,7 +18,7 @@ qtHaveModule(quick) {
                qmlperf
 }
 
-!android:!ios {
+!android:!ios:!winrt {
     SUBDIRS += barstest \
                scattertest \
                surfacetest \
@@ -36,4 +36,4 @@ qtHaveModule(quick) {
     #SUBDIRS += kinectsurface
 }
 
-qtHaveModule(multimedia):!android:!static: SUBDIRS += spectrum
+qtHaveModule(multimedia):!android:!static:!winrt: SUBDIRS += spectrum