summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17143-146/+146
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Don't crash Qt Creator when debugging an object aliasAaron Kennedy2011-01-131-1/+1
| | | | | | | | Task-number: QTBUG-16131
| * Update copyright year to 2011.Jason McDonald2011-01-10143-145/+145
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-233-13/+1
|\ \ | |/
| * WorkerScript could starve image loading of CPU.Martin Jones2010-12-231-1/+1
| | | | | | | | | | | | | | | | We use idle priority for image loading and XmlListModel in order to keep the UI responsive, but WorkerScript used LowPriority which would significantly reduce CPU available for image loading. Task-number: QTBUG-16167
| * Improve QDeclarativeComponent test coverage.Michael Brasser2010-12-222-12/+0
| |
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-202-8/+20
|\ \ | |/
| * Don't truncate image:// url strings prematurelyBea Lam2010-12-202-8/+20
| | | | | | | | | | | | | | | | 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-202-21/+37
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * QmlDebugger: Fix runtime warnings about unregistered metatypesKai Koehne2010-12-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | Check whether the type of a property is known to the metatype system before trying to read from it. That avoids lots of runtime warnings e.g. for the QSequentialGroup::currentAnimation property, which type QAbstractAnimation * isn't registered by default via qRegisterMetaType<>(). Reviewed-by: Christiaan Janssen Task-number: QTCREATORBUG-2853
| * Docs: implications of creating network access managers in other threadsBea Lam2010-12-141-20/+33
| | | | | | | | Task-number: QTBUG-16032
* | Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: (224 commits) Fix warnings, whitespace cleanup Don't rely on uninitialized data Doc: Fixing typo Doc: Fixing typo Skip failing tests Use effective user id instead of getlogin Fix compile error in tst_qfileinfo on Mac/Linux Fix tst_QFileInfo owner() & group() failure on Windows. Fix tst_QFileInfo::canonicalFilePath failure on Windows Fix QDir::relativeFilePath Fix spelling in comments Add missing license header to test case Define _WIN32_WINNT before any includes New attempt at fixing compilation failure Removing unused duplicate definitions No symbolic links in Windows CE Set minimum target Windows version to 2000 More missing includes Add missing include Fix compile error ...
| * \ Merge remote branch 'origin/master' into file-engine-refactorJoão Abecasis2010-12-024-7/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master's version of conflicting def files picked. Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def
| * | | QtDeclarative: make autotests compile on symbianShane Kearns2010-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move tests for private classes inside private_tests scope Add missing libraries Add QT_NO_CONCURRENT ifdef around a test case Define Q_DECLARATIVE_PRIVATE_EXPORT as Q_AUTOTEST_EXPORT, so the classes are exported for autotests, previously they were exported on every OS except symbian. (this doesn't affect exports for production builds) Reviewed-by: Miikka Heikkinen
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-136-47/+85
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix broken database creation caused by previous fixBea Lam2010-12-101-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16447b1193fedf5fdcf1f3d270fa73c5036a1ba0 removed unused directory but the fix meant that the base Databases directory was no longer automatically created. Task-number: QTBUG-15909
| * | | QDeclarativeProperty doc improvementsBea Lam2010-12-091-3/+16
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-094-35/+45
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update QtGui bwins def file for QTBUG-15615 highlightFollowsCurrentItem: false was not always honored ListView: Fix calculation of currentItem position when out of view. Update QtGui def files Fix openDatabaseSync() to not create unused directory Document support for QVariantList and QVariantMap type conversion Some doc clarification for components and javascript integration Cursor shouldn't blink while dragging cursor position Qt.include() docs weren't being picked up by qdoc Doc: make it clear that "z" affects sibling stacking order.
| | * | | Fix openDatabaseSync() to not create unused directoryBea Lam2010-12-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15909 Reviewed-by: Warwick Allison
| | * | | Some doc clarification for components and javascript integrationBea Lam2010-12-061-12/+16
| | | | |
| | * | | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-062-22/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the Qt.include() docs to qdeclarativeengine.cpp and also documents it in the "Integrating JavaScript" page. Task-number: QTBUG-15855
| * | | | Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-1/+7
| |/ / / | | | | | | | | | | | | | | | | Task-number: QTBUG-14736 Reviewed-by: Alessandro Portale
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-0622-295/+678
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | 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
| | |
| * | Append qml import path individually for each available drive on SymbianJoona Petrell2010-12-021-1/+29
| | | | | | | | | | | | | | | Task-number: QTBUG-15405 Reviewed-by: Jason Barron
| * | 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/qt into 4.7Joona Petrell2010-11-3018-258/+599
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativepropertycache.cpp
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-262-1/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-262-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * | | | | Correct ownership semantics for QObject derived typesAaron Kennedy2010-11-301-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15697
| * | | | | Correctly handle CppOwnership even when a QDeclarativeData doesn't existAaron Kennedy2010-11-301-3/+1
| | |_|/ / | |/| | | | | | | | | | | | | Task-number: QTBUG-15695
| * | | | Improve consistency in handling of aliases, bindings and value typesAaron Kennedy2010-11-2917-256/+599
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13719
| * | | | Fix warnings related to unused variables.Thiago Macieira2010-11-262-1/+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-262-31/+35
| |/ / | | | | | | | | | Also clean up some code uglyness in the process
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-254-7/+16
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Allow javascript date and regexp objects in WorkerScript messagesBea Lam2010-11-241-0/+13
| | | | | | | | | | Task-number: QTBUG-14666 Reviewed-by: Aaron Kennedy
| * Don't leak QML compiled data objectsAaron Kennedy2010-11-193-7/+3
| | | | | | | | Task-number: QTBUG-14761
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-193-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| * Fix compilation by s/intptr_t/quintptr/Thiago Macieira2010-11-113-4/+4
| | | | | | | | | | | | | | | | | | intptr_t is defined in some C header that we don't include. I don't know which one it is, but without it, it fails to compile with: declarative/qml/qdeclarativecontext.cpp:477: error: 'intptr_t' was not declared in this scope Reviewed-By: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-129-23/+90
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-111-1/+2
| |\ | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebug: Keep source information when changing an expression Flickable does not reposition its content when it is resized.
| | * QDeclarativeDebug: Keep source information when changing an expressionChristiaan Janssen2010-11-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Copy over the source code location of an expression when it is changed throu the debugging facilities. This enables JavaScript breakpoints to be hit even after the source code of the function has changed. Task-number: QTCREATORBUG-2824 Reviewed-by: Kai Koehne
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-101-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits) Fixed tst_qpixmap::grabWidget autotest failure on QWS. Doc: Fixing typo Doc: Fixing typo Doc: Fixing typo Fixed tst_qwidget::testContentsPropagation auto-test failure. Fixed text rendering bug in raster engine when opacity != 1.0. Prevented race condition on texture destruction. More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout ...
| | * Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| | |
| * | Don't use stdint.h in our headers since it is a C99 header.Martin Jones2010-11-082-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused problems in user applications depending upon the order of inlcusion and/or defining __STDC_LIMIT_MACROS. stdint.h is also not present in msvc, but is present in mingw. Switch to using quintptr. Task-number: QTBUG-14691 Task-number: QTBUG-13953 Reviewed-by: Bea Lam
| * | Add documentation about script evaluation context and allowed typesBea Lam2010-11-041-2/+28
| | | | | | | | | | | | Task-number: QTBUG-14919
| * | Largely rewrite the Using QML in C++ Applications documentation. ItBea Lam2010-11-042-7/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now has an overview of different approaches to QML/C++ integration and demonstrates how to pass data between QML and C++ through properties/functions/signals. The part in the old docs that focused on QDeclarativeContext has been merged into the QDeclarativeContext class docs (although most of the info was largely covered in there already) and the part that covered Network Components has been moved to the QDeclarativeComponent class docs. The custom enum types example previously in extending-tutorial.qdoc has been moved to these new docs. Task-number: QTBUG-14923
| * | Qml Debugging: Only enable if explicitly requestedKai Koehne2010-11-022-0/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
| |
generated by cgit v0.12 at 2025-01-18 00:00:21 (GMT)