| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
This adds the QML1 QDeclarativeWebView integration to the default build (it was
added a while ago) as well as the unit tests.
Change-Id: I7324f5a3b00716d4b300e8c11d9ea3b8b9577da3
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.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>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-25196
Change-Id: Ibdd3053768972a98374cf22c5749448008f303ae
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Kai Koehne <kai.koehne@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>
|
|
|
|
|
| |
Change-Id: I8438bcc8166c1e34bd04b399a02f95d11b1c4d22
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
|
|
|
|
|
|
|
|
|
|
|
| |
Move QtQuick1 WebView from WebKit trunk into this module. It only depends
on public API and is otherwise self-contained. The files upstream are all
copyright Nokia, hence the import here with according re-licensing.
The plugin is not enabled by default yet.
Change-Id: I3fce42d90e83edfaec59ff263e31bfe314f4377c
Reviewed-by: Lars Knoll <lars.knoll@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>
|
|
|
|
|
|
|
|
|
| |
Use QPointer to store classes derived from QObject that weren't
initially shared with QSharedPointer. QWeakPointer must be used only
with QSharedPointer.
Change-Id: I28705055bb0167300fee2dee45a8f05cc8f818f3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.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>
|
|
|
|
|
|
|
|
| |
- Use getPointer to get a weak pointer for the binding.
- Change QWeakPointer<QObject> to a QPointer.
Change-Id: I6c362a51c398f73817b5f4545d21f4845d625e13
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Install and load Qt Quick 1 plugins from imports/QtQuick1/...
This is to avoid conflicts between Qt Quick 1 and 2 and cleanly spearate
the plugins for both.
Currently, e.g. the folderlistmodel exists for both, and gets installed
into the same location.
Change-Id: I55331a5a02148eacc3c615436d77eb97bf0fbd72
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Like this the plugin is together with the functionality and
thus automatically gets installed when the module gets
installed.
Change-Id: I01f9f61d46fb5ef11c5c8f474df8df59865e535c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The readyRead signal (part of QIODevice base class) is the
appropriate signal for knowing when there is data available
in a QNetworkReply.
DownloadProgress is intended for UI elements e.g. progress bars.
Previously it was emitted at the same time, but now it is emitted
less often.
Task-number: QTBUG-20449
Change-Id: I732a2facb083f4cc35d01441a34964847f00fdb2
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
|
|
|
|
|
| |
Change-Id: I0b4156f01d5d1bfe5cdde724148ed681025ab227
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Don't overwrite the ignore value once it's been set to true.
Backport from QtQUick2 to QtQuick1 in Qt 5
(commit a7017465152d544a4217d5ce4f6f84b80cb9b8b9)
Change-Id: Ia93e234773bb75040f889cc03853be311dbafd70
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
| |
Change-Id: I8684a7045100e7020648e54779286ff0d6683ade
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Cherry-pick of b26a588c1702a84ba853df3c757d879cc9f2fc46 from 4.8
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: I4a500b41b02d3cb5dfead4b87ac86e9583024108
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Helps in case the 'file::' prefix is missing from local file URLs
on Windows. 'C:\foo' is then interpreted as URL with protocol
'c', causing an error.
Change-Id: Ib6f4b096bbd1daf0fbc2d58aef714d131e52ef92
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
|
|
|
|
|
| |
Change-Id: I975527171f840d5ea6cdd3c99c35379b5d9faa36
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The check in qmltooling attempts to avoid installing the qtquick1
version of the debugger plugin if qtquick2 is used. The removal of the
declarative module meant that this plugin was always enabled,
potentially overwriting the qtquick2 debugger plugin. This check was
updated to work again, although this approach is still somewhat
problematic. It would be better if the different versions of the
plugins had different names.
The check in tools/designer/src/plugins doesn't seem to make sense, so
it was removed.
Change-Id: I55d1bf59264d3c5d62c2d4545e9ced952e460efb
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
|
|
|
|
|
|
|
|
| |
Ensure comma between elements (9 missing), single space and curly-
braces around title elements, etc.
Change-Id: Iefe491665804861f2a179ca87fb2f8a0eded8781
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|