| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/quickcontrols/extras/flat/main.cpp
src/controls/Private/qquickcontrolsettings.cpp
Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Use the pre-defined macro.
Change-Id: I52e362672ff719202d3e40e4245baac2af29f624
Task-number: QTBUG-53208
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is consistent with the classes that have already had this done.
It prevents clashes with Qt Quick Controls 2.
These classes are not available to the user, so it doesn't affect
compatibility.
Change-Id: Iee73ee6bc530182732ae95993e1f4fc3766eb8e0
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| | |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-35754
Task-number: QTBUG-45868
Change-Id: I9bb332bc85713a17f02f3e7e768592e3234edfe3
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| |/
|
|
|
|
|
| |
Update old header.LGPL3 to header.LGPL
Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| |
|
|
|
|
|
| |
Change-Id: I77e7a218a958d76ac7ef7780f4be52a81f76fa6b
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
qt_XX.qm is only for Qt 4 compatibility and therefore does not link
to qtquickcontrols_XX.qm. The fact that QQmlApplicationEngine
loads qt_XX.qm is wrong, insufficient to support dialog translations,
and also inefficient in that it loads some translations which we
don't need. The loading of relevant translations should be modular
along the same lines that Qt is modular. Each Qt module needs
to load its own translations.
In this case it's needed so that buttons on dialogs will be translated.
Dialogs depends on Controls, and the translation file is named as the
controls translation file, so any future Controls translations can go
here too. It's more efficient to load fewer files than to load separate
translations for each QML module.
Change-Id: I5fe0c39643f066b15a605b53158e9185792fd33e
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
|
| |
|
|
|
|
|
|
|
| |
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL
Change-Id: I470909ba0980db33ab551790d619c59a35978590
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
All the qml and js files are embedded in the Qt Quick Controls plugin
(for Controls, Styles and Private).
If ApplicationWindow.qml is missing, loading the files from resource
will be enabled. Otherwise, the files will be loaded from the local
path.
The purpose of this change is to make the deployment of Qt Quick
Controls easier while keeping the development tasks convenient. With
this solution:
- It is only necessary to deploy the qmldir and the plugin
qtquickcontrolsplugin found in the QtQuick/Controls folder.
- By default the files used are the ones found in the local folder.
Autocompletion and debugging capabilities remain unchanged.
Task-number: QTBUG-31565
Change-Id: I938ebe261c3c35f9e3b066d82c81accd9750edc9
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
Register the C++ private API from the controls plugin. The
private plugin is not needed anymore.
The Controls "submodules" Styles and Private are moved to
the controls subfolder in the sources tree.
Change-Id: I98358227c945b6cd1a8dbff9d07e6cad4f044277
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
