summaryrefslogtreecommitdiffstats
path: root/tools/designer/src/lib/shared
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-31166-2159/+2159
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Fix compiler warnings in Qt Designer.Friedemann Kleint2015-03-022-2/+1
| | | | | | | | | shared/widgetdatabase.cpp:371:66: warning: typedef 'NameItemMap' locally defined but not used [-Wunused-local-typedefs] tools/designer/src/lib/shared/previewmanager.cpp:820:16: warning: converting ‘false’ to pointer type ‘QWidget*’ [-Wconversion-null] Task-number: QTBUG-44747 Change-Id: I9781a8cbce1def5229fe0ed7071c04ae6880b039 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Updated year in copyright headerKai Koehne2014-03-26166-166/+166
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Designer: remove dead code in ↵Marc Mutz2013-11-121-3/+0
| | | | | | | | | | | | | | QStackedWidgetPreviewEventFilter::updateButtonToolTip() The local variable 'className' is no longer used, since at some point in time, it was replaced with the query stackedClassName(), a file- static function. So remove the code that sets it. Change-Id: I2ee7dedc66acfa10949b628499c52f87dab02e7a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qttools/c98012e7a6b6287ec13b8ca4a4d08ed584f7ee8a)
* Fix resetting of string properties.Friedemann Kleint2013-10-311-0/+6
| | | | | | | Task-number: QTBUG-34171 Change-Id: Ib5fe8194d891eb999e41bafde19834be56c84103 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/78d8ee2513bdf52da2e0141be93dfe7bab8a1488)
* Designer: Fix morphing of widgets in QSplitters.Friedemann Kleint2013-06-221-0/+8
| | | | | | | | | | They were not handled at all, children were just reparented resulting in the morphed widgets being appended. Task-number: QTBUG-31911 Change-Id: Idae8f66663416d514a2f3c299e58d726a3dd578a Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/d251ee9dcbd015f2acbe76231902b72163cd05a2)
* Fix moving widgets in horizontal layouts in RTL mode.Friedemann Kleint2013-03-061-1/+4
| | | | | | | | Task-number: QTBUG-25872 Change-Id: Ia311b88f0ed3450d798bc5a9136e978c642d5b25 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/eb456f72052b02a77e22868bfa55a25d7af3e660)
* Qt Designer: Use multiline validation for dynamic string properties.Friedemann Kleint2013-01-211-0/+20
| | | | | | | | Task-number: QTBUG-26394 Change-Id: Idbaa4bad71125b74d8407bb56ee9fdbf83831fe0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/a7d61534acdb90b925d7f250665dcd30c3f37668)
* Update copyright year in Digia's license headersSergio Ahumada2013-01-13166-166/+166
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Detect QMainWindow-separator as passive interactor in Qt Designer.Friedemann Kleint2012-11-281-2/+6
| | | | | | | | | Ensure that dock widgets in Qt Creator can be resized. Task-number: QTCREATORBUG-8284 Change-Id: If6aa55b2dde8fce53e1527db678f518b3912907b Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/5e4bc7e3556cb5afcd82731277bdef60ae2cbe33)
* Fix gcc 4.6 warnings about assigned/unused variables in Qt Designer.Friedemann Kleint2012-09-294-5/+0
| | | | | | Change-Id: Ic983e09769c812412defd6f84298770235c3ed48 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-29166-3985/+3985
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-01166-332/+332
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix compilation when QT_NO_CURSOR is definedRomain Pokrzywka2012-04-102-0/+10
| | | | | | | | | | Although the QtDesigner module isn't built by default on embedded platforms, it's sometimes needed, mainly for dynamic form loading. The library contains a couple of setCursor calls which should then be #ifdef'd, as it's often a disabled feature for embedded UIs. Change-Id: I92d91249905848e73ee933e6f057a30b9cacb03c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-11166-166/+166
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Qt Designer: Fix static linking on Mac.Friedemann Kleint2011-11-081-1/+11
| | | | | | | | | Add a comment in shared.pri explaining the problem. See also e7762b60d519c9ae4b47f6c4ceece584408247ea Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-22542
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13166-2823/+2823
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-04-041-1/+1
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer [Qt Creator integration]: Fix integrated property editor.
| * Designer [Qt Creator integration]: Fix integrated property editor.Friedemann Kleint2011-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Within Qt Creator, properties of types int, bool were always disabled in 4.8 after 99160bb9f851bf02fe5345b5f52217b6c77a57c4 (changed implementation of qFindChild). The Property browser solution is included in 2 different designer libraries by pri (shared part and property editor component), that is, some weak symbols of its Q_OBJECTS are duplicated (see gcc-bug 47877). The manifestation is qFindChild<> failing for QInt/BoolPropertyManager in QtVariantEditorFactory::connectPropertyManager(), qvariantproperty.cpp:1998 (Linux/gcc) in the Qt Creator setup. Work around the issue by using a separate profile containing only the key sequence editor required by the shared part of Qt Designer.
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-03-281-48/+48
|\ \ | |/ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Fix tab order in action editor dialog. Make QtUiTools use the lib-infix passed to configure.
| * Designer: Fix tab order in action editor dialog.Friedemann Kleint2011-03-281-48/+48
| | | | | | | | Task-number: QTBUG-18400
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-03-212-4/+13
|\ \ | |/ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Remember default of main container's object name. Designer: Do not translate page object names of QMdiArea.
| * Designer: Remember default of main container's object name.Friedemann Kleint2011-03-211-2/+11
| | | | | | | | | | | | | | | | | | as a default property value. Users can then safely reset it to its original value. The default-generated name previously led to the uic-generated file names to be different, causing build errors in IDE's. Task-number: QTBUG-18256
| * Designer: Do not translate page object names of QMdiArea.Friedemann Kleint2011-03-211-2/+2
| | | | | | | | | | | | and page-based containers. Task-number: QTBUG-18244
* | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-2/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/symbian-gcce/qmake.conf qmake/generators/metamakefile.cpp qmake/generators/win32/mingw_make.cpp src/corelib/global/global.pri src/corelib/global/qglobal.h src/opengl/qgl.cpp src/opengl/qwindowsurface_gl.cpp src/plugins/platforms/wayland/qwaylandbuffer.h tests/auto/qnetworkreply/tst_qnetworkreply.cpp tools/designer/src/components/formeditor/qdesigner_resource.cpp
| * Designer: Fix a bug affecting tab reordering of promoted tab widgets.Friedemann Kleint2011-03-151-2/+4
| | | | | | | | | | | | | | | | | | | | Event filter was added twice due to widget initialization being done twice caused by recursion of WidgetFactory::createWidget() in the case of a fallback to promotion when a custom widget plugin is missing. Task-number: QTBUG-18121 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-02-221-6/+14
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Check for 0-spacing when loading grid settings.
| * | Designer: Check for 0-spacing when loading grid settings.Friedemann Kleint2011-02-211-6/+14
| | | | | | | | | | | | Task-number: QTBUG-17542
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-022-10/+15
|\ \ \ | |/ / |/| / | |/
| * Fix a crash when undoing form layoutJarek Kobus2011-02-012-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In a rare case when breaking a layout might make widgets overlap, the internal heuristic failed when recreating an original layout during undo. Some widgets were removed from the grid. The patch fixes this heuristic (makes sure we don't remove other widgets). Creating a form layout from overlapping widgets works better now. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTCREATORBUG-3616
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17166-166/+166
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-10166-166/+166
| | | | | | | | Reviewed-by: Trust Me
* | Watch qrc files also when they are emptyJarek Kobus2010-12-091-23/+27
| | | | | | | | | | Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTCREATORBUG-825
* | Designer: Fix coverity warning (memory leak in widget database).Friedemann Kleint2010-12-011-5/+5
| | | | | | | | | | Reviewed-by: Juuso Pakarinen <juuso.pakarinen@tieto.com> Task-number: QT-4341
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Workaround for QFileSystemWatcher regressionJarek Kobus2010-10-141-3/+3
| | | | | | | | | | | | | | Don't call removePath() when it was not added before. Reviewed-by: con <qtc-committer@nokia.com> Task-number: QTBUG-14435
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-225-5/+233
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compiler warnings in qelfparser uic: Add autotests for layout alignment Designer: Support alignment in box and grid layouts.
| * | Designer: Support alignment in box and grid layouts.Friedemann Kleint2010-10-225-5/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | Extend ui-format by alignment-attribute for QLayoutItem, handle it in uic and formbuilder. Support in Designer by context menu. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-3120
* | | Designer: Enable morphing into QTextBrowser.Friedemann Kleint2010-10-191-1/+1
|/ / | | | | | | Task-number: QTBUG-14537
* | Support "icon form theme" inside property editorJarek Kobus2010-09-162-5/+5
| | | | | | | | | | Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QT_BUG-7777
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-102-4/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * Designer: Fix action editor scrolling.Friedemann Kleint2010-09-061-2/+4
| | | | | | | | | | | | | | | | | | In overwritten virtual QAbstractItemView::currentChanged, invoke base implementation. Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Task-number: QTCREATORBUG-2249
| * Wrap translatable messages with tr() in assistant, designer and linguistVictor Ostashevsky2010-09-011-2/+2
| | | | | | | | | | Merge-request: 2456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Designer/uic: Start on support for QIcon::fromTheme().Friedemann Kleint2010-09-088-82/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Schemas: Add "theme" attribute to <iconset> element of the UI format. uic: Extend it to generate the code for icons with themes and/or resource paths, add auto-test for it. Designer: Add 'theme'-member to PropertySheetIconValue + convenience functions including subproperty mask handling and simplify the existing code. Add new class IconThemeEditor to be used in action editor dialog and property editor. Theme names can now be specified in the action editor dialog. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-7777
* | Qt Designer/Integrations: Add properties for use by C++-IDEs.Friedemann Kleint2010-08-232-3/+20
| | | | | | | | | | | | | | | | | | | | | | ...such as the header suffix (like ".h") or whether headers should be lowercase only. Allows for using different suffixes and conventions like 'CamelCase.hxx", etc. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> API-reviewed-by: Kai Koehne <kai.koehne@nokia.com> Task-number: QTCREATORBUG-163
* | Designer: Add 'Simplify rich text' filter to rich text editor.Friedemann Kleint2010-08-172-27/+176
| | | | | | | | | | | | | | | | Add an option to filter out style elements created by the text engine to keep the rich text simple. Acked-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-10890
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * Designer: Prevent rich text from being copied into style sheets.Friedemann Kleint2010-08-051-0/+1
| | | | | | | | | | Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com> Task-number: QTCREATORBUG-1952
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-0619-170/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-0610-17/+17
|/ | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(this,* */f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(&\([^\(),]*\),* */\\2.f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*()\),* */\\2->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\):\([^\(),]*\),* */(\\2:\\3)->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\),* */\\2->f\\1(/'" qFindChild Rev-by: dev mailing list
generated by cgit v0.12 at 2024-11-06 07:39:13 (GMT)