summaryrefslogtreecommitdiffstats
path: root/tools/designer/src/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-201-2/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| * Designer fails to compile if Qt is compiled without size grip supportAntonio Aloisio2009-07-151-2/+4
| | | | | | | | Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | general wording change for some file type namesFrederik Schwarzer2009-07-064-19/+19
| | | | | | | | | | | | | | | | | | | | | | - .ts file -> TS file - .qm file -> QM file - .ui file -> UI file + a handfull of typos I stumbled over Merge-request: 802 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Fixed license header broken by 137bb787.Friedemann Kleint2009-06-291-2/+0
| |
* | Fixed an oversight in Qt Designer that prevents one from designing empty tab ↵J-P Nurmi2009-06-171-5/+7
| | | | | | | | | | | | widgets. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Fixed an oversight in Qt Designer that prevents one from designing empty ↵J-P Nurmi2009-06-171-4/+7
| | | | | | | | | | | | stacked widgets. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-16250-500/+500
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-16250-500/+500
| | | | | | | | Reviewed-by: Trust Me
* | Enable overriding of the factory functions of QUiLoader.Friedemann Kleint2009-05-294-20/+28
| | | | | | | | | | | | | | | | | | | | Move initialization of QAction/QActionGroups elsewhere. Detect the root widget by checking its parent against the parent widget passed in and apply only the size part of the geometry property to it. Task-number: 254824 Initial-patch-by: joao <joao@abecasis.name>
* | Call QFormBuilderExtra::instance lessJoão Abecasis2009-05-291-4/+6
| | | | | | | | Reviewed-by: Friedemann Kleint
* | Fixed compilation Solaris.Friedemann Kleint2009-05-251-10/+6
| |
* | Enabled the use of promoted widgets in new form templates.Friedemann Kleint2009-05-225-4/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The form builder used for preview of the templates did not implement custom widget handling (FormBuilder::createCustomWidgets()). On encountering a promoted widget, the widget factory would then create a Widget Database entry specifying QWidget inheritance (emergency fallback) which could not be overidden later on. To fix this, moved the code for handling custom widgets from QDesignerResource to QSimpleResource and create a new formbuilder class that handles it especially for the New Form Dialog preview. Task-number: 254282
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-181-0/+4
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| * Made it possible to set string properties using ↵Friedemann Kleint2009-05-181-0/+4
| | | | | | | | | | | | | | | | | | QDesignerFormWindowCursor::setProperty. Ensure the text does not get clobbered by the subproperty handling. Reviewed-by: Kai Köhne <kai.koehne@nokia.com> Task-number: 253278
* | Merge branch '4.5'Thiago Macieira2009-05-142-1/+12
|\ \ | |/ | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * Added API for quietly saving a form.Friedemann Kleint2009-05-132-1/+12
| | | | | | | | | | | | | | | | | | Task-number: 163220 Added to FormWindowBase. Required among other things for Qt Creator code completion for uic-generated-headers. Acked-by: dt <qtc-committer@nokia.com>
* | Fixed Qt 4.6 source package compilation by moving the qvfb skins.Friedemann Kleint2009-05-132-15/+1
| | | | | | | | | | | | | | Move skins to tools/shared/deviceskin and have them included automatically by the profile. Acked-by: Jason McDonald <jason.mcdonald@nokia.com> Acked-by: Warwick Allison <warwick.allison@nokia.com>
* | Compile on Mac OS X.Norwegian Rock Cat2009-05-111-3/+8
| | | | | | | | | | | | | | | | The friend thing doesn't really work when it's defined in the class you want to be a friend of, so do the promotion technique instead. Reviewed-by: Thierry Bastian
* | QToolBarLayout and QDockWidgetLayout, which are private classes, areThierry Bastian2009-05-081-4/+8
| | | | | | | | | | | | | | | | | | | | no more exported designer was using QToolBarLayout members. We fixed that by using styles. Reviewed-by: Friedemann Kleint Reviewed-by: ogoffart
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-172-9/+9
|\ \ | |/ | | | | | | Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
| * Fix management of svg iconsJarek Kobus2009-04-172-9/+9
| | | | | | | | | | Task: 251248 Revieved-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-155-13/+25
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * Display QAction keyboard shortcuts in action editor correctly.Friedemann Kleint2009-04-155-13/+25
| | | | | | | | Use PropertySheetKeySequenceValue instead of plain strings.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJarek Kobus2009-04-021-0/+11
|\ \
| * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-011-0/+11
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| | * Add missing copyright headers and the "we mean it" section.Thiago Macieira2009-03-311-0/+11
| | | | | | | | | | | | | | | | | | These were reported by mkdist Reviewed-by: TrustMe
* | | Implement the filter for resource browserJarek Kobus2009-04-022-26/+164
|/ / | | | | | | | | Task: 249659 Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-301-0/+1
|\ \ | |/
| * Fix backslashes in string propeerty in property browserJarek Kobus2009-03-301-0/+1
| | | | | | | | | | | | | | Inside DesignerEditorFactory::createTextEditor() we first do setText() and afterwards we do setTextPropertyValidationMode(). setTextPropertyValidationMode() didn't update the cached text. Below patch fixes it. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: 245503
| * Long live Qt 4.5!Lars Knoll2009-03-23278-0/+88018
|
* Long live Qt!Lars Knoll2009-03-23278-0/+88566
generated by cgit v0.12 at 2024-10-27 04:43:08 (GMT)