| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
There is currently no way in C++ to duplicate the functionality of a qmldir
file in mapping QML files to versioned types in a module. This functionality
would be useful both in cases where a separate qmldir file would be overkill,
and for cases where the type mapping should be generated dynamically.
Change-Id: I28d7898122c5556fcd7cf3476795bcf4bb288eab
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
|
|
|
|
|
|
|
|
|
|
|
| |
As a performance improvement to avoid accessing the filesystem
unecessarily, only import "." implicitly if types cannot be found in the
existing imports. This is not a behavior change for type resolution,
because "." already has the lowest precedence for type resolution.
Change-Id: I8a8f10f7a790e6a02fc2c07c443f7be1984fc979
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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: I7e3c9b9c321278dd24bd17ae2efdc690307cba8a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Provide for checking relative paths only; default to file names.
Currently, the checking triggers on a drive letters and
installation folder names, which is too strict.
Task-number: QTBUG-28277
Change-Id: I2056a39b605f7891d2c3e395efc6bc541aa7e470
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
|
| |
Fix the redirection flaw in QML's XmlHttpRequest implementation that
is described in
http://lists.qt-project.org/pipermail/announce/2012-November/000014.html
Change-Id: I5190e63648f4664753003b70c20cb8dbd20ab150
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When a styled text specifies a font region with some color set,
QDeclarativeTextLayout used to revert to using a default-constructed
(black-colored) pen for text occurring after the </font> tag, rather
than the "default" (property-defined) color.
This commit ensures that the correct pen is used, by setting the pen
of the "inert" painter to be an invalid color rather than a default
constructed pen. It then detects when the current pen transitions
back to this invalid pen, and switches back to using the default
color.
Task-number: QTBUG-28135
Change-Id: I6bcc43fbcf7fb2c680959d27b1422364ebb473ae
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
| |
So that it can skip loading state when the underlying
QNetworkReply is already finished.
Change-Id: Ic2d26271868b64bf8a411b4b54d7e5be7ee5d2b5
Parts-of-the-patch-by: Jeremy Nicholl
Task-number: QTBUG-27723
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Although not valid according to ECMA 5.1, both JSC and V8 accept a
missing semicolon after a do-while loop. (Both JSC and V8 do not do this
through automatic semicolon insertion, but handle it as a special case.)
This is a "port" of a similair change done in the qtdeclarative module.
Change-Id: I417cf18abb75e7040c48894b8f8f68afc41547fe
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
| |
Change-Id: Icfc2b14b1e5ff5eab5fd4af3a6ffbebea6f89e84
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
|
|
|
|
|
|
|
|
|
|
| |
Don't check if the clipboard has content until necessary as the
check can block for an extended period.
Port of 3db5afa71443533eee6825a5fb0da29498f96b94 from qtdeclarative.
Change-Id: I606af79cbf10b147aa1bb6c182b0a84aabbc5257
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
|
|
|
|
|
|
|
|
| |
Qt3 legacy QCoreApplication::Type and QApplication::type() will be
removed -> use qobject_cast instead.
Change-Id: If95a5552440ace2592332de03f9d2240fa8770b9
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
|
|
|
|
|
| |
Change-Id: I42532f6896ff9fe91084e2e1c8aa53a00527329b
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
|
|
|
|
|
|
|
|
|
|
| |
The Qt Quick 2 ones will be in a different place. This restores Qt 4
behaviour.
Change-Id: I6bc11113c0c89f4b11422b7fe98571930eb852cd
Discussed-on: http://lists.qt-project.org/pipermail/development/2012-October/007011.html
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
QDeclarativeGridView crashed in the WelcomeScreen of Qt Creator.
For details refer to the task.
Task-number: QTBUG-23445
Change-Id: I44594a253a004db254e8cd87560de3f0824a94bf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
by using fixed QTextBoundaryFinder behavior.
Update QDeclarativeTextInput autotests.
Task-number: QTBUG-11365
Task-number: QTBUG-27364
Change-Id: Idda22f6c0974bf29d2ff961ea8d998a68c3d676b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
| |
Change-Id: I18a370a58494049939d035f1c3528406f3f7645f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
qmlExecuteDeferred is exported using Q_DECLARATIVE_EXPORT in
qdeclarative.h, so we don't need to use one here. Better not have any
than have the wrong one, which can cause problems.
Change-Id: I672f8aaf0fef2600a6ab8c4a17112404fc5b1cda
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Matches the name that this code used to have in Qt 4.
- Adapt library, change import path to 'QtDeclarative'.
- Update the tests and examples to match the new library name.
- Rename qtquick1global{_p}.h to qtdeclarativeglobal.h.
- Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like
it was in Qt 4 and matching the library name again. This also
changes the include guards in qtdeclarativeglobal{,_p}.h.
- Fix occurrence of quick_debug in tools/qml/qml.pro.
Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
| |
Function elapsedToAbsoluteTime() had wrong implementation on MAC and WIN
platforms.
Change-Id: Icc11e85bcd562cce42af902749883b433a1fcb0b
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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 QPerformanceTimer::elapsed(qint64 to_monotonic_time_ns) 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.
Change-Id: I199211c1de66e930e252e8c033503d7f4940565f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I11a957e35758e821269478ebc91e87f0f5ebc4d5
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
| |
Change-Id: Iad770614f7c1c890febeee662d0ce9370dcb17e3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
| |
Change-Id: I627dfef54743821d0c3019034f114ac4d81fda76
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
| |
Change-Id: I1cb9d92c60e8595432c1a13866c370e040553a6f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
As an added bonus, forward-port a similar approach to 4.8's
a26f545d8e25af74fb43d16c9afa79f6e04463e7 and don't register graphical types in a
non-graphical application as someone (very naughtily) apparently forgot to get
it integrated to Qt 5 first.
Change-Id: I7821523750b3ab6770f367788725d0da70c5ec1f
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Alan Alpert <416365416c@gmail.com>
|
|
|
|
|
|
|
|
| |
It is to be removed, and is obsoleted by QMetaType::PointerToQObject.
Change-Id: I6832808cfd1e22d6c04c7ba37bf52ff7c36f0272
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
|
|
|
|
|
| |
Change-Id: I6a84f8b35f26fbe44b51ecf4f38aa2619996e83a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Change-Id: Ia65d09d850a58e66db2d6d2a25703725283dbdb8
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
| |
Change-Id: I1d1be313492c311aaaf6a87dd96d56d08feb097e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
| |
qtquick1/src/declarative/qml/qdeclarativeengine.cpp:78:25:
fatal error: QNetworkReply: No such file or directory
Change-Id: If39be538bd135118d6654e154e86e8a082f03a58
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The order in which resources declared in QML are placed into the default
property is not defined, and should not be relied upon.
Task-number: QTBUG-26702
Change-Id: I5023b8dad89513cde69852e0c3a910477f60888e
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Adapt to changes in qtbase - removal of third parameter to the
QGraphicsObject ctor, and the declaration of the
QWindowSystemInterface class.
Change-Id: I8b01ae67f09cbf4fc2e3e062dc8b976ccb061234
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
19bba2faca1e1a1e6ddbb7a899a6894fc64c1723 added QtQuick1 to both the
base path of QtQuick 1 imports and the target paths of individual
plugins leading to a duplication of QtQuick1 in the final path.
Remove the suffix from the root destination directory as the plugins
still need to explicity include it in the install path and it's better
if there's a single relative target path used in the .pro files.
Task-number: QTBUG-26707 QTBUG-26701
Change-Id: I79ee28fc5b6ef549cf3c5f71585756149f0f8ff3
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
|
|
|
|
|
|
|
|
| |
-\qmlclass is now \qmltype
-\instantiates is for QML types implemented in C++
Change-Id: I017822524de1879d272d777ec7681f4233128b01
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I0c2af5663852a1fa456684424c220697fa6824e8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
|
| |
we do a double-string-double conversion in QDeclarativeListModel which
introduces precision errors if that conversion is lossy, e.g. ecvt. is
used
Change-Id: Ie871ebbb04695f56fc7b49b9d788037da4a857c0
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The QtQuick1 library relied on special case handling of the
objectName property in qtbase. With Qt5, there is a normal
notify signal for objectNameChanged. Remove the QtQuick1
special cases and fall through to the default code path.
Task-number: QTBUG-26334
Change-Id: I70f31947b6c74c7125d6f99a33e9b02d7ef52273
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
|
|
|
|
|
|
|
| |
This simplifies the handling of static vs shared/DLL builds.
Change-Id: I547df9bc1da3dd0dca4c621f46450328e47cab3c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Change-Id: I9bc7a3ed70f866c59ba9f72ad3a96b22e6bbf7a6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Use the component creationContext to create the highlight item.
Also do this for the header and footer.
Task-number: QTBUG-26043
Change-Id: I74276dfbcb4989b8e2b5acf1f2b16ed5537e24de
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
|
|
|
|
|
|
|
|
| |
anchors.mirrors was removed before QtQuick 1.1 release, but the docs
were not removed.
Task-number: QTBUG-23427
Change-Id: I8352a444b97a21a98228b85f12a652ed013e93f1
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
... and compile the plugin regardless of whether qtdeclarative has
been qmake'd.
Change-Id: I704214e07a92eff6630d94858eb6898a399d6fa2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
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: Id72afd723b21ed0f1a747e2d802d6f9715f6c093
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- setup of PKGCONFIG* variables (automated now)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- QT_BUILD_*_LIB defines (automated now)
- pointless QPRO_PWD assignments
Change-Id: I4b3a1cd560e99658102d374fb278fe3e7744bae9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
| |
Change-Id: Ia96fa9e0ba43de4c32053699d0e9528ef308fb67
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Changes in the build system causes the header of this library
to be included incorrectly. This library was never a hard dependancy
for qtquick1.
Change-Id: If28d4fcd7879c04772158f1e03da6e05c6f21928
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
| |
Don't iterate over a temporary.
Task-number: QTBUG-26209
Change-Id: Iab99d0756c5c30e4f5bb9b674a20eaf76ebce1e6
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
And add the missing forward-declaration to QMetaObject in one place. I
guess no one noticed that QObject was actually fully-declared, despite
the existing forward declaration. This was caused by qpair.h including
qdatastream.h, which includes qiodevice.h, then qobject.h, then
qobjectdefs.h.
Change-Id: Idd3aef1acecf0c045a63c154c3ce2d7835afa71b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
| |
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>
|