qt:qtquick1.git
2 years agoUse QByteArray::toDouble() instead of qstrtod. dev
Erik Verbruggen [Fri, 27 Feb 2015 12:59:17 +0000 (13:59 +0100)]
Use QByteArray::toDouble() instead of qstrtod.

No need to use a secretly exported symbol.

Change-Id: I1cba959a789164cd9f584e9ff2591b7f85ab9a52
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2 years agoMerge remote-tracking branch 'origin/5.5' into dev
Simon Hausmann [Wed, 4 Mar 2015 09:10:37 +0000 (10:10 +0100)]
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I39fbf07f7b4fd4fccdd504ee01e286061f4996a2

2 years agoMerge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5 v5.5.0-alpha1
Frederik Gladhorn [Tue, 24 Feb 2015 17:15:53 +0000 (17:15 +0000)]
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5

2 years agoBump version
Oswald Buddenhagen [Tue, 24 Feb 2015 15:23:14 +0000 (16:23 +0100)]
Bump version

Change-Id: I97bef8bdf910f2f0f29187f39c022a5df06e82cc

2 years agoUpdate copyright headers
Antti Kokko [Thu, 12 Feb 2015 07:32:33 +0000 (09:32 +0200)]
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 <jani.heikkinen@theqtcompany.com>
2 years agoReplace Q_WS_MAC macro in tst_qdeclarativeflickable::flickVelocity()
J-P Nurmi [Mon, 23 Feb 2015 10:44:55 +0000 (11:44 +0100)]
Replace Q_WS_MAC macro in tst_qdeclarativeflickable::flickVelocity()

Change-Id: I15889eee3cee1513e49576be40a7abf97a31da45
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2 years agoMerge remote-tracking branch 'origin/5.4' into 5.5
Frederik Gladhorn [Fri, 20 Feb 2015 14:53:39 +0000 (15:53 +0100)]
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
.qmake.conf

Change-Id: I85eac7ffdbd673aeba4e7437fa5a9dc50759a736

2 years agobic: Add/Replace 5.{0.1,2,3,4}.0 bic data for linux-gcc-amd64
Sergio Ahumada [Wed, 11 Feb 2015 14:12:56 +0000 (15:12 +0100)]
bic: Add/Replace 5.{0.1,2,3,4}.0 bic data for linux-gcc-amd64

Remove the ia32 data since there are no linux x86 machines in
the CI system (which makes the data useless from an automated
testing point of view) and most people use x64 these days anyway.

Change-Id: Ica9ac9728f99b0341a17c120f0564f20f05d5c48
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2 years agoFix autotest to not rely on broken operator<<(QDebug, QUrl) behavior
Kai Koehne [Fri, 13 Feb 2015 08:00:35 +0000 (09:00 +0100)]
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 <jpnurmi@theqtcompany.com>
2 years agoMerge remote-tracking branch 'origin/5.4.1' into 5.4
Frederik Gladhorn [Tue, 10 Feb 2015 09:35:36 +0000 (10:35 +0100)]
Merge remote-tracking branch 'origin/5.4.1' into 5.4

Change-Id: I854c8bff922c0ffcaf2ea6daec00c12e9bed540e

2 years agoFix Url in layoutitem example.
Friedemann Kleint [Mon, 9 Feb 2015 11:29:37 +0000 (12:29 +0100)]
Fix Url in layoutitem example.

Fix warnings:
WARNING: Unexpected stderr:
QDeclarativeComponent: Component is not ready
QGraphicsLinearLayout::insertItem: cannot insert null item

found while mass-testing examples.

Change-Id: I0af369ca7f4d59d822ed7b0c8bd8dcd4cc34ead7
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2 years agoAutotest: Use resources for test data
Rainer Keller [Thu, 5 Feb 2015 08:06:25 +0000 (09:06 +0100)]
Autotest: Use resources for test data

Change-Id: I011b6be94b56baf58f3ee47d0b805932bb94a7f8
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2 years agoThis test seems to be unstable on some platforms v5.4.1
Lars Knoll [Tue, 3 Feb 2015 08:39:15 +0000 (09:39 +0100)]
This test seems to be unstable on some platforms

We've had some failures with this test in the CI system.
Ignore it as we plan on deprecating qt quick1 anyway.

