summaryrefslogtreecommitdiffstats
path: root/tools/designer/src
Commit message (Collapse)AuthorAgeFilesLines
* Enabled the use of promoted widgets in new form templates.Friedemann Kleint2009-05-226-124/+183
| | | | | | | | | | | | | | | 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
* Remove unused variables from various About dialogs.Jason McDonald2009-05-201-5/+1
| | | | Reviewed-by: Trust Me
* Merge commit 'origin/4.5'Olivier Goffart2009-05-183-3/+10
|\ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| * Fixed a bug caused by forms with a sizepolicy of 'Fixed' on the main container.Friedemann Kleint2009-05-182-3/+6
| | | | | | | | | | | | | | | | | | | | Restore 4.4 behaviour by using a QStackedLayout as the layout containing the actual form (as was in 4.4). The difference in behaviour was caused by insertion of an additional widget with a QVBoxLayout which is supposed to ease setting of inheritable properties (style, etc). Reviewed-by: Kai Köhne <kai.koehne@nokia.com> Task-number: 253236
| * 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>
* | Merge branch '4.5'Thiago Macieira2009-05-131-3/+3
|\ \ | |/ | | | | | | Conflicts: tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * qdoc: Fixed some qdoc errors.Martin Smith2009-05-131-3/+3
| |
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-131-89/+105
|\ \ | |/
| * Doc - removing trailing whitespacesKavindra Devi Palaraja2009-05-121-2/+2
| |
| * Doc - cleaning up the documentation of QUiLoader.Kavindra Devi Palaraja2009-05-121-89/+105
| | | | | | | | | | | | | | | | | | Also mentioned an important point: If you subclass QUiLoader and reimplement either createAction(), createActionGroup(), createLayout(), or createWidget() -- you must call the original implementation first, within your implementation. Reviewed-by: João Abecasis <joao@abecasis.name>
* | 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>
* | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-121-1/+1
| | | | | | | | We introduce this new enum, we should be using it.
* | 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.troll.no:qt/qtSimon Hausmann2009-04-271-3/+4
|\ \ | |/
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-271-2/+2
| |\
| * | Make dark color schemes look better in property editor (especially schemes ↵Jarek Kobus2009-04-271-3/+4
| | | | | | | | | | | | | | | | | | | | | which have a grey color for text) Task: 252251 RevBy: Markus Goetz <Markus.Goetz@nokia.com>
* | | Merge branch '4.5'Rhys Weatherley2009-04-211-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.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.qdocconf
| * | QTableWidget header items not re-translated by QUiLoader.Friedemann Kleint2009-04-211-2/+2
| |/ | | | | | | | | | | Task: 251691 Translate correct header item (fix to new feature). Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-201-22/+2
|\ \ | |/ | | | | | | Conflicts: src/gui/itemviews/qheaderview_p.h
| * Fix the About Qt dialog text to be truthful, post-LGPLJason McDonald2009-04-181-22/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the text of the About Qt dialog, as directed by Legal. Note that this change breaks string freeze as the text is translatable, however Legal has decided that shipping legally correct text has priority over shipping complete translations. This change includes updated .ts files to correct the source strings, but no updated translations. This change also removes out-of-date licensing text from the About dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer. Those particular changes should not break translations as they only remove translatable strings and do not modify any others. Task-number: 247608 Reviewed-by: Trust Me .....review will be conducted after submission.
* | 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
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-171-1/+1
| |\
| | * Make choosing a file path for a QUrl-type property work on Windows.Friedemann Kleint2009-04-151-1/+1
| | | | | | | | | | | | | | | Use QUrl::fromLocalFile to construct the url string. Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
| * | Fix management of svg iconsJarek Kobus2009-04-172-9/+9
| |/ | | | | | | | | Task: 251248 Revieved-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Make choosing a file path for a QUrl-type property work on Windows.Friedemann Kleint2009-04-151-1/+1
| | | | | | | | | | Use QUrl::fromLocalFile to construct the url string. Reviewed-by: Jarek Kobus <jkobus@trolltech.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-23787-0/+151396
|
* Long live Qt!Lars Knoll2009-03-23787-0/+151798
generated by cgit v0.12 at 2025-01-06 10:50:19 (GMT)