mirror/qt/qt5.git
5 years agoUpdated submodules.
Frederik Gladhorn [Sat, 14 Nov 2015 15:10:28 +0000 (16:10 +0100)]
Updated submodules.

Change-Id: Id3463e24f1aecc6e2d4d040bc7878ad1d48f6327
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agodeclare mandatory dep serialbus => serialport
Oswald Buddenhagen [Tue, 10 Nov 2015 12:21:10 +0000 (13:21 +0100)]
declare mandatory dep serialbus => serialport

Change-Id: I35c5f18b7c8856071413e50590308f402be7e528
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
5 years agoUpdated submodules.
Jędrzej Nowacki [Thu, 12 Nov 2015 13:18:09 +0000 (14:18 +0100)]
Updated submodules.

Change-Id: I8e348f3cab39f75acb68b2bdc388cd37927424bb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules.
Frederik Gladhorn [Fri, 6 Nov 2015 21:57:43 +0000 (22:57 +0100)]
Updated submodules.

Change-Id: I0793599392d2e64ceabe8d0f24ba7cb0abc76b84
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
5 years agoUpdated submodules.
Jani Heikkinen [Fri, 30 Oct 2015 12:30:15 +0000 (14:30 +0200)]
Updated submodules.

Change-Id: I4f71eed2d556219480490f433323db4c151b4ba7
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdate Qt3d manually
Fredrik Orderud [Wed, 28 Oct 2015 18:59:38 +0000 (19:59 +0100)]
Update Qt3d manually

Fixes a crash at destruction.

Change-Id: Ie773b3def96cc1e55baa36b9ff7cf697770d479e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
5 years agoManual update of qtmultimedia
Simon Hausmann [Tue, 27 Oct 2015 12:14:27 +0000 (13:14 +0100)]
Manual update of qtmultimedia

In order to bring in the missing libs for QTBUG-48914

Change-Id: I678dcd1ca5bdae66efdd09b809ff63c7da37d58a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agoUpdate Qt3d manually
Fredrik Orderud [Sun, 25 Oct 2015 20:06:57 +0000 (21:06 +0100)]
Update Qt3d manually

Fixes some nasty threading problems related to pick event race
conditions and QThreadPool thread recycling.

Change-Id: I977ad310d1a767abc0fbcca49f9088ff5fdda708
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agoUpdate WebEngine manually
Simon Hausmann [Fri, 23 Oct 2015 18:45:07 +0000 (20:45 +0200)]
Update WebEngine manually

This brings in MSVC 2015 fixes and RHEL/OpenSuSE build fixes

Change-Id: I796c153a005e964c4a32203cfe08cbf3ece5f39e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agoFix dependency order for qtlocation and qtwebview
Laszlo Agocs [Fri, 9 Oct 2015 16:41:37 +0000 (18:41 +0200)]
Fix dependency order for qtlocation and qtwebview

Change-Id: Ie61b69be3b38975675fff3553d1f5c9510e7865e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoUpdated submodules.
Simon Hausmann [Thu, 15 Oct 2015 13:03:56 +0000 (15:03 +0200)]
Updated submodules.

Change-Id: I3094692e61e5a41116d69053d1f296eac46e545b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agoUpdated submodules.
Jani Heikkinen [Mon, 12 Oct 2015 04:27:03 +0000 (07:27 +0300)]
Updated submodules.

Change-Id: Ifc06de16a694d8d24bdea3a81e796a0c460e1864
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agodeclare qtgraphicaleffects before qtquickcontrols
Oswald Buddenhagen [Tue, 29 Sep 2015 11:00:17 +0000 (13:00 +0200)]
declare qtgraphicaleffects before qtquickcontrols

otherwise the dependency is botched.

amends 30e19df5b.

Change-Id: I8e17d2f91c7c55c49be6239268f928ae4577d17c
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
5 years agoUpdate build instructions for commercial licensees
Iikka Eklund [Fri, 2 Oct 2015 08:12:03 +0000 (11:12 +0300)]
Update build instructions for commercial licensees

Add build instructions for commercial licensees as well so that the
same README covers both opensource and enterprise users.

This removes the need having separate README file for commercial users.

Change-Id: Ibd3012b428c6fa85f47c1c459d8029ebfce92046
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
5 years agoExplain what the canonical URLs are.
Edward Welbourne [Wed, 23 Sep 2015 10:44:04 +0000 (12:44 +0200)]
Explain what the canonical URLs are.

