qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
71,663 Commits 68 Branches 266 Tags 804 MiB
Commit Graph

65 Commits

Author SHA1 Message Date
Lucie Gérard 3e0276990d Make module ready for source SBOM checking 
This includes:
- turning VERIFY_SOURCE_SBOM ON
- adding exception to the licenseRule.json files
- correcting the licensing given via REUSE.toml files
- renaming license files not located in LICENSES folder.
They need to be named LICENSE. to be ignored by reuse and
excluded from the source SBOM. The name are updated in the
corresponding qt_attribution.json

A lot of files are skipped during the license test,
but all are present in the source SBOM.
This is why  correction are needed before turning the
source SBOM check on.

[ChangeLog][Third-Party Code] Renaming the license files with prefix
LICENSE. to have them ignored by reuse tool.

Task-number: QTBUG-131434
Change-Id: Iab517215bb10a17357d2d2436bba8d3af76e5cd1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 7cb90e1563)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2025-01-27 22:38:50 +00:00
Allan Sandfeld Jensen 577946c1f0 Add Qt::Orientations based flip and flipped functions 
Is easier to read and more bool-trap safe. Old form header deprecated from 6.10

Fixes: QTBUG-129575
Change-Id: Id785b9ce159007ce745c04120b2112c8bb9b0802
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2024-11-29 15:07:14 +01:00
Assam Boudjelthia 529267972b Android: cleanup AndroidManifest.xml files in examples 
Change-Id: I6b0a11ace348891da7ed16dd9039b807902cb828
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
 2024-05-23 17:52:21 +03:00
Lucie Gérard 0f7a64a3ad Add copyright and licensing to build system files missing it 
Task-number: QTBUG-124453
Change-Id: Ibb6a0ab839a16ceef3c68861bac2f508ddb3d1ae
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2024-05-21 17:23:21 +02:00
Kai Köhne 5e699c2a8b Replace 'Qt Designer' and 'Qt Widgets Designer' in code 
Use new term in examples, code comments, error messages and and mime types.

Task-number: QTBUG-122253
Change-Id: I355452d6eb02a7a0ffbb20acf82ddb8ebbfa4837
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
 2024-05-16 13:04:41 +01:00
Allan Sandfeld Jensen 25c96d547b Add CMYK support to QColorSpace 
[ChangeLog][QtGui][QColorSpace] Support for CMYK color spaces has been
added.

Change-Id: I2c684dbeee8b97fc90ca4e2a892349a7fa465d06
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
 2024-04-12 21:53:54 +02:00
Lucie Gérard c2333f312f Correct license for examples files 
Example takes precedent over build system file type.
According to QUIP-18 [1], all examples file should be
LicenseRef-Qt-Commercial OR BSD-3-Clause

[1]: https://contribute.qt-project.org/quips/18

Pick-to: 6.7
Task-number: QTBUG-121787
Change-Id: Id348a89884bb309b96abb31077f14a51086b5d0c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
 2024-03-07 11:06:43 +01:00
Kai Köhne b74f814ae2 Doc: Further replace 'Qt Designer' with 'Qt Widgets Designer' 
Use \QD macro wherever possible.

Amends 8aceccc7eb

Task-number: QTBUG-122253
Change-Id: I276dabd40fb81486f6380fd90cf9968990932a24
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
 2024-02-29 15:35:58 +01:00
Juha Vuolle 30bacf78f4 Add the new Android bluetooth permissions to the manual test app 
Otherwise the bluetooth permission requests fail on 12+ Android.

Fixes: QTBUG-114941
Pick-to: 6.7 6.6 6.5
Change-Id: I545299e38a7b30df840863ac880ad5bdff5fbc5e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
 2024-01-23 18:44:54 +02:00
Alexey Edelev 9ba5c25f12 Add BuildInternals lookup to the settingseditor manual test 
Pick-to: 6.7
Change-Id: Iae39efccaac26bcd12b416c05af36a545dca59b6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
 2024-01-15 10:56:04 +01:00
Assam Boudjelthia ee4f91fa50 Android: set default style extraction to minimal 
The default value in the default manifest has been for few
releases, set as minimal, and since Widgets Android style
is not fully supported anymore, we can set this to default
to minimal under the hood as well to avoid needing to always
explicitly needing to set it to minimal.

Pick-to: 6.7
Change-Id: Id0b2134c572694be1e190347ff75f51ade65f0c4
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
 2023-12-22 21:21:37 +02:00
Volker Hilsheimer bddf27cd5a Move the settingseditor example into tests/manual 
The example uses QTreeWidget when it should use a QTreeView with a
dedicated item model, primarily shows how to use item views (and very
little about QSettings), and is generally not useful to show how an
application could or should use QSettings to store settings.

Turn it into a manual test instead; it's useful for that as it supports
ini and plist files, and settings in different scopes.

