summaryrefslogtreecommitdiffstats
path: root/tools/designer
Commit message (Collapse)AuthorAgeFilesLines
* Designer: Enable morphing into QTextBrowser.Friedemann Kleint2010-10-191-1/+1
| | | | Task-number: QTBUG-14537
* 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 branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-081-1/+1
|\ \ | |/
| * ActiveQt: also make the designer plugin for qaxwidget build in the ↵Patrick Spendrin2010-10-071-1/+1
| | | | | | | | | | | | | | opensource versions Reviewed-by: Olivier Goffart Merge-Request: 843
* | 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-232-56/+95
| | | | | | | | | | | | | | 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-164-47/+276
| | | | | | | | | | 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-1012-196/+28
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * 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-017-23/+23
| | | | | | | | | | 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-0813-84/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Namespace compile fix for 00e954ca817f89958a8a8777d93d3843252dc88cFriedemann Kleint2010-08-231-1/+3
| | | | | | | | Task-number: QTCREATORBUG-163
* | Qt Designer/Integrations: Add properties for use by C++-IDEs.Friedemann Kleint2010-08-234-3/+79
| | | | | | | | | | | | | | | | | | | | | | ...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-175-27/+178
| | | | | | | | | | | | | | | | 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-132-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix the remote command delimiter, this has cahnged at some point.kh12010-08-041-1/+1
| | | | | | | | | | Task-number: QTBUG-12485 QTBUG-12651 Reviewed-by: ck
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-0641-385/+385
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0621-50/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-286-157/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp tests/auto/qfileinfo/tst_qfileinfo.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
| * more fine-grained ts targetsOswald Buddenhagen2010-07-151-13/+0
| | | | | | | | | | | | | | | | | | there are now per-language ts-<package>-<lang> and ts-<lang> targets to update only the files relevant for a given language. there is also a ts-all target which does what the old ts target did. the ts-<package> targets are now named ts-<package>-all and should not be used manually - they exist for the convenience of the ts-all target. the ts target is now only a help blurb.
| * remove redundand translations project filesOswald Buddenhagen2010-07-123-142/+13
| | | | | | | | | | | | lupdate is now powerful enough to use the real project files. this avoids that the file lists run out of sync (which they did, though not as much as i expected).
| * make projects lupdate-friendlyOswald Buddenhagen2010-07-125-15/+15
| | | | | | | | | | | | lupdate currently doesn't parse .qmake.cache, so it lacks QT_SOURCE_TREE. so use relative paths in include statements and (the relevant) include paths instead.
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-154-3/+8
|\ \ | |/ | | | | | | Conflicts: src/gui/kernel/qapplication.h
| * Designer: Fix compiler warnings.Friedemann Kleint2010-07-024-3/+8
| | | | | | | | | | | | | | Warnings introduced by 312c028d44a80f5d6029eb166a0de731f8452525 and gcc 4.5. Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-0113-229/+128
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: bin/syncqt src/gui/text/qtextlayout.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/configure/configureapp.cpp
| * Prohibit some property names to be used for dynamic propertiesJarek Kobus2010-06-221-0/+4
| | | | | | | | | | | | | | | | Since they are used internally for some legacy stuff. We prohibit "groupButtonId" and "database". Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-11584
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-211-1/+16
| |\
| | * Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.Friedemann Kleint2010-06-211-1/+16
| | | | | | | | | | | | | | | | | | | | | The internal QButtonGroup used by Q3ButtonGroup interferes with saving mechanism for QButtonGroup (introduced in 4.5). Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-11431
| * | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-219-225/+99
| |/ | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
| * designer: add sorting in signal-slot editor windowMarek Wieckowski2010-06-092-3/+9
| | | | | | | | Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-203-5/+2
|\ \ | |/
| * Remove obsolete and broken qvfb skins.Jason McDonald2010-05-192-4/+1
| | | | | | | | Reviewed-by: Trust Me
| * Fix cosmetic issue in designer filter editsJens Bache-Wiig2010-05-181-1/+1
| | | | | | | | | | | | | | This makes the icon position similar to Qt Creator and more consistent. Reviewed-by: trustme
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-191-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf
| * REG 4.7: Edit widgets icon no longer in toolbar.Friedemann Kleint2010-05-121-0/+1
| | | | | | | | | | Task-number: QTBUG-10626 Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-05-022-3/+3
|\ \ | |/
| * Backport a fix to Designer filterwidgetJens Bache-Wiig2010-04-292-3/+3
| | | | | | | | | | | | | | Using static here is obviously incorrect as the animations are done per widget. Reviewed-by: danimo
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-04-272-5/+11
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt.qdocconf
| * Backport a few fixes to the Designer filteredit from CreatorJens Bache-Wiig2010-04-201-4/+10
| | | | | | | | | | | | | | First problem is that there are too many animations triggered. Second problem is that it doesnt reflect the disabled state. Reviewed-by: thorbjorn
| * Fix compile warning.Friedemann Kleint2010-04-191-1/+1
| |
* | Designer: Fix cardinality error in stringlist properties in ui4 schema.Friedemann Kleint2010-04-221-1/+1
|/ | | | Task-number: QT-1621
* Remove statically allocated pixmaps through the post routineJarek Kobus2010-04-141-4/+14
| | | | | | | | In order to avoid native pixmap object leaking remove statically allocated pixmaps through the post routine. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-9815
* Fix writing duplicate headers' properties in designer.Jarek Kobus2010-04-132-65/+0
| | | | | | | | | | | Designer has written verticalHeaderVisible property in ui file twice: once done implicitly while saving the fake properties and once done explicitly inside QDesignerResource by calling saveWidget(QTableView/QTreeView). The latter is removed as it is redundant now. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-9351
generated by cgit v0.12 at 2025-01-15 15:01:55 (GMT)