This caught me out the first time I tried to use init-repository.
Documentation should work for noobs.

Change-Id: Ia6c9ce395ace034128bfe80f2c31be7f9cd4cf35
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoAdd qtserialport as dependency for qtlocation
Laszlo Agocs [Tue, 29 Sep 2015 11:09:02 +0000 (13:09 +0200)]
Add qtserialport as dependency for qtlocation

Task-number: QTBUG-48082
Change-Id: I7b90777bfdd1286f6340caf756562146772d0bb3
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
5 years agoUpdated submodules.
Jani Heikkinen [Mon, 5 Oct 2015 04:39:46 +0000 (07:39 +0300)]
Updated submodules.

Change-Id: I871b519649bb6130db128d7ae4c0916ee2e48146
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agoUpdated submodules.
Simon Hausmann [Sat, 26 Sep 2015 09:04:21 +0000 (11:04 +0200)]
Updated submodules.

Change-Id: Ia0a52a43a8c5fa7516c1469241a449c457153040
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agoUpdated submodules.
Simon Hausmann [Fri, 25 Sep 2015 13:22:35 +0000 (15:22 +0200)]
Updated submodules.

Change-Id: Ic5ea73d6ca0ea2e174cd592226a16885a73aeed1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agoAdd a way to build just a few of Qt's modules more easily
Thiago Macieira [Tue, 26 Nov 2013 22:20:34 +0000 (14:20 -0800)]
Add a way to build just a few of Qt's modules more easily

The current way requires passing -skip to configure, which is a list
of what not to build. To set a list of what to build (e.g., for
testing, in a specialized build, etc.), there was no way. Now you can
just do:

    qmake "QT_BUILD_MODULES=qtbase qtdeclarative qtsvg qtxmlpatterns"

(the order doesn't matter)

Change-Id: Ifcaefa35b16b137866ca839a483ce366e35de7ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoAdd qtpurchasing as non-default module
Frederik Gladhorn [Mon, 7 Sep 2015 09:00:01 +0000 (11:00 +0200)]
Add qtpurchasing as non-default module

For 5.6 this is a tech preview, it will be added properly in 5.7.

Change-Id: I709830fbcfc439d5446718093f0c16ad2dcb1e57
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
5 years agoUpdated submodules.
Simon Hausmann [Tue, 22 Sep 2015 09:08:11 +0000 (11:08 +0200)]
Updated submodules.

Change-Id: If0045fccac1af79e858831c75c7808fe6997e37e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
5 years agoUpdated submodules.
Jani Heikkinen [Mon, 21 Sep 2015 07:46:32 +0000 (10:46 +0300)]
Updated submodules.

Change-Id: I3c4cdbef3f8fbc016757fdd6a4b5bb8eb6a644df
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoManual update of qttools to remove webkit dependency
Simon Hausmann [Fri, 18 Sep 2015 06:33:11 +0000 (08:33 +0200)]
Manual update of qttools to remove webkit dependency

Change-Id: I6cf6ae75cedb0945c46fd9b3fa63bd21a9ce4806
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agoUpdated submodules.
Simon Hausmann [Thu, 17 Sep 2015 08:53:48 +0000 (10:53 +0200)]
Updated submodules.

Change-Id: I03bbaedeb88ad76df39ce10f6828ebf5c8b8dadf
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agoMerge remote-tracking branch 'origin/5.5' into 5.6
Oswald Buddenhagen [Thu, 10 Sep 2015 12:24:15 +0000 (14:24 +0200)]
Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: I7a28bcaeb5538763274fdef20f8c8ca81b9b21ad

5 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 3 Sep 2015 19:34:11 +0000 (22:34 +0300)]
Updated submodules.

Change-Id: I0ba6e6ce435be779865b0ace08d74dd29800be9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoAdd QtQuickControls2 as submodule v5.6.0-alpha1
Frederik Gladhorn [Tue, 4 Aug 2015 07:30:01 +0000 (09:30 +0200)]
Add QtQuickControls2 as submodule

Change-Id: I435fb765b48a978763384226e399b33448a40502
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
5 years agoHook qtserialbus into qt5.git
Alex Blasche [Wed, 8 Jul 2015 07:58:42 +0000 (09:58 +0200)]
Hook qtserialbus into qt5.git

