diff options
Diffstat (limited to 'src/imports/controls')
5 files changed, 12 insertions, 12 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc index a2a77505..1397e974 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc @@ -30,6 +30,8 @@ \keyword Qt Quick Controls C++ Classes \title Qt Quick Controls 2 C++ Classes \ingroup modules + \qtvariable quickcontrols2 + \brief Provides classes for setting up the controls from C++. The C++ types can be included into your application using the following diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc index 6e5c7981..0b09edf6 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc @@ -27,16 +27,16 @@ /*! \page qtquickcontrols2-differences.html - \title Differences between Qt Quick Controls + \title Differences between Qt Quick Controls 1 - Qt Quick Controls were originally developed to support desktop platforms, + Qt Quick Controls 1 was originally developed to support desktop platforms, with mobile and embedded support coming shortly afterwards. They have a very broad scope, in that they provide a styling system flexible enough to allow the development of applications that have either a platform-dependent or platform-independent style. On embedded systems, where the hardware has limited resources, this approach - can be inefficient. Qt Quick Controls 2 were designed to solve this problem, + can be inefficient. Qt Quick Controls 2 was designed to solve this problem, using \l {https://blog.qt.io/blog/2015/03/31/qt-quick-controls-for-embedded/}{benchmarks} to guide the development. @@ -98,7 +98,7 @@ \table \header \li - \li Qt Quick Controls + \li Qt Quick Controls 1 \li Qt Quick Controls 2 \row \li Stylable delegates @@ -136,15 +136,15 @@ \li Performance may not be optimal \endlist - \section2 Porting Qt Quick Controls Code + \section2 Porting Qt Quick Controls 1 Code - The API of Qt Quick Controls 2 is very similar to Qt Quick Controls, but it + The API of Qt Quick Controls 2 is very similar to Qt Quick Controls 1, but it does come with some changes necessary to facilitate the improvements. The majority of changes are to do with styling; all of a control's delegates are now accessible in the control itself, instead of in a separate style object. - For example, to style a button in Qt Quick Controls: + For example, to style a button in Qt Quick Controls 1: \qml Button { @@ -170,7 +170,7 @@ With this in mind, a good way to prepare for a migration to Qt Quick Controls 2 is to place each control that you have a custom style for in its - own QML file. For example, the Qt Quick Controls button above could be + own QML file. For example, the Qt Quick Controls 1 button above could be moved to a file named \c Button.qml in a directory named \c controls, and used in the following manner: diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index a9916f60..651336ed 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -153,7 +153,7 @@ \li \l{Deploying Qt Quick Controls 2 Applications}{Deployment} \li \l{Qt Quick Controls 2 Configuration File}{Configuration File} \li \l{Supported Environment Variables in Qt Quick Controls 2}{Environment Variables} - \li \l{Differences between Qt Quick Controls} + \li \l{Differences between Qt Quick Controls 1} \endlist \section1 Reference diff --git a/src/imports/controls/fusion/qquickfusionbusyindicator.cpp b/src/imports/controls/fusion/qquickfusionbusyindicator.cpp index 81618191..a9b75d27 100644 --- a/src/imports/controls/fusion/qquickfusionbusyindicator.cpp +++ b/src/imports/controls/fusion/qquickfusionbusyindicator.cpp @@ -82,7 +82,7 @@ void QQuickFusionBusyIndicator::paint(QPainter *painter) const qreal sz = qMin(w, h); const qreal dx = (w - sz) / 2; const qreal dy = (h - sz) / 2; - const int hpw = qRound(qMax(1.0, sz / 14)) & -1; + const int hpw = qRound(qMax(qreal(1), sz / 14)) & -1; const int pw = 2 * hpw; const QRectF bounds(dx + hpw, dy + hpw, sz - pw - 1, sz - pw - 1); diff --git a/src/imports/controls/fusion/qquickfusionstyle.cpp b/src/imports/controls/fusion/qquickfusionstyle.cpp index a66665fc..cb3889c8 100644 --- a/src/imports/controls/fusion/qquickfusionstyle.cpp +++ b/src/imports/controls/fusion/qquickfusionstyle.cpp @@ -85,8 +85,6 @@ QColor QQuickFusionStyle::innerContrastLine() QColor QQuickFusionStyle::highlight(const QPalette &palette) { - if (isMacSystemPalette(palette)) - return QColor(60, 140, 230); return palette.color(QPalette::Highlight); } |