summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmetaobjectbuilder.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-061-0/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainterpath.cpp src/gui/text/qfontengine_ft.cpp src/s60installs/eabi/QtGuiu.def
| | * Uninitialized memory is compared.Martin Jones2011-05-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memory is allocated and used without first clearing it. At the least this annoys valgrind, but also has potential for real problems. Change-Id: Icf3fd39f44ee0481dd732510e7f8b3ad6cef477d Task-number: QTBUG-15187 Reviewed-by: Aaron Kennedy
* | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
|/ / | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-041-1/+56
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QmlViewer: Translate UI Fix insert and scroll to bottom case QDeclarativeDebug: Fix test case QDeclarativeDebug: Handle case where client with ongoing queries is deleted Remove compile warning Fix QUnifiedTimer bug Stop the animation driver when there are no more animations. Optimization and benchmark for setting object properties from QML. Add Constant and Final flags to QMetaObjectBuilder Fixed QML TextEdit docs Make -no-opengl exist on other platforms Only ask for name when the user goes on the high score list.
| * | Add Constant and Final flags to QMetaObjectBuilderBea Lam2011-03-141-1/+56
| |/ | | | | | | | | Change-Id: I25090e833f7ce184bcbf2bc5b9281c27ab05aa2d Reviewed-by: Michael Brasser
* | Fix declarative after the last changes to the QObject internalsOlivier Goffart2011-03-311-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
|\
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Support property/method versions in QMLMartin Jones2011-01-051-30/+3
|/ | | | | | | | Use metaobject revisioning to exclude properties/revisions added in later versions from interfering with earlier versions. Task-number: QTBUG-13451 Reviewed-by: Aaron Kennedy
* Don't use stdint.h in our headers since it is a C99 header.Martin Jones2010-11-081-8/+4
| | | | | | | | | | | This caused problems in user applications depending upon the order of inlcusion and/or defining __STDC_LIMIT_MACROS. stdint.h is also not present in msvc, but is present in mingw. Switch to using quintptr. Task-number: QTBUG-14691 Task-number: QTBUG-13953 Reviewed-by: Bea Lam
* Ignore non-scriptable properties in QMLAaron Kennedy2010-08-311-2/+2
| | | | QTBUG-13043
* Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-241-1/+1
| | | | | Task-number: Reviewed-by: Aaron Kennedy
* Update #include of private headers in QtDeclarativeThiago Macieira2010-04-021-1/+1
| | | | | Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason.
* Fix copyright year.Jason McDonald2010-02-161-1/+1
| | | | Reviewed-by: Trust Me
* fix includesOswald Buddenhagen2009-12-031-1/+2
| | | | | | | | | | | | - include headers from own directory with "" - include headers from own project without private/ - sort includes from most specific to most generic - make headers self-contained - some whitespace unification no attempt was made at making the qt includes consistent regarding the use of module names and forwarding headers. no attempt was made at sorting includes.
* Undo most of 913dd563064e8047fe738fc9c79135adfb928977Warwick Allison2009-12-021-1/+1
| | | | It seems we're going to have to so a syncqt/configure in Qt modules.
* QMetaObjectBuilder testsAaron Kennedy2009-11-171-2/+3
|
* fix headersWarwick Allison2009-10-291-16/+16
|
* Build on S60.Martin Jones2009-09-151-1/+31
|
* Move qmetaobjectbuilder into declarative/qml directoryMartin Jones2009-09-071-0/+2543
generated by cgit v0.12 at 2025-01-20 14:41:11 (GMT)