summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autotest: Add QtDeclarative to the "headersclean" testThiago Macieira2010-04-021-1/+1
| | | | All public includes are clean for QtDeclarative now.
* Fix QtDeclarative public headers to include <QtDeclarative/foo.h>Thiago Macieira2010-04-024-9/+9
| | | | All Qt public headers must do it like that.
* Update #include of private headers in QtDeclarativeThiago Macieira2010-04-02195-580/+580
| | | | | Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason.
* Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-01184-2825/+8575
|\ | | | | | | | | | | | | Conflicts: examples/declarative/proxywidgets/proxywidgets.pro examples/declarative/widgets/mywidgets.pro examples/declarative/widgets/widgets.pro
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-0184-1438/+1903
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Fix loading of _debug.dylib plugins under OSX. Remove strange binding loop in Repeater test. Improve Transform docs. Add media elements to the QML Elements docs. Doc fix typo Test cost of importing and resolving types (but not creating objects). Make QML 'hello world' tutorial less confusing. ModelNode::setObjectValue() must update the object cache. Doc improvements, fixes Remove references to deleted qmldebugger. Fix Rectangle::gradient rotation doc. Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs import "." first - i.e. override it by everything else. Set positioner size to final size, rather than some random size mid animation Remove effects from element list. Fix imageprovider example compilation on Symbian arm Remove capability flag not available in public SDKs Fix plugin example compilation on Symbian arm Fix compilation on Symbian winscw ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-0184-1438/+1903
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Fix loading of _debug.dylib plugins under OSX. Remove strange binding loop in Repeater test. Improve Transform docs. Add media elements to the QML Elements docs. Doc fix typo Test cost of importing and resolving types (but not creating objects). Make QML 'hello world' tutorial less confusing. ModelNode::setObjectValue() must update the object cache. Doc improvements, fixes Remove references to deleted qmldebugger. Fix Rectangle::gradient rotation doc. Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs import "." first - i.e. override it by everything else. Set positioner size to final size, rather than some random size mid animation Remove effects from element list. Fix imageprovider example compilation on Symbian arm Remove capability flag not available in public SDKs Fix plugin example compilation on Symbian arm Fix compilation on Symbian winscw ...
| | | * Fix loading of _debug.dylib plugins under OSX.Roberto Raggi2010-04-011-1/+4
| | | |
| | | * Remove strange binding loop in Repeater test.Martin Jones2010-04-011-5/+3
| | | |
| | | * Improve Transform docs.Martin Jones2010-04-012-4/+12
| | | |
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0131-274/+524
| | | |\
| | | | * Doc fixBea Lam2010-04-011-1/+1
| | | | |
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0123-274/+334
| | | | |\
| | | | | * Make QML 'hello world' tutorial less confusing.Yann Bodson2010-04-014-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9384
| | | | | * ModelNode::setObjectValue() must update the object cache.Bea Lam2010-04-012-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9509
| | | | | * Doc improvements, fixesBea Lam2010-04-0114-203/+272
| | | | | |
| | | | | * Remove references to deleted qmldebugger.Bea Lam2010-04-012-46/+11
| | | | | |
| | | | * | typoWarwick Allison2010-04-011-1/+1
| | | | | |
| | | | * | Test cost of importing and resolving types (but not creating objects).Warwick Allison2010-04-018-0/+189
| | | | | | | | | | | | | | | | | | | | | | | | Currently, by far the biggest chunk is QUrl hashing :-(
| | | * | | Add media elements to the QML Elements docs.Martin Jones2010-04-015-19/+39
| | | | |/ | | | |/|
| | | * | Fix Rectangle::gradient rotation doc.Martin Jones2010-04-011-2/+1
| | | |/ | | | | | | | | | | | | Task-number: QTBUG-9553
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-016-27/+41
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0127-59/+133
| | | | |\
| | | | * | import "." first - i.e. override it by everything else.Warwick Allison2010-04-016-27/+41
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise, simple things break, like having "image.qml" on a case-insensitive file system.
| | | * | | Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docsMartin Jones2010-04-011-2/+4
| | | | |/ | | | |/| | | | | | | | | | | Task-number: QTBUG-9499
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0116-32/+37
| | | |\ \
| | | | * | Fix imageprovider example compilation on Symbian armJoona Petrell2010-04-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9523 Reviewed-by: Martin Jones
| | | | * | Remove capability flag not available in public SDKsJoona Petrell2010-04-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9366 Reviewed-by: Martin Jones
| | | | * | Fix plugin example compilation on Symbian armJoona Petrell2010-04-012-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9520 Reviewed-by: Martin Jones
| | | | * | Fix compilation on Symbian winscwJoona Petrell2010-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Aaron Kennedy
| | | | * | Renamed widgets example to proxywidgets to avoid conflictsJoona Petrell2010-04-017-11/+14
| | | | |/ | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9518 Reviewed-by: Martin Jones
| | | | * doc - fix sellingpWarwick Allison2010-04-011-1/+1
| | | | |
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-31141-2212/+2776
| | | | |\
| | | | * | doc bug relationships more clearlyWarwick Allison2010-03-313-4/+3
| | | | | |
| | | * | | Set positioner size to final size, rather than some random size mid animationMartin Jones2010-04-0114-28/+100
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9559
| | | * | | Remove effects from element list.Martin Jones2010-04-011-4/+0
| | | | |/ | | | |/|
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-319-1040/+1138
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fixed: Declared properties cannot be assigned in declaration
| | | | * | Fixed: Declared properties cannot be assigned in declarationRoberto Raggi2010-03-319-1040/+1138
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7860
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-01100-1387/+6672
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (67 commits) Skip tst_QGraphicsItem::updateMicroFocus test on Windows and Mac as it does not passes QScript: more missing APIShim Fix compilation warnings QScript: fix compilation warning QScript: fix APIShim usage. QtScript: remove duplicated APIshim in QScriptValueIterator Attempt to fix the test. Total makeover of SVG image reader Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem. Micro optimization after feedback from Jan-Arve. Show only one dialog when using QFileDialog on Mac. Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7 Fix bad merge from 4.6. Doc: Updated the qdoc manual with i18n info. Fixed a code example. Fix QStaticText test on Mac Support the pen set on the painter in QStaticText when using rich text Fix setting font for QStaticText on Linux and Mac Hack .pro files on windows to define QT_NO_EGL Fix QDate::isLeapYear() for years < 1 One more test for chinese codecs ...
| | * | | | Skip tst_QGraphicsItem::updateMicroFocus test on Windows and Mac as it does ↵Olivier Goffart2010-04-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | not passes
| | * | | | QScript: more missing APIShimOlivier Goffart2010-04-011-0/+2
| | | | | |
| | * | | | Fix compilation warningsOlivier Goffart2010-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdialog.cpp:261: warning: enumeral and non-enumeral type in conditional expression Reviewed-by: Thiago
| | * | | | QScript: fix compilation warningOlivier Goffart2010-04-011-1/+1
| | | | | |
| | * | | | QScript: fix APIShim usage.Olivier Goffart2010-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | APIShim needs to be named, otherwise it is just a temporary and the destructor is called too early
| | * | | | QtScript: remove duplicated APIshim in QScriptValueIteratorOlivier Goffart2010-04-011-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added by both 7a11acd536d84ad22ef98a0fdbdb4322a55efafb and 3e5745ea75d73869918889cb374c3d651bed0991 in different branches. in ~QScriptValueIterator and ~QScriptValueIteratorPrivate Only one is required.
| | * | | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-0180-950/+1009
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qstatictext.cpp
| | * | | | Attempt to fix the test.Alexis Menard2010-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:TrustMe
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-3197-1378/+6664
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (60 commits) Total makeover of SVG image reader Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem. Micro optimization after feedback from Jan-Arve. Show only one dialog when using QFileDialog on Mac. Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7 Fix bad merge from 4.6. Doc: Updated the qdoc manual with i18n info. Fixed a code example. Fix QStaticText test on Mac Support the pen set on the painter in QStaticText when using rich text Fix setting font for QStaticText on Linux and Mac Hack .pro files on windows to define QT_NO_EGL Fix QDate::isLeapYear() for years < 1 One more test for chinese codecs QScript: More missing APIShim QScriptEngine: Fix reentrency involving creation and desctructions of QScriptEngines Work-around Symbian 10.1's broken egl.h Add some #warnings to debug Symbian EGL build failure Don't detect EGLImage presence by testing function pointers Implement proper QStaticText support in QPaintBuffer Make QStaticText layout lazy ...
| | | * | | Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-3121-130/+405
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc src/gui/graphicsview/qgraphicswidget.h
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-311182-6051/+13584
| | | |\ \ \ \
| | | | * | | | Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem.Alexis Menard2010-03-314-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsItem is no more lacking a way to notify the input method of a changed micro focus. Reviewed-by:denis Reviewed-by:simon hausmann
generated by cgit v0.12 at 2024-11-12 01:11:45 (GMT)