Pick-to: 6.7
Fixes: QTBUG-119978
Change-Id: I7ce039f6391c41c679d126d90a251eee60327c39
Reviewed-by: Ed Cooke <ed.cooke@qt.io>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
 2023-12-15 18:21:22 +01:00
Laszlo Agocs 9f3d6e325f Make contextinfo example a manual test 
Change-Id: I9023016d50e82bba1fa73632cc1409b3d016f352
Reviewed-by: Kristoffer Skau <kristoffer.skau@qt.io>
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
 2023-11-17 22:27:01 +01:00
Shawn Rutledge 83b592346b Modify the MDI manual test to allow multiple views of same document 
- editing same document in different views is possible? yes
- resizing one QTextEdit calls QTextDocument::setTextWidth(), which
  affects the width in the other view too. You can resize either one,
  but you can't have two views with different layouts, of course.

Added a categorized log message in QTextDocument::setTextWidth()
for a sanity check.

Task-nunber: QTBUG-35688
Change-Id: I59c4d10143fda3a66b946237832274d67f9d9d45
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
 2023-11-02 20:49:32 -07:00
Assam Boudjelthia 028a31b505 Android: remove unneeded allowNativeHeapPointerTagging manifest flag 
Amends b0907db9eae4b85fcab4fa997428c438d9443ee0.

Pick-to: 6.5 6.6
Task-number: QTBUG-91150
Change-Id: Ic7886a9fc69781e4f21417075516106ccb6c7bf5
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
 2023-10-20 18:46:29 +03:00
Tor Arne Vestbø 72a153a7f5 Move simple widget mapper example to manual test 
Pick-to: 6.5 6.6
Change-Id: I703843b5ee935794c2e2fd0407f9a1508b088ab6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-30 08:51:06 +02:00
Tor Arne Vestbø 8937169c19 Move simple dom model example to manual test 
Pick-to: 6.5 6.6
Change-Id: I33120e3f6217ea52bdfdebea8b5faa79d9d3fd68
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-30 08:51:02 +02:00
Tor Arne Vestbø 9c71b92430 Move plug and paint example to manual test 
Pick-to: 6.5 6.6
Change-Id: Ibfd870f2f879d6ae68cd6806b0c1ab02da0a3441
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-30 08:50:59 +02:00
Tor Arne Vestbø 921337f98c Move pixelator example to manual test 
Pick-to: 6.5 6.6
Change-Id: I3ce2bc269a9f77bce3dd41f0127d01091c1408f6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-30 08:50:55 +02:00
Tor Arne Vestbø 5654fbffd5 Move dials example to manual test 
Pick-to: 6.5 6.6
Change-Id: Ib99a3890b814c2089db62485f0a10cf308ff9b66
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-29 14:49:14 +02:00
Tor Arne Vestbø 81db1766dd Move textedit example to manual test 
Pick-to: 6.5 6.6
Change-Id: Ic3189044598be8e121c1f065e68e04a3547a87d0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-29 14:49:13 +02:00
Tor Arne Vestbø 40dbee13eb Move tetrix example to manual test 
Pick-to: 6.5 6.6
Change-Id: Ie73d9e35df8513d05d55ffbad1f02584359e3bd0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-29 14:49:13 +02:00
Tor Arne Vestbø 89b463ac2f Move styles example to manual test 
Pick-to: 6.5 6.6
Change-Id: I5738932c0c498ce2075a399274e3b80a04ad9211
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-29 14:49:13 +02:00
Tor Arne Vestbø 1e954f9be8 Move stylesheets example to manual test 
Pick-to: 6.5 6.6
Change-Id: If0206e63546bf948af4cfb65773e2662c53a5e79
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-29 14:49:13 +02:00
Tor Arne Vestbø c5ee7c8b8f Move main window example to manual test 
Pick-to: 6.5 6.6
Change-Id: I7d9281f173ce9fb24c0f565797b6fbcfba10459f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-29 14:49:13 +02:00
Tor Arne Vestbø 4b79834e1a Move MDI example to manual test 
Pick-to: 6.5 6.6
Change-Id: Ide698a171a4600cb4bac6574b6be74c17f779051
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-29 14:49:13 +02:00
Tor Arne Vestbø cd7995de57 Move windowcontainer example to manual test 
Pick-to: 6.5 6.6
Change-Id: I68b866bcc2659b90aad2c10dc06240674bf4a826
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
 2023-06-29 03:13:10 +02:00
