summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2014-11-19 15:39:56 +0200
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2014-11-19 15:56:56 +0200
commitcba93d8dea82ee2a5d2cf98f2ad6d8dd43b14d7e (patch)
tree3607211046b70b00f9036a61af8b9798740190eb /examples
parent11ed44c13c227c73d9b2ec416aed54b00bda2a0a (diff)
Fix WinRT issues.
Primary fix is to not use shared context in qml with WinRT, as that causes black screen. Also removed widget apps from build in WinRT. Change-Id: Id65ce90dbeb80442194ab838952e8cadc91135a6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/datavisualization/audiolevels/audiolevels.pro4
-rw-r--r--examples/datavisualization/bars/bars.pro4
-rw-r--r--examples/datavisualization/custominput/custominput.pro4
-rw-r--r--examples/datavisualization/customitems/customitems.pro4
-rw-r--r--examples/datavisualization/customproxy/customproxy.pro4
-rw-r--r--examples/datavisualization/datavisualization.pro2
-rw-r--r--examples/datavisualization/draggableaxes/draggableaxes.pro4
-rw-r--r--examples/datavisualization/itemmodel/itemmodel.pro4
-rw-r--r--examples/datavisualization/rotations/rotations.pro4
-rw-r--r--examples/datavisualization/scatter/scatter.pro4
-rw-r--r--examples/datavisualization/surface/surface.pro4
-rw-r--r--examples/datavisualization/texturesurface/texturesurface.pro4
-rw-r--r--examples/datavisualization/volumetric/volumetric.pro4
13 files changed, 25 insertions, 25 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 ) {