lp:~neon/qt/qtquick1

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

327. By Frederik Gladhorn <email address hidden> on 2015-02-24

Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5

326. By Antti Kokko <email address hidden> on 2015-02-23

Update copyright headers

Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: I9e68d256991ef7325c29c38ce9c007506ce6b150
Reviewed-by: Jani Heikkinen <email address hidden>

325. By J-P Nurmi on 2015-02-23

Replace Q_WS_MAC macro in tst_qdeclarativeflickable::flickVelocity()

Change-Id: I15889eee3cee1513e49576be40a7abf97a31da45
Reviewed-by: Jani Heikkinen <email address hidden>
Reviewed-by: Shawn Rutledge <email address hidden>

324. By Kai Koehne <email address hidden> on 2015-02-13

Fix autotest to not rely on broken operator<<(QDebug, QUrl) behavior

QmlInfo does call nospace() in the constructor. However, the
streaming operator for QDebug di permanently reset this to space(),
which the autotest relies on. This got fixed in qtbase change
868201155fd, letting this autotest fail.

Move QUrl to the end of the chain so that the broken behavior of
QUrl isn't checked anymore.

This is a cherry-pick of change 2aec854665f62e2177 in qtdeclarative.

Change-Id: I40f775749392e1c7516b9316706976862025f806
Reviewed-by: J-P Nurmi <email address hidden>

323. By Frederik Gladhorn <email address hidden> on 2015-01-19

Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev

322. By Friedemann Kleint <email address hidden> on 2015-01-07

Add missing includes.

After qtbase/90e7cc172a7521396bb2d49720ee4ceb9a9390b3,
QStringList no longer includes QDataStream.

Change-Id: I25c86ab233a79e71a4e0723c729a571014012cb8
Reviewed-by: Olivier Goffart <email address hidden>

321. By Konstantin Ritt <email address hidden> on 2014-12-14

[TextLayout] Drop unused member

QStaticTextItem never uses `chars` and `numChars`.
A respective change to QStaticText will follow.

Change-Id: I004a2e5d61841de63775d8207b5fd0bdf416f4c7
Reviewed-by: Lars Knoll <email address hidden>

320. By Simo Fält <email address hidden> on 2014-12-03

Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev

319. By Simo Fält <email address hidden> on 2014-12-03

Change test data from 6.7 to 6.5

Applying QtDeclarative's, 205336ebc859e670a4d06524ce65a22befc0eab4
to QtQuick1.

Change-Id: I285b35cbc727e847c45dab22e232640d9faaac21
Reviewed-by: Simon Hausmann <email address hidden>
Reviewed-by: Jędrzej Nowacki <email address hidden>

318. By Jędrzej Nowacki <email address hidden> on 2014-11-19

Do not use QMetaType::registerType.

The function is transitional from Qt4 to Qt5. It should not be called.

The patch is a semi cherry-pick of:
 14e247e4b94df17ed62750b4468c2ac25aabe30f
 a49154a75005403185e3813d441fb3e1931af2a2
 1f74dde59f8ecb8be3a41973ab5d8d435815edd6
from qtdeclarative.

Change-Id: I5f90a58d6fa8d1df69e149da22e17e234173dd68
Reviewed-by: Simon Hausmann <email address hidden>