diff options
author | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
commit | efa04c2ae8427c70848477ace3d8f6e82baaab11 (patch) | |
tree | c0394c9cd5ce51961337a7a15e169074dd41632b /src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc | |
parent | 9c7429219d36e8eb40e1fe6e679715c89209fc40 (diff) | |
parent | 6476de0b669162cf08c11f5c8d5ad0b42419f365 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/imports/controls/qtquickcontrols2plugin.cpp
Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc')
-rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc index afe5611f..cfcfa149 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc @@ -59,10 +59,10 @@ \c material selector will be present and the \c +material/CustomButton.qml version will be used instead. - \code + \code \QtMinorVersion // main.qml - import QtQuick 2.6 - import QtQuick.Controls 2.1 + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 ApplicationWindow { id: window @@ -78,10 +78,10 @@ The base implementation of the custom button is a simple rounded flat button. - \code + \code \QtMinorVersion // CustomButton.qml - import QtQuick 2.6 - import QtQuick.Controls 2.1 + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 Button { id: control @@ -99,12 +99,12 @@ Material style, requests a dark theme to get light text, and creates a drop shadow for the background. - \code + \code \QtMinorVersion // +material/CustomButton.qml - import QtQuick 2.6 - import QtGraphicalEffects 1.0 - import QtQuick.Controls 2.1 - import QtQuick.Controls.Material 2.1 + import QtQuick 2.\1 + import QtGraphicalEffects 1.\1 + import QtQuick.Controls 2.\1 + import QtQuick.Controls.Material 2.\1 Button { id: control |