2 files changed, 27 insertions, 35 deletions

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 7c7190342..a1d024c06 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,15 +1,5 @@
 # Generated from examples.pro.
 
-#special case begin
-# Examples are disable for now on MSVC - big_resources does not seem to
-# have been translated into CMake automtically yet, and trying to replace it
-# manually with qt6_add_big_resources fails as of june 2020.
-# Disable that temporarily to be able to test on Win32
-if(MSVC)
-    return()
-endif()
-
-#special case end
 qt_examples_build_begin()
 
 if(QT_FEATURE_qt3d_extras)
diff --git a/examples/qt3d/CMakeLists.txt b/examples/qt3d/CMakeLists.txt
index e4d66a2b5..052309345 100644
--- a/examples/qt3d/CMakeLists.txt
+++ b/examples/qt3d/CMakeLists.txt
@@ -1,35 +1,37 @@
 # Generated from qt3d.pro.
 
+add_subdirectory(3d-text)
 add_subdirectory(simple-cpp)
-#add_subdirectory(3d-text)
-#if(TARGET Qt::Widgets)
-#    add_subdirectory(basicshapes-cpp)
-#endif()
-#if(TARGET Qt::QuickWidgets AND TARGET Qt::Widgets)
-#    add_subdirectory(widgets-scene3d)
-#endif()
+if(TARGET Qt::Widgets)
+    add_subdirectory(basicshapes-cpp)
+endif()
+if(TARGET Qt::QuickWidgets AND TARGET Qt::Widgets)
+    add_subdirectory(widgets-scene3d)
+endif()
 if(TARGET Qt::Quick)
+    add_subdirectory(advancedcustommaterial)
+    add_subdirectory(compute-particles)
+    add_subdirectory(controls)
+    add_subdirectory(controlsunderlay)
+    add_subdirectory(instanced-arrays-qml)
+    add_subdirectory(multiviewport)
+    add_subdirectory(planets-qml)
+    add_subdirectory(scene2d)
+    add_subdirectory(scene3d)
+    add_subdirectory(scene3dview)
     add_subdirectory(simple-qml)
-#    add_subdirectory(shadow-map-qml)
-#    add_subdirectory(instanced-arrays-qml)
-#    add_subdirectory(planets-qml)
-#    add_subdirectory(advancedcustommaterial)
+    add_subdirectory(simplecustommaterial)
+    add_subdirectory(wave)
+
+    # these require qt6_add_big_resources but it's broken at this point QTBUG-85051
 #    add_subdirectory(anaglyph-rendering)
-#    add_subdirectory(compute-particles)
-#    add_subdirectory(phong-cubes)
 #    add_subdirectory(lights)
-#    add_subdirectory(scene3dview)
-#    add_subdirectory(controlsunderlay)
-#    add_subdirectory(simplecustommaterial)
-#    add_subdirectory(qardboard)
 #    add_subdirectory(pbr-materials)
-#    add_subdirectory(scene2d)
-#    add_subdirectory(multiviewport)
+#    add_subdirectory(phong-cubes)
+#    add_subdirectory(qardboard)
+#    add_subdirectory(shadow-map-qml)
 #    add_subdirectory(wireframe)
-#    add_subdirectory(wave)
-#    add_subdirectory(scene3d)
-#    add_subdirectory(controls)
 endif()
-#if(TARGET Qt::Multimedia AND TARGET Qt::Quick)
-#    add_subdirectory(audio-visualizer-qml)
-#endif()
+if(TARGET Qt::Multimedia AND TARGET Qt::Quick)
+    add_subdirectory(audio-visualizer-qml)
+endif()