aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeengine.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* QDeclarativeExpression: storing column number in expression locationChristiaan Janssen2012-01-161-1/+1
| | | | | Change-Id: I2d69738158abfc76f80b1cfc0e0ccb145fda2245 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* QDeclarativeDebug: Add a debug message service.Aurindam Jana2012-01-091-0/+2
| | | | | | | | | | | QDeclarativeDebugMsgService installs a QtMsgHandler which forwards debug output to a client defined port only if the service is Enabled. It also forwards the debug output to the previous message handler. Effectively, this service just eavesdrop on debug output, forwarding it to a port only if a client is connected. Change-Id: Ie0ee7bab57ef8f03a2de34d91921f054a7ec147f Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QDeclarativeEngine: Polish code for file name case check.Friedemann Kleint2012-01-061-9/+8
| | | | | | | | | | - Use Q_OS_WIN instead of Q_OS_WIN32 - const-correctness - Use QString::fromWCharArray() Change-Id: I67aa4bb69240cf187832ea456dd74d2909e7ae62 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-051-1/+1
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Reserve enough space in the QDeclarativePropertyCache hashAaron Kennedy2011-12-221-4/+1
| | | | | | | | It was too easy for callers of copy() to pass the wrong reserve size, so a new copyAndAppend() method has been added to reduce error. Change-Id: If2f13e2e0733e5d87c527934dc5a6c8d0c8df572 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* QV8DebugService: Simplify the service codeAurindam Jana2011-12-141-1/+1
| | | | | | | | | Removed all parsing functionality. The service only acts as a delegate to v8 debugger. Apart from that, it calls the v8 debug static APIs when requested by client. Change-Id: I2917c2d080e5b409a4b5f39d386279c33634cade Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Fix linking of QtQuick.dll on Windows.Friedemann Kleint2011-12-071-0/+1
| | | | | | | | | | | Put class QDeclarativeComponentAttached into a separate header. When declared as Q_AUTOTEST_EXPORT in declarative/qml/qdeclarativecomponent_p.h which is included by quick/qquickloader.cpp, the Q_AUTOTEST_EXPORT is seen as __declspec(dllexport) and linking fails. Change-Id: I835197e3af6993cfd9325a432f33c636b9bfd3e6 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix crash when QtQuick 2.0 wasn't importedAaron Kennedy2011-12-051-0/+2
| | | | | | | | | The QML compiler still tried to resolve the implicit "Component" element within the QtQuick 2.0 namespace. Task-number: QTBUG-23017 Change-Id: I62ae962f58787910a76f76c872daa08874b5df56 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Say hello to QtQuick moduleKent Hansen2011-12-021-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Remove QSGContext and QSGTexture from QDeclarativePixmapDataGunnar Sletta2011-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | In order to cleanly support multiple windows we need to not have the QSGContext reference in QDeclarativeEngine and we need to be able to have one copy of the texture for each QSGContext that is not sharing when we have multiple windows. This also makes it easier to the release graphical resources from a running application, which is another feature that we want to eventually implement. This patch does remove an adaptation feature which is the decodeToTexture, which seemed like a good idea at the time but in hindsight has not been used for anything. Edit: resolved conflict in qquickimage.cpp Edit: updated QDeclarativePixmap testcase Edit: updated QQuickImage testcase Edit: Rebased on top of QDeclarativePixmapCacheChanges Change-Id: Ifc61dd8158d3f841437d029b6031a91196145517 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* DeclarativeDebugServices: Cleanup CodeAurindam Jana2011-11-251-6/+3
| | | | | | | | Removed addEngine and removeEngine methods from services that do not use the functions of QDeclarativeEngine. Change-Id: Id2ddcbe8cf5706d1e4ca4b59011c7e3574cfdba8 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Move registration of QtQuick 2 types to separate classKent Hansen2011-11-241-8/+2
| | | | | | | | | Just a bit of cleanup to make QtQuick2's definition follow the convention of QtQuick1, in preparation of moving QtQuick2 to its own library. Change-Id: If9e19e5f5512f9417373bb977bcb424186554c8f Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Move QDeclarativeListModel and friends from util/ to qml/Kent Hansen2011-11-241-1/+3
| | | | | | | | | | | QDeclarativeWorkerScript depends on QDeclarativeListModel et al, so the latter should also reside under qml/. Note that QDeclarativeOpenMetaObject also had to be moved, since QDeclarativeListModel depends on it. Change-Id: I164cba0e530d22b5771056a2acde12a18d5e83e1 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Move QDeclarativeApplication from util/ to qml/Kent Hansen2011-11-241-0/+1
| | | | | | | | QDeclarativeEngine/QV8Engine depend on QDeclarativeApplication, so this class should reside under qml/, not util/. Change-Id: I2cd49ba1170bfb610a7607525891cb80c8828f27 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Qt.locale() and JS locale type extension.Martin Jones2011-11-221-0/+2
| | | | | | | Task-number: QTBUG-17129 Change-Id: I69cbbe858735b750b4e37ce489f2fa1ad5d8b5d3 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Skip the captured properties step in bindingsAaron Kennedy2011-11-041-1/+1
| | | | | | | | | | Objects and notifiers in the capturedProperties list were not guarded which can lead to crashes if they're deleted prior to the binding completing. Now the notifiers are connected to and guarded immediately to prevent this. Change-Id: I912e323c52bf6169fb5077e552d5d38d9aa7faec Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Fix most of the declarative bindings failing on ARM.Jani Uusi-Rantala2011-11-011-1/+1
| | | | | | | | | | | There was a mismatch between 32 and 64-bit integers which caused a lot of qdeclarative unit tests to fail and QML to generally not work properly on ARM. All of the failing auto tests pass now on ARMV7. Change-Id: Icf230f79e56c15743c6ee943859ac02e649a6e0a Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Ensure that chained incubation works from componentCompleted.Martin Jones2011-11-011-0/+3
| | | | | | | | | Make chained AsynchronousIfNested initiated from componentComplete work correctly, i.e. asynchronous incubator is not Ready until all chained creation is Ready. Change-Id: I286cc10e2f09e36dcc6034f3f23681e833d7e6e8 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Rename QDeclarativePropertyCache::Data to QDeclarativePropertyDataAaron Kennedy2011-10-261-2/+2
| | | | | | | This class is now too large to be nicely nested. Change-Id: I32cfa5caa524b8bf447d1f8c53ef2763f60bdac1 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Rename QSG* to QQuick* in particles folderAlan Alpert2011-10-251-2/+2
| | | | | Change-Id: I793eaf16f3810df0cb0f9f8482ac0b9d6137595d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Rename Qt Quick-specific classes to QQuick*Kent Hansen2011-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Declarative: Fix MSVC and g++ warningsFriedemann Kleint2011-10-191-1/+1
| | | | | | | | | | | | | | | | | Potentially severe: - Fix int/bool mismatches - Use of uninitialized variable - Do connectionMask shift operations in 64bit - Enum type mismatch for QLineControl::EchoMode Various: - class/struct mismatches - UnhandledEnumeration values - Unused variables - Constructor initialization order Change-Id: Ieb52f8990445fe95f94070175a0f9beb66863240 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* qdoc3: Remove several "QML:" qualifiers which should no longer be requiredMartin Smith2011-10-181-14/+14
| | | | | | | | Task-number: QTBUG-22123 Change-Id: I78f755f978547685e77f4864bc47d1a2b2602343 Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Clean up declarative includesKent Hansen2011-10-171-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (This commit is in preparation of moving several files to a separate library (QtQuick2).) Don't add all subfolders to the includepath (from the .pri files). There's no good reason to do that. For headers (both public and private) that are in the same folder as the file that includes them, prefer to use #include "foo.h" #include "bar_p.h" For public headers that are outside the current folder but have "unambiguous" names (e.g. qdeclarative prefix), use #include <foo.h> For private headers that are outside the current folder, use #include <private/baz_p.h> Also change #include <QtDeclarative/private/foo_p.h> to #include <private/foo_p.h> The header filenames already have a qdeclarative or qsg prefix; there's no need to prefix by module name to disambiguate. Finally, #include "private/foo_p.h" should be avoided. private/ is used for auto-generated (forwarding) headers, which never reside in the current (source) directory. Use angle brackets instead. Change-Id: I04f8477fdba043546064ee276475c09dc373f8f2 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Optimize signal handlingAaron Kennedy2011-10-121-0/+94
| | | | | | | | | | | | | | | Bindings connect to lots of signals that are never emitted. By managing signal connection lists ourselves, we can do a much better job than Qt's generic signal/slot connection logic. Also, by connecting to QDeclarativeNotifierEndpoint's rather than QObject slots, we can eliminate the need to instantiate a QObject for the V4 and V8 binding managers. Change-Id: I598667deaefdbd2860227bd74378a1b196761686 Reviewed-on: http://codereview.qt-project.org/6278 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>
* QInputPanel exposed as a property from QDeclarativeApplicationSami Kananoja2011-10-111-0/+7
| | | | | | | | | Task-number: QTBUG-21449 Change-Id: I437f80f4d1f0dbb3cb410940213eae50a4cef2cd Reviewed-on: http://codereview.qt-project.org/5852 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Debugger: Fix lock when profilingKai Koehne2011-10-071-0/+2
| | | | | | | | | | | | | Parts of the loading of data is now in a separate thread, which was already trying to log trace data while the QDeclarativeDebugTrace constructor was still blocking. Avoid this by calling QDeclarativeDebugTrace constructor before the actual execution begins (addEngine()). Also make sure that the logging methods are reentrant with a mutex. Change-Id: I5c2c1d14763fd9c7cb6fc93c6dff22d00d8737f1 Reviewed-on: http://codereview.qt-project.org/6169 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Debugger: Call removeEngine also for QV8DebugServiceKai Koehne2011-10-061-0/+1
| | | | | | | Change-Id: Ibb35e577f8844b47a844864f7639321859e20866 Reviewed-on: http://codereview.qt-project.org/6171 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QV8Profiler serviceChristiaan Janssen2011-10-061-1/+5
| | | | | | | | | | Expose the v8 profiler API through the declarative debugging infrastructure. The client side is implemented in Qt Creator. Change-Id: Idf4f3338d2e6756e7774f0704c0e5c4b35b0ed35 Reviewed-on: http://codereview.qt-project.org/5893 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Remove a few unneeded includesKent Hansen2011-09-301-15/+0
| | | | | | | Change-Id: I63a9cda5000cc872ad5a5d3c4b55243b8afb0527 Reviewed-on: http://codereview.qt-project.org/5782 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Ensure JS-owned QObjects are cleaned up on v8engine dtorChris Adams2011-09-301-0/+3
| | | | | | | | | | | | | This commit ensures that the garbage collector is invoked during engine destruction. This commit also adds a unit test which ensures that the JS GC destroys JS-owned C++ objects correctly when the QDeclarativeEngine is destroyed. Task-number: QTBUG-20377 Change-Id: I2de1f2dfd1e60cc2f76abb523b99bf169d2a5a13 Reviewed-on: http://codereview.qt-project.org/3285 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Remove more QByteArray<->QString conversionsKent Hansen2011-09-291-2/+2
| | | | | | | | | | Prefer to store types as QStrings. It's only when we manipulate raw (compiled, meta-)data that utf conversion is needed. Change-Id: Ie138a69c9a409804e1b90b21c1d60dedea35bddb Reviewed-on: http://codereview.qt-project.org/5781 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Asynchronous component instantiationAaron Kennedy2011-09-291-45/+103
| | | | | | | | | | | | | This introduces two main: * the QML compiler executes in a separate thread * item instantiation can be interrupted and resumed to allow it to be split across multiple frames. Task-number: QTBUG-21151 Change-Id: I9631c62bb77da3a2e0c37f0da3719533fdce4fef Reviewed-on: http://codereview.qt-project.org/5676 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove some unused includes.Jędrzej Nowacki2011-09-151-2/+0
| | | | | | | Change-Id: I5090b0d3c88f3c972b1f1d2a56a954138f8d02ca Reviewed-on: http://codereview.qt-project.org/4283 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-09-121-8/+26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * Improve efficiency of qmlEngine()Aaron Kennedy2011-09-091-2/+20
| | | | | | | | | | | | | | | | | | Also document qmlEngine() and qmlContext() Change-Id: I83eb092490160eee72d87473befdcea1492ded13 Reviewed-on: http://codereview.qt-project.org/4491 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
| * Doc fix for QDeclarativeEngineDamian Jansen2011-09-071-2/+2
| | | | | | | | | | | | | | | | | | imageProvider return details in wrong place. Change-Id: I5e2162b88a6bfd95222b9a7ac87d408c7740558d Reviewed-on: http://codereview.qt.nokia.com/4295 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
| * Rename QDeclarativeEngineDebugServer to ~ServiceKai Koehne2011-08-311-4/+4
| | | | | | | | | | | | | | | | | | And fix the file names/location, too Change-Id: If2d5ec0896332896ad11af748ec8f75c39e1555c Reviewed-on: http://codereview.qt.nokia.com/3890 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | Remove the remaining dependencies onto QtWidgetsLars Knoll2011-09-011-1/+0
| | | | | | | | | | | | Change-Id: I49efc4d0af4c19c24515ecfaa5c549e36f442cc8 Reviewed-on: http://codereview.qt.nokia.com/3992 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-311-1/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/v8 src/declarative/declarative.pro src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgshadereffectsource_p.h src/declarative/items/qsgview.cpp src/declarative/particles/qsgcustomparticle.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro src/qtquick1/qtquick1.pro tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsglistview/qsglistview.pro tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
| * Optimizations to imports.Martin Jones2011-08-301-0/+28
| | | | | | | | | | | | | | Change-Id: If4a51ad3b7c0ecc2261eea1d07a949119c3ad860 Reviewed-on: http://codereview.qt.nokia.com/3754 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * Improve QStringHashAaron Kennedy2011-08-301-1/+3
| | | | | | | | | | | | | | | | We now support reserving nodes, and keys that are ASCII strings. Change-Id: I9cc04438a1e9ceee1081cb1216e0273227551222 Reviewed-on: http://codereview.qt.nokia.com/3745 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-251-8/+13
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgitem.cpp src/declarative/items/qsgtextnode.cpp tests/auto/declarative/examples/examples.pro tools/qmlviewer/qmlviewer.pro Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
| * Enable v8 debuggingAurindam Jana2011-08-171-2/+2
| | | | | | | | | | | | | | | | | | Javascript v8 debugging service replaces the QScript debugging service. Change-Id: I25eea00eed3959b84a8f412e4c3484296d62e27b Reviewed-on: http://codereview.qt.nokia.com/2614 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * Remove dead code.Jedrzej Nowacki2011-08-041-6/+0
| | | | | | | | | | | | | | | | | | Structure was not used. Change-Id: Ib3a67f8a1850c211bb0b0700c10153eb9ab6441a Reviewed-on: http://codereview.qt.nokia.com/2583 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-08-021-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the need for applications to explicitly make a call to enable the debug services, and rather does it in declarative.h when the 'declarative_debug' CONFIG option is used. Done-with: Kai Koehne Reviewed-by: Martin Jones Reviewed-by: Michael Brasser (cherry picked from commit 5517cc588c39814530b8bfd957821f55be42acf2) Change-Id: Iacfc5a9b2ca0c2610288cf86f190b4a9950cacd1 Reviewed-on: http://codereview.qt.nokia.com/2436 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-111-6/+5
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/declarative.pro src/imports/gestures/gestures.pro src/imports/inputcontext/inputcontext.pro src/qtquick1/graphicsitems/qdeclarativeitem.cpp src/qtquick1/qtquick1.pro Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
| * Merge the QJSEngine and QJSValue development branch into master.Simon Hausmann2011-07-291-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | Build against refactor.Samuel Rødal2011-07-291-1/+1
|/ | | | Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 12:59:25 +0000