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 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 agoBump version
Oswald Buddenhagen [Tue, 17 Jun 2014 22:36:21 +0000 (00:36 +0200)]
Bump version

Change-Id: I83a2f252c5a0f105f4d0984652e41049009f8499

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

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

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

4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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

4 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>
4 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

4 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>
4 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>
4 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>
4 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>
4 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>
4 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


Change-Id: I0f21f35cbace3cacbb0b2536c8f1eb6e11f025b5

4 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>
4 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

Change-Id: Ic39b7ddfc8a2fed6456ec617304aaf5035774e14
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
4 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

4 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

4 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


Change-Id: Ia89f74de1281f7357cfa75b22b6d43e83b032ab2

4 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

Task-number: QTBUG-35006

Change-Id: Ife4b515648cba42b91612736ccd9375f1f46808a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 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>
4 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>
4 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

4 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>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Sergio Ahumada [Fri, 8 Nov 2013 17:16:44 +0000 (18:16 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I6556b93b0897a2df48a68238b8ab150541fcbb3f

4 years agotests: fix tst_qdeclarativemoduleplugin::incorrectPluginCase()
Liang Qi [Tue, 15 Oct 2013 08:09:46 +0000 (10:09 +0200)]
tests: fix tst_qdeclarativemoduleplugin::incorrectPluginCase()

It gives different error message based on the case sensitivity of
the file system on Mac.

Task-number: QTBUG-32646
Change-Id: I8b5986a4bc8886924e678692c6679e571a11dd33
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
4 years agouse private linkage where possible
Oswald Buddenhagen [Thu, 31 Oct 2013 12:56:49 +0000 (13:56 +0100)]
use private linkage where possible

Change-Id: Ia64fcacff77933a00df6eecd866f75466f4f99a3
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
4 years agotests: replace nokia with qtproject in tst_qdeclarativemoduleplugin
Liang Qi [Thu, 31 Oct 2013 08:53:17 +0000 (09:53 +0100)]
tests: replace nokia with qtproject in tst_qdeclarativemoduleplugin

Change-Id: Ia531065e3069aa010f99f91a8c8228788b3f0848
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Thu, 24 Oct 2013 10:56:37 +0000 (12:56 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I636400c00ec6470d4dff4844a977ef0f5aa3a53b

4 years agotests: Replace Q_OS_MACX -> Q_OS_OSX v5.2.0-beta1
Sergio Ahumada [Fri, 18 Oct 2013 18:43:16 +0000 (20:43 +0200)]
tests: Replace Q_OS_MACX -> Q_OS_OSX

Use the correct identifier for the OS X operating system.

Change-Id: I5f93d63fc7e3041a45485ca10ccf5a1bde04bb01
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
4 years agoBump qtquick1 version to 5.3.0
Thiago Macieira [Mon, 23 Sep 2013 02:44:40 +0000 (19:44 -0700)]
Bump qtquick1 version to 5.3.0

Change-Id: I5d94fe1e2fde1ff898afbd9da93f77deeb0a1769
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Fri, 11 Oct 2013 14:15:40 +0000 (16:15 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iefc16b6899346b1d15bcf0e4394ede2eade3f933

4 years agoremove stale phonon reference
Oswald Buddenhagen [Mon, 2 Sep 2013 15:02:01 +0000 (17:02 +0200)]
remove stale phonon reference

Change-Id: I0ab1c16d2a9b593782f846ac11374ff9727d72c1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
4 years agoRemove QtAlgorithms usage from QtQuick1.
Friedemann Kleint [Thu, 26 Sep 2013 13:14:53 +0000 (15:14 +0200)]
Remove QtAlgorithms usage from QtQuick1.

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: I774f69bd3e60764a144b921a2383d832b38765ce
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev v5.2.0-alpha1
Sergio Ahumada [Wed, 18 Sep 2013 19:47:35 +0000 (21:47 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I46b53c8d8aaed59e548ccb8cadb60afd00ca7aa6

4 years agoDoc: Move Qt Quick 1 demos and their documentation old/5.1
Topi Reinio [Thu, 13 Jun 2013 13:13:32 +0000 (15:13 +0200)]
Doc: Move Qt Quick 1 demos and their documentation

When installing the examples, we currently end up with a
QT_INSTALL_EXAMPLES/demos directory with nothing but documentation

This change moves the docs and also the demos themselves into

Also fixes the links in demo .qdoc files.

Task-number: QTBUG-31722
Change-Id: Ied15526be1db8437e14be786ea69eae98af8dd3f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Sergio Ahumada [Fri, 6 Sep 2013 12:32:58 +0000 (14:32 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I061a46a31c7e16386a2040b4777bc797aaa635e2

4 years agoFix compilation for -no-opengl build
Kai Koehne [Tue, 3 Sep 2013 13:37:40 +0000 (15:37 +0200)]
Fix compilation for -no-opengl build

shadereffects is already included conditionally a few lines below.

Change-Id: I8fd0a244708b0c5a820a0edc0fc9c9ce2e5513c0
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
4 years agoQmlJs: Fix yet another instance of QmlJsParser...
Tobias Hunger [Thu, 29 Aug 2013 12:12:39 +0000 (14:12 +0200)]
QmlJs: Fix yet another instance of QmlJsParser...

Same (!a == b) issue as everywhere else. Can we please unify all those
parsers? They all are slightly different though, at least this issue,
is never on the same line number.

Change-Id: Ie2d1540d47b848ed0c7596b3f309c046b64390cf
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoRemove unnecessary dependency to qtjsbackend from sync.profile
Simon Hausmann [Tue, 13 Aug 2013 08:02:19 +0000 (10:02 +0200)]
Remove unnecessary dependency to qtjsbackend from sync.profile

Change-Id: Ic463237518c930fe367d0458859caa0050f45929
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
4 years agoDoc: several updates to the module page.
Jerome Pasion [Fri, 2 Aug 2013 12:09:31 +0000 (14:09 +0200)]
Doc: several updates to the module page.

1)Setting \qtvariable in module page.
\qtvariable indicates the QT variable needed in .pro files.

2)WS fixes.

Qt Quick 1 is deprecated but it is still nice to update the module page.

Change-Id: I5358a03566589a6910469c0bbd4a717e90be1c34
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
4 years agoMerge branch 'stable' into dev
Sergio Ahumada [Mon, 5 Aug 2013 08:34:15 +0000 (10:34 +0200)]
Merge branch 'stable' into dev


Change-Id: Ic423a5bbe47dfa2b5d432e1af1032067d68b22e6

4 years agoKeyboard input documentation: an event accepted does NOT bubble up
Jeremy Katz [Tue, 16 Jul 2013 04:54:04 +0000 (21:54 -0700)]
Keyboard input documentation: an event accepted does NOT bubble up

Add missing negation for the code snippet demonstrating accepting a
key event

Change-Id: Ia4c1cc4f207df9fb6e041ff088c6da2a63cd47b9
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
4 years agoFail tst_qdeclarativeborderimage::mirror() on Windows.
Friedemann Kleint [Mon, 29 Jul 2013 09:44:38 +0000 (11:44 +0200)]
Fail  tst_qdeclarativeborderimage::mirror() on Windows.

As expected. The test was using an invalid URL and thus
successfully comparing 2 empty images.

Task-number: QTBUG-32661
Change-Id: If6f0ad23454673b4b4fb2bc0a73da2b50663f171
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
4 years agoMerge remote-tracking branch 'origin/release' into stable
Sergio Ahumada [Fri, 26 Jul 2013 19:51:52 +0000 (21:51 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I23fb0ae0d08e0cdcda7d17c70cb19f1e499e1475

4 years agoStabilize and fix tst_qdeclarativetextedit.
Friedemann Kleint [Wed, 24 Jul 2013 08:39:02 +0000 (10:39 +0200)]
Stabilize and fix tst_qdeclarativetextedit.

Introduce a scoped pointer for the views to ensure cleanup
after failing tests. Fix calculation in positionAt() to
use a QPaintDevice and the first line of the text.
Move calls to QDeclarativeView::setFocus() below activation
for it to set the "active" focus item correctly.

Task-number: QTBUG-32538
Change-Id: Ibf10d00b9bddd587f5721d5b5011f6eafc617f39
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
4 years agoStabilize and fix tst_qdeclarativetextinput on Windows.
Friedemann Kleint [Wed, 24 Jul 2013 08:41:56 +0000 (10:41 +0200)]
Stabilize and fix tst_qdeclarativetextinput on Windows.

Introduce a scoped pointer for the views to ensure cleanup
after failing tests. Clear text in maxLength().
Move calls to QDeclarativeView::setFocus() below activation
for it to set the "active" focus item correctly.

Add message to obtain more information about failing tests.

Task-number: QTBUG-32538

Change-Id: Id65afbdfb0f9fd70846958fcb28fdd0fe1bd70f7
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
4 years agoBump MODULE_VERSION to 5.1.2
Sergio Ahumada [Tue, 23 Jul 2013 10:03:34 +0000 (12:03 +0200)]
Bump MODULE_VERSION to 5.1.2

Change-Id: I36783bb7f976375cbc9b64a371889a8784350110
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoAdd changes-5.1.1 file v5.1.1
Sergio Ahumada [Mon, 22 Jul 2013 11:22:29 +0000 (13:22 +0200)]
Add changes-5.1.1 file

Change-Id: I9062104d41ad4a4af352dc6366f550c09b3d8ebd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Tue, 23 Jul 2013 09:15:17 +0000 (11:15 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I776abad2c248f697ff729057cfaff16b4a395380

4 years agoUse GET method for redirect in QDeclarativeXMLHttpRequest.
Friedemann Kleint [Thu, 18 Jul 2013 08:22:21 +0000 (10:22 +0200)]
Use GET method for redirect in QDeclarativeXMLHttpRequest.

Initial-patch-by: Marek Więckowski <wiecko@fuw.edu.pl>
Task-number: QTBUG-32332
Change-Id: I393308134d60e484464e0cfc6cdcdac1edc27f8d
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
4 years agoChange domain used in cpp-extensions-example.
Friedemann Kleint [Thu, 18 Jul 2013 10:39:32 +0000 (12:39 +0200)]
Change domain used in cpp-extensions-example.

Task-number: QTBUG-32390
Change-Id: I373183e096390bd1564c2d263190fb9063a733a2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
4 years agoFix regression from Qt 4 for deep group properties
Simon Hausmann [Tue, 16 Jul 2013 13:28:11 +0000 (15:28 +0200)]
Fix regression from Qt 4 for deep group properties

Setting a property like someObject.font.family would cause an out-of-bounds
assertion in QList, called from QQmlCompiler::genValueTypeProperty. This
appears to be a regression from commit
5e970b84663f5398eb51d4575856d1a3c44df953, which replaced one -1 to
QMetaType::QVariant too many times. It appears the use of -1 is rather
deliberate here and not to indicate the use of a QVariant property.

The attached test verifies this as well as the successful setting of the
property at the end.

Task-number: QTBUG-31576
Change-Id: I237ea08847e1db31481a311ea8ec23a5ccc702d8
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
4 years agoReplace qt.nokia.com by www.qt-project.org in tests.
Friedemann Kleint [Mon, 15 Jul 2013 12:51:36 +0000 (14:51 +0200)]
Replace qt.nokia.com by qt-project.org in tests.

Task-number: QTBUG-32390

Change-Id: I3662046e22c014618ba07b1c8fddda13ac09690a
Reviewed-by: Leonard Lee <leonard.lee@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
4 years agoFix organization domains.
Friedemann Kleint [Mon, 15 Jul 2013 12:54:47 +0000 (14:54 +0200)]
Fix organization domains.

Task-number: QTBUG-32390
Change-Id: Ibaeb0b1ad2ee7b446252fc5e5984c78dbb909a3f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
4 years agoReplace www.nokia.com by www.qt-project.org in tests.
Friedemann Kleint [Fri, 12 Jul 2013 08:20:38 +0000 (10:20 +0200)]
Replace nokia.com by www.qt-project.org in tests.

Task-number: QTBUG-32390
Change-Id: Iad6471698c31ff24cc622456d5d51a23af047780
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Thu, 11 Jul 2013 21:27:09 +0000 (23:27 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Id822cb4487136926c8a3a3f54f6a978e8592c6ac

4 years agotest: Add 5.1.0 bic data for linux-gcc-ia32
Sergio Ahumada [Fri, 5 Jul 2013 18:49:03 +0000 (11:49 -0700)]
test: Add 5.1.0 bic data for linux-gcc-ia32

Change-Id: I652230600a169be519387cfe147693efd621399c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Thu, 27 Jun 2013 11:00:29 +0000 (13:00 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I00ecf95f451bfe78507b3c2cf6634e71d4a5a451

4 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Thu, 20 Jun 2013 14:16:46 +0000 (16:16 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ie3ba29b032c149795efb6abd91b2d65e6e666540

4 years agoAdd changes-5.1.0 file v5.1.0 v5.1.0-rc2
Sergio Ahumada [Mon, 13 May 2013 18:24:48 +0000 (20:24 +0200)]
Add changes-5.1.0 file

Change-Id: I93db177fbc1309033b06be11dadee7580b03e8f3
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Wed, 12 Jun 2013 17:18:58 +0000 (19:18 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I19a932141748119ccdc0a9cd9f926403f67f5968

4 years agoFix warnings found by clang: unused private members
Thiago Macieira [Tue, 4 Jun 2013 20:47:58 +0000 (13:47 -0700)]
Fix warnings found by clang: unused private members

For qdeclarativebinding_p.h, since the class is private, there is no
BC guarantee, so we can just remove the members. This class has a
friend, but the friend is also in the same .cpp.

qdeclarativebinding_p.h:139:14: error: private field 'm_object' is not used [-Werror,-Wunused-private-field]
qdeclarativebinding_p.h:140:9: error: private field 'm_index' is not used [-Werror,-Wunused-private-field]

For QSGGeometry, since this is a public class, we can't remove the
members. Just make them unused.

qsggeometry.h:124:11: error: private field 'm_reserved_pointer' is not used [-Werror,-Wunused-private-field]
qsggeometry.h:127:10: error: private field 'm_reserved_bits' is not used [-Werror,-Wunused-private-field]

Change-Id: Ia3650f38f32bd4cd705078a69c5445c64883bce4
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
4 years agoqmlplugindump1: make it behave more like qmplugindump v5.1.0-rc1
Fawzi Mohamed [Fri, 7 Jun 2013 09:46:44 +0000 (11:46 +0200)]
qmlplugindump1: make it behave more like qmplugindump

* use -nonrelocatable as flag
* always emit meta object revisions

Change-Id: I8bab4e4faf458f403dbfdc9e6c11c0ad17c27295
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Tue, 4 Jun 2013 17:50:51 +0000 (19:50 +0200)]
Merge remote-tracking branch 'origin/stable' into dev


Change-Id: I9d0d430d894c4ba1409e19ff9244cf94937eb021

4 years agoFix VS2010 compile warning
Alan Alpert [Tue, 30 Apr 2013 22:44:19 +0000 (15:44 -0700)]
Fix VS2010 compile warning

warning C4510: 'QQmlPrivate::RegisterCompositeType' : default constructor could not be generated
Backport of a11f4e4318b3b9d04faf533b68809937fb2208e2 from qtdeclarative

Task-number: QTBUG-30454
Change-Id: I16ec8995ac1df3c92353006473ca082c4ed4e5b8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Fri, 31 May 2013 11:48:47 +0000 (13:48 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I5c5246ef6c3028118bac4f3d19fdfda5bd52799d

4 years agoEdited copyright header
Teemu Kaukoranta [Tue, 28 May 2013 12:24:11 +0000 (15:24 +0300)]
Edited copyright header

Removed deprecated "all rights reserved" string

Change-Id: Ib407aa8eee6e529bd5a59d152589e4231d5d979f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
4 years agoBump MODULE_VERSION to 5.1.1
Sergio Ahumada [Tue, 28 May 2013 18:24:33 +0000 (20:24 +0200)]
Bump MODULE_VERSION to 5.1.1

Change-Id: I97ba1994172ac32472a12eb3b82d1f22670e9232
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agomake use of qt_app.prf
Oswald Buddenhagen [Fri, 26 Apr 2013 13:08:16 +0000 (15:08 +0200)]
make use of qt_app.prf

Change-Id: Ibb906772daf7a6bc6d56874db0a4ced2cafa67a4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
4 years agoadjust to new "configure -nomake tools" semantics
Oswald Buddenhagen [Thu, 25 Apr 2013 18:04:04 +0000 (20:04 +0200)]
adjust to new "configure -nomake tools" semantics

this also reverts f47715f0a4 on the way, as this should make it

Change-Id: Ib54177b35f2378d7e6df497f546a8c4f19d00914
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
4 years agoUpdate all plugins.qmltypes files except webview
Liang Qi [Mon, 27 May 2013 14:11:50 +0000 (16:11 +0200)]
Update all plugins.qmltypes files except webview

Task-number: QTBUG-31388
Change-Id: I16a137190c6a1ddba196b0624ade67c1e7fd9eed
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
4 years agoTools: unnecessary to make qmlplugindump a bundle
Liang Qi [Mon, 27 May 2013 14:00:57 +0000 (16:00 +0200)]
Tools: unnecessary to make qmlplugindump a bundle

Embed Info.plist in qmlplugindump executable in a special way.

Change-Id: Ia83cf15a1dc8c7e37560a280bd711ff2e4468ad8
(cherry-picked from qtdeclarative/4d173d5f16c103f640d4089feed44a74b14e9004)
Reviewed-by: Liang Qi <liang.qi@digia.com>
4 years agosync.profile: Point dependencies to an empty string
Sergio Ahumada [Fri, 24 May 2013 20:22:43 +0000 (22:22 +0200)]
sync.profile: Point dependencies to an empty string

This means that we are going to use the same branch name for the
dependencies as the branch of the repository under test.

If we are testing the 'stable' branch, all dependencies will point
to the 'stable' branch as well.

Change-Id: I9bc9d2df9ce434453c652ac97bb786e6400d5af1
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Thu, 23 May 2013 11:12:33 +0000 (13:12 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I03cb83e49d476283280ebb5963a513d109d224c8

4 years agoMove debugger plugins into separate qml1tooling directory
Kai Koehne [Tue, 7 May 2013 11:19:46 +0000 (13:19 +0200)]
Move debugger plugins into separate qml1tooling directory

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>
4 years agoCleanup and fix the Getting Started tutorial
J-P Nurmi [Tue, 14 May 2013 13:28:49 +0000 (15:28 +0200)]
Cleanup and fix the Getting Started tutorial

The tutorial got messed up by 04cb8ef1. This change restores the core/
folder from within the gsQml/ backup folder and then deletes it.

Task-number: QTBUG-31082
Change-Id: Ie18af90dbc70812dc7e74fdd1389a8734cf62fd4
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
4 years agoiOS: fix build on iOS
Richard Moe Gustavsen [Tue, 14 May 2013 08:32:36 +0000 (10:32 +0200)]
iOS: fix build on iOS

Currently, apps for iOS needs to be build through Xcode. So
disable building tools for now, until a proper solution is ready.

Change-Id: Ib31ad29d83c9043be94881e536975682adca4061
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
4 years agoMove exports conflicting with QtQml into namespace
Kai Koehne [Tue, 7 May 2013 07:45:27 +0000 (09:45 +0200)]
Move exports conflicting with QtQml into namespace

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>
4 years agotst_qdeclarativeimage: it's OK to receive a network image in chunks
Shawn Rutledge [Fri, 10 May 2013 09:07:32 +0000 (11:07 +0200)]
tst_qdeclarativeimage: it's OK to receive a network image in chunks

and if so, there can be more than 2 signals to update progress.

Task-number: QTBUG-31065
Change-Id: I36294eb8a40c0e8d4beac29a8484260d5cfe6e73
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
4 years agoMake sure correct files are bundled on Android v5.1.0-beta1
Eskil Abrahamsen Blomfeldt [Fri, 3 May 2013 07:20:52 +0000 (09:20 +0200)]
Make sure correct files are bundled on Android

The imports must be bundled in the apk.

Change-Id: I44cd4b442f9f3c8b6bf3534ffbfb8866475599e4
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
4 years agoFix bic baseline data
Jan Arve Saether [Tue, 30 Apr 2013 06:19:21 +0000 (08:19 +0200)]
Fix bic baseline data

Caused by https://codereview.qt-project.org/54820

I actually tried to avoid this with
but my assumption was wrong.

Change-Id: Ibf8ba1031a84745dfec65d300a73e10c6728393d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoDoc: Remove instructions for using qtdemo from examples README
Topi Reinio [Fri, 12 Apr 2013 10:01:36 +0000 (12:01 +0200)]
Doc: Remove instructions for using qtdemo from examples README

The Qt Examples and Demos Launcher is not maintained anymore. Edit the
README to mention Qt Creator as the way to find and launch examples.

Task-number: QTBUG-28388
Change-Id: I507b0af3888185a0cb86a3e71cab9115b9275892
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agotest: Remove CONFIG+=parallel_test from tst_examples
Sergio Ahumada [Thu, 11 Apr 2013 11:21:43 +0000 (13:21 +0200)]
test: Remove CONFIG+=parallel_test from tst_examples

This fails quite often on Mac because it gets mixed with the same
test in qtdeclarative.git while testing qt5.git

Change-Id: I58f3f9d8e64b080a2a78fdedb409acd68324c8f8
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Wed, 3 Apr 2013 14:05:08 +0000 (16:05 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ia3d23c08fddda65432bb5b3e3c7889abf524d936

5 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Wed, 3 Apr 2013 12:56:53 +0000 (14:56 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iec94e513079426e5d87bdd24753863038cee573e

5 years agoFix warnings for QtQuick1
Thiago Macieira [Tue, 2 Apr 2013 17:14:44 +0000 (10:14 -0700)]
Fix warnings for QtQuick1

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>
5 years agoDoc: Fix faulty code snippet in QDeclarativeEngine class reference
Topi Reinio [Wed, 27 Mar 2013 11:11:22 +0000 (12:11 +0100)]
Doc: Fix faulty code snippet in QDeclarativeEngine class reference

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>