summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Collapse)AuthorAgeFilesLines
* Manual sync with masterAaron Kennedy2009-07-311-4/+1
|
* Merge branch 'master' of ../../qt into kinetic-declarativeuiAaron Kennedy2009-07-312-1/+4
|\ | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qabstractitemmodel.cpp src/corelib/kernel/qmetaobject.cpp src/corelib/kernel/qmetaobject.h
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtAaron Kennedy2009-07-311-1/+1
| |\
| | * parse Q_INVOKABLE explicit constructorsOlivier Goffart2009-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | regression introduced in e43eae35 because the code of maybeParseFunction and parseFunction is not exactly the same. Reviewed-by: Kent Hansen
| * | Remove isDynamic property flagAaron Kennedy2009-07-311-2/+1
| | | | | | | | | | | | Reviewed-by: Roberto Raggi
| * | Reorder flag values in ascending orderAaron Kennedy2009-07-311-3/+4
| | | | | | | | | | | | Reviewed-by: Roberto Raggi
| * | Dynamic meta object supportAaron Kennedy2009-07-311-3/+6
| | | | | | | | | | | | | | | | | | | | | This is an internal API used by declarative. Authored-by: mae Reviewed-by: Aaron Kennedy
| * | Add FINAL attribute to Q_PROPERTY()Aaron Kennedy2009-07-313-2/+9
| | | | | | | | | | | | | | | | | | This will be used by the declarative module to optimize property bindings. Reviewed-by: Roberto Raggi
| * | Add CONSTANT attribute to Q_PROPERTY()Aaron Kennedy2009-07-313-2/+31
| |/ | | | | | | | | | | This will be used by the declarative module to determine if a property lacking a NOTIFY signal is truly constant, or just missing a NOTIFY signal. Reviewed-by: Roberto Raggi
* | Remove Q_CAST_INTERFACES support from mocAaron Kennedy2009-07-296-107/+79
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-07-232-21/+19
|\ \ | |/ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h
| * Fix Warning saying that signal cannot be made virtualOlivier Goffart2009-07-221-11/+9
| | | | | | | | | | | | | | | | The test for virtual signal did not work. But we cannot make an error right now or it might break existing code (exemple in task 210879) Reviewed-by: Kent Hansen
| * make the boostrap lib work for projects that aren't in src/toolsJoerg Bornemann2009-07-201-10/+10
| | | | | | | | | | | | | | This is preparation for making Windows CE checksdk use the bootstrap lib. Reviewed-by: thartman
* | Add FINAL attribute to Q_PROPERTY()Aaron Kennedy2009-07-163-2/+9
| | | | | | | | This will be used by the declarative module to optimize property bindings.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-103-7/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/kernel/qmetaobject.cpp tools/qdoc3/generator.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * general wording change for some file type namesFrederik Schwarzer2009-07-063-7/+7
| | | | | | | | | | | | | | | | | | | | | | - .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>
* | Add CONSTANT attribute to Q_PROPERTY()Aaron Kennedy2009-07-033-2/+30
| | | | | | | | This will be used by the declarative module to determine if a property lacking a NOTIFY signal is truly constant, or just missing a NOTIFY signal.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-022-55/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/kernel/qevent.cpp src/gui/kernel/qevent_p.h tools/qdoc3/codemarker.cpp tools/qdoc3/cppcodemarker.cpp tools/qdoc3/generator.cpp
| * src/tools/idc: Remove QT_WA and non-Unicode code paths, dropping Win9x and ↵miniak2009-07-011-53/+16
| | | | | | | | | | | | | | NT support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| * Merge branch '4.5'Thiago Macieira2009-06-261-2/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/network/access/qnetworkreplyimpl.cpp
| | * make invokable constructors work with classes in namespaceKent Hansen2009-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the fully qualified classname at relevant places in the moc-generated code. Also, QMetaObject::newInstance() needs to strip the namespace part, since the constructor signatures don't contain the fully qualified name. Task-number: 246064 Reviewed-by: Simon Hausmann
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-1975-160/+182
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-06-162-10/+29
| |\ \
| | * | Prevent uic3 from clobbering the QLabel3::wordWrap property.Friedemann Kleint2009-06-161-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | Basically make use of customer patch, do not try to use the value obtained from the alignment if property is present. Task-number: 128859
| | * | 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-1675-150/+150
| |\ \ \ | | |/ / | |/| / | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1675-150/+150
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Add detailed warning when idc fails.Prasanth Ullattil2009-06-151-0/+3
| | | | | | | | | | | | | | | | | | | | | When idc fails to dump IDL, the input executable name is now displayed on the commnad line. Reviewed-by:TrustMe
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-112-3/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicswidget.cpp src/gui/painting/qdrawutil.cpp src/gui/painting/qpainterpath.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * | Only include QMetaType if required in moc generated filesOlivier Goffart2009-06-112-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including it might cause build errors. (and thus break source compatibility) The problem was seen on KDE where some cpp files included x11 headers and then later included the .moc file, then qmetatype.h complains that Bool is defined Reviewed-by: Brad
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-093-6/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp tools/qdoc3/tree.cpp
| * | make moc-generated code compile againKent Hansen2009-06-081-0/+2
| | | | | | | | | | | | Needed due to commit 4acabb3abd0ff109b9abeedb6832f5b1c3e0cc4e
| * | handle qreal properties correctly in the meta-object systemKent Hansen2009-06-052-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cross-compiling, it's possible that the size of qreal for moc itself (host platform) is different from the size of qreal on the target platform. Thus, we should not encode the metatype-id of qreal at moc time. Instead, use QMetaType::QReal in the generated code so that the the property flags are only derived at compile time. We also need to support the pesky QT_COORD_TYPE. In this case, qreal can be _any_ type (not just float or double), so we encode the property type as 0 and have a special check in QMetaProperty::type() that resolves the correct type at runtime. Reviewed-by: Simon Hausmann
* | | Revert "Naively fix handling of qreal properties for ARM."Michael Brasser2009-06-081-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2575eac4c26ad92dde95959a82f576edc3e76e1d. Conflicts: src/declarative/qml/qmlvme.cpp
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-2913-95/+95
|\ \ \ | |/ / | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/doc.cpp
| * | improved string operations all over the placeThierry Bastian2009-05-2813-95/+95
| | | | | | | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | | Naively fix handling of qreal properties for ARM.Michael Brasser2009-05-221-0/+6
| | | | | | | | | | | | | | | This gets things working, but isn't ideal as it treats qreal properties as type double on ARM (where they should be of type float).
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-051-7/+7
|\ \ \ | |/ / | | | | | | kinetic-declarativeui
| * | 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>
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-226-83/+115
|/ /
* | 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-2388-0/+38192
|
* Long live Qt!Lars Knoll2009-03-2388-0/+38532
generated by cgit v0.12 at 2025-02-03 16:00:52 (GMT)