| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
tqtc/lts-5.15-opensource
Change-Id: I2813471aad9bc8b9bd04efe8571be6d1bee3045c
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I1b3f0d1b84f507e45728a00fa652d0db936cebca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit bd8827cd95552372a5aca78a21210a46bddadc36)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|\ \
| |/
| |
| |
| |
| | |
tqtc/lts-5.15-opensource
Change-Id: Ic4320871845328c7fdb0168bb27e981ea31dcb27
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add a default for new items to the column editor.
Amends 3ecd3398218f4bddebeb034b4914699132cd5288.
Task-number: QTBUG-85513
Change-Id: Ib78a967db710f16c783610825544c31187351654
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit dde1806d113b953955986589c866885f9958adf5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The horizontal QTableWidget headers are centered by default.
This is a problem since QTableWidgetItem::textAlignment() returns 0
for the default value and the header items are presented as list
widget items in the editor which have default alignment.
Populate the header list in the item editor correctly.
Add a default value to the property manager (in the form
of an attribute) and add a reset function.
Also pass a default for saving.
Fixes: QTBUG-85513
Change-Id: I78b95515f829cfb280f19a674575c8bd91fbb948
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 3ecd3398218f4bddebeb034b4914699132cd5288)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Use Qt::WA_WState_Hidden for header visibility when the item
view is hidden.
Fixes: QTBUG-49591
Change-Id: Ic00f5bb8a2a1fe3d77358dc20c441bf763bb9204
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 908660847ccd632fbb18f605d387ce806ab1be1e)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Determine the single step of the vertical scroll bar by
the item height.
Pick-to: 6.1 5.15
Fixes: QTBUG-93099
Change-Id: Ib04200131a64abb7beecd28bfa73433d6c20e9bf
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 7b2ffbc9697bab43a68efd12a2c58e5f5781bf21)
|
|/
|
|
|
|
|
|
|
|
|
| |
This reverts commit 57a6c4852376027df7808cda250339dd5b37000e.
Revert of commercial license headers is required for Qt 5.15.3
opensource release.
Task-number: QTBUG-91108
Change-Id: I56aa875d75deeb6c50c10e72553612ae6420fea5
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-89980
Change-Id: Ice588f78d392f1dfd1f96de8840a3c7e28e4edd1
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 0a097b742dcffc04690e98ce2e574febad25014d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Updated the header.COMM license header to files
under tqtc-qttools.
The commercial license header may contain some
additional lines so that its line count equals with
the earlier license header. Reason for this is that
some autotests use hard coded line numbers and a change
in the line count causes failures in tests.
Task-number: QTQAINFRA-4158
Change-Id: I463b2076d98776025ddea67d6f685f8a3b0709a2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: I4559c14316d63325554466c710ef0d8017e5876f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit b5da5f522616f99b000ed1c64a5cc1de0c3f8937)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Adapt to qtbase/00a5629d8de18bc1a5dfb6e2526c03b4b021c903.
Change-Id: I60d087effa61b09c7907d6168f8fa710462913c3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 87b3a255d3ede3d8aef7fc1ebdbb30b2bff2463f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
In preparation for deprecating operator+.
It's deprecated in C++20. Insert casts as necessary. Drive-by,
prepare for deprecation of operator+ for building key sequences.
Initial-patch-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Change-Id: Iaae4e35a56aa1c2365bc25af2582cf820de38d5e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit ae8239a53ea9c512d60f54903c741aab33a6b439)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Output .html filenames should not change unless absolutely necessary.
Change-Id: I17e2c95e18a7e23772d8b425c5255d0672fa6a57
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit db9dd6090c985d1d1ebfafdceb00cf2e252066ba)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
The latter has been the preferred name since Qt 4.7.0.
Change-Id: Ic6e1969788fb408929614474faac0bfc3fdfb602
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 8f269096b340b6ad384d00e841105b63b9e987a0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rewrite the message handler to take a QString and fix occurrences in
actions code, fixing:
src\designer\qdesigner.cpp(107): warning C4996: 'QString::QString': Use fromUtf8, QStringLiteral, or QLatin1String
src\designer\qdesigner_actions.cpp(325): warning C4996: 'QString::QString': Use fromUtf8, QStringLiteral, or QLatin1String
src\designer\qdesigner_actions.cpp(509): warning C4996: 'QString::QString': Use fromUtf8, QStringLiteral, or QLatin1String
src\designer\qdesigner_actions.cpp(515): warning C4996: 'QString::QString': Use fromUtf8, QStringLiteral, or QLatin1String
Change-Id: I9841cfff7fc7ab125168cd771eac55bfa7efe433
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 687b8d957a2288ce27ca6d3dd2a267aa6b85212e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Split up the chapters and add one about Python.
Change-Id: I58c5fe4ceeca5978c0dfbe73ab726a18080d21ea
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 150c2fbad94ae99833da27be7ea9fa13412eeba7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Use auto, raw string literals, member initialization and
streamline a bit.
Change-Id: I08c49c40e3636fe711568c10a8f4cae226700a87
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 2a05e4cc6eba5a74e12563e77afa18d4548c9a3b)
Reviewed-by: Qt Cherry-pick Bot
|
|
|
|
|
|
|
|
|
|
|
| |
Use QScopedPointer, like elsewhere in the code.
Fixes: QTBUG-83984
Change-Id: I6006b4c7f5ba6dfd0f4eccea2b6e9227cbf3a02c
Coverity-Id: 21962
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit c260c31a441ebae149fccad6d0a9dde68c57b4eb)
Reviewed-by: Cherry-pick Bot
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-83858
Change-Id: Ib0663aa7c98c8f0ae47907f87665c564e5b96186
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 5ac442521c252c6294a04de012243436e3ce2411)
Reviewed-by: cherrypickbot
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-81845
Change-Id: I94670a6dd44732cda2353d90bbfd31f477a4ca20
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 8a26263d8e54e1abb16d201be56688481cffa00b)
Reviewed-by: cherrypickbot
|
|
|
|
|
|
|
|
|
|
|
|
| |
Ensure new connections are visible and selected.
The order of statements in Add/DeleteConnectionCommand
needs to be changed for the model indexes to be valid.
Cherry-picked from branch: dev
Change-Id: Ib66ab86a085e47829cc5c8c0c6da78c9a7321748
Task-number: QTBUG-82924
Reviewed-by: cherrypickbot
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The implementation was broken in the sense that it would
return column text strings for the font/color roles since enum
deprecatedMember was 0.
Restructure the code to use a switch and a helper for the column
text.
Cherry-picked from branch: dev
Change-Id: Ifb055519b796d4323c3aac7bf24ccac8facf1497
Change-Id: I43a9c7e9f48ecb2e51849ce53e939c80aae54d5a
Task-number: QTBUG-82924
Reviewed-by: cherrypickbot
|
|
|
|
|
| |
Change-Id: I9d1c9126b526161aa58c9068bca30ef6dd1ac7fb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The command is deprecated and has no effect apart from generating
a documentation warning.
Drop the command also from the output generated by qtattributionsscanner.
Change-Id: Ic286909215d55f4062ea0af790bfb9be91747a98
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use PM_LayoutLeftMargin, PM_LayoutHorizontalSpacing instead of
PM_DefaultChildMargin, PM_DefaultLayoutSpacing, fixing:
formeditor/formwindowsettings.cpp:11452: warning: ‘PM_DefaultChildMargin’ is deprecated [-Wdeprecated-declarations]
formeditor/formwindowsettings.cpp:116:53: warning: ‘PM_DefaultLayoutSpacing’ is deprecated [-Wdeprecated-declarations]
A child widget needs to be passed to PM_LayoutLeftMargin to
correctly obtain the child margin.
Change-Id: Ided8fb45d2372a56bae3a0304c35339fcc3b83ee
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
| |
The comment was present on the existing strings. Amends
7fd5d435b76460e42cd25004056a39e05f376baa.
Change-Id: Ic5a03c3b63a974956845ad2a3d1fb6c7d4df98a2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
| |
Fix warnings introduced qtbase/11dc7b35c8c3957bd19087a5e3ae7cfc4f1a3343.
Task-number: QTBUG-81845
Change-Id: I49169c34ec9aaff3625bcb9dfaef1d29b7beae07
Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
|
|
|
|
|
|
|
|
|
| |
Replace by QMap::insert(), fixing:
shared\qlayout_widget.cpp:1918:79: warning: 'QMap<K, V>& QMap<K, V>::unite(const QMap<K, V>&) [with Key = int; T = bool]' is deprecated: Use QMultiMap for maps storing multiple values with the same key. [-Wdeprecated-declarations]
shared\qlayout_widget.cpp:1922:82: warning: 'QMap<K, V>& QMap<K, V>::unite(const QMap<K, V>&) [with Key = int; T = bool]' is deprecated: Use QMultiMap for maps storing multiple values with the same key. [-Wdeprecated-declarations]
Change-Id: I57c48aa52399b2a372c683aab8117bb8031002af
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Fix warning:
shared\iconselector.cpp: In member function 'void qdesigner_internal::IconThemeEditor::updatePreview(const QString&)':
shared\iconselector.cpp:594:64: warning: 'const QPixmap* QLabel::pixmap() const' is deprecated: Use the other overload which returns QPixmap by-value [-Wdeprecated-declarations]
const QPixmap *currentPixmap = d->m_themeLabel->pixmap();
Change-Id: Ib15a354133f65b5a55edfe5e11a046aa675ac0a2
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
|
|\
| |
| |
| | |
Change-Id: Ie6dc6946f0cf21c2cf57643c393e61b2deefb90d
|
| |
| |
| |
| |
| | |
Change-Id: I81c229523e0d896f25d6d961c9857b615218ecbb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-46653
Change-Id: I62145c2ecb97a5f3538502303fbdb81ad33aded7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Ensure the highlight color (which affects the subwindow border)
has a visible effect.
Change-Id: Ic4a3e9295aa85fb248546714fd29f02eca2ce2a5
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Add more widgets. Most importantly, add an item view with alternate
colors to be able to view selection colors.
Change-Id: I263ad4b5109e42b3e839892af5fd8d8d7066ca30
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Apply the rcc part from qtbase/c7e35ffe69a73bb144618714313673f0d0c28394
to the copy of the rcc code used in Qt Designer, fixing:
shared/rcc.cpp: In member function 'bool RCCResourceLibrary::addFile(const QString&, const RCCFileInfo&)':
shared/rcc.cpp:605:47: warning: 'QHash<K, V>::iterator QHash<K, V>::insertMulti(const Key&, const T&) [with Key = QString; T = RCCFileInfo*]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations]
Change-Id: Ib9989db852a8e0333d508c055c9f2667d65d74e9
Reviewed-by: hjk <hjk@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change-Id: Ie413ca2e2f81ac0e92628ffd2f3e93047a91bd0c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit 6b2f32f3dc9de965801927a4bc5d970028a318a6)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The behavior of Widgets will change to always return true for
those cases, which needs to be handled in the property sheet.
Add flags and types for handling the checked/checkable
dependencies to QDesignerPropertySheet::isEnabled().
QtWidgets also contained handling for the movable/allowedAreas
properties of QToolBar, but these appear to be non-functional, the
properties are designable regardless of parent. In addition, Qt
Designer currently only supports QToolBar on main windows.
Change-Id: Id417ee084a74ff91deaae13b567e64d8ff52c3e8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
It is being deprecated.
Change-Id: I5a2216b313c53ff7d42e02c0d91632550f3536ae
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I10d9aba4e504f9759dcbedad84601eb3f1083b19
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Use auto for QStringRef.
- Use auto for QList and iterators, refactoring some loops.
Task-number: QTBUG-79896
Change-Id: I065d5b6d49404e51a10a7e1d7373eff41f9cb032
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I577c86f95e65e7bfae1e92e9fd33356a6301f89b
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- QDoc Manual: UIComponents example project has been moved to be a part
of test case - remove references to it from the manual.
- Add missing image.
- Document the namespace qdesigner_internal as \internal.
Fixes: QTBUG-79833
Change-Id: Ic0984cef4091e794de5e502d04a897b1f532d9d8
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Use a property sheet instead, fixing warnings:
qdesigner_dockwidget_p.h:53: Warning: Providing a function for DESIGNABLE in a property declaration is deprecated and will not be supported in Qt 6 anymore.
qdesigner_dockwidget_p.h:54: Warning: Providing a function for DESIGNABLE in a property declaration is deprecated and will not be supported in Qt 6 anymore.
Change-Id: I9b3b09e5a6a13667782a8bdb7bdd3c4d7a6145c3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Replace:
empty() by isEmpty()
front()/back() by constFirst()/constLast(), preventing detaching
Streamline some code.
Task-number: QTBUG-79896
Change-Id: Ic3f8414db79a83a30b55369a9352f332b41aa621
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| | |
Fixes: QTBUG-79973
Change-Id: I7ac28fdb66536d6b97791cad5a1eaf571d5785f9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
The class will likely be deprecated in Qt 6.
Task-number: QTBUG-79896
Change-Id: Icd0b6d157ec1d199f7c3a36b6490df8c4db3c88e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I3d3791f792e56bbd0dbf9b72edb55bedcec7639e
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
State that the resulting files are not intended to be used
without editing.
Change-Id: I5ae342907a9394427ef9d3471ff2670421da8cc0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Kavindra Palaraja <kpalaraja@luxoft.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
By passing the color group QPalette::brush(), there is no
more need to use QPalette::setCurrentColorGroup() and the
argument to savePalette() can be made const-ref.
Fix other palette-related functions to conform to the Qt
coding styles.
Change-Id: Ifaaf02cde8b192bcac570c9d8e57c16c4b6553b2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|