summaryrefslogtreecommitdiffstats
path: root/src/designer/src
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Regenerate projects after mergewip/cmakeAlexandru Croitor2020-03-188-29/+45
| | | | | | | Plus additional adjustments. Change-Id: I0c2341ef6a5557e18df91b753f9e441c5b1a68e2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-18158-1097/+1030
|\ | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: Ia86822a3b64be4e17d525f6b055eadfab7215bc8
| * Merge remote-tracking branch 'origin/5.15' into devPaul Wicking2020-03-111-3/+4
| |\ | | | | | | | | | Change-Id: I7956e542a44db1a4e5589dccc267b7c306a50975
| | * Qt Designer: Fix warnings about deprecated style metricsFriedemann Kleint2020-03-051-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Qt Designer: Fix build with regards to QOpenGLWidgetFriedemann Kleint2020-03-055-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | QOpenGLWidget is now in QtOpenGLWidgets. Change-Id: I9815cf484cdf29cfa3511e400e39fc6731be1291 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-251-15/+15
| |\| | | | | | | | | | Change-Id: Iabcee67b9cf246cd5f1fe97205ed41b4763210ec
| | * Qt Designer: Add missing extra comments to strings from Palette PreviewFriedemann Kleint2020-02-211-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | The comment was present on the existing strings. Amends 7fd5d435b76460e42cd25004056a39e05f376baa. Change-Id: Ic5a03c3b63a974956845ad2a3d1fb6c7d4df98a2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-186-6/+6
| |\| | | | | | | | | | Change-Id: Iddb27e0884cb095f46fd668a2b8d64dc6dd4f58d
| | * Fix deprecation warnings about QComboBox: deprecate currentIndexChanged(QString)Friedemann Kleint2020-02-136-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Fix warnings introduced qtbase/11dc7b35c8c3957bd19087a5e3ae7cfc4f1a3343. Task-number: QTBUG-81845 Change-Id: I49169c34ec9aaff3625bcb9dfaef1d29b7beae07 Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
| * | Make Qt UiTools a dynamic libraryKai Koehne2020-02-145-6/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][General] Qt UiTools is now built as a dynamic library (instead of a static one), and therefore has to be deployed along with the other Qt libraries. Fixes: QTBUG-437 Change-Id: Ib69915c9d6f6b3466f58dcf8787a1773dc7007bc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Revert "Release Qt UI Tools library under BSD license"Kai Koehne2020-02-1419-585/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The license was originally changed from LGPL to BSD because the Qt UI Tools library was built statically by default. We will revert this in a follow-up commit. This reverts commit 909a00a4f3d1882eb974ad2953024c4670e2e392. Change-Id: Id1d24429d633688b537fcf90b53ff55d0ccd28fc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-081-2/+2
| |\| | | | | | | | | | Change-Id: Ib8c7aa10dc0aa93ec4572a10b0cd39d9686f0523
| | * Qt Designer: Fix deprecation warning about QMap::unite()Friedemann Kleint2020-02-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-011-2/+1
| |\| | | | | | | | | | Change-Id: I674982e1a1f7d47bb1541f544ff1506a7cbe3a72
| | * Qt Designer: Fix deprecation warning about const QPixmap* QLabel::pixmap()Friedemann Kleint2020-01-311-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Prospective fix for moved QOpenGL classesSimon Hausmann2020-01-273-0/+11
| | | | | | | | | | | | | | | | | | | | | Those are moving from QtGui to QtOpenGL, so prepare for that. Change-Id: I24c8ecd9b14291b26c3580b6292f10a77bc9a1f2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-187-162/+283
| |\| | | | | | | | | | Change-Id: Iaac26eb3c356beb28f70417d63fd00bd0efb57ee
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-141-2/+2
| | |\ | | | | | | | | | | | | Change-Id: Ie6dc6946f0cf21c2cf57643c393e61b2deefb90d
| | | * Bump copyright yearJani Heikkinen2020-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I81c229523e0d896f25d6d961c9857b615218ecbb Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| | * | Don't use deprecated QMatrix class anymoreJarek Kobus2020-01-103-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-46653 Change-Id: I62145c2ecb97a5f3538502303fbdb81ad33aded7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * | Qt Designer/Palette Editor: Set preview palette on QMdiSubWindowFriedemann Kleint2020-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the highlight color (which affects the subwindow border) has a visible effect. Change-Id: Ic4a3e9295aa85fb248546714fd29f02eca2ce2a5 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| | * | Qt Designer/Palette Editor: Improve the Preview WidgetFriedemann Kleint2020-01-082-149/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Qt Designer: No longer handle functions given for the DESIGNABLE property ↵Friedemann Kleint2020-01-065-38/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attribute Remove the parameter from the introspection interface and its handling. Change-Id: I1957563808811371f51c00312906f7f52da458f6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-281-2/+2
| |\| | | | | | | | | | | | | | Change-Id: I08845e94921c40cf6530f646af2652d9d0abd547
| | * | rcc.cpp: Use a QMultiHash explicitly if insertMulti() is being usedFriedemann Kleint2019-12-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Fix Qt6 buildAlexandru Croitor2019-12-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Qt Designer: Migrate from QList to QVectorFriedemann Kleint2019-12-09120-290/+287
| | | | | | | | | | | | | | | | | | | | Change-Id: I75f6f4b7157616ba86bf520e1936536571a66ba5 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | | Port the rest of QtToolsLeander Beernaert2019-12-124-2/+84
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4115bde9af38219682d0e6707bc7aa8fcb8d6bb0 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-12-09159-1261/+1674
|\| | | | | | | | | | | | | | | Change-Id: I6368c62aaf33bff9d9f41d7830ee7411c2cfd827
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-302-2/+37
| |\| | | | | | | | | | | | | | Change-Id: I50a7c2b57add2be49cb42083df8584882d78ea44
| | * | Qt Designer: Handle properties that specify a function for DESIGNABLEFriedemann Kleint2019-11-262-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Qt Designer: Replace QList by QVector in the ui4.cpp/.h filesFriedemann Kleint2019-11-262-60/+60
| | | | | | | | | | | | | | | | | | | | Change-Id: I953359bcbe071316f684a8019bef9d9c2f0a8a5c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-2373-306/+268
| |\| | | | | | | | | | | | | | Change-Id: Ib7e4d5d1f997c67bb68f4c5cb20adb4a5e26f6f5
| | * | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-2211-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is being deprecated. Change-Id: I5a2216b313c53ff7d42e02c0d91632550f3536ae Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Qt Designer: Port QList->QVector for some internal classesFriedemann Kleint2019-11-2021-53/+58
| | | | | | | | | | | | | | | | | | | | Change-Id: I10d9aba4e504f9759dcbedad84601eb3f1083b19 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| | * | Qt Designer: Prepare for deprecation of classes in Qt 6Friedemann Kleint2019-11-1947-228/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-164-2/+8
| | |\| | | | | | | | | | | | | Change-Id: I577c86f95e65e7bfae1e92e9fd33356a6301f89b
| | | * Doc: Resolve documentation warningsTopi Reinio2019-11-114-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-1680-323/+403
| |\| | | | | | | | | | | | | | Change-Id: I059498b4a62bee84d301b8dff36f2de40b9b02e0
| | * | Qt Designer: Fix deprecated usage of function for DESIGNABLEFriedemann Kleint2019-11-153-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Qt Designer: Fix Qt API usageFriedemann Kleint2019-11-1572-224/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Qt Designer/Action editor: Focus action dialog control according to columnFriedemann Kleint2019-11-136-8/+59
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-79973 Change-Id: I7ac28fdb66536d6b97791cad5a1eaf571d5785f9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| | * | Qt Designer/uic: Remove references to QStringRef in the ui4 codeFriedemann Kleint2019-11-121-89/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class will likely be deprecated in Qt 6. Task-number: QTBUG-79896 Change-Id: Icd0b6d157ec1d199f7c3a36b6490df8c4db3c88e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | | Qt Designer: Clean up the SDK headersFriedemann Kleint2019-11-1135-62/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use "= default" for constructors/destructors - Disable copy/move for non-QObject type interfaces and add constructors were needed - Remove duplicated disable copy for QObject type interfaces - Fix some formatting - Remove default implementation of QDesignerContainerExtension::canAddWidget()/canRemoveWidget() - Remove Qt 6 fixme comments Task-number: QTBUG-79896 Change-Id: If9521910c6488c081817e2ccdbf42de578cb16ad Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-091-0/+15
| |\| | | | | | | | | | | | | | Change-Id: Ib03e04e3ed003ab487fb610663b9308fad70604e
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-021-0/+15
| | |\| | | | | | | | | | | | | Change-Id: I3d3791f792e56bbd0dbf9b72edb55bedcec7639e
| | | * QAbstractFormBuilder::save(): Add a note explaining property issuesFriedemann Kleint2019-10-291-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Qt Designer: Change action object naming to camel caseFriedemann Kleint2019-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9bced121cfa83105159860bab2177fc2d0e87de4 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-026-185/+386
| |\| | | | | | | | | | | | | | Change-Id: Id3978877eb1ee8ca748705b2a55b5fdabb52fcf5
| | * | QAbstractFormBuilder: Refactor saving of palettesFriedemann Kleint2019-10-303-32/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 07:22:18 +0000