From 0ca9f69389daa5b8f6ee2aa6d783335cb5a5b756 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Mon, 30 Sep 2019 15:17:05 +0200 Subject: Doc: Correct link error Package type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-78803 Change-Id: Ideff1b3974dcb9ef833e5847e5a2df344105f241 Reviewed-by: Topi Reiniƶ Reviewed-by: Paul Wicking --- examples/quick/views/doc/src/views.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/quick/views/doc/src/views.qdoc b/examples/quick/views/doc/src/views.qdoc index 294b88542b..16237a68e0 100644 --- a/examples/quick/views/doc/src/views.qdoc +++ b/examples/quick/views/doc/src/views.qdoc @@ -87,7 +87,7 @@ \section1 Packages - \e Packages uses the \l Package type to transition delegates between + \e Packages use the \l [QML]{Package} type to transition delegates between two views. It has a Package object which defines delegate items for each view and an -- cgit v1.2.3 From af623414ece84e0f9cd0d56f0dd22d155851098c Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 8 Oct 2019 10:32:27 +0200 Subject: Add guards in .pro of platform/api-specific scenegraph examples Task-number: QTBUG-78783 Change-Id: Icda60d4358c35de311552fd7562c3cf0c3425b7b Reviewed-by: Paul Olav Tvete --- examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro | 2 ++ examples/quick/scenegraph/metaltextureimport/metaltextureimport.pro | 2 ++ examples/quick/scenegraph/metalunderqml/metalunderqml.pro | 2 ++ examples/quick/scenegraph/vulkanunderqml/vulkanunderqml.pro | 2 ++ 4 files changed, 8 insertions(+) (limited to 'examples') diff --git a/examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro b/examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro index 3c94d48ac4..7658a9a813 100644 --- a/examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro +++ b/examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro @@ -1,3 +1,5 @@ +!win32: error("This example requires Windows") + QT += qml quick HEADERS += d3d11squircle.h diff --git a/examples/quick/scenegraph/metaltextureimport/metaltextureimport.pro b/examples/quick/scenegraph/metaltextureimport/metaltextureimport.pro index c8ea7ce478..5b11606946 100644 --- a/examples/quick/scenegraph/metaltextureimport/metaltextureimport.pro +++ b/examples/quick/scenegraph/metaltextureimport/metaltextureimport.pro @@ -1,3 +1,5 @@ +!macos: error("This example requires macOS") + QT += qml quick HEADERS += metaltextureimport.h diff --git a/examples/quick/scenegraph/metalunderqml/metalunderqml.pro b/examples/quick/scenegraph/metalunderqml/metalunderqml.pro index 9b27638a6d..9fd131fe1b 100644 --- a/examples/quick/scenegraph/metalunderqml/metalunderqml.pro +++ b/examples/quick/scenegraph/metalunderqml/metalunderqml.pro @@ -1,3 +1,5 @@ +!macos: error("This example requires macOS") + QT += qml quick HEADERS += metalsquircle.h diff --git a/examples/quick/scenegraph/vulkanunderqml/vulkanunderqml.pro b/examples/quick/scenegraph/vulkanunderqml/vulkanunderqml.pro index 9a0a87c9f0..9ea57b91c3 100644 --- a/examples/quick/scenegraph/vulkanunderqml/vulkanunderqml.pro +++ b/examples/quick/scenegraph/vulkanunderqml/vulkanunderqml.pro @@ -1,3 +1,5 @@ +!qtConfig(vulkan): error("This example requires Qt built with Vulkan support") + QT += qml quick HEADERS += vulkansquircle.h -- cgit v1.2.3