summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Make the rules for redirects a bit stricter.v4.8.4Richard Moore2012-11-221-3/+5
| | | | | Change-Id: I7a3cec664aa028202de3d3bda9f499e4deb2998d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QDeclarativeTypeLoader: Avoid stat() calls to . and ..Thomas McGuire2012-10-221-1/+1
| | | | | | | | | Not needed in Qt5, QDirIterator is not used there, Qt5 contains a completely new type cache. Change-Id: Ifb97cfda0589210783bccc65ab27a546e0f1fca8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* Fix access to uninitialised memory that might lead to crashesThiago Macieira2012-10-131-0/+5
| | | | | | | | | | | | | | | QMetaObject is POD, so its constructor is implicit and trivial (doesn't initialise anything). QAbstractDynamicMetaObject doesn't add a constructor, so the QMetaObject sub-object remains uninitialised. The users of either class must ensure they initialise the members if they will be accessed. Task: QTBUG-23214 cherry-picked from qt5 95cb2a1b5caf7d7158dd1176380c1458ea22b54f Change-Id: If0e6b129e1bddc3b70feafa4b318280bb715ab04 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QDeclarativeTrace patch for a custom trace instanceFrantisek Vacek2012-10-125-4/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for the BB10 Cascades profiling. There are more reasons for introducing this patch: 1) Cascades do not use QtGui library for QML rendering. It has its own paint engine with client-server architecture. Profiler traces are sent asynchronously from non Qt renderer thread to the Qt client. The QPerformanceTimer has to be patched too, cause we need to know time difference between tracing zero time and some time in past, see: qint64 elapsedToAbsoluteTime(qint64 absoluteMonotonicTimeNs) const 2) Since we need more sophisticated trace engine in cascades, this patch allows explicitly assign custom class derived from QDeclaraqtiveDebugtrace to the trace framework. If no custom instance is assigned, the default QDeclarativeDebugTrace instance is created implicitly on first trace request. Using custom trace instance which is not part of Qt (it is part of libbbcascades) allows us to implement all Cascades trace special needs in libbbcascades and not to carry Qt with the platform specific code. 3) The NO_CUSTOM_DECLARATIVE_DEBUG_TRACE_INSTANCE macro is introduced to allow custom trace engine only on the bleckberry platform, see declarative.pro. If this macro is defined Qt compiles from its original code. 4) Possibility of custom QDeclaraqtiveDebugTrace instance might be usable for other projects which needs to extends somehow default Qt trace functionality. 5) Patch is not intended to be applied to Qt Quick 2, since declarative debugging infrastructure is changed there. (cherry picked from commit f13b52f25c1e0bc26dcf3ea304b3495f7d5cd370) Change-Id: I199211c1de66e930e252e8c033503d7f4940565f Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Fix QObject::receivers() within connectNotify()Thomas McGuire2012-10-122-1/+7
| | | | | | | | | | | | The receiver count needs to be correct in connectNotify() to be compatible with ordinary connections. Fix this and add test. This is a backport of qtdeclarative commit b1c6e095404ccb7788e6b12fff692c71f4900815 Change-Id: Ic3145a536c928eccfcc29b4d010a526135b654b0 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Use QVarLengthArray when creating the connectNotify() argumentThomas McGuire2012-10-123-3/+9
| | | | | | | | | | | This gets rid of the heap allocation of the QByteArray. This change is not needed in Qt5, as there, QMetaMethod is used as the argument, and therefore there is no need to construct a SIGNAL-compatible string in memory. Change-Id: Ie2023aeb99bc8f792d437ec604e9989a5efe456b Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Register Qt 4.7 import on-demand, instead of at startup.Robin Burchell2012-10-049-19/+58
| | | | | | | | | | | | | | | | | | This is a slightly less awkward approach (keeps backwards-compatibility) while speeding up startup for applications that don't use the old import path. Also prints a warning to let developers know they should migrate their code when possible. Completely disabling the Qt 4.7 import is still possible by setting QT_NO_IMPORT_QT47_QML. This takes around 10-15ms off a very simple "hello world" on my macbook. (backport of qtquick1/2a3e9eb0ba00acf30b9cc40f7e2e4347726fb6b4) Change-Id: I6960e7c28bb4f153d793802b978c1944977e8ed4 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* EngineDebug: Updated and renamed serviceAurindam Jana2012-10-024-72/+96
| | | | | | | | | | | Updated service to include parent ids. Since this will break client compatibility, the service has been renamed to 'DeclarativeDebugger' from 'QDeclarativeEngine'. This is effectively a backport of the 'QmlDebugger' service from Qt5. Change-Id: Ic3000712d986e19bdf89417e9c4c23229d56f9dc Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-296-9/+5
| | | | | | | | | | - Assigned/Unused variables. - Unsigned comparison >= 0 is always true. - Constructor initialization order. - Signed/Unsigned comparisons. Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-29325-7830/+7830
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Include the signal code in the argument of (dis)connectNotify().Thomas McGuire2012-09-263-3/+3
| | | | | | | | | | | | | | | | As it turns out, the convention of (dis)connectNotify() is to include the signal prefix, i.e. '2'. Therefore add this prefix also when calling these functions from QML. Also add a unit test confirming that the C++ and QML cases are now handled the same way. This patch is not needed in Qt5, as connectNotify() and disconnectNotify() take a QMetaMethod as a parameter, not a const char*. Change-Id: I3add0fc13c60a479949cf3d31218af5fd3f546a2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Revert "Delete JS-owned QML objects right away in the engine dtor."Peter Kümmel2012-09-254-41/+21
| | | | | | | | | | | This reverts commit ecc432a5b7ae269220f86c6f0b3dd364f8643191 to fix a crash on exit. Task-number: QTBUG-20377 Change-Id: I6606ff194f2c16e06bdbbfca94e55821cf055f75 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Delete JS-owned QML objects right away in the engine dtor.Thomas McGuire2012-09-144-21/+41
| | | | | | | | | | | This prevents memory leaks when the engine is destroyed after exec() has already finished. In most cases this happens during application shutdown, at which point the event loop is never entered again. Task-number: QTBUG-20377 Change-Id: I65564ed3e56314d656d92fd66f11ae67d4eb932b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Make connectNotify() work with QMLThomas McGuire2012-08-3111-34/+239
| | | | | | | | | | | | | Call connectNotify() and disconnectNotify() in QML signal handlers and in QML bindings. This is a backport of Qt5's QtDeclarative commit 26ea8e01e9ee2a8c8c09266147b94c9ac92d09f9. Task-number: QTBUG-11284 Change-Id: If5c3701426208875f3b775040c4e7bcbaac2b0a9 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Register less types for QtDeclarative/QCoreApplicationKevin Ottens2012-08-203-68/+78
| | | | | | | | | | | | | | | | | | In Qt5 QtQml and QtQuick are separated so you have control on the amount of facilities you need. It is not the case in Qt4 unfortunately so you always pay the price of those registration. To overcome that, this patch avoids quite some of the type registration when we detect we're not running a QApplication. In such case all the GUI related QtQuick 1 runtime is not usable anyway. We keep around only a handful of convenience like Timer, Connection, Component, etc. Change-Id: Idf5aa935795a224ceb5bc66015282fd094b5686c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* XMLHttpRequest does not support the DELETE methodJani Honkonen2012-08-151-1/+4
| | | | | | | | | | This is a backport from qt5 commit: 0eeb925aa5039ffddf8d623f250980fc4c97712e Task-number: QTBUG-17963 Change-Id: Ibc262e81d6c7d3b6882461627a7a312d1fbafb3b Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-01325-655/+655
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* MouseArea: use current value of drag.axisAlberto Mardegan2012-07-252-11/+8
| | | | | | | | | | | | | If the drag.axis is changed while a drag operation is in progress, put it into action immediately. This allows, for example, start a dragging operation out of an item in a scrollable ListView to anywhere on the screen. See the linked bug number for an example. Task-number: QTBUG-26440 Change-Id: I4ffa71c08b97a767aec7f69d19271000a2631327 Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix roundtrip between double and string in QDeclarativeListModel leading to ↵Florian Hänel2012-07-251-4/+7
| | | | | | | precision issues Change-Id: Ib667dc79072e900f200943f05fb3db9512f4282e Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Qml ListView highlight component cannot access ListView scopeMartin Jones2012-07-042-64/+48
| | | | | | | | | Use the component creationContext to create the highlight item. Also do this for the header and footer. Task-number: QTBUG-26043 Change-Id: Ib4b947d022cb1513f728ac66455bfd2fe2703744 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Item.mapFromItem() crashes with Items not created by the engine.Martin Jones2012-06-261-2/+4
| | | | | | | | | | Item.mapFromItem() and Item.mapToItem() get the script engine from the item they are called on. Safer to use the script value passed to the function to determine the engine being used. Task-number: QTBUG-26280 Change-Id: Id9d6c952cc91c7799910b29a27e24945d8ba073b Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* rewind macro in WinCE wrongly substituted.Martin Jones2012-06-261-0/+8
| | | | | | | | | qdeclarativestateoperations_p.h gets wrong macro substitution by rewind(fp) macro when compiling for Windows CE Task-number: QTBUG-26227 Change-Id: I228ab17ee0be0e228d0c782bfb48ad5c8b12169f Reviewed-by: Bea Lam <bea.lam@nokia.com>
* QDeclarativeTextInput sends delayed mouse events to input contextLauri Malmi2012-06-071-3/+13
| | | | | | | | | | | | | | | QDeclarativeTextInputPrivate::sendMouseEventToInputContext() now forwards also the delayed press events (sent by QDeclarativeFlickable) to Input context. In case of delayed event QWidget pointer in QGraphicsSceneMouseEvent parameter is null and QApplication::focusWidget() is used to obtain QWidget pointer. Task-number: ou1cimx1#1001264 Change-Id: Ia595af651c322b0c91f3a2bd93a9ac1111a00cf6 Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Propagate left key presses to the parent item when TextInput is empty.Marcel Schuette2012-05-301-1/+1
| | | | | | | | | | Don't overwrite the ignore value once it's been set to true. Backport from Qt 5.0 to Qt 4.8 (commit a7017465152d544a4217d5ce4f6f84b80cb9b8b9) Task-number: QTBUG-25447 Change-Id: I2232806b1235b0c901aab21116b5bc70c65d0500 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix crash when using aliases and variantsNicolas Arnaud-Cormos2012-05-251-1/+1
| | | | | | | | | | Right now, the parser crash when using id.variant.property for an alias. The current patch fix the crash, and it displays an error message in the console now (like QtQuick 2). Task-number: QTBUG-25341 Change-Id: I5e2c13f487655fd2b90129c5693f5daf3f77984b Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix memory leak in qdeclarativevisualdatamodel.Andrew den Exter2012-05-211-2/+4
| | | | | | | | | | | Parent order was backwards, the inner context was parented to the outer context, and then the inner context was reparented to the delegate. Parent the outer context to inner context so both are deleted when the delegate is deleted. Task-number: QTBUG-25784 Change-Id: I1d6cd4dfc2530424535a7e00164563d9b4aaa513 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Wrong signals received when moving Flickable elementKatja2012-05-111-2/+2
| | | | | | | | | | Both onMovingHorizontallyChanged and onMovingVerticallyChanged received when Flickable element moved only to one direction. Fixed so that only relevant signal sent. Task-Id: QTBUG-25042 Change-Id: I20acb2403e08c2afa681da2e553cea227c91f001 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Clicking on a disabled ListView's delegate breaks mouse interactionPasi Pentikainen2012-05-081-1/+1
| | | | | | | | | | A disabled Flickable should not filter children. This is a backport of change I9f0d8fbfd0922b5c6a9eaffa69212867359f79e0, from Qt5 (later discarded in QtQuick1 restructuring of Qt5). Task-number: QTBUG-20584 Change-Id: Id279907ee90faf19284c12b548467850662a7019 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix crash in TextEdit when changing text content.Andrew den Exter2012-04-271-1/+1
| | | | | | | | | Verify the text cursor is not before attempting to deference the layout it refers to. Task-number: QTBUG-25389 Change-Id: I8a75393c5af9f81821ad91cbfdd7bbca0d84b1a2 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Moved qmljs_debug_arguments to QCoreApplicationRafael Roquetto2012-04-201-13/+13
| | | | | | | | | Enable the use of the QML debugger without QtGUI Based on Qt5's 9a096d9e. Change-Id: If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc Fix- a QML MouseArea Elelment can accept 5 buttons.Rick Stockton2012-03-201-0/+2
| | | | | | | | | | | Add XButton1 AND Xbutton2 to the list of accepted Buttons. This is only a doco fix, without any code change. On branch 4.8 Change-Id: Ib396ec7707a63123759f1164927f0b63850cebe9 Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix QDeclarativeItem::hasActiveFocus().Andreas Aardal Hanssen2012-03-191-2/+5
| | | | | | | | | | | | | | | | | | This function returns true if the item (or, in case it's a focus scope, one of its children,) has focus (i.e., will receive key events now), or will receive focus once the scene is activated. It also returns true if the item has not yet been added to a scene, but has subFocus, implicating that someone has called setFocus() on it prior to it being added to the scene; the latter case seen most commonly in unit tests. Cherry-picked from qt/qtquick1: bb364c14157df635cf166b293f8cab6c22534aa1 Task number: QTBUG-24681 Change-Id: I2f2d9dd81820e94202a44393a38972c868a774b7 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Build fix for QtDeclarative in WindowsCEjaanttil2012-02-061-0/+7
| | | | | | | | | | | | | | | | | | | qdeclarativestateoperations.cpp in declarative module needs to include qgraphicsitem.h. In windows CE, the qgraphicsitem.h further needs to include qfunctions_wince.h. qfunctions_wince.h is used to implement posix functions missing from WinCE. One of reimplemented functions in qfunctions_wince.h is posix rewind. Now qdeclarativestateoperations.cpp also implements method called rewind with different prototype. Two incompatible prototypes of rewind break the QtDeclarative build for WinCE. As a workaround the POSIX rewind reimplemented by qfunctions_wince.h is now undefined in this class, because it is not needed here. Task-number: QTBUG-22511 Change-Id: I9e569fa753e70b386068f54d95c3aae0a2dbe55d Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixed compiler warning about unused status argument.jaanttil2012-02-031-0/+1
| | | | | | | | | Task-number: QTBUG-22512 Change-Id: I6894259faa3af6171a3f5313357d222e45b48af3 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixed warning by MSVC about class/struct mismatch in MethodData.Janne Anttila2012-02-031-1/+1
| | | | | | | | | | | MSVC reported the following warning when compiling declarative module: 'MethodData' : type name first seen using 'class' now seen using 'struct' Fixed by changing the forward declaration from class to struct. Task-number: QTBUG-22512 Change-Id: I066feea80115d1d968332933d78e0408cd92a70a Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix pinch-zoom problem when application is deactivatedJarkko T. Toivonen2012-02-032-3/+11
| | | | | | | | | | | | | | | | | | Deactivation can happen for example if some notification dialog opens on top of the application. In this case the PinchFinished signal was not emitted. It is fixed so that when the QDeclarativePinchArea component receives QEvent::WindowDeactivate event, the ongoing touch activity is cancelled, which causes the pinch to finish. Also if QEvent::TouchUpdate event is received without receiving QEvent::TouchBegin event first, the QEvent::TouchUpdate event will not cause the updatePinch() method to be called. Task-number: ou1cimx1#948030 Change-Id: Ib8b9e1a022415be06f1a8e778b887418f32c75ef Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fixed compiler warnings about unused q and d variables in declarative.jaanttil2012-02-023-3/+0
| | | | | | | Task-number: QTBUG-22512 Change-Id: I9acde5b799aa12c9de6e3321003bd5dcc4bb853d Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Fixed crash in QDeclarativeGridViewMartin Jones2012-02-021-1/+1
| | | | | | | | Inserting new items used a different threshold than removing items outside the view in refill. Change-Id: Id3605122a7a31caf0b661e78b5d868ceb3f01e20 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-11325-327/+327
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Declarative: Use qDebug() for debugger status updatesKai Koehne2011-11-282-2/+2
| | | | | | | | | | Although "Qml debugging is enabled. Only use this in a safe environment!" is a warning, using qWarning() for it let every app crash that is run with QT_FATAL_WARNINGS. Fix that by using qDebug() for the updates that happen during 'normal' operation. Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Change-Id: Ie37a35ca27ec6e507f7de140484ca8cf96410be2
* Declarative: Unify output of warning messages in debug serverKai Koehne2011-11-281-12/+15
| | | | | | | | Use the stream operator instead of toAscii().constData(), or qPrintable. Also use QString::fromLatin1() instead of QString::fromAscii(). Task-number: QTBUG-22860 Change-Id: Iabe37778f0fd50ca450f0504939441c633d6354e
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-11-251-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (23 commits) Added missing license header. Adjust pathes once again. Fixed a link Fixed a link Split behavior and wigglytext examples Rename files to show up in docs. Whitespace changes and added depends. Fix up examples. Fixed some linking issues. Removed unecessary files from folders. Fixes for the manifest and links. Changed some of the short descriptions for WebView examples. Removed unecessary duplicate files. Fix link to WebView examples. Fix link to ListView and WebView example pages. Fixed lists to be ordered lists and added curly brackets Change the links to behavior examples. Fix warning about unbalanced parantheses. Fix abstractitemmodel compilation error. Split ListView and WebView examples. ...
| * Fixes for the manifest and links.Casper van Donderen2011-11-241-3/+3
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-244-52/+60
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix Linux-Symbian parallel cross-compilation configure step Symbian: don't merge native clipboard, overwrite. Surviving out of memory in Qt Quick app Export QtGui functions required by QtMultimediaKit backend fix bearer crash Fix alignment of non-wrapped richtext QML Text elements.
| * | Surviving out of memory in Qt Quick appmread2011-11-213-51/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtQuickPlayground app contains a version of samegame which allow the user to edit the code. By setting the ball size to 8, the app can run out of memory. This leaves it in a pretty bad state. But apps on Symbian shouldn't crash due to OOM and should allow some operation. This change fixes the immediate OOM crashes in declarative, gui and corelib. It shows warning dialogs which explain what has gone wrong and leaves the app in a state that can be exited cleanly from the Symbian task list. Task-number: QT-5319 Reviewed-by: Shane Kearns Reviewed-by: Gareth Stockwell Reviewed-by: Martin Jones
| * | Merge remote-tracking branch 'qt/4.8'Pasi Pentikainen2011-11-171-16/+41
| |\ \ | | |/
| * | Fix alignment of non-wrapped richtext QML Text elements.Miikka Heikkinen2011-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QTextDocument needs to know the actual control width rather than the text width to be able to align the text to the control. Task-number: ou1cimx1#934687 Reviewed-by: Joona Petrell
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-11-231-7/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Sequential reading not supported. DeclarativeDebugServer: Instantiate QPluginLoader on heap Fix failing unit tests. qmlplugindump: Fix dumping empty names for generated QMetaObjects. Fix compile with -qtnamespace Properly protect access to pixmap reader thread with mutex Move tga support from Qt3d to Qt. Move tga support from Qt3d to Qt. Properly protect access to pixmap reader thread with mutex qmlplugindump: Add flush to fix output redirection on windows.
| * | Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-11-221-7/+8
| |\ \
| | * | DeclarativeDebugServer: Instantiate QPluginLoader on heapAurindam Jana2011-11-171-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pluginloader is instantiated on heap with server as its parent so that the connection plugin instance remains loaded in memory. This prevents the plugin loader in QDeclarativeInspectorService to accidentally un-load the plugin while it's in use. Change-Id: I11c82ce595a336ba0fd1b243d23cb497fe355147 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
generated by cgit v0.12 at 2025-08-07 14:02:41 (GMT)