Change-Id: I17c8c55205f852b3e79f279cad7b87f403d7fbe7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agoAdd qtwebview as submodule
Frederik Gladhorn [Wed, 19 Aug 2015 07:02:18 +0000 (09:02 +0200)]
Add qtwebview as submodule

Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
5 years agoRemoved QtWebkit and QtWebkit-Examples from qt5.git
Jani Heikkinen [Fri, 21 Aug 2015 11:31:55 +0000 (14:31 +0300)]
Removed QtWebkit and QtWebkit-Examples from qt5.git

QtWebkit (and QtWebkit-Examples) were deprecated in Qt 5.5 and will now
be removed from qt5.git in Qt5.6 release

Change-Id: I86e1072141956136fa5e4220cdcdf812492453b3
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
5 years agoFix QtEnginio branch
Simon Hausmann [Tue, 1 Sep 2015 16:01:46 +0000 (18:01 +0200)]
Fix QtEnginio branch

The 1.3 branch does not exist anymore, let's use 5.6

Change-Id: I442ad45c73a0e08c853385c999dddf818447bb82
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules.
Simon Hausmann [Thu, 3 Sep 2015 12:48:42 +0000 (14:48 +0200)]
Updated submodules.

Change-Id: Ie8c296b8e64fe0083ab5ec1584a42c7165fbe3ab
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agognuwin32: remove win_bison/win_flex
Andrew Knight [Sun, 2 Aug 2015 14:32:11 +0000 (17:32 +0300)]
gnuwin32: remove win_bison/win_flex

These tools are copies of bison/flex and are no longer needed.

Change-Id: Ia543926ee8126358beee2aed03752d9cfe803f07
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 31 Aug 2015 19:33:56 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: I1497a398e34e18abb18f705b2294464840629ca1
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoRemove quick1 from default checkout
Jani Heikkinen [Fri, 14 Aug 2015 04:41:41 +0000 (07:41 +0300)]
Remove quick1 from default checkout

QtQuick1 was deprecated in Qt 5.5 and will now be removed from
default modules in qt5.git

Change-Id: I88aa9d75ace8d91b4cd469d7511662425e67d95f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 24 Aug 2015 11:33:44 +0000 (14:33 +0300)]
Updated submodules.

Change-Id: I56e7af096e889d56ef67baabf38529c0ccb8d8b5
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoMerge remote-tracking branch 'origin/5.5' into 5.6
Liang Qi [Mon, 24 Aug 2015 14:18:23 +0000 (16:18 +0200)]
Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
qt3d
qtactiveqt
qtandroidextras
qtbase
qtcanvas3d
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtgraphicaleffects
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwayland
qtwebchannel
qtwebengine
qtwebkit
qtwebkit-examples
qtwebsockets
qtwinextras
qtx11extras
qtxmlpatterns

Change-Id: I7410d9be5775ab276fb5a57adb397f4f92d77a50

5 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 21 Aug 2015 03:33:14 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: Icf1e00c471aea0ce5228165735195a9f0f76fe36
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 17 Aug 2015 19:34:13 +0000 (22:34 +0300)]
Updated submodules.

Change-Id: Id60882b0bc98875361477cb5aaf7d12c2693f900
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoAdd the GPLv3 license text
Thiago Macieira [Wed, 8 Jul 2015 00:35:11 +0000 (17:35 -0700)]
Add the GPLv3 license text

LGPLv3 refers to it but does not include it in its body.

Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
5 years agoMerge remote-tracking branch 'origin/5.4' into 5.5
Oswald Buddenhagen [Fri, 14 Aug 2015 11:38:53 +0000 (13:38 +0200)]
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I5b894e7f72ad81e62a6ea0777e6713dfa36c8a68

5 years agoMerge remote-tracking branch 'origin/5.4.2' into 5.4 5.4
Oswald Buddenhagen [Fri, 14 Aug 2015 11:34:32 +0000 (13:34 +0200)]
Merge remote-tracking branch 'origin/5.4.2' into 5.4

Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19

5 years agoAdd qtgraphicaleffects as an optional dependency for qtquickcontrols.
Mitch Curtis [Thu, 13 Aug 2015 08:45:22 +0000 (10:45 +0200)]
Add qtgraphicaleffects as an optional dependency for qtquickcontrols.

This is a prerequisite to making qtgraphicaleffects a dependency in
qtquickcontrols' sync.profile.

Task-number: QTBUG-46393
Change-Id: I3679392a7feb48ecefa4a01a7ecb42b2e6287ecb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agognuwin32: Remove old versions of bison/flex from the distribution
Andrew Knight [Sun, 2 Aug 2015 07:03:20 +0000 (10:03 +0300)]
gnuwin32: Remove old versions of bison/flex from the distribution

