| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
Separate the QML 1 and QML 2 debugger plugins. This helps avoid
a nasty crash in libgobject when (uneccessarily) loading and unloading
the wrong plugins.
Task-number: QTCREATORBUG-9232
Change-Id: I0bce7b364fcce983ccaa531d9008609ff08bb77f
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Move exported qml* symbols that conflict with QtQml into an - automatically
imported - namespace. This ensures apps can link against both
QtDeclarative and QtQml.
To keep the BC promise the old symbols are still exported.
Task-number: QTBUG-29584
Change-Id: Icf4e586fee51d2bd82125398e2bb96d6dd355cc5
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|
|
|
|
|
|
| |
The imports must be bundled in the apk.
Change-Id: I44cd4b442f9f3c8b6bf3534ffbfb8866475599e4
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
|
|
|
|
|
|
| |
qpacketprotocol.cpp:299:12: error: variable "writeBytes" set but not used [-Werror=unused-but-set-variable]
Change-Id: I04a33119b30669dda688591aee60dcb2b7bbd41b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|
|
|
|
|
|
|
|
| |
A common way to access the engine instance is via QDeclarativeView
- fix the code snippet accordingly.
Task-number: QTBUG-20747
Change-Id: Iff837f834ca6c950aa6c78c418f544789b4fcaf9
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
|
|
|
|
|
|
|
| |
Change-Id: I72c16f3affb297985e9e5d2e9f524537212d06ad
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
|
|\
| |
| |
| |
| |
| | |
This starts Qt 5.1 release cycle
Change-Id: Ic10a8c118053323004cafe1b4bffd990a16aaf7f
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Store the qint64 julian day in 2 ints, allowing Qt Quick1
applications to work until approx 2.5 Quadrillion AD.
Task-number: QTBUG-28119
Change-Id: Id9cbcd8f01fb15e3eef13609e96d107b48b3ad9b
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| |\
| | |
| | |
| | | |
Change-Id: I39178ea637dc950cbbb631b725350ab99897ad45
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I74d07deb862ff7099eaeeae93b04be3c7496c5c8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I7fd31373b4d08130c1fb44bb5b203331313558c3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
| |\ \
| | | |
| | | |
| | | | |
Change-Id: I71384165752875c073dfbcbd279cfdc82eeea4dc
|
| |\ \ \
| | | | |
| | | | |
| | | | | |
refs/staging/dev
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I4fd7f5c1096b0460bd23e2831e6207d63c2b69e3
|
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Model modifications that did not trigger the refill logic caused
the view's currentSection property to contain an outdated value.
A new autotest has been added to catch the bug.
Task-number: QTBUG-29712
Change-Id: I88cf1295ac55dad7596b6ba1fe475ebf98a31026
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.
Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: Ic5b55b26967d65b3f11cac6fc3963f33ec6051a4
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix MinGW-warning about invalid dllimport-directive.
Change-Id: I12b2888c09de5b548fd3bd7e626717ee057de80c
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I1175450886eca4dcaf7e81ae82fd112e541ad2f8
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
sync.profile
tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Calculate drag distance relative to the mouse position when a drag is
detected rather than the press position so there isn't a large change
in position on the first move.
Task-number: QTBUG-30188
Change-Id: I46918a7b3c62bdaef567b6a9fed651ce33434247
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
|
| |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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>
|