summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeworkerscript.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-2/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add documentation about script evaluation context and allowed typesBea Lam2010-11-041-2/+28
| | | | | | | | Task-number: QTBUG-14919
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | 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
| * qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+1
| | | | | | | | ...and a set of functional group pages.
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-061-1/+1
|/ | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* Minor doc fixesBea Lam2010-06-111-1/+4
|
* Doc fixes and improvements - fix some example code, link toBea Lam2010-06-021-3/+3
| | | | examples from class docs and improve assorted docs
* Allow js files with '.pragma library' to be used from WorkerScriptBea Lam2010-05-261-0/+1
|
* Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivateBea Lam2010-05-241-9/+1
|
* Allow resource files to be loaded in WorkerScriptBea Lam2010-05-241-3/+11
|
* doc fixBea Lam2010-05-181-2/+2
|
* Qt.include() support in worker scriptsAaron Kennedy2010-05-141-1/+5
|
* Make QDeclarativeParserStatus method pure virtual to encourage right code.Warwick Allison2010-04-301-7/+22
| | | | | Fix all code to be right, except multimedia. Currently, it's not *required* that types work without componentComplete, so not vital.
* Move documentation code to snippet.Yann Bodson2010-04-121-41/+15
|
* Make sure WorkerScript thread is stopped on deletion. This also fixesBea Lam2010-04-091-0/+13
| | | | the leaking of the worker agent in ListModel.
* Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-081-1/+1
|
* Update #include of private headers in QtDeclarativeThiago Macieira2010-04-021-4/+4
| | | | | Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason.
* WorkerScript was receiving events after deletion and trying to processBea Lam2010-03-301-1/+5
| | | | these events.
* Fix mutex handling that was causing tests to sometimes crash/fail.Bea Lam2010-03-231-2/+2
|
* Remove WorkerListModel and integrate its functionality into ListModel.Bea Lam2010-03-161-630/+17
| | | | Task-number: QT-2829
* Add WorkerScript docs and tests.Bea Lam2010-03-031-1/+82
| | | | Task-number: QT-2807
* Add docs and tests for WorkerListModel.Bea Lam2010-03-021-1/+136
| | | | Task-number: QT-2807
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-0/+1041
QDeclarativeXXX.