The win_flex/win_bison tools are already in the repository and working
with all projects, so the GnuWin32 versions can be removed and the
winflexbison versions can take their place.

Task-number: QTBUG-46852
Change-Id: I41bc541adab834ff83912d7a4f076a87fc174601
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 13 Aug 2015 03:33:38 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: Idbdb4ce40f9456898ac9148dc08473f636f34f1d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agofix qtcanvas3d submodule reference
Oswald Buddenhagen [Wed, 12 Aug 2015 14:31:03 +0000 (16:31 +0200)]
fix qtcanvas3d submodule reference

Change-Id: I67d89f5e8d04a1e60ff0aedc33e29da7a58df620

5 years agoAdjust submodule branches
Oswald Buddenhagen [Mon, 10 Aug 2015 14:53:39 +0000 (16:53 +0200)]
Adjust submodule branches

Change-Id: I7755bb88167297aef9defaa6b66639fde6e9804d

5 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 7 Aug 2015 03:33:37 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: I20beccb62815f3c6948d888ccfad0b69c42b55e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 13 Jul 2015 19:33:57 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: Ie77fe47fcec71a13d3640059d1e0ce66a47fc0b2
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 10 Jul 2015 19:33:57 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: I22c7d89fd93a256c4051f49b9a9b89789e697df6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Sat, 11 Jul 2015 02:33:44 +0000 (05:33 +0300)]
Updated submodules.

Change-Id: Idc11a328839163ffae5e72f2e43860b12f19c668
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Tue, 30 Jun 2015 11:34:07 +0000 (14:34 +0300)]
Updated submodules.

Change-Id: Ideafacc193da59a1db25e006b16630b74535cbee
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoREADME: Replace qt-project.org with qt.io
Kai Koehne [Tue, 30 Jun 2015 12:59:11 +0000 (14:59 +0200)]
README: Replace qt-project.org with qt.io

Change-Id: Iacc4dc8f28ce2c0bb1d761834d0f90b444f47327
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 29 Jun 2015 19:33:57 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: Ibc862a8b12e46042819341229b31883bc9a1462e
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoAdd qtquickcontrols as an optional dependency to qtlocation module
Aaron McCarthy [Wed, 24 Jun 2015 12:07:15 +0000 (22:07 +1000)]
Add qtquickcontrols as an optional dependency to qtlocation module

With the correct modules checked out 'make module-qtlocation' will build
everything necessary to run the examples.

Change-Id: I0c63221b5704c2b13495f3dc3221e888d8e9547c
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 26 Jun 2015 03:33:33 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: Ie231e8be72006172dd80ec9f1df8f57e7fc54891
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 25 Jun 2015 10:33:48 +0000 (13:33 +0300)]
Updated submodules.

Change-Id: Ic5910fb0b28553d1eb0815e578381fd358e342fc
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 25 Jun 2015 11:34:05 +0000 (14:34 +0300)]
Updated submodules.