Change-Id: If882598dfd0cdb13b588ca9ad4074d61b8574d19
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
2 years agoQDeclarativeTextEdit: fix use of uninitialised value.
David Faure [Mon, 2 Feb 2015 13:31:32 +0000 (14:31 +0100)]
QDeclarativeTextEdit: fix use of uninitialised value.

Detected by valgrind (in Qt 4.8.6):
==27068== Conditional jump or move depends on uninitialised value(s)
==27068==    at 0x70C7289: QDeclarativeTextEdit::updateTotalLines() (qdeclarativetextedit.cpp:1742)

Change-Id: I17856a6d5e06f10f2daf5f3534c175526f21b5dc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2 years agoMerge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Frederik Gladhorn [Mon, 19 Jan 2015 12:24:24 +0000 (13:24 +0100)]
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev

2 years agoBump version
Oswald Buddenhagen [Fri, 16 Jan 2015 20:06:45 +0000 (21:06 +0100)]
Bump version

Change-Id: I3c95c3c20a14cf1342e87c3026b294fe2996c592

2 years agoFix empty arrays in QML 1
Robert Griebl [Thu, 8 Jan 2015 14:48:28 +0000 (15:48 +0100)]
Fix empty arrays in QML 1

Commit 9cbb6fa added a regression, where empty arrays would produce errors
in QML 1.

Change-Id: Ie5c784d5ec921d1ca69084750ed37fc2e273bbef
Task-number: QTBUG-43656
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2 years agoAdd missing includes.
Friedemann Kleint [Wed, 7 Jan 2015 08:50:16 +0000 (09:50 +0100)]
Add missing includes.

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

