summaryrefslogtreecommitdiffstats
path: root/src/tools/uic
Commit message (Collapse)AuthorAgeFilesLines
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-191-2/+2
|\
| * Ran the script utils/normalizeOlivier Goffart2009-11-181-2/+2
| | | | | | | | Over src/ tools/ examples/ and demos/
* | uic: Call to setCentralWidget() not generated for promoted central widgets.Friedemann Kleint2009-11-161-1/+1
| | | | | | | | | | | | | | | | Remove check for central widget class type after checks for special child types (QMenu, etc as in formbuilder). Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-5824
* | uic/Designer: Use correct margin defaults for custom page-based containers.Friedemann Kleint2009-11-105-3/+22
|/ | | | | | | | | | | | | | | | | Designer-formbuilder/uic incorrectly considered custom containers that do not inherit a known page-based container (say QTabWidget) as instances of QLayoutWidget, giving them a default margin of 0. Add a check for the custom widget <container>-element to the checks for QLayoutWidget in uic/formbuilder. In the formbuilder, introduce a new data structure to store custom widget information instead of using 3 separate hashes. Adapt one autotest baseline (Qt 3). Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-5335
* Update license headers again.Jason McDonald2009-09-0932-128/+128
| | | | Reviewed-by: Trust Me
* Generate Q_UNUSED(varName) only when varName was not used in ↵Jarek Kobus2009-09-042-2/+10
| | | | | | | | | retranslateUi(Class varName) method. Autotests for uic updated accordingly Task: 260784 RevBy: Kai Koehne <kai.koehne@nokia.com>
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-3132-416/+416
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-3132-416/+416
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1132-32/+32
| | | | | | | | Reviewed-by: Trust Me
* | Remove last vestiges of the qtusagereporter.Jason McDonald2009-08-241-15/+0
| | | | | | | | Reviewed-by: Trust Me
* | Update contact URL in license headers.Jason McDonald2009-08-1232-32/+32
| | | | | | | | Reviewed-by: Trust Me
* | Fix build warningHarald Fernengel2009-08-071-1/+1
| | | | | | | | | | | | | | | | gcc was complaining about format string not being a string literal. Also fixes the small chance that error messages would be bogus if they contain printf control characters. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* | Fix warnings on mingwThierry Bastian2009-08-061-3/+3
| | | | | | | | mingw doesn't support format with %llu or %ll. So I used a QString
* | general wording change for some file type namesFrederik Schwarzer2009-07-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | - .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>
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-06-161-3/+19
|\ \
| * | Made uic generate QLayout::setContentsMargin instead of setMargin.Friedemann Kleint2009-06-161-3/+19
| | | | | | | | | | | | | | | With the exception of layout functions, which is too weird. Task-number: 255846
* | | Merge license header changes from 4.5Volker Hilsheimer2009-06-1632-64/+64
|\ \ \ | |/ / |/| / | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1632-64/+64
| | | | | | | | Reviewed-by: Trust Me
* | improved string operations all over the placeThierry Bastian2009-05-282-5/+5
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-7/+7
|\ \ | |/
| * Fix crash in uic regarding setting QIconJarek Kobus2009-04-281-7/+7
| | | | | | | | | | | | | | The regression was intruduced in change 04c01e15. Task: 252333 RevBy: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-171-8/+8
|\ \ | |/ | | | | | | Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
| * Fix management of svg iconsJarek Kobus2009-04-171-8/+8
| | | | | | | | | | Task: 251248 Revieved-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Long live Qt 4.5!Lars Knoll2009-03-2335-0/+22126
|
* Long live Qt!Lars Knoll2009-03-2335-0/+22466
generated by cgit v0.12 at 2024-12-04 23:40:46 (GMT)