Change-Id: Icc425a6784ea3ae379716ddb1e79a8a07ccd8d74
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.5
Qt Submodule Update Bot [Wed, 24 Jun 2015 03:33:50 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: I88f32b10ee95f967686bf9c3295887b4ebb62eba
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. dev
Qt Submodule Update Bot [Tue, 23 Jun 2015 18:34:15 +0000 (21:34 +0300)]
Updated submodules.

Change-Id: Ic5e879665945d79c0fcdb27c2c00978b7abdeef6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. dev_1434886384 43/114843/2
Qt Submodule Update Bot [Sun, 21 Jun 2015 02:33:31 +0000 (05:33 +0300)]
Updated submodules.

Change-Id: I5c321f6626e9bf6f64f2c120e8281547e2561880
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. dev_1434820518 60/114760/7
Qt Submodule Update Bot [Sat, 20 Jun 2015 10:33:21 +0000 (13:33 +0300)]
Updated submodules.

Change-Id: I3009287ec75bfa7b3084fad32a75552656845434
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1434784502 77/114577/5
Qt Submodule Update Bot [Sat, 20 Jun 2015 03:33:47 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: Ibc644efc00d00f43c1d202106bae6facf015c7fb
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1434740765 75/113375/12 5.4
Qt Submodule Update Bot [Fri, 19 Jun 2015 18:18:58 +0000 (21:18 +0300)]
Updated submodules.

Change-Id: I00defc7101f1cabc0cc540a84846ec9b7933f599
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. dev_1434604595 23/114023/19
Qt Submodule Update Bot [Thu, 18 Jun 2015 02:33:10 +0000 (05:33 +0300)]
Updated submodules.

Change-Id: I7257e86c7381f5237c2c135a4395e88b65735cd3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1434543958 50/113850/23
Qt Submodule Update Bot [Wed, 17 Jun 2015 11:35:10 +0000 (14:35 +0300)]
Updated submodules.

Change-Id: Ia820c1611af25853deb8161041adf39b7bfa61db
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. dev_1433826766 39/110939/89
Qt Submodule Update Bot [Tue, 9 Jun 2015 02:33:05 +0000 (05:33 +0300)]
Updated submodules.

Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1433655697 14/113814/5
Qt Submodule Update Bot [Sun, 7 Jun 2015 03:33:19 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: I5384ff79efab1a68cfb665f1e764d7f5ee73fcba
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoqtdeclarative is an optional dependency for qtwebkit 5.5_1433533840 05/112205/4
Michael Olbrich [Tue, 12 May 2015 10:45:10 +0000 (12:45 +0200)]
qtdeclarative is an optional dependency for qtwebkit

This way qtwebkit can be built when qtdeclarative is disabled. This is
especially useful for targets without OpenGL.

Also add qtxmlpatterns to the optional dependencies. It was an indirect
dependency before via qtdeclarative.

Change-Id: Ib4c29b958bd63d528fba8ec326e2dbc1ea8bce08
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1433451874 28/113428/11
Qt Submodule Update Bot [Thu, 4 Jun 2015 19:33:10 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: I4fc367abe95ee78166067047d0f229bba9991956
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1433058586 48/113348/4
Qt Submodule Update Bot [Sat, 30 May 2015 19:33:04 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: I88af8ac70704e63a2154b3fe22b51483a69d84c3
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1433056615 12/112412/19
Qt Submodule Update Bot [Sat, 30 May 2015 18:18:40 +0000 (21:18 +0300)]
Updated submodules.

Change-Id: Ib62714f88c3cd381cbbf8758c7b1029c2fa254ed
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1432927283 90/113190/6
Qt Submodule Update Bot [Fri, 29 May 2015 11:34:14 +0000 (14:34 +0300)]
Updated submodules.

Change-Id: I57641bf25f49f0f8eb55ccb08a4ede2d6a7af499
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoMerge branch '5.4' into 5.4.2 5.4.2 5.4.2 v5.4.2
Oswald Buddenhagen [Fri, 29 May 2015 18:12:13 +0000 (20:12 +0200)]
Merge branch '5.4' into 5.4.2

Change-Id: I33d967b5f668c672a55ad93ac314340453850521

5 years agoMerge tag 'v5.4.1' into 5.4
Oswald Buddenhagen [Fri, 29 May 2015 13:53:05 +0000 (15:53 +0200)]
Merge tag 'v5.4.1' into 5.4

Qt 5.4.1 Release

5 years agoMerge tag 'v5.4.0' into 5.4
Oswald Buddenhagen [Fri, 29 May 2015 13:52:28 +0000 (15:52 +0200)]
Merge tag 'v5.4.0' into 5.4

Qt 5.4.0 Release

5 years agoUpdated submodules. 5.4.2_1432894183 56/113256/2
Qt Submodule Update Bot [Fri, 29 May 2015 04:26:03 +0000 (07:26 +0300)]
Updated submodules.

Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1432813057 69/112969/7
Qt Submodule Update Bot [Thu, 28 May 2015 11:04:52 +0000 (14:04 +0300)]
Updated submodules.

Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoSet win_bison/win_flex executable 5.5_1432745790 81/112981/2
Andrew Knight [Sun, 24 May 2015 19:57:18 +0000 (22:57 +0300)]
Set win_bison/win_flex executable

This fixes failed execution when the Qt sources are exported to
Windows over a network share or attempted to be executed on a Linux
system using binfmt.

Change-Id: I00b1073e516d2441498a39cc13e4295484e1ef9d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
5 years agoUpdated submodules. 57/112657/20
Qt Submodule Update Bot [Wed, 27 May 2015 03:33:04 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: I31ee12ede4defe80e20dd49b9ca7b425b6758965
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1432365194 99/112699/6
Qt Submodule Update Bot [Fri, 22 May 2015 18:17:49 +0000 (21:17 +0300)]
Updated submodules.

Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1432030076 30/112430/10
Qt Submodule Update Bot [Tue, 19 May 2015 09:37:18 +0000 (12:37 +0300)]
Updated submodules.

Change-Id: I833cf03a1efe7ef6fa8f11020826063804ebddaa
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1431752402 32/112332/4
Qt Submodule Update Bot [Fri, 15 May 2015 18:17:21 +0000 (21:17 +0300)]
Updated submodules.

Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1431687718 23/112023/15
Qt Submodule Update Bot [Thu, 14 May 2015 19:33:30 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: I619984c9c8d142c465bb86a571d101ac564676d2
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1431616780 71/110571/25
Qt Submodule Update Bot [Thu, 14 May 2015 02:19:30 +0000 (05:19 +0300)]
Updated submodules.

Change-Id: I68b5c48282234a27f7c96595c8d84a4dc0bb3871
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1431532691 35/112235/4
Qt Submodule Update Bot [Wed, 13 May 2015 12:17:59 +0000 (15:17 +0300)]
Updated submodules.

Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1431187664 52/111952/6
Qt Submodule Update Bot [Sat, 9 May 2015 11:33:11 +0000 (14:33 +0300)]
Updated submodules.

Change-Id: I56a80384b1c5fef07b53d41bcc8567177f6f43db
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1431174236 02/111702/5
Qt Submodule Update Bot [Fri, 8 May 2015 18:17:33 +0000 (21:17 +0300)]
Updated submodules.

Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1430978412 41/111641/10
Qt Submodule Update Bot [Thu, 7 May 2015 03:32:56 +0000 (06:32 +0300)]
Updated submodules.

Change-Id: I359f9925da5f735a654ab18efbc68305f5dadfd2
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1430640288 07/111507/8 v5.5.0-beta1
Qt Submodule Update Bot [Sat, 2 May 2015 19:32:49 +0000 (22:32 +0300)]
Updated submodules.

Change-Id: Ic38d3b26e9a53fb6b0671ebfdbd05f6a925fe668
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1430639986 05/111505/5
Qt Submodule Update Bot [Sat, 2 May 2015 02:18:06 +0000 (05:18 +0300)]
Updated submodules.

Change-Id: I39ce0228dad0d141df17ea5f911046130f823467
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1430330389 77/111377/5
Qt Submodule Update Bot [Wed, 29 Apr 2015 11:35:30 +0000 (14:35 +0300)]
Updated submodules.

Change-Id: I0d362ee5568abc3943a83b10ae8b6444103ff8c3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1430218799 49/110849/11
Qt Submodule Update Bot [Tue, 28 Apr 2015 09:51:37 +0000 (12:51 +0300)]
Updated submodules.

Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1430196724 80/110380/33
Qt Submodule Update Bot [Tue, 28 Apr 2015 03:34:10 +0000 (06:34 +0300)]
Updated submodules.

Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoMerge remote-tracking branch 'origin/5.5' into dev dev_1429627894 12/110912/1 12/110912/2
Frederik Gladhorn [Tue, 21 Apr 2015 14:26:04 +0000 (16:26 +0200)]
Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
qt3d
qtactiveqt
qtandroidextras
qtbase
qtcanvas3d
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwayland
qtwebengine
qtwebkit
qtwebkit-examples
qtwebsockets
qtwinextras
qtxmlpatterns

Change-Id: I691dbbe6d3399d601336bb7e309579fb89d6381c

5 years agoReplace old qt-project.org wiki with wiki.qt.io 5.4_1429177412 72/108572/2
Sergio Ahumada [Sat, 14 Mar 2015 14:36:29 +0000 (15:36 +0100)]
Replace old qt-project.org wiki with wiki.qt.io

Change-Id: I9a1114a8b5da649d3da718248fe5df5781810c20
Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1429089540 02/110102/10
Qt Submodule Update Bot [Wed, 15 Apr 2015 02:19:15 +0000 (05:19 +0300)]
Updated submodules.

Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1428985529 67/110067/11
Qt Submodule Update Bot [Tue, 14 Apr 2015 03:34:21 +0000 (06:34 +0300)]
Updated submodules.

Change-Id: I1d66817cbc1f67e7fd8e2d3f92ec39af344a2f43
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoAdjust submodule branches
Oswald Buddenhagen [Fri, 10 Apr 2015 10:10:34 +0000 (12:10 +0200)]
Adjust submodule branches

Change-Id: Ib30d8a8c4691787c460fe6540b64e2d593422c68