summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-064-4/+4
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-065-0/+461
| |\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Labs (experimental) Gesture support.
| * \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-014-2/+12
| |\ \ | | | | | | | | | | | | | | | | 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-03-314-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'make sis' finding the dll on symbianThomas Zander2010-03-314-4/+4
| | | | |
* | | | | Fix anchors, etc.Warwick Allison2010-04-062-2/+1
| |_|_|/ |/| | | | | | | | | | | (pass parser status up to QDeclarativeItem)
* | | | Labs (experimental) Gesture support.Warwick Allison2010-04-065-0/+461
| |_|/ |/| | | | | | | | By popular demand.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-011-1/+1
|\ \ \
| * | | typoWarwick Allison2010-04-011-1/+1
| |/ /
* | | Add media elements to the QML Elements docs.Martin Jones2010-04-013-1/+11
|/ /
* | docWarwick Allison2010-03-311-0/+8
|/ | | | Task-number: QTBUG-9372
* Fix installation of qmldir filesAlan Alpert2010-03-304-4/+4
| | | | | | | The old pro files did not actually install the qmldir files in clean builds. These ones should work. Reviewed-by: Harald Fernengel
* docWarwick Allison2010-03-291-0/+4
|
* Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-264-0/+44
| | | | | Task-number: QTBUG-9364 Reviewed-by: jbarron
* Document Particles module import.Martin Jones2010-03-261-0/+5
|
* Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-254-93/+1
|\ | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp
| * Remove support for QML-in-HTML-in-WebViewWarwick Allison2010-03-242-88/+0
| | | | | | | | Currently, this feature too prone to accidental misuse and abuse.
| * Remove dead performance measurement code from QMLAaron Kennedy2010-03-221-4/+0
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-191-1/+1
| |\ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Initialize variable. Setting stacking order from top to bottom seems to work better. Don't crash if an out of bounds model index is accessed.
| | * Initialize variable.Martin Jones2010-03-191-1/+1
| | |
* | | doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-242-2/+2
| | |
* | | Rename m_volume to m_volThiago Macieira2010-03-202-6/+6
|/ / | | | | | | HP-UX has a #define somewhere for m_volume
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-196-115/+267
|\ \ | |/ |/| | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add autoLoad property to multimedia declarative elements. Fix; QML Video item is sensitive to property assignment order
| * Add autoLoad property to multimedia declarative elements.Justin McPherson2010-03-196-8/+62
| | | | | | | | | | Task-number: QTBUG-8947 Reviewed-by: Andrew den Exter
| * Fix; QML Video item is sensitive to property assignment orderJustin McPherson2010-03-196-114/+212
| | | | | | | | | | Task-number: QTBUG-8605 Reviewed-by: Andrew den Exter
| * Fix include() path in qimportbase.priJoão Abecasis2010-03-111-1/+1
| |
* | Fixed install of qml imports when doing a vcproj build.Rohan McGovern2010-03-191-1/+1
| | | | | | | | | | This qmake script had wrong logic as a result of a bad copy and paste (probably from translations\translations.pro)
* | fix installation of imports librariesYann Bodson2010-03-151-4/+3
| |
* | Fix installation of imports librariesTobias Hunger2010-03-123-8/+7
| |
* | no need to include this private headerYann Bodson2010-03-111-1/+1
| |
* | fix particles pluginYann Bodson2010-03-111-1/+15
| |
* | Don't export symbols in webkit plugin.Yann Bodson2010-03-114-63/+4
| |
* | Move particles in their own plugin (Qt.labs.particles)Yann Bodson2010-03-116-1/+1666
| | | | | | | | Task-number: QT-2846
* | Document - and use - the qmlRegisterXXX template functionsmae2010-03-102-4/+4
| | | | | | | | This commit removes the obsolete QML_REGISTER_TYPE macros.
* | fix inclusion of qt_targets.pri in qimportbase.priJoerg Bornemann2010-03-101-1/+1
| | | | | | | | Reviewed-by: Roberto Raggi
* | Use TARGETPATH instead of hardcoding locationsTobias Hunger2010-03-102-2/+2
| |
* | Fix location in which webkit import is stored in builddirTobias Hunger2010-03-101-1/+1
| |
* | Merge remote branch 'qt/4.7' into qml-4.7Qt Continuous Integration System2010-03-102-4/+6
|\ \ | |/ | | | | | | Conflicts: src/declarative/util/qdeclarativestateoperations.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-082-4/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (74 commits) Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown Mac: compile fix Fix build JPEG plugin: Use switch() instead of if() don't try to build corewlan plugin when corewlan was not found at configure Avoid conversion to/from QChar in the cn codec to unicode Avoid memory allocations in conversion from Gb2312/Gb18030 to unicode fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. ...
| | * doc: Fixed some QML qdoc errors.Martin Smith2010-03-052-4/+6
| | |
* | | Make QDeclarativeItem NOTIFY signals canonicalJoona Petrell2010-03-092-4/+5
|/ / | | | | | | | | Task-number: QTBUG-7193 Reviewed-by: akennedy
* | Always copy the qmldir files into the build directoryTobias Hunger2010-03-084-7/+7
|/ | | | ... even when -prefix is set
* Move the multimedia files to the correct place.Martin Jones2010-03-048-0/+2684
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-042-5/+26
| | | | | Conflicts: src/src.pro
* Fix settings (was not exported type).Warwick Allison2010-03-034-4/+8
|
* Fix build of importsTobias Hunger2010-03-0219-0/+2791
* Fix export macro used in webkit * Fix dependencies on declarative/mutlimedia * Copy qmldir files into the build tree