summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-07300-5506/+10227
|\
| * Don't crash if a target isn't specified for AnchorChanges.Michael Brasser2010-04-061-0/+12
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-06223-4119/+4364
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-066-1/+462
| | |\ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Labs (experimental) Gesture support.
| | * | Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-052-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This of course requires installing libdbus compiled for Windows CE too. Task-number: QTBUG-9582 Patch-by: Romain Pokrzywka (from KDAB)
| | * | Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixedThiago Macieira2010-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was: " Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Reviewed-By: Rohan McGovern "
| | * | Revert "Attempt at fixing Phonon build issue on Symbian."Thiago Macieira2010-04-041-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7992ea34f9f1ed67d4e44f43c3a8133ae5aa3ac4. Turns out that this had already been fixed before the update to 4.4.0, but never upstreamed. Revert to the fixed version. I'll upstream the bugfix.
| | * | Attempt at fixing Phonon build issue on Symbian.Thiago Macieira2010-04-041-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Why, why did someone think that template QObjects with partially exported symbols was a good idea? Reviewed-by: Trust Me
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-031-0/+14
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: [plugins] Don't conclude that a .debug file is a plugin.
| | | * | [plugins] Don't conclude that a .debug file is a plugin.Thiago Macieira2010-04-031-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Unix systems (that are not Mac), the Qt buildsystem splits the code from the debug symbols using objcopy. The resulting .debug file contains a valid ELF header, with a copy of the main library's section headers. But the contents of those sections are missing. When we try to dlopen(3) those libraries, libdl crashes. So we shouldn't try to open those files.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-0213-3511/+3701
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Make s60main static lib not depend on QtCore" 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()
| | | * | Revert "Make s60main static lib not depend on QtCore"Iain2010-04-022-48/+5
| | | | | | | | | | | | | | | | | | | | This reverts commit faff1c60a2a7f6ebef90249e759bdf822c8b17de.
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-0114-3516/+3749
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0123-1114/+1251
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-0114-3516/+3749
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0114-3516/+3749
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3114-3516/+3749
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'make sis' finding the dll on symbianThomas Zander2010-03-314-4/+4
| | | | | | | | | |
| | | | | | | * | | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-31183-2391/+5303
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | * | | | 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
| | | | | | | | | | |
| | | | | | | * | | | Update EABI def files for 4.7Shane Kearns2010-03-306-3508/+3456
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | | | * | | | Merge remote branch 'qt/4.7' into 4.7Shane Kearns2010-03-30370-6604/+13998
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| | | | | | | * | | | | Exporting QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-292-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was missing and not covered by the standard autotests, so its missing was not detected for quite some time. Task-number: QTBUG-8423 Reviewed-By: Shane Kearns
| | | | | | | * | | | | Adding QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was missing and not covered by the standard autotests, so its missing was not detected for quite some time. Task-number: QTBUG-8423 Reviewed-By: Shane Kearns
| | * | | | | | | | | | 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-0186-2410/+6521
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/proxywidgets/proxywidgets.pro examples/declarative/widgets/mywidgets.pro examples/declarative/widgets/widgets.pro
| | * | | | | | | | | Fix Phonon compilation with a namespaced Qt.Thiago Macieira2010-04-016-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'll upstream this patch myself.
| * | | | | | | | | | Fix anchors, etc.Warwick Allison2010-04-062-2/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | (pass parser status up to QDeclarativeItem)
| * | | | | | | | | Labs (experimental) Gesture support.Warwick Allison2010-04-066-1/+462
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | By popular demand.
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-0123-1114/+1251
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-0123-1114/+1251
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| | | | | | | | |
| | | * | | | | | Improve Transform docs.Martin Jones2010-04-011-4/+11
| | | | | | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-012-2/+4
| | | |\ \ \ \ \ \
| | | | * | | | | | 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-012-2/+3
| | | | |\ \ \ \ \ \
| | | | | * | | | | | ModelNode::setObjectValue() must update the object cache.Bea Lam2010-04-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9509
| | | | * | | | | | | typoWarwick Allison2010-04-011-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Add media elements to the QML Elements docs.Martin Jones2010-04-014-10/+27
| | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | 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-011-25/+25
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-014-29/+37
| | | | |\ \ \ \ \ \
| | | | * | | | | | | import "." first - i.e. override it by everything else.Warwick Allison2010-04-011-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-2/+2
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix compilation on Symbian winscwJoona Petrell2010-04-011-2/+2
| | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Aaron Kennedy