summaryrefslogtreecommitdiff
path: root/src/declarative/qml/qdeclarativeengine.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-211-4/+8
|\ \ \ \ \ | |/ / / /
| * | | | Don't truncate image:// url strings prematurelyBea Lam2010-12-201-4/+8
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Url fragments and queries were being removed from the image ids passed to QDeclarativeImageProvider. Task-number: QTBUG-16195 Reviewed-by: Martin Jones
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-0/+27
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/graphicsview/qgraphicslayout.cpp src/gui/text/qfontengine_s60.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
| * | | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-061-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the Qt.include() docs to qdeclarativeengine.cpp and also documents it in the "Integrating JavaScript" page. Task-number: QTBUG-15855
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-27/+36
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | | Mention that image providers should be added before loading QML filesBea Lam2010-12-031-0/+3
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-301-2/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix resource leak in QEgl::getCompatibleVisualld() Fixed OpenGL state getting out of sync. Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a Declarative: Fix compiler warnings (Linux/g++)
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-261-1/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed OpenGL state getting out of sync. Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a Declarative: Fix compiler warnings (Linux/g++)
| | | * | Declarative: Fix compiler warnings (Linux/g++)Friedemann Kleint2010-11-261-1/+2
| | | |/ | | | | | | | | | | | | Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * | | Correctly handle CppOwnership even when a QDeclarativeData doesn't existAaron Kennedy2010-11-301-3/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-15695
| * | | Fix warnings related to unused variables.Thiago Macieira2010-11-261-0/+2
| |/ / | | | | | | | | | | | | | | | | | | Just add some Q_UNUSED for parameters or remove the variable we don't need for the others. Reviewed-by: Trust Me
| * | Fix type punning warnings from gccAaron Kennedy2010-11-261-23/+30
| |/ | | | | | | Also clean up some code uglyness in the process
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * Qml Debugging: Only enable if explicitly requestedKai Koehne2010-11-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Enable the remote debugging of QDeclarativeEngines only after QDeclarativeDebugHelper::enableDebugging() has been called. Approved by 4.7 Program Team. Reviewed-by: Alessandro Portale Task-number: QTBUG-13762
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-021-1/+1
|\ \ | |/
| * Doc: Fixed typoThorbjørn Lindeijer2010-11-011-1/+1
| |
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
|\ \ | |/
| * Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-151-8/+78
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qpaintengine_raster.cpp tests/auto/declarative/qdeclarativetext/data/alignments_cb.png tests/auto/declarative/qdeclarativetext/data/alignments_cc.png tests/auto/declarative/qdeclarativetext/data/alignments_ct.png
| * Fix autotest on windowsAaron Kennedy2010-10-131-1/+3
| |
| * Compile on WinCEAaron Kennedy2010-10-131-2/+2
| |
| * Compile on MSVC2008Aaron Kennedy2010-10-121-3/+2
| |
| * Fix autotest on windowsAaron Kennedy2010-10-111-0/+12
| |
| * Allow objectName to be used in QML bindingsAaron Kennedy2010-10-111-8/+35
| | | | | | | | Task-number: QTBUG-13999
| * Install the declarative objectNameChanged callbackAaron Kennedy2010-10-111-0/+4
| | | | | | | | Task-number: QTBUG-13999
| * Check plugin and QML file case on Mac and WindowsAaron Kennedy2010-10-081-0/+26
| | | | | | | | | | | | | | | | | | This test should prevent the case where a QML app that is developed on a case insensitive filesystem (like on Mac or Windows) and then run on a case sensitive filesystem (like on Linux) fails to find module plugins, imports and QML files. Task-number: QTBUG-13517
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-051-10/+8
|\ \ | |/
| * Qt.openUrlExternally should resolve relative URLs.Michael Brasser2010-10-011-9/+7
| | | | | | | | Reviewed-by: Aaron Kennedy
| * Documentation: input to Qt.rgba should be from 0-1, not 0-255.Michael Brasser2010-10-011-1/+1
| |
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-3/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * Register QtQuick 1.0 module.Aaron Kennedy2010-09-291-3/+9
| | | | | | | | | | | | | | Qt 4.7 is still supported, but deprecated. Reviewed-by: Martin Jones Task-number: QTBUG-13799
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-1/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * Improve docs for Qt.quit()Bea Lam2010-09-231-1/+3
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * This patch allows modifications on PropertyChanges on the flyThomas Hartmann2010-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is important for Bauhaus to ensure that we can edit properties and states dynamically in the visual editor Most of the changes consist of added functions for Bauhaus, that do not affect any current behaviour. Important changes: QDeclarativeAbstractBinding is holding a QSharedPointer to itself so that other classes can hold a weak reference to avoid accessing dangling pointers while keeping track of bindings. QDeclarativeStateOperation now has its own private class QDeclarativeStateOperationPrivate to hold a pointer back to QDeclarativeState since the parent is not set correctly in every context. QDeclarativePropertyChangesPrivate does now hold a QDeclarativeGuard instead of a raw pointer to the target QObject. In Bauhaus the target object might be deleted. Reviewed-by: Aaron Kennedy
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-5/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * Merge branch '4.7' into qmldocsDavid Boddie2010-09-061-1/+1
| |\
| | * Support passing QObject derived types to QML methodsAaron Kennedy2010-09-031-1/+1
| | | | | | | | | | | | QTBUG-13047
| * | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-011-2/+2
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-311-0/+3
| |\
| | * Fix application exiting in embedded qml examplesJoona Petrell2010-08-301-0/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-13178 Reviewed-by: Martin Jones
| * | Simplify type management codeAaron Kennedy2010-08-271-2/+2
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-16/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * QDeclarativeEngineDebugServer: make it a singleton.Olivier Goffart2010-08-241-5/+2
| | | | | | | | | | | | | | | | | | It is already a singleton, just formalize it so it can be used in other files than qdeclarativeengine.cpp This also remove the global olbject QDeclarativeEngineDebugServer::m_engines Reviewed-by: Lasse Holmstedt
| * Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-241-1/+1
| | | | | | | | | | Task-number: Reviewed-by: Aaron Kennedy
| * Allow QML Quit buttons to work inside QtDemo.Alan Alpert2010-08-201-1/+1
| | | | | | | | Also changes the line documenting the quit signal on QDeclarativeEngine.
| * QDeclarativeImageProvider: Do not keep the global declarative mutex locked ↵Olivier Goffart2010-08-191-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when processing. The point is to be able to process images in a thread. If the mutex is locked, this is useless. Use case is a slow QDeclarativeImageProvider that generates thumbmails from large files. Even with the asynchronous attribute set to true, the gui thread would be blocked by the mutex. By using QSharedPointer, I also fix the leak of the providers (which were not deleted) Reviewed-by: Martin Jones
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-161-0/+2
| |\ | | | | | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc
| | * qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+2
| | | | | | | | | | | | ...and a set of functional group pages.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-131-3/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc
View Lorry Controller Status