summaryrefslogtreecommitdiffstats
path: root/src/tools/moc/util
Commit message (Collapse)AuthorAgeFilesLines
* Update contact information in license headers.Sergio Ahumada2012-08-013-6/+6
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-113-3/+3
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-133-53/+53
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-193-3/+3
|\
| * Update copyright year to 2011.Jason McDonald2011-01-103-3/+3
| | | | | | | | Reviewed-by: Trust Me
* | Allow a revision to be associated with properties and methods.Martin Jones2011-01-051-0/+1
|/ | | | | | | | | | | | | | | | | | | Allows a revision to be associated with properties via: Q_PROPERTY(int prop READ prop1 REVISION 1) Allows a revision to be associated with methods via either: public slots Q_REVISION(1): void method1(); or: public slots: Q_REVISION void method1(); Private revision() methods are added to QMetaProperty and QMetaMethod to access the revision info. This is private API for use by QML for now. Task-number: QTBUG-13451 Reviewed-by: Kent Hansen
* Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| * Implement Q_PRIVATE_PROPERTY that allows you to declare propertiesAlexis Menard2010-03-191-1/+1
| | | | | | | | | | | | | | | | where the read/write are in the d pointer. Works like Q_PRIVATE_SLOT. Reviewed-by:olivier Reviewed-by:akennedy Reviewed-by:warwick allison
* | Remove the OBJECTS_DIR variable assignment from some projets in Qt.Jocelyn Turcotte2010-03-041-1/+0
|/ | | | | | | This prevent debug and release object file to be mixed up when linking these application in a debug_and_release configured Qt. Reviewed-by: Marius Storm-Olsen
* Update copyright year to 2010Jason McDonald2010-01-063-3/+3
| | | | Reviewed-by: Trust Me
* Update license headers again.Jason McDonald2009-09-093-12/+12
| | | | Reviewed-by: Trust Me
* Add missing license headersJason McDonald2009-09-031-0/+41
| | | | Reviewed-by: Trust Me
* Update tech preview license header.Jason McDonald2009-08-312-26/+26
| | | | Reviewed-by: Trust Me
* Update license headers.Jason McDonald2009-08-112-2/+2
| | | | Reviewed-by: Trust Me
* Update license headers as requested by the marketing department.Jason McDonald2009-06-162-4/+4
| | | | Reviewed-by: Trust Me
* Long live Qt 4.5!Lars Knoll2009-03-234-0/+529