diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-02-12 14:42:47 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-02-14 11:09:22 +0000 |
| commit | 523fe4c15e8e962d13ca17bc0645468ab867c926 (patch) | |
| tree | 28fef227518211fd1f28fb6c7b9ab08959c21f7c /src/shared/qtpropertybrowser/qteditorfactory.cpp | |
| parent | 066161834ed0fa101b72f4df9d45441df187750e (diff) | |
| parent | 8923c9a51e2b1da324d6d02235a1c37f2e59f669 (diff) | |
Merge tag 'v6.5.5-lts' into tqtc/lts-6.5-opensourcev6.5.5-lts-lgpl6.5
Qt 6.5.5-lts release
Conflicts solved:
dependencies.yaml
src/designer/src/designer/doc/snippets/CMakeLists.txt
src/designer/src/designer/doc/snippets/autoconnection/CMakeLists.txt
src/designer/src/designer/doc/snippets/imagedialog/CMakeLists.txt
src/designer/src/designer/doc/snippets/multipleinheritance/CMakeLists.txt
src/designer/src/designer/doc/snippets/noautoconnection/CMakeLists.txt
src/designer/src/designer/doc/snippets/singleinheritance/CMakeLists.txt
src/designer/src/designer/doc/snippets/uitools/calculatorform/CMakeLists.txt
Change-Id: I70474eb774c0b95093a50b784738651f989d8349
Diffstat (limited to 'src/shared/qtpropertybrowser/qteditorfactory.cpp')
| -rw-r--r-- | src/shared/qtpropertybrowser/qteditorfactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/qtpropertybrowser/qteditorfactory.cpp b/src/shared/qtpropertybrowser/qteditorfactory.cpp index 1f51f2ba7..bc12579ed 100644 --- a/src/shared/qtpropertybrowser/qteditorfactory.cpp +++ b/src/shared/qtpropertybrowser/qteditorfactory.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial #include "qteditorfactory.h" #include "qtpropertybrowserutils_p.h" |