summaryrefslogtreecommitdiffstats
path: root/tools/designer/src/components
Commit message (Collapse)AuthorAgeFilesLines
* Fix gcc 4.6 warnings about assigned/unused variables in Qt Designer.Friedemann Kleint2012-09-292-3/+1
| | | | | | 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-29187-4501/+4501
| | | | | | | | 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>
* Make sure the parent widget still exists.Jarek Kobus2012-08-312-2/+4
| | | | | | | | | | | | It may happen that InPlaceWidgetHelper's destructor is called after parent widget destructor. Now inside InPlaceWidgetHelper's destructor we check if parent widget still exists. Task-number: QTCREATORBUG-7684 Change-Id: I4c9ecbfae7323fd95345ccabc113218a7011ebe8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit aad795575646b37b5c531cb6314eaa049e90e076)
* Fix deleting of QTreeWidget items.Friedemann Kleint2012-08-201-0/+1
| | | | | | | | | | | | Breakage introduced by af617c319772a34115d0c4d802f25a807cb43065, which caused the autoconnections to no longer work. Task-number: QTBUG-26770 Change-Id: Id00341d93d4a830f3f48a1db6234818e6d262977 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> (cherry picked from commit c6616bcdc87b8665a2ea84b07dd04229f2ccbd7a)
* Update contact information in license headers.Sergio Ahumada2012-08-01187-374/+374
| | | | | | | | | | | | | - 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>
* Don't change the current page of mainwindow containerJarek Kobus2012-07-061-1/+1
| | | | | | | Task-number: QTBUG-12097 Change-Id: I3d9fa918ac8ea9ee419a3384f0d9e33366315a6c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-11187-187/+187
| | | | | | | | | 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-2/+7
| | | | | | | | | Add a comment in shared.pri explaining the problem. See also e7762b60d519c9ae4b47f6c4ceece584408247ea Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-22542
* Designer: Fix static linking.Jarek Kobus2011-08-311-9/+2
| | | | | | | | | | Fix a regression introduced by change e7762b60d519c9ae4b47f6c4ceece584408247ea working around an issue caused by changing the behaviour of qFindChild<> in 99160bb9f851bf02fe5345b5f52217b6c77a57c4. Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com> Task-number: QTBUG-21173
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13187-3192/+3192
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditorTasuku Suzuki2011-05-021-1/+1
| | | | | | TabOrderEditor should allow user to set tab order for widget that focusPolicy contains Qt::TabFocus. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-04-091-1/+3
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Allow promoted QWidget's to be buddies. Designer: Specify 'notr' attribute for buttongroup name.
| * Designer: Allow promoted QWidget's to be buddies.Friedemann Kleint2011-04-081-1/+3
| | | | | | | | | | | | Extend check for focusPolicy by promoted check. Task-number: QTBUG-18631
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-03-229-54/+163
|\ \ | |/ | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Avoid nested QDialog's in item widget content dialogs.
| * Designer: Avoid nested QDialog's in item widget content dialogs.Friedemann Kleint2011-03-229-54/+163
| | | | | | | | | | | | | | | | | | | | | | Refactor the AbstractItemEditor to be a QWidget instead of a dialog as it is used for the Rows/Columns of trees, tables as well, creating a hierarchy of nested QDialogs. The nested QDialogs cause some of the crashes observed with transparent styles using event filters accessing QWidget::window() in QEvent::Hide event filters. Task-number: QTBUG-18222
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-03-211-1/+4
|\ \ | |/ | | | | | | | | | | | | 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-1/+4
| | | | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-151-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Designer: Fix a bug affecting tab reordering of promoted tab widgets. Designer: Fix a bug clearing the Z-Order when adding a new widget. Adjust right bearing when breaking with line separators
| | * Designer: Fix a bug clearing the Z-Order when adding a new widget.Friedemann Kleint2011-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | Wrong list was used when adding widgets. Task-number: QTBUG-18120 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix warning about uninitialised variable use
| * | | Fix warning about uninitialised variable useThiago Macieira2011-03-081-1/+1
| | | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-03-081-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Set dirty correctly in case resource paths were changed.
| * | | Designer: Set dirty correctly in case resource paths were changed.Friedemann Kleint2011-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-17918
* | | | Store property editor's column positions in settingsJarek Kobus2011-02-231-0/+4
| | | | | | | | | | | | | | | | | | | | RevBy: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task: QTBUG-15497
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-172-3/+12
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf mkspecs/symbian-gcce/qmake.conf src/corelib/global/qnamespace.h src/corelib/global/qnamespace.qdoc src/plugins/plugins.pro tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
| * | | Designer: Slots of main container not visible in signal/slot editor.Friedemann Kleint2011-02-112-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression introduced by dd7873cd7e02e42b384709f33a34f69bc06fb25d of QTBUG-17179. Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Task-number: QTBUG-17358
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-102-13/+11
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp 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 tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * | Designer: Fix a crash in the Signal-Slot-Editor.Friedemann Kleint2011-02-042-13/+11
| |/ | | | | | | | | | | | | | | | | Object search found deleted widgets by name when searching on the form window. Search main container instead, do not assert. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-17179
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17187-187/+187
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10187-187/+187
| | | | | | | | Reviewed-by: Trust Me
* | qt project files: create pkg-config files for mingwMark Brand2011-01-101-1/+1
| | | | | | | | | | | | | | This is mostly the same as for unix. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-071-0/+1
|\ \ | |/
| * Designer: Block QEvent::WinIdChange.Friedemann Kleint2011-01-061-0/+1
| | | | | | | | | | | | | | As it causes an obscure deletion crash related to the formeditor rubberband on Mac. Reviewed-by: con
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-111-5/+12
|\ \ | |/
| * Designer: Fix a crash when copying empty page-based containers.Friedemann Kleint2010-10-111-5/+12
| | | | | | | | | | Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-14208
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * Designer: Minor BT issue: '-' button in Signal/Slot editor not updated.Friedemann Kleint2010-09-231-1/+1
| | | | | | | | Reviewed-by: Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com>
* | Designer/QFormBuilder::save(): Fix traversal of QGridLayout/QFormLayoutFriedemann Kleint2010-09-231-28/+0
| | | | | | | | | | | | | | Remove redundant code in qdesigner_resource ass well. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-13683
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-2/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-141-2/+4
| |
* | Support "icon form theme" inside property editorJarek Kobus2010-09-162-42/+271
| | | | | | | | | | 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-105-182/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Tools (uic/rcc): Improve warning messages.Friedemann Kleint2010-09-071-1/+0
| | | | | | | | | | | | | | | | | | Output as 'filename: Warning: message' and make some uic warnings more verbose to make Qt Creator parsing easier. Fix resource warning in Qt Designer. Reviewed-by: dt Rubber-stamped-by: Tobias Hunger <tobias.hunger@nokia.com>
| * Wrap translatable messages with tr() in assistant, designer and linguistVictor Ostashevsky2010-09-011-11/+11
| | | | | | | | | | Merge-request: 2456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Remove unused source files in designerVictor Ostashevsky2010-08-313-170/+1
| | | | | | | | | | Merge-request: 2463 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Designer/uic: Start on support for QIcon::fromTheme().Friedemann Kleint2010-09-081-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Designer: Add 'Simplify rich text' filter to rich text editor.Friedemann Kleint2010-08-173-0/+2
| | | | | | | | | | | | | | | | 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
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-0617-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-068-25/+25
|/ | | | | | | | | | | | | 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-09-20 02:59:37 (GMT)