Tor Arne Vestbø ec01f6ae8b Move movie example to manual test 
Pick-to: 6.5 6.6
Change-Id: Ie185a3c88eced7b8b0fe324b9ef62ab86d38d521
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 14:05:41 +02:00
Tor Arne Vestbø c7702638f3 Move pinch zoom example to manual test 
Pick-to: 6.5 6.6
Change-Id: I0632a839ef069e13a8b859a22f47be2e7423ffb0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 14:05:41 +02:00
Tor Arne Vestbø e00d8aa6a8 Move validators example to manual test 
Pick-to: 6.5 6.6
Change-Id: Ic91bc89422fb23e3782db69bab2953e7cf8ddf69
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 14:05:41 +02:00
Tor Arne Vestbø a18c55e738 Move item views puzzle example to manual test 
Pick-to: 6.5 6.6
Change-Id: Idbb4222861be86275a86f731e75127b8496a08a7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 12:05:41 +00:00
Tor Arne Vestbø 645e011d7d Move interview example to manual test 
Pick-to: 6.5 6.6
Change-Id: I06c77672c3ca08dfd3e50af25ed3e1669462259a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 14:05:40 +02:00
Tor Arne Vestbø b8f588bea7 Move image viewer example to manual test 
Pick-to: 6.5 6.6
Change-Id: I4b64033f1a075681ce5b918fdf2e018ad05a7869
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 14:05:40 +02:00
Tor Arne Vestbø c3fd8e911e Move icons example to manual test 
Pick-to: 6.5 6.6
Change-Id: I08f44448f96a61f780c21d628954879c7b28dce3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 09:56:40 +02:00
Tor Arne Vestbø 95595d68be Move graphis view flow layout example to manual test 
Pick-to: 6.5 6.6
Change-Id: I713816114b87def9eab79b893d13554f1c37c6a5
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 09:56:40 +02:00
Tor Arne Vestbø 532e1c9bf6 Move fridge magnets example to manual test 
Pick-to: 6.5 6.6
Change-Id: I6e40aff63f24dc98ab6b84450d288159f036142b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 09:56:40 +02:00
Tor Arne Vestbø 917282ea53 Move font sampler example to manual test 
Pick-to: 6.5 6.6
Change-Id: I696d9be26edfaadd40579884930b2f061d308a06
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 09:56:39 +02:00
Tor Arne Vestbø 0b6f5ae131 Move finger paint example to manual test 
Pick-to: 6.5 6.6
Change-Id: I26eec035eaa78eac2aa96de72ae38093bc08fd23
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 09:56:39 +02:00
Tor Arne Vestbø 9a320b037c Move fade effect example to manual test 
Pick-to: 6.5 6.6
Change-Id: I7f4e1d9b57be2d0ef22eb56d5d1f7abc5074ebae
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 00:09:59 +02:00
Tor Arne Vestbø 7b4b5c839b Move embedded dialogs example to manual test 
Pick-to: 6.5 6.6
Change-Id: I86213aa47def7ebacaa9465a0200cef10871706e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 00:09:59 +02:00
Tor Arne Vestbø 76ba4a0422 Move dynamic layouts example to manual test 
Pick-to: 6.5 6.6
Change-Id: I34288b2b22cbbfb3b77870f0c71778bcf3d552fb
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 00:09:58 +02:00
Tor Arne Vestbø cefb1c9ca9 Move drag and drop puzzle example to manual test 
Pick-to: 6.5 6.6
Change-Id: I859cdb2cf74cd6272c29924c77dab26b4f4c0b6c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-28 00:09:58 +02:00
Tor Arne Vestbø 2a65849e10 Move dock widgets example to manual test 
Pick-to: 6.5 6.6
Change-Id: I23ca3f2450df8f6c71509235ccec655d88d0d6d7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-26 23:15:02 +02:00
Tor Arne Vestbø fc0e82f58a Move dirview example to manual test 
Pick-to: 6.5 6.6
Change-Id: I9057d5efb1cdf3e425e879f8cc96a544c1892e77
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-26 23:15:02 +02:00
Tor Arne Vestbø 65e7303ec9 Move digital clock example to manual test 
Pick-to: 6.5 6.6
Change-Id: I043c0060a71d9de2f3e74aab0759d07a20880c3a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-26 23:15:02 +02:00
Tor Arne Vestbø e46fb69a87 Move chart example to manual test 
Pick-to: 6.5 6.6
Change-Id: I95a40834853a0157d8fa6137431bfd86ce855b2f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-26 23:15:02 +02:00
Tor Arne Vestbø 3a8265a429 Move character map example to manual test 
Pick-to: 6.5 6.6
Change-Id: Ie27fe436fc7ae7774beaa78f8a27f6009027753a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-26 23:15:01 +02:00
Tor Arne Vestbø 288c7ef557 Move calendar example to manual test 
Pick-to: 6.5 6.6
Change-Id: Ie2215ae0feeb322888619aed632e20db9b69e20b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-26 23:15:01 +02:00
Tor Arne Vestbø 42b58f8cb4 Move border layout example to manual test 
Pick-to: 6.5 6.6
Change-Id: I3f45043a64275f8678288e1d9839271eafa1fd2b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-26 20:47:45 +02:00
Tor Arne Vestbø 6c96218b43 Move qpa examples to manual tests 
Pick-to: 6.6 6.5
Change-Id: I7b25b1c8100f04eec3d9a571f59a1babef55b1d5
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2023-06-26 20:47:45 +02:00