Change-Id: I25c86ab233a79e71a4e0723c729a571014012cb8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Fri, 2 Jan 2015 11:25:15 +0000 (12:25 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
.qmake.conf

Change-Id: I7a07ebd7ccf3fc9ec26f7bbf2936b1a787c097f7

2 years agoFix change-of-sign warning detected by ICC
Thiago Macieira [Sun, 23 Nov 2014 06:44:19 +0000 (22:44 -0800)]
Fix change-of-sign warning detected by ICC

subscribeIndex is quint16, so it can't store a value of -1. Store 65535
instead.

Note: in findgeneric, subIdx will NOT be -1. It will be 65535.

Change-Id: I4b5ad6415609f409660a035de6f763ddb2da2f7e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2 years ago[TextLayout] Drop unused member
Konstantin Ritt [Sat, 22 Nov 2014 00:28:21 +0000 (04:28 +0400)]
[TextLayout] Drop unused member

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

Change-Id: I004a2e5d61841de63775d8207b5fd0bdf416f4c7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2 years agoBump version
Oswald Buddenhagen [Fri, 12 Dec 2014 12:48:30 +0000 (13:48 +0100)]
Bump version

Change-Id: I2ff94f952edc3add07c0b53bb54d042a61fe23c2

2 years agoMerge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Simo Fält [Wed, 3 Dec 2014 16:23:10 +0000 (17:23 +0100)]
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev

2 years agoChange test data from 6.7 to 6.5
Simo Fält [Tue, 2 Dec 2014 16:07:41 +0000 (18:07 +0200)]
Change test data from 6.7 to 6.5

Applying QtDeclarative's, 205336ebc859e670a4d06524ce65a22befc0eab4
to QtQuick1.

Change-Id: I285b35cbc727e847c45dab22e232640d9faaac21
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Fri, 21 Nov 2014 15:12:46 +0000 (16:12 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I5fbaf737a8aa58d34aa0eacef4adc5352e0ddbf8

2 years agoDo not use QMetaType::registerType.
Jędrzej Nowacki [Thu, 13 Nov 2014 11:22:20 +0000 (12:22 +0100)]
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 <simon.hausmann@digia.com>
2 years agoExtend timeout in tst_qdeclarativetextedit::delegateLoading v5.4.0 v5.4.0-rc1
Frederik Gladhorn [Wed, 29 Oct 2014 13:08:02 +0000 (14:08 +0100)]
Extend timeout in tst_qdeclarativetextedit::delegateLoading

On some CI machines (OS X 10.7) this test actually passes but takes
5100 ms to load the delegate.

Task-number: QTBUG-42264
Change-Id: I008cbf0e163257c800370951920384108e5a390b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Mon, 27 Oct 2014 11:48:47 +0000 (12:48 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I48df1568991f8c8bb6836b1d323710805a98ef44

2 years agoSkip failing test data
Alan Alpert [Thu, 31 Oct 2013 05:40:54 +0000 (22:40 -0700)]
Skip failing test data

The test is crashing on windows, skipping it will at least allow the
other parts of the test to run.

Task-number: QTBUG-30131
Change-Id: Iff420c71c29a482641275da938bfcb8c43a45042
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
3 years agotests: tst_qdeclarativelanguage: fix filesystem case sensitivity
Shawn Rutledge [Tue, 21 Oct 2014 12:31:19 +0000 (14:31 +0200)]
tests: tst_qdeclarativelanguage: fix filesystem case sensitivity

importIncorrectCase() and errors(incorrectCase) give different error
messages depending on the case sensitivity of the file system on OS X.
Those are in turn different than error messages on other operating
systems with case-sensitive filesystems.

This patch is very similar to the one that was done in qtdeclarative:
2ebf4ba4710a01a038d05cfea741e5538bb4567f for QTBUG-37622

Change-Id: Ib13d717712cf88b476ca7edd8aababd7f5456c50
Task-number: QTBUG-41961
Reviewed-by: Liang Qi <liang.qi@digia.com>
3 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Mon, 20 Oct 2014 17:13:22 +0000 (19:13 +0200)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I89edb0c7d2d7abd6ac5a14f9f5afcb60f722734a

3 years agoMerge remote-tracking branch 'origin/5.3' into 5.4
Frederik Gladhorn [Tue, 14 Oct 2014 12:05:04 +0000 (14:05 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I320a0ae55f27db5a8bcb50c2574c3f92fbf35e63

3 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Thu, 9 Oct 2014 16:04:49 +0000 (18:04 +0200)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I51b5541943de39d87eed4887a879eeacb3a7e376

3 years agoBlacklist constantly failing test case on Mac OS X v5.4.0-beta1
Kalle Viironen [Tue, 16 Sep 2014 10:37:06 +0000 (13:37 +0300)]
Blacklist constantly failing test case on Mac OS X

tst_qdeclarativetextinput fails on Mac OS X

Task-number: QTBUG-41316
Change-Id: I86724ecf0196ab4728f3bf14fcfc6cfe18bc20d1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Fri, 19 Sep 2014 15:53:47 +0000 (17:53 +0200)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I64648cf46b65e9396ef58b8f7ed8437bf2339e7e

3 years ago qmlplugindump: Use _CrtSetReportMode() for MSVC only.
Friedemann Kleint [Fri, 19 Sep 2014 11:13:37 +0000 (13:13 +0200)]
 qmlplugindump: Use _CrtSetReportMode() for MSVC only.

Fix warnings when using MinGW:

main.cpp: In function 'int main(int, char**)':
main.cpp:734:55: warning: statement has no effect [-Wunused-value]
     _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
                                                       ^
main.cpp:735:53: warning: statement has no effect [-Wunused-value]
     _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG);
                                                     ^
main.cpp:736:54: warning: statement has no effect [-Wunused-value]
     _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG);

where _CrtSetReportMode() is an empty macro.

Change-Id: Ibd9024246f59e0c5d1a6a6a017cd680fd60b0113
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
3 years agoMerge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Frederik Gladhorn [Wed, 17 Sep 2014 19:03:57 +0000 (21:03 +0200)]
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4

3 years agoUse QSignalSpy instead of waitFor in tst_qpacketprotocol
Ulf Hermann [Wed, 17 Sep 2014 17:01:43 +0000 (19:01 +0200)]
Use QSignalSpy instead of waitFor in tst_qpacketprotocol

Our CI metrics tell us that this test is in much better shape in
QtQuick2 than here. So let's apply the only differing change here, too.

Change-Id: I1985f20ba36b94d698699173fb911e393b31c215
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
3 years agoRemove qtdemo from gitignore
Rainer Keller [Wed, 17 Sep 2014 08:51:05 +0000 (10:51 +0200)]
Remove qtdemo from gitignore

QtDemo was removed with a commit in qtdoc.

Change-Id: I73c11c66933d23565e38e3e93e1300b794a80f6a
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
3 years agocompile with QT_NO_CURSOR 5.3
Joerg Bornemann [Mon, 15 Sep 2014 15:57:16 +0000 (17:57 +0200)]
compile with QT_NO_CURSOR

Change-Id: Ied2bb3467f6d76cfab57bbd27c7f4b315c036d6f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
3 years agocompile with QT_NO_TOOLTIP
Joerg Bornemann [Mon, 15 Sep 2014 15:57:06 +0000 (17:57 +0200)]
compile with QT_NO_TOOLTIP

Change-Id: I3d50df90315de4c73b5d49520585676197011072
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
3 years agoMerge remote-tracking branch 'origin/5.3' into 5.4
Frederik Gladhorn [Tue, 16 Sep 2014 13:27:45 +0000 (15:27 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
.qmake.conf

Change-Id: I842b005b9818c9e201a09d51bcf418e2dd0a1ef9

3 years agoMake sure that the itemview's count property is reliable
Nils Jeisecke [Fri, 28 Feb 2014 11:53:43 +0000 (12:53 +0100)]
Make sure that the itemview's count property is reliable

This fixes a missing countChanged signal when model
changes happen while the itemview component is not
completely initialized.

Task-number: QTBUG-37115
Change-Id: I20c749b9e521b0292186adbecd09e1d362520881
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
3 years agoBump version
Frederik Gladhorn [Fri, 29 Aug 2014 09:33:38 +0000 (11:33 +0200)]
Bump version

Change-Id: I8eb3593fc738554c52999119439b5f5ff32933f7

3 years agoUpdate license headers and add new license files v5.4.0-alpha1
Antti Kokko [Thu, 21 Aug 2014 12:51:17 +0000 (15:51 +0300)]
Update license headers and add new license files

- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: I736aeb1a53f8aac59e8df360447864fea64d3dee
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
3 years agoMerge remote-tracking branch 'origin/5.3' into 5.4
Frederik Gladhorn [Tue, 12 Aug 2014 10:50:38 +0000 (12:50 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: Ie53408303d45db4bbc2030d3076f1ec868afedb2

3 years agoBump version
Oswald Buddenhagen [Sat, 9 Aug 2014 19:30:50 +0000 (21:30 +0200)]
Bump version

Change-Id: I45794952049658ec8d6a41a0b9d3da40be6ba549

3 years agoFix Flickable mouse grab issue.
Robert Griebl [Thu, 31 Jul 2014 13:39:02 +0000 (15:39 +0200)]
Fix Flickable mouse grab issue.

This issue cannot be reproduced on the desktop with a mouse (at least I
could not).  It can however reliably be reproduced on iMX6 embedded hardware
with a touch-screen.  It seems like the TS driver is reporting mouse events
with a much more coarse granularity than the USB mouse driver, which in turn
triggers this bug.
(Qt4's declarative, as well as Qt5's quick1 and 2 all have the same issue)

Change-Id: I01c9fc433a78d5f79518786783e24f3f93eaa50a
Task-number: QTBUG-27185
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
3 years agoAdd handling of value-type lists to QDeclarativeExpression::evaluate()
Robert Griebl [Thu, 31 Jul 2014 14:14:03 +0000 (16:14 +0200)]
Add handling of value-type lists to QDeclarativeExpression::evaluate()

QDeclarativeExpression::evaluate() converts all arrays to QList<QObject *>,
even if the items cannot be represented by a QObject *. In case of a
string-list, a QList of null-pointers is returned (which isn't very helpful).
This patch makes evaluate() convert arrays, which contain ONLY value-type
items, into a plain QVariantList.

Change-Id: Ib8452cf9dd0241f146955f5de35336f48b9007c1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
3 years agoqmlplugindumper: do not pop up a window if an assert is triggered 5.3.2 v5.3.2
Fawzi Mohamed [Wed, 30 Jul 2014 13:07:11 +0000 (15:07 +0200)]
qmlplugindumper: do not pop up a window if an assert is triggered

On windows the debug version of qmlplugindumper used to show a panel on
assert failure. Failure should be silent.

Done-with: Thomas Hartmann <thomas.hartmann@digia.com>
Task-number: QTCREATORBUG-12644
Change-Id: I0491ab745a546687772cd0d70fb6b8be0f03bb75
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
3 years agoMerge remote-tracking branch 'origin/5.3' into dev
Frederik Gladhorn [Tue, 29 Jul 2014 10:51:06 +0000 (12:51 +0200)]
Merge remote-tracking branch 'origin/5.3' into dev

Change-Id: Ib65e8d81071452904ec3b0423e91dca1b0101452

3 years agoQDeclarativeError::toString: improve handling of empty urls.
David Faure [Fri, 25 Jul 2014 16:29:19 +0000 (18:29 +0200)]
QDeclarativeError::toString: improve handling of empty urls.

"file::2:23: ..." is strange to read. Show "<Unknown File>:2:23: ..." instead,
by treating empty urls (including "file:") as unknown, and by still showing
line and column numbers in such a case.

This change makes it possible for QUrl::fromLocalFile("") to return an
empty url rather than "file:", which this module was relying upon in the tests.

Change-Id: Id6d8aaa73673283cb65cbd1316dca77f859a3f8f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
3 years agoCompile fix: do not use composeMode() if QT_NO_IM is defined.
Steffen Imhof [Fri, 23 May 2014 13:37:45 +0000 (15:37 +0200)]
Compile fix: do not use composeMode() if QT_NO_IM is defined.

Change-Id: Ib0046657ba687e6427c67c7dce0d71ec3be87f48
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
3 years agoAvoid direct GL calls in Quick1
Laszlo Agocs [Thu, 26 Jun 2014 13:53:21 +0000 (15:53 +0200)]
Avoid direct GL calls in Quick1

Change-Id: I72c78f3c2920d7c27c013eaad39259a7c7009940
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
3 years agoMerge remote-tracking branch 'origin/5.3' into dev
Frederik Gladhorn [Thu, 26 Jun 2014 15:25:31 +0000 (17:25 +0200)]
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
.qmake.conf

Change-Id: Ibcd05d8dcf19133830920d9eba3fa1450b3d3de1

3 years agoBump version
Oswald Buddenhagen [Tue, 17 Jun 2014 22:36:21 +0000 (00:36 +0200)]
Bump version

Change-Id: I83a2f252c5a0f105f4d0984652e41049009f8499

3 years agoFix tst_qdeclarativeapplication on OS X
Sergio Ahumada [Tue, 3 Jun 2014 13:02:32 +0000 (15:02 +0200)]
Fix tst_qdeclarativeapplication on OS X

This change is similar to qtdeclarative/a292bcb1438034a24e95ec08be04a76ba832d793

Change-Id: I2d758d6725b32a8f9779e14560b9b61271a5cb97
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
3 years agoFix tst_qdeclarativetextinput::copyAndPaste() for asynchronous clipboard notification.
Sergio Ahumada [Mon, 2 Jun 2014 12:03:56 +0000 (14:03 +0200)]
Fix tst_qdeclarativetextinput::copyAndPaste() for asynchronous clipboard notification.

Change qtbase 6a61a00ddb21e79412e82069dfef50192bfd724d for Windows uses
new clipboard notification API that results in asynchronous clipboard
notifications.

This change is similar to qtdeclarative/a7122f3b2832ad65cfd0ab0ce0315a7042ee9f92

Change-Id: I3bb85f7dbc258f8f93cde8af1c9b24286b99ce21
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Sergio Ahumada [Tue, 3 Jun 2014 09:16:35 +0000 (11:16 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf
src/declarative/qml/qdeclarativemetatype.cpp

Change-Id: I133752e1df91677925005fa8c1268b32fba312ea

3 years agoDon't add the database before verification stable v5.3.1
Rob Hoelz [Tue, 22 Apr 2014 05:19:50 +0000 (00:19 -0500)]
Don't add the database before verification

The local storage facility exposed to QML has a bug; if you attempt to
open a versioned connection, the version is wrong, and you try to handle
that error, the connection is still stored in a connection pool, but in
an unopened state.  The next time you attempt to connect, no matter if
you have the version right or not, the database handle will complain
about being unopened.

See also http://qt-project.org/forums/viewthread/38458/

Task-number: QTBUG-38543
Change-Id: I597497aab4895c868275a247ad96fb969e1c8ae5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoFix copy and paste error
Frederik Gladhorn [Wed, 14 May 2014 11:35:04 +0000 (13:35 +0200)]
Fix copy and paste error

Fix error 13 identified by static analysis from
http://www.viva64.com/en/b/0251/

This is in line with qtdeclarative.

Change-Id: I3d3879bb93f9ae5bdcdd583645b1657f55140fdf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
3 years agoDon't use a variable called 'interface'
Thiago Macieira [Thu, 1 May 2014 21:54:02 +0000 (14:54 -0700)]
Don't use a variable called 'interface'

MSVC has #define interface struct, resulting in a nonsensical error from
the compiler about "struct: missing tag name" in a line that doesn't say
"struct".

Change-Id: I1ca703fd7920052e9d0bdf9a6936df77597ff022
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
3 years agoqmlplugindump: Fix platform plugin specification.
Friedemann Kleint [Mon, 5 May 2014 10:38:17 +0000 (12:38 +0200)]
qmlplugindump: Fix platform plugin specification.

Fix warning:
Project WARNING: CONFIG+=qpa_minimal_plugin is deprecated. Use QTPLUGIN.platforms=qminimal instead.

Change-Id: I33330bdbe7639de777b4f0fedd4ecadd184733bf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Thu, 1 May 2014 10:47:27 +0000 (12:47 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ied69074622a6d08ded39acd7e9f7949c1dbaabf8

3 years agoAdd 5.3 Changelog v5.3.0 v5.3.0-rc1
Alan Alpert [Thu, 24 Apr 2014 03:26:49 +0000 (20:26 -0700)]
Add 5.3 Changelog

There was a bug fixed for this release.

Change-Id: I428a01111874c70d2151213d2b3c555444333aaa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agoBump MODULE_VERSION to 5.3.1
Sergio Ahumada [Thu, 17 Apr 2014 15:24:55 +0000 (17:24 +0200)]
Bump MODULE_VERSION to 5.3.1

Change-Id: Ifb2361ae4fe8e6d6e2f06dc20cb4c7b4739a7021
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Fri, 11 Apr 2014 12:15:47 +0000 (14:15 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ie3850f2b3abc07fff45c563c9a80045fdd6468bb

3 years agomake QtQuick1 claim plugins of type 'qml1tooling'
Oswald Buddenhagen [Fri, 4 Apr 2014 16:26:06 +0000 (18:26 +0200)]
make QtQuick1 claim plugins of type 'qml1tooling'

Change-Id: Ifd4d0da3e79fc087f56a3d3c8104e35a66ef47fc
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Iikka Eklund [Tue, 1 Apr 2014 08:46:57 +0000 (11:46 +0300)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I222f518e398b90382e452921411cfe81836ce02f

3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Mon, 24 Mar 2014 15:07:50 +0000 (16:07 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ic5bcce627df03517c29597e6bb864f7b3fad2ebe

3 years agoEnsure TextEdit's text is vertically aligned after resizing its height.
Mitch Curtis [Tue, 11 Mar 2014 12:31:53 +0000 (13:31 +0100)]
Ensure TextEdit's text is vertically aligned after resizing its height.

The current code only updates the alignment if the width of the
TextEdit changed, but we must also check if the height has changed.

Task-number: QTBUG-36069

[ChangeLog][QtDeclarative][TextEdit] Fixed TextEdit not vertically
aligning its text after having its height changed.

Change-Id: I428a01111874c70d2151213d2b3c5553e7f21186
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
3 years agoCorrect QDeclarativeTextEdit::positionToRectangle(). v5.3.0-beta1
Mitch Curtis [Thu, 20 Mar 2014 09:54:21 +0000 (10:54 +0100)]
Correct QDeclarativeTextEdit::positionToRectangle().

d->yoff is the content offset when the content is not top aligned.
This means that positionToRectangle() returned incorrect values when
the content was bottom or vertical center aligned. In other words,
it didn't apply the offset but gave coordinates from the beginning of
the content instead of from the beginning of the item.

Change-Id: I044b79434b9a67b0539050e39953d5889a3ed1db
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Sergio Ahumada [Tue, 11 Mar 2014 08:27:02 +0000 (09:27 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2

3 years agoFix typos in comments and documentation
Sergio Ahumada [Tue, 4 Mar 2014 19:25:54 +0000 (20:25 +0100)]
Fix typos in comments and documentation

Change-Id: Ie7c4d63d632bf32ee583ddcd807252225ddde3fd
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
3 years agoRevert "Dynamic GL support in Quick1's ShaderEffectSource"
Laszlo Agocs [Fri, 28 Feb 2014 12:05:27 +0000 (13:05 +0100)]
Revert "Dynamic GL support in Quick1's ShaderEffectSource"

Will need to change to QOpenGLContext::currentContext()->isES()
once the qtbase changes are in.

This reverts commit 3eeaf987123f73ad7a4745745d9e7c70f30942cd.

Change-Id: I7ac8718bc07cbcbaefe1633856722ae402078112
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
3 years agoFix encoding of localized messages
Kai Koehne [Wed, 19 Feb 2014 08:14:07 +0000 (09:14 +0100)]
Fix encoding of localized messages

QDebug::operator<<(const char*) uses QString::fromUtf8(), while
qPrintable(str) returns QString::toLocal8Bit(). This messes up e.g. the
Russian translations.

Task-number: QTBUG-35825
Change-Id: Ib3f0004df677196a0bd17ac48c65f2d51b833044
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
3 years agoFix MSVC-warnings about double to float truncation.
Friedemann Kleint [Wed, 29 Jan 2014 07:44:33 +0000 (08:44 +0100)]
Fix MSVC-warnings about double to float truncation.

warning C4305: 'argument' : truncation fromm 'double' to 'float'

Change-Id: I7e419700b26ff66c48562b73db74b45ab1673c23
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Mon, 24 Feb 2014 19:04:29 +0000 (20:04 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia3d0ffbe6ba6c8c34ec1ca2961953797d82ce282

3 years agowhitespace fixes
Oswald Buddenhagen [Fri, 17 Jan 2014 18:33:29 +0000 (19:33 +0100)]
whitespace fixes

remove trailing spaces & expand tabs

Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoDynamic GL support in Quick1's ShaderEffectSource v5.3.0-alpha1
Laszlo Agocs [Thu, 6 Feb 2014 09:18:11 +0000 (10:18 +0100)]
Dynamic GL support in Quick1's ShaderEffectSource

Not strictly necessary but it is better not to call glEnable()
with values that are not supported by GLES2. This way the
error state will not polluted by an invalid_enum or similar.

Change-Id: I952273f1814d9f124e5c4baa6196386645202439
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
3 years agoBump module version to 5.4.0
Thiago Macieira [Wed, 19 Feb 2014 20:20:48 +0000 (12:20 -0800)]
Bump module version to 5.4.0

Change-Id: I49e9b8117f01dfd86f6cdd73509d54575a187f0f
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoMerge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Frederik Gladhorn [Mon, 17 Feb 2014 10:17:26 +0000 (11:17 +0100)]
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

3 years agoProspective build fix after commit f8dbed12266c42785c1e4758eed05833ec035f33 in qtbase
Simon Hausmann [Mon, 17 Feb 2014 08:31:22 +0000 (09:31 +0100)]
Prospective build fix after commit f8dbed12266c42785c1e4758eed05833ec035f33 in qtbase

Pass through the QVariant argument provided by the caller (QInputMethod).

Change-Id: Ia99546cd16287c14ce414d6aad0ea04488e7c6e2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Wed, 12 Feb 2014 13:11:42 +0000 (14:11 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ie11564446e707146f266f384fce794bd34b9d5f7

3 years agoDisable build for WinRT
Maurice Kalinowski [Mon, 3 Feb 2014 06:32:41 +0000 (07:32 +0100)]
Disable build for WinRT

Change-Id: I9539aed1011325e201d7e32ea02b8c3fee77af30
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
3 years agoNormalize signal & slot signatures in connection
Thiago Macieira [Sun, 2 Feb 2014 22:08:51 +0000 (14:08 -0800)]
Normalize signal & slot signatures in connection

Profiling shows Qt Creator spends 2% of its load time normalizing

Change-Id: Id7ba78038c8504d960172923026245d28de182e8
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
3 years agoFix warning about unused variables in getting-started tutorial.
Friedemann Kleint [Mon, 27 Jan 2014 16:05:04 +0000 (17:05 +0100)]
Fix warning about unused variables in getting-started tutorial.

Change-Id: Ic7945d59fb0dd207997698259e770af626f9e7e7
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
3 years agoFix compiler warning in example. old/5.2
Christian Kandeler [Fri, 17 Jan 2014 10:54:35 +0000 (11:54 +0100)]
Fix compiler warning in example.

Change-Id: Ie57d6e5c8811a7845c55a069150de2fe0f796599
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
3 years agoFix MSVC-warning about unused variable d in qdeclarativeitem.cpp.
Friedemann Kleint [Fri, 24 Jan 2014 13:41:12 +0000 (14:41 +0100)]
Fix MSVC-warning about unused variable d in qdeclarativeitem.cpp.

Change-Id: I39fe8076e53d159b060db8884df108a790bc6469
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Fri, 17 Jan 2014 16:24:12 +0000 (17:24 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I0f21f35cbace3cacbb0b2536c8f1eb6e11f025b5

3 years agoBump MODULE_VERSION to 5.2.2
Sergio Ahumada [Wed, 15 Jan 2014 21:58:41 +0000 (22:58 +0100)]
Bump MODULE_VERSION to 5.2.2

Change-Id: I7d5d4708679d8fa8006428057b5acda87c1ede99
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agoFix autotests expecting a trailing whitespace for qDebug stream
Kai Koehne [Wed, 30 Oct 2013 15:59:41 +0000 (16:59 +0100)]
Fix autotests expecting a trailing whitespace for qDebug stream

The behavior of QDebug was fixed in qtbase. Update autotests
accordingly.

Change-Id: Ic39b7ddfc8a2fed6456ec617304aaf5035774e14
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Thu, 5 Dec 2013 17:46:03 +0000 (18:46 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ib5b91e20ee9aff1fb0eba6854fa517961f8fce5b

3 years agoMerge remote-tracking branch 'origin/release' into stable v5.2.1
Frederik Gladhorn [Tue, 3 Dec 2013 17:27:21 +0000 (18:27 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Id938fd62f7a500973b43f21e803f8b8c0c1a660d

3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Fri, 29 Nov 2013 15:05:06 +0000 (16:05 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: Ia89f74de1281f7357cfa75b22b6d43e83b032ab2

3 years agoAllow QtDeclarative and QtQml to co-exist at run-time v5.2.0
Simon Hausmann [Mon, 25 Nov 2013 09:29:45 +0000 (10:29 +0100)]
Allow QtDeclarative and QtQml to co-exist at run-time

This patch changes QDeclarativeData to share the very first bit with QtQml's
QQmlData, to indicate ownership by either run-time. We need to check the bit in
the only QObject callback we use (destroyed), the other callback was unused and
removed.

Task-number: QTBUG-35006

Change-Id: Ife4b515648cba42b91612736ccd9375f1f46808a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoBump MODULE_VERSION to 5.2.1
Sergio Ahumada [Mon, 25 Nov 2013 11:48:28 +0000 (12:48 +0100)]
Bump MODULE_VERSION to 5.2.1

Change-Id: Ie118f79e690ba82f6bc6410c3e8158d57f710060
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoFix QML file in wigglytext-example.
Friedemann Kleint [Fri, 22 Nov 2013 07:45:23 +0000 (08:45 +0100)]
Fix QML file in wigglytext-example.

Task-number: QTBUG-33871
Change-Id: I0dcd1fa10d82b929161afb044867983675064247
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Wed, 20 Nov 2013 15:44:36 +0000 (16:44 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I2c6a554f6033ce83379f2338fd3064ab39674215

3 years agoDebugger: Fix debugging with newer Qt Creator's v5.2.0-rc1
Kai Koehne [Fri, 8 Nov 2013 13:59:45 +0000 (14:59 +0100)]
Debugger: Fix debugging with newer Qt Creator's

Make sure we advertise the QDataStream version, so that Qt Creator
doesn't fall back to Qt_4.7.

This is the minimal change necessary to achieve this. QtQml does
actually consider the maximum data version announced on the client side,
but that would require bigger changes in this module ...

Task-number: QTCREATORBUG-10694
Change-Id: I1f0f005429e4d2736dc8661dd8c0d869279f856e
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>