| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.
Task-number: QTBUG-67283
Change-Id: Idfd176b7f7b077a5b7c66b7738dc9bcac94ab290
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 6f57506953cc1efaf474368393ecb1df38c9f46a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
| |
Task-number: QTBUG-101408
Change-Id: I011d5ed352298902158d0b1b89ad3b99b310fc83
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously it failed with
QQmlApplicationEngine failed to load component
qrc:/alarms/main.qml: No such file or directory
main.cpp was adjusted to use alarms/main.cpp but the resource file
locations were not changed.
Change them to match the expected path in main.cpp.
qtquickcontrols2.conf needs to stay in the root of the resource path,
so it's added via a separate resource.
Amends 302121874ea6e664ea2a59a07bff8fa06983c335
Pick-to: 5.15 6.2 6.3
Fixes: QTBUG-100434
Change-Id: I3436e07600ca7dad8bba45274ba49dc6c137a938
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
CMAKE_INCLUDE_CURRENT_DIR is not necessary anymore for moc since
CMake 3.8: https://cmake.org/cmake/help/latest/release/3.8.html#other-changes
Enable CMAKE_AUTOUIC only if .ui files are present.
Pick-to: 6.3
Change-Id: Ic34418e3306de0ee1769bc3153bb833f7951da19
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
- Update information about and screenshots of Qt Creator
New Project wizard template.
- Use the main.cpp file generated by Qt Creator 7.0
Fixes: QTBUG-99847
Pick-to: 5.15 6.2 6.3
Change-Id: I1c2208267e9554e2f929ffffaa3dabd5554fc12e
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
| |
Pick-to: 6.2 6.3
Change-Id: I7582f6c1b9daacaf694355269663b1d6616e0c05
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
| |
All demos are using qt6_add_resources.
Pick-to: 6.2 6.3
Task-number: QTBUG-87643
Change-Id: I14c7d876b2ac3b1a24cec78fbd4463a46c71e564
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Needed for subsequent change that will check and error out if the
version is lower than 3.16. We do that to ensure all policies
introduced by CMake up to version 3.16 have their behavior set to
NEW.
Pick-to: 6.2
Task-number: QTBUG-95018
Change-Id: I23a59d7bfa89ffdacf8002b03657b7da38669ee2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|
|
|
|
|
|
|
|
| |
Ignore .ui.qml files though for now, until they are properly handled
by Qt Design Studio.
Task-number: QTBUG-89033
Change-Id: I85ea1dc2f85928e9fa1f473535687ab8b0288e9d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The example doesn't actually use it anyway.
Pick-to: 6.0
Fixes: QTBUG-89026
Change-Id: Id6a7a44af8674a28113372de5ed080f18d1c287a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
| |
As well as the MACOSX_BUNDLE properties as necessary.
Task-number: QTBUG-87664
Change-Id: I474b13a0a78a33fff1d06b283a88b0c33a7dd524
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
Compiler complains that's deprecated and always on.
Change-Id: Ic42db6288cde5c95093715afd5df98368d67bd1f
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-87661
Change-Id: Id97b3405ce69eb5db61790e8187a48762f3067db
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-86815
Change-Id: Id8da24b8a26f0263324a8fed5fd9cedbfa3ee11a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
| |
Fixes: QTBUG-83910
Change-Id: If0ebd9d0b528cd84ffe92955b7d1c4d580d397fb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
The current example didn't compile on Windows, because all Qt examples
require a target file.
Also clean up unnecessary parts generated by the Qt Creator wizard.
Change-Id: I40b834e544a146d3e232844e667d568b102bec5c
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|
|
|
|
|
|
| |
Rewrote delete statement in AlarmDelegate.qml
Change-Id: Ib112103c0666a6bce34576da5f38594ceac14788
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
| |
qrc:/AlarmDelegate.qml:139: ReferenceError: alarmModel is not defined
Change-Id: Id92b377375006e08d25a593b6532a5eaeb5b35a0
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
Task-number: QTBUG-68739
Change-Id: Ib14e4eb4c20583af2be9198539077f1be5ae471a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|