| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes a regression whereby on the first mouse move the contentItem was
moved the total distance from the touch point to where the drag
distance was exceeded. For large drag thresholds this causes a
noticeable jump.
Task-number: QTBUG-30032
Change-Id: I92c119d27dc2e22203484f9ada5978697d171957
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
|
|
|
|
|
|
|
|
|
|
|
| |
In automated GUI test scenarios it often desired not to wait for animations
before verifying a result, so setting the duration to zero should accomplish
this, before this patch; if duration was set to zero QSmoothedAnimation
would treat it as if duration was not set, and used velocity to calculate
animation speed.
Change-Id: Ie6520d6c595bd014f3cab69bbb527e773f3850da
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Emit activeFocusChanged up the focus tree when an item receives a focus
event, rather than when the focusItem changes which happens before
internal state is sufficiently updated for hasFocus and hasActiveFocus
to return the correct values from within a changed signal handler.
There are some limitions to this. First the signals are not emitted
reliably when the scene is not active which makes sense for activeFocus
but not for focus. The second is in some instances the focus and
activeFocus can update unnecessarily while the focus chain sorts itself
out.
QDeclarativeItem tests by Andreas Aardal Hanssen <andreas@hanssen.name>
Task-number: QTBUG-28288
Task-number: QTBUG-25644
Change-Id: Ib3d17c42754c15a08b34c3388f50b45cc1d2a831
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
|
|
|
|
| |
If the boundBehavior prevents the flickable from moving its content
item in response to a drag it shouldn't grab the mouse as that will
prevent a parent MouseArea or Flickable from handling the drag.
Task-number: 29718
Change-Id: Ief82ef7b898ea2581fd0b7e52548f451d887e2f1
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
|
|
|
|
| |
A MouseArea shouldn't prevent a parent MouseArea or Flickable from
handling a drag event unless it is going to do something useful with
it.
Task-number: QTBUG-29717
Change-Id: I17caa51ebc2e547e73e727fd185e60644591ad2b
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
|
|
|
|
| |
We used to copy builtins.qmltypes into qtbase/imports/QtQuick1, but
install it into into $QT_INSTALL_IMPORTS. Unify this by copying
it also directly into the imports directory.
Change-Id: I9fe2feae4ff0da49d59d787b92ba2d7d4c47461d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
| |
QDoc doesn't differentiate between \badcode and \code. They both
look the same in the output.
Change-Id: I3661a893a9413a0b137e236083cc9ac5677ffecb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|
|
|
|
| |
Change-Id: Ic87c7fdecbe3c5431d38b228e186237ccd2aed3b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|\
| |
| |
| | |
Change-Id: Ied6e28f0e7e3dceccdbbe878dfab8f88c64e32d8
|
| |
| |
| |
| |
| | |
Change-Id: I995109869294f3106046a8fd8299b6300b4c567f
Reviewed-by: hjk <qthjk@ovi.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Grepping through qdoc files, 'the the' appears in a few places.
Also one instance of 'centre' replaced by 'center'.
Change-Id: If978895c470ff02a0fe0c164aec421943deb24d3
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|/
|
|
|
|
|
|
|
|
|
| |
QPerformanceTimer was a copy of QElapsedTimer with some additional functionality
which has since been subsumed into QElapsedTimer, so remove the forked code.
(backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative)
Change-Id: Ife1dac4d6c46404b43253680819da21350c65569
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
|
|
|
| |
Found by clang:
qml/qdeclarativexmlhttprequest.cpp:1324:24: error: equality comparison result unused [-Werror,-Wunused-comparison]
Change-Id: Ie46678d6102f2e50bf87a53a9cbc14d114b4e334
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
|
|
|
|
|
| |
qml/qdeclarativevme.cpp:286:26: error: destination for this 'memset' call is a pointer to dynamic class 'QObject'; vtable pointer will be overwritten [-Werror,-Wdynamic-class-memaccess]
qml/qdeclarativemetatype.cpp:441:9: error: expression result unused; should this cast be to 'void'? [-Werror,-Wunused-value]
util/qdeclarativefontloader.cpp:87:52: error: addition of default argument on redeclaration makes this constructor a default constructor [-Werror,-Wdefault-arg-special-member]
qmlplugindump/main.cpp:180:75: error: unused parameter 'engine' [-Werror,-Wunused-parameter]
qml/qdeclarativefastproperties_p.h:53:1: error: class 'QMetaObject' was previously declared as a struct [-Werror,-Wmismatched-tags]
Change-Id: I1e91252d048e36e684a854ca1c6eb92e5a871444
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
|
|
|
| |
There are a couple virtuals that are being overridden intentionally. We
can't raise the previous virtual because they are privates. So the only
thing we can do is disable the warning.
Change-Id: Ie9c02e5d5a02d35c4cd7712c554be6e5cf5523a7
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
| |
Change-Id: I925fc622998c0ea7e8b045b70e0145a9bbd29459
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
| |
Change-Id: Ie2aa164eeb265a52a59da080f51e29aeaf77083b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
There aren't that many captured properties, decreasing the increment
will give better performance.
Change-Id: Iddb17c695eda5513f2d038123f4c886e559d8f6a
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backport 447e5acb880ebda498891623dc4009984cb73bc6 and
0fc361f96b06ba318e70610e46beb421753cae9d which fix bugs related
to currentIndex. The first commit ensures currentIndex=0 when all
items are removed; the second ensures that the initial currentIndex
value is respected and also resets the view correctly if the model
changes.
Change-Id: I73266a211001a54163be8415d449802ff077a72e
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
By placing imports into a hash keyed by the qualifier, imports were not
processed in the order they appeared in the source. This is perhaps not a major
problem, but it is nice to have predictability.
This becomes more important in Qt 5, when QHash is randomly seeded at
application startup, as alterations to order could have strange side effects on
code.
Reported-by: Maciej Blomberg
Change-Id: Ibd34fab1eed4bc727b498ba4684c62d801ae713b
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The crash triggered by our (supported & documented) use-cases (calling
map{From,To}Item with a null value), has been introduced earlier this year,
by this change:
https://qt.gitorious.org/qt/qt/commit/bec02b3f3
Also:
* Clarify QDeclarativeItem::map{From,To}Item statement ordering.
* Handle the engine-less item corner case.
Change-Id: I33678f7267a4b624bfa61247a643f37ad2ec735d
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
|
|
|
|
|
|
|
|
|
| |
It was decided to leave in the examples as reference, but
not obviously refer to them in the documentation.
Change-Id: I932a2a3fc983d5a8a63855ae94d509161fdfada4
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: I0aea3bfcae77d22f04166ce7e04c9a4898e7f99b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
| |
Change-Id: I52b87947559c10d3e60af81fe8d4f3189dd1614e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|
|
|
|
|
|
|
| |
Needed for automating static plugin loading.
Task-number: QTBUG-28131
Change-Id: Ia32d3dad2136d0fda468a538fe9be989e72c79eb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
In QDeclarativeEngine initialization,it goes through all types,
including Font in Gui. This causes a crash when using
QDeclarativeEngine with QCoreApplication.
Task-number: QTBUG-28375
Change-Id: Idce2a046db7e52a1c13b8c5c0315e36873f7e27d
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.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>
|
|
|
|
|
| |
Change-Id: I4970676013d374db528c693375dd9ba2a3108908
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Recreate the shader program as required when the GL context
changes. Also delete the shader program when the ShaderEffectItem
is deactivated, to save graphics memory.
Previously, this was done only for Symbian platforms, and in a
suboptimal fashion. This patch implements the behaviour for all
platforms in a more optimal manner.
Task-number: QTBUG-28136
Change-Id: I8281e77f7285ea0046bdf092ab827cae3b00a6d2
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
|
|
|
|
| |
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 ObserverMode was enabled, the messages to the plugin
were not delivered and hence the feature did not work.
Change-Id: I58ec83a4ee727b32833c011a4942cde0cd6a02c8
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.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>
|
|
|
|
|
|
| |
Change-Id: I0d0147592e981ef5c6543d50aa5c2cb355268553
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.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>
|
|
|
|
|
|
|
|
|
| |
DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.
some other setup can be skipped as well.
Change-Id: If6e77a42a571e1977875b13bc8519a2cd43df16a
Reviewed-by: Joerg Bornemann <joerg.bornemann@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>
|
|
|
|
|
|
|
|
| |
QtQuick1 uses the Widgets related API of QtWebKit and hence needs
to use the QtWebKitWidgets module.
Change-Id: Idf2e65d053e1dbf2501486c8f0a22b8b25f23efc
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.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>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-27471
Change-Id: I4f15e7358739ac6057798505af5ea4c171207f20
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
|