summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* only add phonon and scripttools dependencies if they're available, otherwise ↵Romain Pokrzywka2010-05-031-3/+7
| | | | | | | linking will fail Merge-request: 591 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qdoc: Added breadcrumbs for most other pages.Martin Smith2010-05-031-0/+8
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-308-13/+67
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) bye bye QMakeProjectEnv short-cut evaluation inside if() tests eliminate special splitting of INCLUDEPATH and DEPENDPATH do not env-expand cache file path s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/ s/INCPATH/INCLUDEPATH/ s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/ teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH) warn about usage of deprecated variables warn about using non-lowercased replace $$function()s add -Wdeprecated option (on by default) make QMakeProject::isEmpty() consider legacy mappings document some functions' scope fix $$size() not using function-scoped variables doc: Fixed some qdoc errors. qdoc: Added breadcrumbs for namespaces. Autotest: check that we receive key events on toplevel widgets Cocoa: key events stopped working Update Polish translations qdoc: Added "All namespaces" to the API Lookup box. ...
| * doc: Fixed some qdoc errors.Martin Smith2010-04-301-0/+1
| |
| * qdoc: Added breadcrumbs for namespaces.Martin Smith2010-04-302-3/+7
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-302-3/+3
| |\
| | * Backport a fix to Designer filterwidgetJens Bache-Wiig2010-04-292-3/+3
| | | | | | | | | | | | | | | | | | | | | Using static here is obviously incorrect as the animations are done per widget. Reviewed-by: danimo
| * | qdoc: Added "All namespaces" to the API Lookup box.Martin Smith2010-04-301-0/+1
| |/
| * qdoc: Added breadcrumbs to examples. Coolio.Martin Smith2010-04-293-0/+37
| | | | | | | | Doesn't work in a few cases because of non-standard naming of things.
| * qdoc: Sprinkled more breadcrumbs.Martin Smith2010-04-282-9/+20
| |
* | Don't disable the symbian media backend.Andrew den Exter2010-04-291-16/+20
|/ | | | | | | The absence of the DirectX or Windows SDK is of no relevance to the symbian media backend. Reviewed-by: Derick Hawcroft
* Fix compile.Aaron McCarthy2010-04-281-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-274-29/+68
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compilation with QT_NO_TEXTSTREAM Fix the compilation with QT_NO_TOOLTIP Add unit tests for a number of QList methods. Crash while dragging on Mac OS X (Cocoa) Doc & menubar hidden for QtDemo after switching back from fullscreen qdoc: Added breadcrumbs for class pages. QTabWidget documentMode not working correctly on Mac qdoc: Removed MacRefs for Xcode documentation stuff. Slight QList documentation fix.
| * qdoc: Added breadcrumbs for class pages.Martin Smith2010-04-272-27/+19
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-279-49/+50
| |\
| * | qdoc: Removed MacRefs for Xcode documentation stuff.Martin Smith2010-04-273-3/+50
| | | | | | | | | | | | Also added the infrastructure for generating breadcrumbs.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-274-16/+25
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits) Plugins documentation. Fix update issue when an item has an effect and child. Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints. Disallow "Qt" as namespace import Don't "adjust" the z value of a delegate that has been cached. Correctly inherit extension properties Autotests More QDeclarativeNetworkAccessManagerFactory doc clarification. Fix QDeclarativeNetworkAccessManagerFactory docs. Don't crash on invalid model remove signal. Ensure scheduled layout can occur before testing. Fix remaining 4.6 type registrations (to 4.7). doc anchor margins vs. anchor (line) state/animation. These examples should not be included in this test Unify naming of settings / UI to be "Qt Qml Runtime" Improved error messages for type resolving, new debug option Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin Add doc pages for qml examples. ...
| * | Fix remaining 4.6 type registrations (to 4.7).Warwick Allison2010-04-271-1/+1
| | | | | | | | | | | | | | | | | | Missed/cross-paths with a29627231a02ebf98645675acbd353618d1109d4. Task-number: QTBUG-10081
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-264-15/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: These examples should not be included in this test Unify naming of settings / UI to be "Qt Qml Runtime" Improved error messages for type resolving, new debug option Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin Add doc pages for qml examples. Replace usage of print() with console.log(). Remove out-of-date performance doc. Fix hidden menu on embedded. Location of binary is not on installed-content import path. Doc fixes. Return null if creation fails. Basic Component doc. Collection of small doc improvements compile
| | * | Unify naming of settings / UI to be "Qt Qml Runtime"Kai Koehne2010-04-263-6/+7
| | | | | | | | | | | | | | | | Reviewed-by: Henrik Hartz
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-9/+17
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin Add doc pages for qml examples. Replace usage of print() with console.log(). Remove out-of-date performance doc. Fix hidden menu on embedded. Location of binary is not on installed-content import path. Doc fixes. Return null if creation fails. Basic Component doc. Collection of small doc improvements compile
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-9/+17
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin Add doc pages for qml examples. Replace usage of print() with console.log(). Remove out-of-date performance doc. Fix hidden menu on embedded. Location of binary is not on installed-content import path. Doc fixes. Return null if creation fails. Basic Component doc. Collection of small doc improvements compile
| | | | * Fix hidden menu on embedded.Warwick Allison2010-04-232-7/+17
| | | | | | | | | | | | | | | | | | | | Menu strangely still produces hits on embedded. Don't create it if frameless.
| | | | * Location of binary is not on installed-content import path.Warwick Allison2010-04-231-2/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: mae
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-264-29/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: add translator comment save a QFile::encodeName() Don't use QList's begin() and end() where possible. Ensure we stop the name lookups in QAbstractSocket if we abort(). Don't rely on tryStart() to do job control. Improved workaround for new qt documentation, base on dboddie's work. Doc: Fixed typos. Ensure that all qthelp URLs have paths that start with /qdoc/. Doc: Fixed the Declarative documentation set. Tweaked the others.
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-2618-134/+387
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/helpviewer.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp
| | * | | | | Improved workaround for new qt documentation, base on dboddie's work.kh12010-04-263-13/+12
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the check more generic, to also work for all other Qt namespaces than qt.ver.s.ion. Still there's something broken in Qt webkit or so. Backported from Qt Creator code. Reviewed-by: ck
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-231-13/+30
| |\ \ \ \ \
| * | | | | | Ensure that all qthelp URLs have paths that start with /qdoc/.David Boddie2010-04-232-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-221-40/+39
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qdeclarative.qdocconf
| * | | | | | | Doc: Fixed the Declarative documentation set. Tweaked the others.David Boddie2010-04-225-26/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-261-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: DEF file updates for BWINS and EABI for Symbian Fix typo Revert "Add QML imports to s60installs.pro" Assigned a UID3 to qml.exe.
| * | | | | | | Assigned a UID3 to qml.exe.Frans Englich2010-04-261-1/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Allocated in S60 Team's wiki over UID3s in Qt.
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-261-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: correcting a character bug in the footer.
| * | | | | | Doc: correcting a character bug in the footer.Morten Engvoldsen2010-04-261-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed "subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation>\n" \ into "subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ Reviewed-by: trust me
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-243-18/+36
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits) Remove trace code from directshowaudioendpointcontrol.h. New configure.exe binary Add support for MSBuild, which is the project format for MSVC 2010 Only add qvideowidget test once. Multimedia causes build failure when Qt is configured with -embedded Player demo: load not only local files but playlists and urls passed as Gstreamer media backend: preserve playback rate after seeks and media QT7 mediaservice; fix leaking strings. Fixed Qt build with mediaservices disabled. Multimedia tests; fix for missing dependency Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. ...
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-233-18/+36
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits) Remove trace code from directshowaudioendpointcontrol.h. New configure.exe binary Add support for MSBuild, which is the project format for MSVC 2010 Only add qvideowidget test once. Multimedia causes build failure when Qt is configured with -embedded Player demo: load not only local files but playlists and urls passed as Gstreamer media backend: preserve playback rate after seeks and media QT7 mediaservice; fix leaking strings. Fixed Qt build with mediaservices disabled. Multimedia tests; fix for missing dependency Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. ...
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-04-233-3/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into 4.7
| | | * | | | Add support for MSBuild, which is the project format for MSVC 2010Martin Petersson2010-04-213-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Marius SO
| | * | | | | Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-2222-272/+530
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| | Conflicts: demos/multimedia/player/player.pro
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-191-15/+27
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. QtMediaservices -> QtMediaServices. configure; Fixes for changes to use mediaservices. Fixed compile errors in pulseaudio backend for soundeffect Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d Fixed compile errors with gstreamer plugin Create Mediaservices lib, separate from Multimedia. Gstreamer media backend: seek to media start on end of stream.
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-181-15/+27
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. QtMediaservices -> QtMediaServices. configure; Fixes for changes to use mediaservices. Fixed compile errors in pulseaudio backend for soundeffect Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d Fixed compile errors with gstreamer plugin Create Mediaservices lib, separate from Multimedia. Gstreamer media backend: seek to media start on end of stream.
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-161-15/+27
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. QtMediaservices -> QtMediaServices. configure; Fixes for changes to use mediaservices. Fixed compile errors in pulseaudio backend for soundeffect Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d Fixed compile errors with gstreamer plugin Create Mediaservices lib, separate from Multimedia. Gstreamer media backend: seek to media start on end of stream.
| | | | | * | | | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-04-156-21/+62
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7
| | | | | * | | | | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-15/+27
| | | | | | | | | |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-231-13/+30
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc: Removed nested <ul> elements from the TOC Diacritic input broken, duplicate the base glypha (on Mac OS X carbon) Cocoa: quiting the app from the menubar may cause a crash
| * | | | | | | | qdoc: Removed nested <ul> elements from the TOCMartin Smith2010-04-231-13/+30
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Moved the class="leveli" into the <li> elements.
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-2211-106/+341
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits) Do not treat images in qml examples differently. Replace Flickable overshoot property with boundsBehavior Autotests and doc Give error on attempt to import types from too-early version number. Remove (undocumented) QML bindings for effects. De-straighten them lines. Doc: fix QStringList model doc (really). Doc: fix QStringList model docs Change return type to match value(). Add duration and easing properties to AnchorAnimation. Autotest Remove dead code Compile on Windows (export decl fix). Fix versioning of Qt Declarative's in-built types Fixed declarative/parserstress autotest. Fix parsing of regular expression literals. Fill out QGraphicsLayout bindings Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). ...
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-2211-106/+341
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits) Do not treat images in qml examples differently. Replace Flickable overshoot property with boundsBehavior Autotests and doc Give error on attempt to import types from too-early version number. Remove (undocumented) QML bindings for effects. De-straighten them lines. Doc: fix QStringList model doc (really). Doc: fix QStringList model docs Change return type to match value(). Add duration and easing properties to AnchorAnimation. Autotest Remove dead code Compile on Windows (export decl fix). Fix versioning of Qt Declarative's in-built types Fixed declarative/parserstress autotest. Fix parsing of regular expression literals. Fill out QGraphicsLayout bindings Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). ...