From 32810acaa191ba00be5aac5d771c23b87628292c Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 6 Oct 2016 00:11:25 +0200 Subject: Let specifying the fallback style for custom styles For example, you can call QQuickStyle::setStyle(":/mycontrols") and QQuickStyle::setFallbackStyle("Material") to select a custom style so that the missing files will fallback to the Material style. Notice that the Material and Universal styles do not contain all files. For example, the non-visual Control.qml, Container.qml are not duplicated. For these, we must fallback to the Default style that is guaranteed to contain them all. [ChangeLog][Controls] Added support for specifying the fallback style for custom styles via :/qtquickcontrols2.conf, QT_QUICK_CONTROLS_FALLBACK_STYLE or QQuickStyle::setFallbackStyle(). Change-Id: I00be1c8c6aaca875ef851c90d018e9b5e2f501b7 Reviewed-by: Mitch Curtis --- tests/auto/qquickstyle/qquickstyle.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/auto/qquickstyle/qquickstyle.pro') diff --git a/tests/auto/qquickstyle/qquickstyle.pro b/tests/auto/qquickstyle/qquickstyle.pro index b6173c1b..5514685a 100644 --- a/tests/auto/qquickstyle/qquickstyle.pro +++ b/tests/auto/qquickstyle/qquickstyle.pro @@ -5,3 +5,4 @@ SOURCES += tst_qquickstyle.cpp osx:CONFIG -= app_bundle QT += quickcontrols2 testlib +QT_PRIVATE += core-private gui-private quickcontrols2-private -- cgit v1.2.3