summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0184-1437/+1903
|\ | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.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/qt-s60-public into ↵Qt Continuous Integration System2010-04-0124-3531/+3772
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-0124-3531/+3772
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-3124-3531/+3772
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| | | * | | Fix regression on SymbianShane Kearns2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit c43400792b637c744ca840a4ecb339ffdb27c604 made "x:/" a root directory only on windows. It should be a root on symbian too. Reviewed-by: mread
| | | * | | Fix broken test caseShane Kearns2010-03-311-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian and WinCE don't have . and .. directory entries. Other test cases in this autotest make allowance for this, so I have done the same thing for the updateFileLists test case. Reviewed-by: mread
| | | * | | Cleanup the deployment codeThomas Zander2010-03-315-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove local defines and passing of a list while its never used, only define it where its actually used.
| | | * | | Fix 'make sis' finding the dll on symbianThomas Zander2010-03-314-4/+4
| | | | | |
| | | * | | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-31210-2558/+5930
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebCore/WebCore.pro src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | | * | | | Re-add line that was lost during webkit update.Thomas Zander2010-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing a 'make sis' expects the dll in the libdir, so place it there. This fixes out-of-source building to always put the dll in the exepcted dir. https://bugs.webkit.org/show_bug.cgi?id=36749
| | | * | | | Work around bad naming of exported class in symbian sdk causing conflictThomas Zander2010-03-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbian SDK has a Time class defined which means that the compiler complains about the name already being used. Lets just disable the compile as this is not worth disturbing the example over.
| | | * | | | Fix building on public symbian SDK.Thomas Zander2010-03-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the capability CAP_GENERAL_DLL is apparently an alias, so replace it with the extended version
| | | * | | | Fix qmake with the symbian makespec failing when project has a dash in itThomas Zander2010-03-301-2/+2
| | | | | | |
| | | * | | | Make s60main static lib not depend on QtCoreThomas Zander2010-03-302-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline all the code that is used from QtCore as we should not assume QtCore is present for a static library linked into random 3rd party applications.
| | | * | | | Remove stray non-latin1 characterThomas Zander2010-03-301-1/+1
| | | | | | |
| | | * | | | Fix out-of-source symbian build for external appsThomas Zander2010-03-301-1/+1
| | | | | | |
| | | * | | | Update EABI def files for 4.7Shane Kearns2010-03-306-3508/+3456
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-12-01 03:59:28 (GMT)