qt/qtbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
70,782 Commits 1 Branch 1 Tag
6.8
Commit Graph
7 Commits
Author SHA1 Message Date
Tarja Sundqvist ed77a3ca9e Revert "Update commercial SPDX-License-Identifier"
Smoke build / build (-pkg-config -system-sqlite -system-pcre -system-zlib -system-freetype -system-libpng -system-libjpeg -system-harfbuzz -system-libb2 -system-doubleconversion, jpeg sqlite libpng pcre2 harfbuzz freetype libb2 double-conversion, HOMEBREW_NO_INSTALL… (push) Has been cancelled
Smoke build / build (-qt-sqlite -qt-pcre -qt-zlib -qt-freetype -qt-libpng -qt-libjpeg -qt-harfbuzz -no-feature-sql-psql -no-feature-sql-mysql -no-feature-sql-odbc, choco install, --yes --no-progress, windows-2019, windows-2019, ninja) (push) Has been cancelled
Smoke build / build (-xcb -system-sqlite -system-pcre -system-zlib -system-freetype -system-libpng -system-libjpeg -system-harfbuzz -system-libb2 -system-doubleconversion -system-libmd4c, libgl-dev libglu-dev 'libxcb*-dev' libx11-xcb-dev libxkbcommon-x11-dev libpcre… (push) Has been cancelled
Smoke build / build (-xcb -system-sqlite -system-pcre -system-zlib -system-freetype -system-libpng -system-libjpeg -system-harfbuzz -system-libb2 -system-doubleconversion, libgl-dev libglu-dev 'libxcb*-dev' libx11-xcb-dev libxkbcommon-x11-dev libpcre2-dev libz-dev l… (push) Has been cancelled 
This reverts commit b530ae6e81.

The revert is needed for the Qt 6.8 LTS opensource releases.
They cannot contain commercial SPDX license identifiers.

Task-number: QTLTSOSS-264
Change-Id: Ice9d1595750519076d1c2a1c1927d38944811598
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
 2025-09-11 21:42:22 +03:00
Tarja Sundqvist b530ae6e81 Update commercial SPDX-License-Identifier 
Updated the commercial SPDX-License-Identifier to
the source files (including tools and utils). Examples,
tests, documentation, or build files are not updated.

Modified licenseRule.json and REUSE.toml accordingly.

Task-number: QTBUG-136484
Change-Id: I4b82a867e37cb90a9d94db60a9c5715dd0557562
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2025-07-02 14:08:11 +03:00
Lucie Gérard 3828b30951 Correct license in qmake/ 
The majority of files in qmake/ have non-LGPL licensing.
Remove the mix of licenses and follow the majority.
Not sure what is the type of the files in qmake/
according to QUIP-18 [1].

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

Pick-to: 6.7
Task-number: QTBUG-121787
Change-Id: I4003daada9e20b9ea4524de89ba49fbe0880ec23
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
 2024-02-13 13:55:02 +01:00
Giuseppe D'Angelo 04f2acf93a qtpaths: generate proper JSON 
The "manual" generation left a trailing comma in the object definition.
This is illegal, as per RFC 8259:

      object = begin-object [ member *( value-separator member ) ]
               end-object

Hence, the resulting JSON does not get accepted by any parser.

Let's just not do that and use QJsonDocument.

Change-Id: I882486e55f66c52d142638f37584088091bbc123
Pick-to: 6.2 6.5 6.6
Fixes: QTBUG-115124
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
 2023-07-08 10:50:41 +02:00
Marc Mutz df9d882d41 Port from container.count()/length() to size() 
This is semantic patch using ClangTidyTransformator:

  auto QtContainerClass = expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o)
  makeRule(cxxMemberCallExpr(on(QtContainerClass),
                             callee(cxxMethodDecl(hasAnyName({"count", "length"),
                                                  parameterCountIs(0))))),
           changeTo(cat(access(o, cat("size"), "()"))),
           cat("use 'size()' instead of 'count()/length()'"))

a.k.a qt-port-to-std-compatible-api with config Scope: 'Container'.

<classes> are:

    // sequential:
    "QByteArray",
    "QList",
    "QQueue",
    "QStack",
    "QString",
    "QVarLengthArray",
    "QVector",
    // associative:
    "QHash",
    "QMultiHash",
    "QMap",
    "QMultiMap",
    "QSet",
    // Qt has no QMultiSet

Change-Id: Ibe8837be96e8d30d1846881ecd65180c1bc459af
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2022-10-04 07:40:08 +02:00
Lucie Gérard 05fc3aef53 Use SPDX license identifiers 
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
Files that have to be modified by hand are modified.
License files are organized under LICENSES directory.

Task-number: QTBUG-67283
Change-Id: Id880c92784c40f3bbde861c0d93f58151c18b9f1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
 2022-05-16 16:37:38 +02:00
Alexey Edelev 5db8579620 Add support for various output formats for QMakeProperty 
Add the ability to select a standard and json output formats of
the Qt properties. This patch also improves the encapsulation of
QMakeProperty.

Change-Id: Ib1d232be1b430ed8456ce65cc98141282e4c3f7f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2021-03-12 13:20:00 +01:00