| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
- Change \title, \page, and \l instances that used "qtlabs" instead
of "qtquick".
- Renamed the qdocconf file and changed the qch parameters in it to use
"Qt Quick Controls 2".
- Added "2" as output suffix for the html filenames.
Change-Id: Ia2fdd1c835229e5216f42a2fdfa5f7e11965e21d
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
The same way other plugins do it. The main plugin file and the build
system flags are specified in the .pro file, and the list of classes
and types provided by the plugin are specified in the .pri file.
Change-Id: I60c8aeca36c4a177f613ce88f34bfaf5d69b7543
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
The imports will be done later, as we don't want to change them until
the module is releasable (which requires things like selection handles,
etc.).
Change-Id: I2140cff7058fc3b696e92ca8c0e5e06dca9a7c9c
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/controls/data/tst_combobox.qml
Change-Id: I9d0c9a8adbe098720f0766e38db8aa2be4ed7408
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The error was:
Error in '.rcc\debug\qmake_Qt_labs_controls.qrc':
Cannot find file 'C:/dev/qt5.7/qtquickcontrols2/src/imports/controls/designer/images/*.png'
Change-Id: Icfd1225e8c130d8d48f821af981b64202c687956
Task-number: QTBUG-51708
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/templates/qquickrangeslider_p.h
Change-Id: Ibe8ec18a7e22080f69f316d0394af1d03517ce93
|
| |
| |
| |
| |
| |
| |
| | |
Causing build problems due to RCC'ing 'designer/images/*.png'
Change-Id: I4d97d8514fa38e5d78b8a6b1b6647e3834c864d7
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|/
|
|
|
| |
Change-Id: Ib262bce848bfada1bcddb2df1dd99a399870f3e1
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I7f973deec7453c4b80c03b3dc063f4d0dbe850c5
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: Iffaafc1d5512b4e47a7c6c304a3883ab8d986b12
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Now that we have a good place for it, we can share a common base class
for QQuickMaterialStyle and QQuickUniversalStyle. QQuickStyle implements
the inheritance pattern for attached styles, in one place.
Change-Id: I459d98f96ce7c6de1ce7ef716e859f459278d8ad
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I7b8aaedf3a3c645db7bf6a1ca88472d8458de568
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
| |
Also moved to QtLabsControls lib.
Change-Id: I8ed1256da2b9aa63db4ca3b51a0ace3ba730e542
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Remove some superfluous spaces, include paths, and module deps.
Also, use more explicit QT_PRIVATE for private dependencies.
Change-Id: I85d48213441749ab18442928a20cbb4c9c6dad0b
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
| |
http://lists.qt-project.org/pipermail/development/2012-February/002001.html
Change-Id: Id6815c3bd9b196590b0c93b8ddf2f977cdc6a511
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Usage:
# +material/material.pro
include(../shared/shared.pri)
// qquickmaterialstyle.cpp
#include "qquickstyle_p.h"
QQuickMaterialStyle *style =
QQuickStyle::instance<QQuickMaterialStyle>(item);
// ...
QQuickMaterialStyle *parent =
QQuickStyle::findParent<QQuickMaterialStyle>(this);
// ...
QList<QQuickMaterialStyle *> children =
QQuickStyle::findChildren<QQuickMaterialStyle>(object);
// ...
Change-Id: I2c01a1aa36805f16d83fa60ab25b2cc29e6a43cc
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Iab776ece0035877414626230985bb94edcfba5d8
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ief9ee07d1f5f6c80500bfa611bace860481e2a3f
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The original split existed because the public and enterprise
controls were developed separately. Now that all controls are
public and developed together, the split no longer makes sense
and is difficult for users to understand.
Change-Id: I00420f4d09f8c837232231d03fe818b7b3403fab
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I864eaf25f586c49c03708fb83e8e99b115cdb3a7
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I1e663bb7be2be8b3d4edf0c038862cc2150aec40
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I12aa4b73de8a33fcec1ea603d88cea2fa5a6b231
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I8d8aa96f2f37f458577a5a3ec681e3c9174d0918
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
| |
The module name has been change to qtquickcontrols2.
Change-Id: I023fca6086251e151752ef6f18fe8bf6ffcaf1e1
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ia5387aa16325453c676a2542f80c827d4c069ca9
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
SpinBox is a desktop centric control. It won't be provided in Qt Quick
Controls 2.0, but maybe later when desktop support is re-considered.
Qt Quick Controls 2.0 will focus on embedded and mobile. SpinBox is
still available in 1.x
Change-Id: I272b030734bad58de7e5b26c522189e0c520fca5
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I006ee566647e31d1a14919d164d7dd68539aae10
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
|
|
Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
|