Qt Submodule Update Bot
ada6b66011
Update submodules on '5.9' in qt5
...
Change-Id: Ib3cb8cae3bbdedbaafe1e5deb3c0ca9252f010d3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-15 06:55:38 +00:00
Simon Hausmann
fa903eba4b
Merge remote-tracking branch 'origin/5.6' into 5.9
...
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Icee114ea6bd025a54db7ce34d6a0bd0dc16e767c
2017-04-13 21:54:47 +02:00
Heikki Halmet
e48d653150
Provisioning: Change tier1 templates for Windows 10
...
These tier 1 templates includes changes needed by 5.9, but we can use
these same tier 1 templates for 5.6 also
Change-Id: I3ad0d75ab89f7b6502b758fb94f984cc6e0b7f16
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-13 12:31:58 +00:00
Qt Submodule Update Bot
bac199faa3
Update submodules on '5.9' in qt5
...
Change-Id: Ice64fb51928fda825b63eef8e09f752c4a67395f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-04-13 12:23:29 +00:00
Konstantin Tokarev
aac3786d67
Add cmake location to PATH when provisioning macOS 10.12
...
Change-Id: I3afecaefced45704b77b461a2bc2869134567a2e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-12 08:55:39 +00:00
Qt Submodule Update Bot
4b5af2de68
Update submodules on '5.9' in qt5
...
Change-Id: Id6c112e68c465ae52d49f4b35bee648894a35fef
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-11 16:45:57 +00:00
Tony Sarajärvi
b8211774d9
Fix provision help script DownloadURL.sh
...
The script neglected the result of the sha1 after download.
Even with a failure it exited nicely.
Change-Id: I6c0e25c2b764a0ad54acbe317eddf395a56d7f1c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-04-10 17:27:24 +00:00
Qt Submodule Update Bot
d353476112
Update submodules on '5.9' in qt5
...
Change-Id: I9c5567a7b76101548b690dee3bba06fcdf11bd36
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-10 11:54:11 +00:00
Tony Sarajärvi
bb5139dd09
Enable autotests for Ubuntu 16.04 and swap configs
...
As autotests pass, we can also move all existing
Ubuntu 14.04 configurations to run on a more recent
Ubuntu 16.04.
Task-number: QTQAINFRA-1101
Change-Id: I99c4f674dc48521c66ac579c6bb1b5396c282131
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org >
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-04-10 05:20:10 +00:00
Liang Qi
b80fa7bc4c
Merge remote-tracking branch 'origin/5.6' into 5.9
...
Conflicts:
.gitmodules
qt.pro
Commit ed8f84f149 (webengine needs tools)
together with commit 5656b4848e (webkit
needs webengine) creates a circular dependency with qttools also
depending on webkit. So this commit breaks it by swapping the
serialization order between webkit and webengine.
Change-Id: I36309908adb754072495e02785ad158f8b389548
2017-04-08 19:51:16 +00:00
Liang Qi
6720096ee0
Merge remote-tracking branch 'origin/5.8' into 5.9
...
Change-Id: I908f38bd8cfcfd481f005a2588df5d3440eac9c5
2017-04-08 16:04:53 +02:00
Konstantin Tokarev
0c7c11ca56
Fix AltUrl of cmake for macOS provisioning
...
Change-Id: I730a65c2fcbea14bd3fe44e01a182f095d96b0ab
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-07 22:04:06 +00:00
Oswald Buddenhagen
5656b4848e
serialize build of qtwebkit and qtwebengine
...
linking both at the same time requires more than my 16GB of RAM, so
introduce a .gitmodules field which serializes the two.
in practice, it is just interpreted as an optional dependency. the CI
system won't be taught about it, so this will not cause an unnecessary
serialization there.
Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-06 21:56:25 +00:00
Qt Submodule Update Bot
b91aca3ab8
Update submodules on '5.9' in qt5
...
Change-Id: I2ffc93d7195ab1d368a8dec8219be46acf1f74ee
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-06 17:39:47 +00:00
Simon Hausmann
c675a237f1
Remove special configuration for xmlpatterns
...
Commit 8b13ccf0238aecfe2a01e3a2e6d90620a8b9e516 in coin attempted to
incrementally add OpenSuSE 42.1 support module by module, and various
transitions have lead to this file. Meanwhile commit
aa7531ca7d0e8f92c49a54f11460ece647ef73f1 in coin replaced OpenSuSE 13.01
globally with 42.1 for all modules, so this separate treatment is not
needed anymore.
Change-Id: I0e162a64816f7925a5afd5a79614a1e8843d9b7e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2017-04-06 14:35:20 +00:00
Oswald Buddenhagen
315b76dc9b
fix url normalization
...
after 8c0390143 , we cannot rely on the denormalized segment starting
with a slash any more.
Task-number: QTBUG-59753
Change-Id: Ia3a3c005d1f41320747a60efc48a180caa88206b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io >
Reviewed-by: Valentin Fokin <fokinv@inf.u-szeged.hu>
2017-04-06 09:20:33 +00:00
Qt Submodule Update Bot
e7fc74d781
Update submodules on '5.6' in qt5
...
Change-Id: I89f138e0d359d429864351172c5d7cdc6475590c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-06 09:20:29 +00:00
Qt Submodule Update Bot
04ec42b9e1
Update submodules on '5.8' in qt5
...
Change-Id: I39b5d0e9bddc2f5519cb08ac0b7b538a49a550b4
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-06 09:20:26 +00:00
Simon Hausmann
30da853b97
Enable QEMU based ARM testing for qtdeclarative with Boot2Qt
...
The module has been changed to run a sub-set of tests. With that in
place we can enable test execution, providing us with some CI test
coverage for the ARM JIT, for example.
Change-Id: I5b0ad68fcd4fa8fb73f59432b42ccdd9a5b6fd59
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io >
Reviewed-by: Lars Knoll <lars.knoll@qt.io >
2017-04-05 09:34:04 +00:00
Qt Submodule Update Bot
c55903eaa6
Update submodules on '5.9' in qt5
...
Change-Id: I549dc236009aadd78fb163a2a26b2384bb7de9ab
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-05 05:27:25 +00:00
Sami Nurmenniemi
e3d84a49c0
Remove fonts-noto-cjk on Ubuntu-16.04-x86_64 provision image
...
First test using QFont fails if fonts-noto-cjk is installed. This
happens because running fontcache for that font takes > 5 mins when
run on QEMU. Running fc-cache doesn't help since host version creates
cache for a wrong architecture and running armv7 fc-cache segfaults
on QEMU.
Change-Id: I6667b29ad4c4cae8d242e3af63defb603a6e6ec7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-04 05:06:46 +00:00
Liang Qi
285ee106e7
Merge remote-tracking branch 'origin/5.6' into 5.9
...
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
This also fixes the 7Z extraction code to work on the windows 7 x86
installation where 7z is not in the PATH anymore with revision 2. The
fallback code was 64-bit only and needs the null check for ProgramFiles(x86)
along with the fall back to ProgramFiles to locate the 7z executable.
Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
2017-04-03 12:06:27 +00:00
Qt Submodule Update Bot
df3c9ce7da
Update submodules on '5.8' in qt5
...
Change-Id: I9444728a1fa2c23e65a3f809767509a0854f1e2d
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-02 05:13:29 +00:00
Qt Submodule Update Bot
1bb9546b48
Update submodules on '5.8' in qt5
...
Change-Id: I551f0a875c9c16acbcd768994051e85d9fcde47c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-01 20:23:34 +00:00
Qt Submodule Update Bot
742737bd7c
Update submodules on '5.6' in qt5
...
Change-Id: I31ee5d48a4cdf6d7a28f9ec7b19c87b04f4b4e06
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-01 20:20:30 +00:00
Liang Qi
95223c7466
Update qtserialbus manually
...
Change-Id: Ic4e1200a5d75e0c7b33fcb43efb27706260e3202
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-01 07:28:35 +00:00
Qt Submodule Update Bot
30e0f087d4
Update submodules on '5.9' in qt5
...
Change-Id: I64a699afde6c7444abfad5d0cac19f2d1d332f7f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-01 06:39:12 +00:00
Heikki Halmet
e00cb3ac59
Provisioning: Bug fix patch for msvc 2015 update 3
...
This bug fix patch is needed for QtWebEngine
Change-Id: Id2c624461fbe27d9fd12a149281cae324bf8b14e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-03-31 06:42:09 +00:00
Simo Fält
8b59bbc2a4
Coin provisioning: Use arg instead of autodetecting architecture
...
When provisioning windows machine, it seems that detecting architecture
by checking [System.Environment]::Is64BitProcess doesn't work properly.
Instead pass 32 or 64 as an argument when calling powershell script.
Change-Id: I890ad141b8ef194275848d0e656431753463cd2b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-03-30 15:14:04 +00:00
Liang Qi
990625d8cb
Update submodules on '5.9' in qt5
...
Change-Id: I7dfea76bca9df8ab4db1be65068ffa46b414ad3d
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-30 05:43:35 +00:00
Liang Qi
bee0c1b12f
Update submodules on '5.9' in qt5
...
Change-Id: Iefd15fd52d2300981820cb1b067f512228100503
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-28 04:45:10 +00:00
Liang Qi
0b1af0bb2f
Update submodules on '5.8' in qt5
...
Change-Id: Icc31f52cf5a77a4100dfd63acd32e1596ead3dad
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-23 11:33:56 +00:00
Heikki Halmet
80b739b1e8
Provisioning: Move Visual Studio installation to pre-provisioning
...
Visual Studios will be pre-provisioned to tier1/vanilla os when visual
studio update is needed. Even if using pre-configured offline
installer with specific workload and components the installation is
still taking too long. This way we'll reduce provisioning time
significantly
Change-Id: I1f831aef648716dc640ce9cbfb4e63aa54e7afd0
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-03-22 09:31:06 +00:00
Liang Qi
a2cd0b3102
Update submodules on '5.6' in qt5
...
Change-Id: I8050d2b9f1f2d3ad55f64c139410abc09f21dc6e
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-20 08:05:40 +00:00
Liang Qi
6d8560c63f
Update submodules on '5.9' in qt5
...
Change-Id: Id9f9836551a35fba5ccd12be449f9c4a92acf486
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-19 18:46:59 +00:00
Liang Qi
6995b1e85d
Update submodules on '5.8' in qt5
...
Change-Id: Ibf0175771f357c30243b5d309cfb4facc4a6b31b
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-19 13:13:06 +00:00
Liang Qi
e193001bca
Update submodules on '5.9' in qt5
...
Change-Id: I210324952a0126cd656344eebee2dbd6a32f6dc1
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-18 06:43:06 +00:00
Jason Erb
084d79e8b4
Reflect current URL in example comment
...
Change-Id: I51091c69d2698ba23207a95d17f4748c22cd7cb7
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io >
2017-03-16 12:01:37 +00:00
Liang Qi
ce96014426
Update submodules on '5.6' in qt5
...
Change-Id: Ibb0fac8d2a36e6aeeb25aa91bb1a74403005205b
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-16 12:01:34 +00:00
Allan Sandfeld Jensen
3e35991013
Install g++-multilib on Ubuntu 16.04 platforms
...
This is needed to cross-build to 32bit x86 which WebEngine needs for
Boot2Qt ARM builds.
Task-number: QTBUG-59504
Change-Id: I9851d97949dc67c6f564cf09443b0a04998b2590
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-16 06:20:01 +00:00
Tony Sarajärvi
b14198730d
Remove command line tools from macOS 10.11 and 10.12
...
Qt should not require command line tools to be installed.
When they are installed, we can accidentally rely on
on the tools instead of sysroot.
Task-number: QTBUG-58325
Change-Id: I9ad942c6f67e4c1b7348258a9178ab497ee58800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-15 13:21:40 +00:00
Liang Qi
e7c6dcdb32
Update submodules on '5.8' in qt5
...
Change-Id: Iac3e9b6581b2bb490c8c58ccf50cd4f14b6651a8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-15 06:46:50 +00:00
Paolo Angelelli
88e87fe7d3
Recommend qtquickcontrols2 for qtlocation
...
The MapViewer example now uses qtquickcontrols2 sliders.
This patch adds the related dependency
Change-Id: I50db8e6355ee02b61dcd7a4230fafc1fd060fe3d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io >
2017-03-14 07:03:14 +00:00
Kari Oikarinen
b037d8f7b1
Provision libusb for 64-bit Windows 8 and 10 as well
...
Amends 380fca84a9fe583e245355f2e36931473665cf0b.
Change-Id: Ia6e1a3bf2465770f55201cd723b329af42984d2b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io >
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-03-14 07:03:11 +00:00
Jason Erb
8c0390143b
Remove init-repository assumption of repo url “…/qt/<repo>”
...
Task-number: QTBUG-59355
Change-Id: I7bc2c94f13c6cf43bd9d4472f18b3b769e75954b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io >
2017-03-13 15:18:47 +00:00
Qt Submodule Update Bot
f7694572d8
Update submodules on '5.9' in qt5
...
Change-Id: Id6e972d67243340551b0cae64619428a8f601f4c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-13 08:56:08 +00:00
Simon Hausmann
2d59a20361
Fix network test server setup
...
Use the correct IP address for the network test server that all the
other machines are using as well.
Change-Id: I1ffe4b6f5851bcb06dc2d39265979b799715ec3f
Task-number: QTBUG-59241
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io >
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-03-10 06:10:43 +00:00
Liang Qi
ec763635fa
Update submodules on '5.9' in qt5
...
Change-Id: Id75b75b5dff01db70f87c0f72648bd158e6465dd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-10 06:10:40 +00:00
Liang Qi
1269f1bc8a
Update submodules on '5.8' in qt5
...
Change-Id: Ic13d3040b541a4b4e9a293885ce49b0b9ba64afa
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-08 20:52:45 +00:00
Joerg Bornemann
a5330bb632
Add ForceDebugInfo to MSVC platforms
...
Create release debug information for MSVC configurations for which we
build packages.
Also, for hard-to-reproduce autotest crashes in the CI enabling
ForceDebugInfo is crucial to get a meaningful backtrace.
Task-number: QTBUG-3934
Change-Id: Ie4ea7b9c6aa251a12796621817d8e3411bbed81d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-07 21:29:30 +00:00
Liang Qi
87a4180718
Update submodules on '5.9' in qt5
...
Change-Id: Idad0e50dd673356a7ed27d7c7c978ba10229b71a
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-07 21:19:31 +00:00
Liang Qi
ad3c519525
Merge remote-tracking branch 'origin/5.8' into 5.9
...
Change-Id: I415772838a8434d00ad4ccebc8b1c4180e85880b
2017-03-04 22:21:23 +01:00
Teemu Holappa
111799abf1
Add qemu user mode binary
...
qemu is used to run unit tests for arm binaries in coin.
Change-Id: I8610b5d7603fa3bcd5cf0f9e83ee38e219b60a85
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-03 14:37:46 +00:00
Akseli Salovaara
8de4f42cb6
Provisioning: Upgrade conan version from 0.16.0 to 0.20.2
...
Conan provisioning fails on private Coin instance due to error message
Could not find a version that satisfies the requirement conan==0.16.0
(from versions: 0.15.0, 0.16.1, 0.17.2, 0.18.1, 0.19.3, 0.20.0, 0.20.1,
0.20.2)
No matching distribution found for conan==0.16.0
Upgrading to 0.16.1 resulted warning
"Your conan's client version is deprecated
for the current remote (v0.20.2). Upgrade conan client."
and provisioning failed with "ERROR: All remotes failed"
After upgrade to 0.20.2 conan provisioning script is working again.
Change-Id: I2fe9d65460954c929abb4822d206dde42909d5b3
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru >
2017-03-03 12:26:24 +00:00
Liang Qi
93b18e36e4
Update submodules on '5.9' in qt5
...
Change-Id: I525727ffd60aabf0f8e964377f6a670f26a49338
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-02 22:01:24 +00:00
Allan Sandfeld Jensen
5f598f67f3
Add libxss-dev needed by QtWebEngine
...
Change-Id: Iac7e6b730803865d00b17d53e6aa488e80123b5b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-01 16:34:16 +00:00
Liang Qi
df0092448a
Update submodules on '5.9' in qt5
...
Change-Id: Ia56d37f29ee715654aaeae85274073d74aedd0e8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-01 12:08:29 +00:00
Teemu Holappa
85f6859c3d
Change Boot2Qt to use Ubuntu 16.04
...
Changed Boot2Qt CI host from Ubuntu 14.04 to 16.04.
There is also changed the target architecture to x86_64.
Even though the meta-boot2qt builds binaries to the armv7 tests
are run in host machine using Qemu thus we spoof Coin to believe
we are running native binaries.
Change-Id: I633d01b80ec8ae753badf495ec8faa90b4659c11
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-02-28 19:37:43 +00:00
Liang Qi
b94b02b9a0
Update submodules on '5.9' in qt5
...
Exclude qtbase this time.
Change-Id: Ib294e795f7c822f3bc8a66643880cf09994d09ac
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-28 09:36:11 +00:00
Heikki Halmet
460cfd01b3
Provision: Storage icu version to versions.txt
...
~/versions.txt will be used to storage sw version information
Change-Id: Ia84e0fc55f5bbcf4afd902ce601556defcc565a0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-02-28 07:23:53 +00:00
Liang Qi
0fdc536920
Update submodules on '5.8' in qt5
...
Change-Id: Icdce897429db6ec02938807bc2add8ae8d9a1ccc
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-27 04:01:39 +00:00
Liang Qi
3fa98fcbb5
Update submodules on '5.6' in qt5
...
Change-Id: I6676715446aa572b96f4abe7d3d8932817bfaed1
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-25 07:39:57 +00:00
Svintsov Dmitry
6c6169f292
Make top-level configure script more portable
...
Remove hard-coded path to pwd; there is no need to have it, and for example
NixOS doesn't actually have it at this location, leading to such an error:
./configure: line 36: /bin/pwd: No such file or directory
/qtbase/configure not found. Did you forget to run "init-repository"?
Change-Id: If3372db3390ba5f39c5003d12ff2a466f39ff353
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-02-24 12:19:39 +00:00
Liang Qi
b5e631ad6f
Update submodules on '5.8' in qt5
...
Change-Id: Id5ddefcb8bb28109f75b181e5db41ad98519ffc6
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-24 06:25:51 +00:00
Liang Qi
161f9ef9a5
Update qtbase manually
...
Change-Id: I5ccb9dbba46e97d213bfbb3a69393b7beed54665
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-24 06:25:33 +00:00
Oswald Buddenhagen
ed8f84f149
declare optional dependency of qtwebengine on qttools
...
starting with 5.7, it optionally comes with a qt designer plugin.
Change-Id: Idcc81b2688a1c09d3273b07a1ec991b54903e94c
Reviewed-by: Michal Klocek <michal.klocek@qt.io >
2017-02-23 09:48:32 +00:00
Liang Qi
e0416f4966
Update submodules on '5.8' in qt5
...
Change-Id: I81b3b50b87402c49a306d381c2d107fc6d4d91da
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-23 09:48:32 +00:00
Jani Heikkinen
9d03dae052
Update submodules on '5.9' in qt5
...
There seems to be some issue with updating all submodules so update
qtbase and qtdeclarative only to get INTEGRITY compile
Change-Id: I079837a75f20e649f26b4b55d66e65edf0ba33a5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-22 04:05:40 +00:00
Liang Qi
2df983757a
Update submodules on '5.8' in qt5
...
Change-Id: I2a905ff8300b2f64537446ee763202eeed216c6e
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-19 15:44:06 +00:00
Liang Qi
848c4ac3f8
Merge remote-tracking branch 'origin/5.6' into 5.8
...
Change-Id: I0203dea8e441e58400d6c44697588a44b97a522b
2017-02-17 15:22:56 +01:00
Liang Qi
7470f97c4e
Update qtwebengine manually again
...
Change-Id: I6fabfa3a4ce0b0fbcb1da2e15bdf5f8f6ac6e643
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-17 12:16:32 +00:00
Liang Qi
3fb0afb7f9
Update qtwebengine manually
...
Change-Id: I86dc97895dbbbff1a14e90d0a7c2ae359ce25891
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-16 15:00:58 +00:00
Tony Sarajärvi
628639ea0d
Add macOS 10.12 as a build target with tests disabled
...
Task-number: QTQAINFRA-1092
Change-Id: I0098a1ad9df115f911a401ba06a443a30374135b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:44:20 +00:00
Tony Sarajärvi
00635a672a
Provision: Set bash_profile to read .bashrc in macOS 10.12
...
The method (vmware tools) of launching a process inside a virtual
machine results in the launch of a process that does not originate
from a login shell. Therefore the CI system explicitly starts the
agent with "bash -l -c" to enforce the invocation as login shell
and thus execute settings from /etc/profile, ~/.bash_profile, etc.
This brings the behavior of the system closer to what we see as
developers.
However the shell is a non-interactive shell, therefore ~/.bashrc
is not read by default.
On Linux systems such as RHEL, ~/.bash_profile is configured to still
read ~/.bashrc.
For consistency we apply the same logic to the macOS configurations.
Task-number: QTQAINFRA-1091
Change-Id: I72206dbd8f7289de86830db23fa1ae2c548181eb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:44:14 +00:00
Tony Sarajarvi
c4a5844e25
Add MySQL provisioning script for macOS 10.12
...
Task-number: QTQAINFRA-1091
Change-Id: Id20e5398007284ddf809f2c2c49a60711729db26
Reviewed-by: Liang Qi <liang.qi@qt.io >
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:44:10 +00:00
Tony Sarajarvi
a8348c9e6c
Add postgresql.sh provisioning script for macOS 10.12
...
Task-number: QTQAINFRA-1091
Change-Id: Idf314816d4986855b0b4d92a5f523ec1397f4083
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:44:06 +00:00
Tony Sarajarvi
430aa0192d
Add cmake.sh to provisioning for macOS 10.12
...
Task-number: QTQAINFRA-1091
Change-Id: I3d58c7e94866754adb22975b874ebe4a0e239ec1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:44:03 +00:00
Tony Sarajarvi
1dbe2c1ff4
Add command line tool provisioning for macOS 10.12
...
Task-number: QTQAINFRA-1091
Change-Id: I2b209c8ca59af5bfdcc1faa46ac771a85eeb457e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:43:59 +00:00
Tony Sarajarvi
c3fa9ffd76
Add xcode.sh provisioning script for macOS 10.12
...
Task-number: QTQAINFRA-1091
Change-Id: I6d2071c3304cc8df31d8bbad6d713d21ea2dda25
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:43:56 +00:00
Tony Sarajarvi
884d198a34
Add xz.sh provisioning script for macOS 10.12
...
Task-number: QTQAINFRA-1091
Change-Id: I5594ae5591ad0b092ed000da8930972475163f51
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:43:51 +00:00
Tony Sarajärvi
a56c7ef768
macOS 10.12: Switch crash reporting to server mode
...
Task-number: QTQAINFRA-1091
Change-Id: I49c2f92f570a648e80ac16180bdf0c7967ed1120
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:43:47 +00:00
Tony Sarajarvi
8254e8659f
Add system setup provisioning script for macOS 10.12
...
Task-numer: QTQAINFRA-1091
Change-Id: I0da0e22dd859609fa107b9c157a678a4e2d252e4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:43:43 +00:00
Jake Petroules
a5ba58e8dd
Remove QT_SKIP_MODULES declaration
...
These exclusions belong in the individual modules.
Change-Id: Iaa868bf953f7bc3d72b6508272a18798a8569f4d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-02-15 18:02:33 +00:00
Liang Qi
e8231a46f2
Update submodules on '5.8' in qt5
...
Change-Id: Idb3b5cdd408d20582f10372a0e42e6f63e7a94bc
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-15 07:39:20 +00:00
Liang Qi
9e092f8cad
Update submodules on '5.9' in qt5
...
Change-Id: I631be2f14aa948c1c7678f7a1e0f2fd073a27ce5
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-14 20:56:59 +00:00
Tony Sarajärvi
58ad2e46f3
Add system setup provisioning script for Ubuntu 16.04
...
Task-number: QTQAINFRA-1099
Change-Id: I4ea578b65aca8511641a61461fd1295a3723fdab
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-02-13 14:27:28 +00:00
Tony Sarajärvi
d6beaa6f27
Add APT package provisioning to Ubuntu 16.04
...
Task-number: QTQAINFRA-1099
Change-Id: Ie884846a21c3962aeeb83762113475f9eaf2f20d
Reviewed-by: Simo Fält <simo.falt@qt.io >
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-13 14:27:25 +00:00
Tony Sarajärvi
e5a1280ff0
Add Ubuntu 16.04 as a build target
...
As autotests pass, a subsequent commit will make
Ubuntu 16.04 replace Ubuntu 14.04 build targets.
Task-number: QTQAINFRA-1100
Change-Id: Ief659eec39f40873681ba617c37acf3662551fc1
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-02-13 14:27:22 +00:00
Liang Qi
d4e3b5f48d
Update qtlocation manually
...
Task-number: QTBUG-58807
Change-Id: Ia06d2a40c18d60e4665f0f7659ffd860a9deecf9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-13 14:27:19 +00:00
Joerg Bornemann
ef0e6e1e8f
Add ForceDebugInfo to RHEL-6.6-x86_64
...
On this particular platform we get hard-to-reproduce autotest crashes in
the CI. Enable ForceDebugInfo to get a meaningful backtrace.
Change-Id: Ic9ca50394ad5708c3de4d26eb87d4c2a9d580b18
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-13 12:33:28 +00:00
Liang Qi
36bedf10de
Update submodules on '5.8' in qt5
...
Change-Id: If01fe1a84460b65322bfe9d8c402f24d44e98094
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-12 06:57:40 +00:00
Liang Qi
cb78b8cfca
Update submodules on '5.6' in qt5
...
Change-Id: I2b0758eeb79aedf3450e857fc3e29de6d3659d47
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-11 19:56:57 +00:00
Liang Qi
79b410a77f
Update submodules on '5.9' in qt5
...
Change-Id: I04eca9ec2a5c278d53c83f5b73a7e154d33115a5
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-11 07:56:16 +00:00
Qt Submodule Update Bot
7fdf860fc5
Update submodules on '5.9' in qt5
...
Change-Id: I7c87e4fcd54dbaaa28dc6de510bcb6631fc14208
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-02-10 16:11:18 +00:00
Akseli Salovaara
880e750629
Provisioning: Update opengl32.dll x86 on Windows 10 x64
...
OpenGL32 update is needed for autotests to pass.
At least tst_qglbuffer vertexBuffer will fail without an update.
This update is already in place on Windows x86 and x64 CI hosts but
applied only to System32 -folders.
Change-Id: I223ffc53ecba77030385f29463c419acdc12e1a3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-02-10 06:14:13 +00:00
Akseli Salovaara
f1f9b94b00
Provisioning: Install postgresql x86 and x64 libraries to Windows 10
...
Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.
Change-Id: Ied654efb2f33ab1c643f38a1ea50a127aeb7af7e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-02-10 06:14:10 +00:00
Akseli Salovaara
fb7581847e
Provisioning: Install OpenSSL x86 and x64 libraries to Windows 10 x64
...
Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.
Change-Id: Idada7fc41202298c6f1b2919f0f4343b717e890a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-02-10 06:14:08 +00:00
Akseli Salovaara
da4c2e21b1
Provisioning: Install MySQL x86 and x64 libraries to Windows10 x64
...
Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.
Change-Id: I8eea51a0bfd05bc72d1d004649211c7bc5901d97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-02-10 06:14:06 +00:00
Brett Stottlemyer
dc4ec9c5d9
Add qtremoteobjects
...
Change-Id: Ie7e673d95b4930a93fc6d1a4aa86241061001bc2
Reviewed-by: BogDan Vatra <bogdan@kdab.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-02-10 00:17:37 +00:00
Jani Heikkinen
6c76752673
Change qtgamepad status from preview to addon
...
qtgamepad will be officially supported with Qt 5.9
Change-Id: I3f941189881f2ab32ef10d4fff242e0d075798f3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-02-10 00:17:33 +00:00
Liang Qi
de553b356b
Update submodules on '5.9' in qt5
...
Change-Id: Id4973a02255df2d2b311ac9f3b60d545bac3128f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-09 18:23:52 +00:00
Tony Sarajärvi
e4769f9379
Add one OS X 10.11 configuration to the CI
...
The "-3" suffix for the configuration name is
due to it being a clean TIER1 image and has
not everything preinstalled manually.
Tests are disabled at first. They will be enabled
once we sort out all failing autotests.
Task-number: QTQAINFRA-1088
Change-Id: I7adc05869524acdff9ba295d604c3fc28a7aab99
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-02-09 08:36:22 +00:00
Tony Sarajärvi
9c80884735
Provisioning: remove extra crashreport script
...
We have a duplicate of the same file, but different name.
Change-Id: Iedd70498a91bde0dddb05c33972fd21274399ae8
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:36:20 +00:00
Tony Sarajärvi
ae5c1d4f5d
Provisioning: remove Android provisioning script
...
Android tools and NDK is not needed in 10.11.
Task-number: QTQAINFRA-1087
Change-Id: I8f3f4e71492ea09828823f6ef70ab29faa08934c
Reviewed-by: Simo Fält <simo.falt@qt.io >
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:36:17 +00:00
Tony Sarajärvi
8f9d75f18f
Add command line tools provisioning script for OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: I51aa4ee850d8e8603fac78572942e3be8f1175e4
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-02-09 08:36:15 +00:00
Tony Sarajärvi
0b3c843fb2
Add MySQL provisioning script to OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: If10ba5d5d3f2b4891098ffad8519fe4e16d8c268
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:36:13 +00:00
Tony Sarajärvi
fc32c9bbf7
Add postgresql provisioning script for OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: Ia186b8df007384f7fd03139ad448563b920ee21b
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:36:10 +00:00
Tony Sarajärvi
13ed034dc3
Add Cmake provisioning script for OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: If598b4b8391e13ed0891d8a65f752492fe303d29
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:36:08 +00:00
Tony Sarajärvi
f7d20b7cc2
Add XCode provisioning script for OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: I416b38459ef278f82af0379b46fd78f5ccc6512c
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:36:05 +00:00
Tony Sarajärvi
7a48b0d17c
Add xz.sh provisioning script for OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: I29879e17a18ffb7950c7a85db75f4bc2765741d5
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io >
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-02-09 08:36:02 +00:00
Tony Sarajarvi
f969320ac5
Add provisioning PKG install helper script for bash
...
Task-number: QTQAINFRA-1087
Change-Id: I93f33e2e93371f68f31a9ed8b4d9c89ee091b629
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:35:59 +00:00
Tony Sarajarvi
dd1b6e53b1
Add provisioning helper script for installing compressed files
...
This script downloads a file from a given URL,
uncompresses it and installs it to a desired location.
Task-number: QTQAINFRA-1087
Change-Id: I466cb81ec6c96bb0d46329ec98dcc4f31be173ec
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:35:56 +00:00
Tony Sarajärvi
d6f56195bc
Add system setup provisioning for OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: Icba6d58c56fc00b4fe3a7a3f72050465ff64d104
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-02-09 08:35:54 +00:00
Liang Qi
15e396f7c3
Update submodules on '5.8' in qt5
...
Change-Id: I8c13bd75500b5fe21bde113b40b4e4161b8355f0
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-08 08:34:46 +00:00
Heikki Halmet
ad97fd589f
Provisioning: Visual Studio 2015 with update 3
...
Common install script for Visual Studio installation and
updates. Latest Visual Studio 2015 update is required
for releases
Change-Id: I5b41625ca7f161b4ba2d417797f8839ef175cdbc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-02-07 19:25:11 +00:00
Konstantin Tokarev
25160f24b6
Upgrade CMake to 3.6.2
...
QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on
Windows 10 machines.
Task-number: QTQAINFRA-996
Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
(cherry picked from commit 77eeee64a4 )
2017-02-07 19:25:07 +00:00
Konstantin Tokarev
2835a4d873
Upgrade CMake to 3.6.2 on Windows 7 builder
...
Task-number: QTQAINFRA-996
Change-Id: I84867a5b630c4cf1e712047c58c6cad9e5e43800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
(cherry picked from commit daa8653121 )
2017-02-07 19:25:03 +00:00
Simo Fält
f65479ee0c
Upgrade CMake to 3.6.2 on Windows 8
...
Pyside requires CMake 3.0 or higher
Change-Id: Ic3f7eb4e89cd022364b1437fa8ff4476c86c3e47
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-02-07 19:24:59 +00:00
Heikki Halmet
c8372d3641
Linux android builds to RHEL 7.2
...
In 5.9 android builds will be using
RHEL 7.2 instead of 6.6
Task-number: QTQAINFRA-1096
Change-Id: Ia802aa31fe347616c829e2142991686fe8e95ed9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-02-06 12:07:46 +00:00
Liang Qi
5035a69e55
Update qtbase manually
...
Change-Id: I2e9330f0f037bd8637c4391fe5abde613aadc2ea
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-06 08:02:38 +00:00
Jani Heikkinen
b071c82d19
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
2017-02-06 07:12:39 +00:00
Frederik Gladhorn
ce7b09a1fc
Add speech-dispatcher-devel to RHEL
...
Without this Qt Speech is useless in our packages.
Task-number: QTBUG-58461
Change-Id: I5c93fae1b3a2987353c75865f1b0831114afedbf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-02-05 16:53:46 +00:00
Simon Hausmann
527829a600
Merge remote-tracking branch 'origin/5.8' into 5.9
...
Change-Id: Ic7dab06f6b6e6cf326df651151eade22429b997f
2017-02-05 15:17:50 +01:00
Liang Qi
bbdeca02e9
Merge "Merge remote-tracking branch 'origin/5.6' into 5.8" into refs/staging/5.8
2017-02-04 14:20:27 +00:00
Liang Qi
4b45cd68d4
Update submodules on '5.8' in qt5
...
Change-Id: Ic3a06dd310fd7b67b53b95c8f6b1ef8813449fe5
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-04 06:19:21 +00:00
Simon Hausmann
d641d6546b
Merge remote-tracking branch 'origin/5.6' into 5.8
...
Conflicts:
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
Change-Id: I10fcdfc0af68741d931f4732783bafdad2fffc4a
2017-02-03 09:15:43 +01:00
Heikki Halmet
a36977963a
Provision: Storage android sdk and ndk version information
...
Sdk and ndk version information will be storaged to versions.txt.
Versions.txt will be used for all provision scripts and later on it's
data will be printed to provision log.
Also script name changed to match both android sdk and ndk.
Change-Id: I3366e596f539099c3b587466d90905d0889398fe
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-02-03 05:47:05 +00:00
Heikki Halmet
6afffd6985
Provision: Script to print sw versions to provision log
...
This script is the last script that is run by provisioning. It will
print all storaged sw information to provision log
Change-Id: I2c76d5f7cccf9c116cb660ffcb67d3bece473da8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-02-03 05:46:57 +00:00
Joerg Bornemann
32b5e271a8
Update jom to 1.1.2
...
The most important changes that affect the CI are:
- Fixed bogus path in error message for failed targets.
- Fixed error "JobClient destroyed while still acquiring."
that could be yielded for failed builds.
- Fixed /k option (QTCREATORBUG-17131).
- Added the special .NOTPARALLEL target that disables parallel
build for the containing makefile. (This one is needed to
build QtWebEngine in debug-and-release properly.)
- Introduced the JOMFLAGS environment variable.
This is a MAKEFLAGS pendant. JOMFLAGS is useful to set up
separate flags for nmake and jom.
Change-Id: Icb2462d06b000a3fe29e1e9290b294cb1e900409
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-02-03 05:46:51 +00:00
Frederik Gladhorn
713188e4af
Revert "Clean up usage of qtsvg as dependency"
...
qtdeclarative has a runtime dependency, some tests rely on the svg
module being available, so in order to not reduce the test coverage,
revert this change.
I'd like to see a better/cleaner separation, but for the time being,
better coverage wins.
This reverts commit fbd782636b .
Change-Id: I60d6b585e25e2e7c4f6ad705b754279968827842
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-02-03 05:46:43 +00:00
Heikki Halmet
0c8536fc0a
Provision: Script for linux to remove preinstalled software
...
Script to remove tier1's preinstalled software. Script itself includes
all information about the software that needs to be removed from tier2
before provision starts to run installations. When this script is run
for certain platform that platform needs to provision all removed
software back to tier2 template. So user needs to make sure that all
needed provision script are available when calling this removal-script.
Goal is to have vanilla os when provision don't need to remove any
software before installations. When this goal is reached this script
and script calls can be removed from provision.
Change-Id: I048909800807fabb1dc599e768a90e7457fbc2cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-02-03 05:46:33 +00:00
Oswald Buddenhagen
2c1d5ad754
Merge remote-tracking branch 'gerrit/dev' into 5.9
2017-02-01 21:04:15 +01:00
Kari Oikarinen
321d5f1488
Provision libusb-1.0 for Windows
...
It's needed by tqtc-boot2qt/qdb.
Change-Id: Id5b8b18a2090c040c3eec1bd3c4c521456245381
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-01-31 18:33:44 +00:00
Kari Oikarinen
db9682888c
Add PS provisioning helper for 7-Zip files
...
Change-Id: Ice10e54137da8a0d2372019a195a63121fd00a8a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-01-31 18:33:41 +00:00
Liang Qi
07b72ae2c3
Update qtconnectivity manually
...
Change-Id: Ic3c8400ab26b09277752e5b9b347dc7a33679618
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-31 17:16:33 +00:00
Simon Hausmann
dfaa59fcb3
Bump Android API level to 21
...
This extends commit f3b0b9e292 to the
macOS and Windows platforms.
Change-Id: I180d81266897582cee1bec5938fbd3bb9c5c2ee3
Task-number: QTBUG-58367
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io >
2017-01-31 12:37:11 +00:00
Liang Qi
a20cc5b452
Merge remote-tracking branch 'origin/5.8' into dev
...
Task-number: QTBUG-58371
Change-Id: I9d7027c72fb10b5cc549762d8bb1f13ee5ec9c5d
2017-01-30 10:00:59 +01:00
Liang Qi
9be869ba48
Merge remote-tracking branch 'origin/5.6' into 5.8
...
Task-number: QTBUG-58371
Change-Id: Ic3ec10a04ec9fcfea38324f6052b2d082c6ece58
2017-01-28 12:21:28 +01:00
Heikki Halmet
d4681ee690
Android sdk and ndk to provisioning for Windows 7
...
Installs latest Android sdk and ndk.
It also runs update for SDK API level 18, latest SDK- and platform-
tools and build-tools version 23.0.3.
Task-number: QTBUG-58369
Change-Id: Ib42f5149243fc5d262f6542e26726d1c8cbb2e8c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-01-28 03:57:41 +00:00
Liang Qi
98fa30e28e
Update submodules on '5.8' in qt5
...
Change-Id: If492971dc4c714f7d11e693d13abc64d6bba83e3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-28 03:56:27 +00:00
Liang Qi
0874dba009
Merge remote-tracking branch 'origin/5.8.0' into 5.8
...
Change-Id: I20aad260fd151fc3261548eead12cb23fa3127b6
2017-01-26 15:54:16 +01:00
Liang Qi
18967fce7d
Update submodules on '5.8' in qt5
...
Change-Id: I51a509a5499af603c7eba23ba66b0ddb1eafa4f8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-26 00:13:35 +00:00
Oswald Buddenhagen
29a926f941
Adjust submodule branches
...
Change-Id: Ifd38a97f7b51138504e8d7ace030a175640bc216
2017-01-25 11:39:31 +01:00
Simo Fält
61c59c145b
Restore RHEL 7.2 in the dev branch (5.9)
...
RHEL7.2 was disabled due to blocking configure change.
Task-number: QTBUG-58073
Change-Id: Ic517d53bddecbcf035410d4f22a678ab72e0d44d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-01-25 03:24:37 +00:00
Liang Qi
f8eb9821c3
Update submodules on 'dev' in qt5
...
Change-Id: I80604b065ad943f7bbddeb6dba4ba05a78ba2c05
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-24 22:37:07 +00:00
Heikki Halmet
3276f075b9
Provision: Set bash_profile to read .bashrc
...
The method (vmware tools) of launching a process inside a virtual
machine results in the launch of a process that does not originate
from a login shell. Therefore the CI system explicitly starts the
agent with "bash -l -c" to enforce the invocation as login shell
and thus execute settings from /etc/profile, ~/.bash_profile, etc.
This brings the behavior of the system closer to what we see as
developers.
However the shell is a non-interactive shell, therefore ~/.bashrc
is not read by default.
On Linux systems such as RHEL, ~/.bash_profile is configured to still
read ~/.bashrc.
For consistency we apply the same logic to the macOS configurations.
Change-Id: I417ecd7866bc4ae1b50beb14c19b456588b4050a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-01-24 19:19:27 +00:00
Heikki Halmet
eeea4e5c3a
Add Android NDK/SDK to provision for macOS 10.10 and 10.11
...
Install latest Android sdk and ndk.
It also runs update for SDK API level 18
Task-number: QTBUG-58370
Change-Id: I1bf8cb42dd3e753be27fa9fcd2c1ac8ccbdb87c3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-01-24 19:19:24 +00:00
Jesus Fernandez
1b8b891910
Add Coverity-Id to .commit-template
...
Change-Id: Icb7321584c59f5322ae2fb6d75f9d1b7ba2fcfe2
Reviewed-by: Marc Mutz <marc.mutz@kdab.com >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2017-01-24 10:23:27 +00:00
Liang Qi
84ed87b496
Update submodules on '5.8' in qt5
...
Change-Id: If8fe86b5faa11ef6a04a5433e325975e49361965
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-24 09:40:15 +00:00
Liang Qi
80358b1e1d
Update submodules on 'dev' in qt5
...
Change-Id: Ia7ef89c8452841c3bbf56bada0060e977fd310cc
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-23 15:33:13 +00:00
Liang Qi
1a3ff2b1af
Update submodules on '5.8' in qt5
...
Change-Id: I05b0a2ab6493c9435a8a37d129decf0596a8b84d
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-22 11:15:48 +00:00
Liang Qi
07cc7ef71a
Update submodules on '5.6' in qt5
...
Change-Id: I57bbccaf30143e1ca8b56ca31a229b007111a34f
Reviewed-by: Liang Qi <liang.qi@qt.io >
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org >
2017-01-22 10:28:45 +00:00
Alex Blasche
f3b0b9e292
Bump Android API level version to 21
...
This is required for new Bluetooth features in Qt 5.9+.
Change-Id: I2aa41117dfd93fc94d72012ca229bd2bc61f2bbd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-01-21 07:58:40 +00:00
Liang Qi
3e4f86d652
Update submodules on '5.8' in qt5
...
Change-Id: Ib1144af40af6562020a0f46fb1d31107a5e1e0e3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-19 16:10:16 +00:00
Qt Submodule Update Bot
ee19f88fe0
Update submodules on '5.8.0' in qt5
...
Change-Id: Ib32e222f05e3af71d9f194683ba57f792343924d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-01-19 13:09:05 +00:00
Oswald Buddenhagen
e74b0f7df4
Merge remote-tracking branch 'origin/5.8' into 5.8.0
...
This pulls in the CI build configurations.
These files were previously stored in the CI source tree, but they do belong
here. They describe the different configurations under which we want to build
Qt and its submodules, in terms of underlying virtual machine template, host
OS, target OS and CI related features that may also map to Qt configuration
features.
Task-number: QTQAINFRA-1074
Started-by: Simon Hausmann <simon.hausmann@qt.io >
Change-Id: I8ab9b987a28566ad036dcaf8f0663bd633fea439
2017-01-18 10:49:22 +01:00
Liang Qi
43c9b16100
Update submodules on '5.6' in qt5
...
Change-Id: Ie8aa9fd84a4b85c280831771c261b621238c9bf4
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-17 05:29:11 +00:00
Liang Qi
b336c10c08
Update submodules on '5.8' in qt5
...
Change-Id: I6c8442fbe66f30e1c822efa0ff83387c25e6ac8f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-16 11:41:13 +00:00
Liang Qi
c7e283a595
Update submodules on 'dev' in qt5
...
Change-Id: Iadacad3bd0da1cd22299a6ef7a7f662530b5494f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-15 08:07:02 +00:00
Liang Qi
1ba2e08637
Update submodules on '5.8' in qt5
...
Change-Id: Ibd6924df667113c2a1c9b3a3e8f9c8d29c52c85c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-14 08:01:20 +00:00
Simon Hausmann
a34d812580
Merge remote-tracking branch 'origin/5.8' into dev
...
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
dev branch.
This is done within the same change as the merge to preserve atomicity.
Task-number: QTQAINFRA-1074
Change-Id: Ic47f7db3506ace4faca028b902d48cdb009c8495
2017-01-14 08:40:10 +01:00
Qt Submodule Update Bot
63d77a0b28
Update submodules on '5.8.0' in qt5
...
Change-Id: I13f342ad11d00e1d6df9af60290bbd97793b3a6d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-01-14 07:32:35 +00:00
Liang Qi
4d206f1fb6
Update submodules on 'dev' in qt5
...
Change-Id: I848fb61ce1e338d56bf665ad285d69b90bee06b9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-13 16:28:56 +00:00
Simon Hausmann
9de5f6957c
Merge remote-tracking branch 'origin/5.7' into 5.8
...
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
5.8 branch.
This is done within the same change as the merge to preserve atomicity.
Task-number: QTQAINFRA-1074
Change-Id: Iac469c44048721530380ab577c6dbf1a6fa28211
2017-01-12 22:19:30 +01:00
Liang Qi
7b17d411f1
Update submodules on '5.8' in qt5
...
Change-Id: Id1cef4535c8f5ef2b7d366b73ca4335e2c58f2a3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-12 16:47:52 +00:00
Liang Qi
d0bbf98cc9
Update submodules on '5.6' in qt5
...
Change-Id: I5599c7876c25f21fb286013a2d8cccda5efebe02
Reviewed-by: Liang Qi <liang.qi@qt.io >
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org >
2017-01-12 05:58:01 +00:00
Simon Hausmann
0f4fdb9490
Merge remote-tracking branch 'origin/5.6' into 5.7
...
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
5.7 branch.
This is done within the same change as the merge to preserve atomicity.
Task-number: QTQAINFRA-1074
Change-Id: Ie7bde30bd64d439cd17ea789102550ab9fb44194
2017-01-11 16:29:06 +01:00
Simon Hausmann
3035f20934
Add CI build configurations
...
These files were previously stored in the CI source tree, but they do
belong here. They describe the different configurations under which we
want to build Qt and its submodules, in terms of underlying virtual
machine template, host OS, target OS and CI related features that may
also map to Qt configuration features.
Task-number: QTQAINFRA-1074
Change-Id: I7ce48e3b15da757166eeac7531478d3746c8aa7f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2017-01-11 13:57:45 +00:00
Liang Qi
4b6bff8044
Update submodules on '5.8' in qt5
...
Change-Id: I413f02de39f18259ab7bb10054ff75dc0ed04ed0
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-11 12:22:47 +00:00
Heikki Halmet
2cf8327999
Provision: Cmake 3.6.2
...
Red Hat 6.6 needs cmake for GammaRay
OpenSUSE 42.1 and Ubuntu 14.04 needs cmake for pyside
Change-Id: I64b25be70057b86be7bfc96fb07446f7727bbefe
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-01-11 10:05:59 +00:00
Tony Sarajärvi
8266919b6e
Add provision helper file to install compressed packages
...
Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-01-11 10:05:50 +00:00
Tony Sarajarvi
2059ce3d2d
Add DownloadURL.sh provisioning helper script
...
Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-01-11 10:05:40 +00:00
Tony Sarajarvi
da48107b08
Add provisioning try-catch helper script for bash
...
Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-01-11 10:05:21 +00:00
Liang Qi
96a8c36ee8
Update submodules on '5.8' in qt5
...
Change-Id: I0d6757349b933d131aa0eef501dc3e1509a545c4
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-10 18:31:37 +00:00
Simon Hausmann
5f40fd649e
Improve build performance on Windows
...
Disable the windows search indexing service, which has a tendency to start
indexing source code archives that we've just extracted. We are not interested
in this service.
Change-Id: I1d3f5178a035bc951499d993641a9315db9712ca
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2017-01-09 13:37:16 +00:00
Qt Submodule Update Bot
4cdbf1893f
Update submodules on '5.8.0' in qt5
...
Change-Id: I32db28a8a7f6068aca3fb6c34c15998b569e3d5e
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-01-09 11:15:26 +00:00
Simon Hausmann
ab9b902f3f
Merge remote-tracking branch 'origin/5.7' into 5.8
...
Change-Id: Id9533b63ae2e6d67d8c07101c406c40057c13b9f
2017-01-08 21:12:18 +01:00
Tony Sarajärvi
17c97ea79a
Add provision helper file to install compressed packages
...
Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-01-08 16:28:50 +00:00
Tony Sarajarvi
2b2188cc77
Add DownloadURL.sh provisioning helper script
...
Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-01-08 16:28:39 +00:00
Tony Sarajarvi
c5e6abcafa
Add provisioning try-catch helper script for bash
...
Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-01-08 16:28:32 +00:00
Qt Submodule Update Bot
e47e40eb1c
Update submodules on '5.8.0' in qt5
...
Change-Id: If96f0ff600589f565235c471fa3380bbe9848914
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-07 08:07:10 +00:00
Simon Hausmann
15e1dc2054
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: I9def17eb03e1c08d1e44c8f90841b1bf5160d638
2017-01-06 20:35:52 +01:00
Simo Fält
167e4fc36f
Provisioning: Disable Windows Defender
...
This will reduct the timeouts coin has had recently with win machines.
Change-Id: I32118f226194a3ea5e3c85d24103ec8341925d3c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-01-06 12:15:36 +00:00
Qt Submodule Update Bot
40addc7d81
Update submodules on '5.8.0' in qt5
...
Change-Id: I2cc710394ca9910d60bdf6d8e6079968a17f6270
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-01-03 15:26:13 +00:00
Simon Hausmann
26775d4e3e
Merge remote-tracking branch 'origin/5.8' into 5.8.0
...
This brings in the Android OpenSSL fixes to allow the use of newer TLS
versions with Qt, the conan manifest updates to allow for provisioning
to work as well as a few other fixes from the stable branches.
Change-Id: If2e4a1b8a4c8e44cd8d9b8918a3083cbaf1b385c
2017-01-02 09:43:07 +01:00
Liang Qi
570c251596
Update submodules on 'dev' in qt5
...
Change-Id: Iea0ccd093912ab6a7ecb866c2592f23995a624d5
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-25 20:12:20 +00:00
Simon Hausmann
ffa5fe8b2f
Merge remote-tracking branch 'origin/5.7' into 5.8
...
Change-Id: I49d18025acb322bf45b6cdc38adb05618cb90153
2016-12-25 18:12:11 +00:00
Liang Qi
7cfb602367
Update submodules on '5.8' in qt5
...
Change-Id: I496fe34b7f81ae099fdb0733f87268ed805df992
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-25 10:59:20 +00:00
Konstantin Tokarev
678fcb4e66
Updated conan manifests after modification of packages
...
Change-Id: I60eee501254d41b438085b7b687af6aa2c085dba
Reviewed-by: Vitaliy Slobodin <vitaliy.slobodin@gmail.com >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-12-24 07:32:20 +00:00
Simon Hausmann
591c6d0446
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Conflicts:
coin/provisioning/common/02-python.ps1
Change-Id: I6b5f2c464cc350798c7c73fba9e79a3f4f534586
2016-12-21 21:38:29 +01:00
Simon Hausmann
8a60455e61
Remove shutdown "helpers" for macOS
...
It turns out that they don't quite work the way we expected them to, and
instead we Coin is going to shut down the VMs directly at the right
time.
Change-Id: I9f7a6f2f898002a25544fc513a0c2414fcd5c263
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-12-21 11:32:28 +00:00
Qt Submodule Update Bot
10c4c43e52
Update submodules on '5.8.0' in qt5
...
Change-Id: I060ef5334c8d096c6167663b5c2dd8d45a5a2aec
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-20 09:19:36 +00:00
Simo Fält
ff1ad70a19
Provision: Install pyside python dependencies to Windows
...
To test successfully pyside dependencies with Coin, we need
python virtual env.
Change-Id: I59c620b7da9c78d2b5c55e233d75597b747a8e84
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-12-19 21:39:35 +00:00
Simo Fält
fc6717cf23
Provision: Install pyside python dependencies to Linux
...
To test successfully pyside dependencies with Coin, we need
python-dev packages and virtual env.
Change-Id: I29a5eed769798da4e4799eb5ccdff1cd032070d5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-12-19 21:39:26 +00:00
Qt Submodule Update Bot
2c9249195d
Update submodules on '5.8.0' in qt5
...
Change-Id: Id31eaddee9fe5f64def0e4ddf3b81007c7fead16
Reviewed-by: Antti Kokko <antti.kokko@qt.io >
2016-12-19 08:56:44 +00:00
Qt Submodule Update Bot
5664df0625
Update submodules on '5.8.0' in qt5
...
Change-Id: I2f0a28823f83b2980989b3070a6ee91e1957ee7e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-12-17 07:31:37 +00:00
Qt Submodule Update Bot
6c15dc0302
Update submodules on '5.8.0' in qt5
...
Change-Id: Ic73b70eb3399c4d1a69e76e0a55896ced61423b6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-16 19:55:39 +00:00
Heikki Halmet
e86ba9e1f7
Provision: Android openssl 1.0.2j for Windows 7
...
We are currently using too old openssl for Android builds in Windows 7.
Openssl version need to be at least 1.0.1.
This script will configure openssl 1.0.2j for Android using tools
from msys.
Change-Id: I9ab9a3b4f9f3953cf99bf15fee631f5a7961b42d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-12-16 14:44:55 +00:00
Liang Qi
79fa5f3c87
Update submodules on 'dev' in qt5
...
Change-Id: I37b7fb682d4d8db6cdc87ab8f10be55bc1094bd9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-15 18:06:00 +00:00
Liang Qi
f8252d7f1c
Update submodules on 'dev' in qt5
...
Change-Id: I6624474fd032d697e851fa9ef0d087fde25195ae
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-14 14:48:58 +00:00
Liang Qi
94080ce9cf
Update submodules on '5.8' in qt5
...
Change-Id: I867f4a94c3cc5ff7252339520cc10721937e1187
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-13 05:04:56 +00:00
Liang Qi
2f9d551948
Update submodules on '5.7' in qt5
...
Change-Id: I87579c99e2ee1c2b7ab4d1cf3d403443f215cddb
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-12 08:18:36 +00:00
Liang Qi
79e3c32051
Update submodules on 'dev' in qt5
...
Change-Id: I6da970179afdf84cc629190c1a8b2595c35d4a06
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-12 07:29:06 +00:00
Qt Submodule Update Bot
6199444cce
Update submodules on '5.8.0' in qt5
...
Change-Id: I9dee754f6b2ea4be834a483012ec8e13fe72c8c8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-11 14:29:27 +00:00
Liang Qi
42e12a14f0
Update submodules on '5.8' in qt5
...
Change-Id: I245111cba87f41dfb18ca13527960d24e0a84700
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-10 19:02:18 +00:00
Qt Submodule Update Bot
46d87fb50e
Update submodules on '5.8.0' in qt5
...
Change-Id: I602ac700f615b32917a16cc368403978869b0c9a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-10 16:29:33 +00:00
Liang Qi
4cc6c5b7ee
Update submodules on '5.8' in qt5
...
Change-Id: Iab0f72430400b83be8664c232394959d81a9f28c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-09 20:12:45 +00:00
Qt Submodule Update Bot
0b3ea7ef1b
Update submodules on '5.8.0' in qt5
...
Change-Id: I288795ff5b32bb847d17f1ae9828bc1c83102e8b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-09 18:22:00 +00:00
Qt Submodule Update Bot
a6cf19107c
Update submodules on '5.8.0' in qt5
...
Change-Id: Ia2d83e159b8648958cb123045aabd254330287ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-08 10:10:22 +00:00
Simon Hausmann
16d05b088e
Improve disabling of screensaver on macOS
...
Setting the idleTime on currentHost works well, until the hardware UUID changes
and thus the host ID for the setting. With kvm that happens quite frequently,
with vmware less but also occasionally (deep clone for example). By disabling
the screensaver on start-up we can cover all cases quite easily.
Change-Id: Ibdcf404430656f9caa47386ca3c732366ddfc8c7
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2016-12-08 08:18:56 +00:00
Qt Submodule Update Bot
8afbd91698
Update submodules on '5.8.0' in qt5
...
Change-Id: Ie42264d273d73c32f2763ed3c9dfa7dcb1ede5d6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-07 18:59:00 +00:00
Jędrzej Nowacki
0ce4f02c5f
Suppress shutdown indicator in Ubuntu
...
We want to quit machines without being asked, if we are
really sure.
Change-Id: Ic7156f5b0fe236c0270d8c2e4fcc322a82776caf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-12-07 13:48:24 +00:00
Simon Hausmann
be37958406
Disable the screensaver on macOS definitely and permanently
...
Change-Id: I8856eebfe91b9e1cc2cc318a1e7ea80348f1486e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2016-12-07 13:47:48 +00:00
Simon Hausmann
3718450891
Fix paths for provisioning on macOS
...
The directory names were missing the architecture, otherwise the content was
unused.
Change-Id: I0316da5c4b1352012f27ce330c3319a8aedf01ea
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2016-12-07 13:47:46 +00:00
Frederik Gladhorn
d0552ebf2d
Fix macOS provisioning not shutting down cleanly
...
After provisioning we want the machine to be sensibly shut down since we
will use the disk image later. VSphere doesn't manage to shut down 10.8
VMs. Help out by calling shutdown.
For the other OS X/macOS versions, this is also desirable since
controlling the power state of these machines is hard with different
virtualization solutions (we're looking at OpenNebula/KVM).
Change-Id: Ieabc14f9c8c1af9421a0ef91dd670f4790a84461
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2016-12-07 13:47:42 +00:00
Liang Qi
97e6ed74e4
Merge remote-tracking branch 'origin/5.8.0' into 5.8
...
Conflicts:
.gitmodules
Change-Id: I749924de83f87e436448bf1287fe057e2fe4c45b
2016-12-05 10:00:11 +01:00
Liang Qi
91191afe3f
Update submodules on '5.8' in qt5
...
Change-Id: Ibfed6d06a7f83a124b185c18ee690b2fb3141271
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-04 14:26:31 +00:00
Liang Qi
2c27ccd1c9
Merge remote-tracking branch 'origin/5.7' into 5.8.0
...
Change-Id: Ic9a6b04afe47529c4f953bace93e9c17d8c4d39d
2016-12-02 09:02:23 +01:00
Liang Qi
38c422a405
Update submodules on 'dev' in qt5
...
Change-Id: If15f5387b25fd86b6b1b481f0ec25928304d8c05
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-01 09:42:08 +00:00
Liang Qi
d379d768e6
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: Ib22c9e0f5c3e7c256ca083de33e6ad0475f20ce9
2016-12-01 09:58:28 +01:00
Liang Qi
877b3b9991
Update submodules on '5.8' in qt5
...
Change-Id: I0af8e18f49f251a347eb5afd9037bd0462edc9a9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-01 06:20:02 +00:00
Liang Qi
794392344d
Update submodules on '5.8' in qt5
...
Change-Id: Ib16f362b961d0522c5f990d59f1e5d3974992190
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-30 18:36:09 +00:00
Konstantin Tokarev
860b38110b
Copy conanfile to conanbuildinfos directory
...
Conanfile is required for running "conan imports" as a part of "make install"
procedure, however its original location is unknown to build system of
module.
Conanfile is copied with its conventional name "conanfile.txt" to avoid
tying module build system to more qt5.git layout peculiarities. In
future we may want to have several conanfiles in one provisioning dir,
like qtwebkit-mingw.txt and qtwebkit-msvc.txt.
Also simplified syntax of PowerShell variables interpolation, $() is needed
only for interpolating expressions.
Task-number: QTQAINFRA-998
Change-Id: I6904e80f4f85bb5269b0830272c6eaa2c8100789
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-30 15:31:55 +00:00
Konstantin Tokarev
7dc66c9528
Updated conan to 0.16.0
...
* Use --no-imports when installing packages, imports will be performed
on "make install" step with new "conan imports" command.
* Add txt generator to all conanfiles because it will be needed for
"conan imports".
Change-Id: Ie5e7ac6bfbf14dfa32ce82136b6be5e39476e393
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-30 15:31:52 +00:00
Oswald Buddenhagen
150071b395
don't fail to check out some modules in pinned mode
...
when used without the --branch option, we clone with --no-checkout, to
avoid unnecessarily checking out files twice when the recorded sha1
doesn't happen to be the tip of the default branch. however, that would
leave the index in a dirty state which would make the subsequent
submodule update abort at some point, silently.
to deal with the problem, we ignore this type of index dirtyness and use
submodule update with --force.
Task-number: QTBUG-57289
Change-Id: I6fc9693b0eaadfb04d2d80f9c8f1f2e11be47ae9
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io >
2016-11-30 15:12:13 +00:00
Oswald Buddenhagen
977f0841e4
refuse to operate with dirty submodules
...
the operation would later error out anyway, after spending a lot of time
fetching the remotes, and leaving a partially updated state behind.
Change-Id: Ib2a688e446a9bd4ba3b15fc73082224433c18388
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io >
2016-11-30 15:12:07 +00:00
Liang Qi
75f605743c
Update submodules on '5.6' in qt5
...
Change-Id: I88a559589ffd21c7436df6c644c92db21244860d
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-30 12:22:14 +00:00
Qt Submodule Update Bot
aed00a8dd3
Update submodules on '5.8.0' in qt5
...
Change-Id: I0222dbc952686d2bad1f4878a61047ace3fd4dce
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-30 05:38:04 +00:00
Liang Qi
b461645ce9
Update submodules on 'dev' in qt5
...
Change-Id: Ib6ed9acdc2de652ed0581ab2ce322bea072fec07
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-26 20:12:41 +00:00
Liang Qi
18a8082944
Update submodules on '5.8' in qt5
...
Change-Id: I602135f4911ae5dd19f188582f3b124eace332fd
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-26 20:08:33 +00:00
Liang Qi
b2d2d7bfff
Update submodules on '5.8' in qt5
...
Change-Id: I102175b389cd2470429d0b30bd2be1c92b90b5cf
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-26 12:25:31 +00:00
Liang Qi
b74a26b980
Update submodules on '5.6' in qt5
...
Change-Id: Id212d3e785bef2ca0aa0d9fad3b7933369626643
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-26 10:23:43 +00:00
Liang Qi
ad1fc7cc5d
Update submodules on '5.7' in qt5
...
Change-Id: I81e9785dce8bbbe6bada7d90732cda708c98d0a4
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-26 10:22:00 +00:00
Liang Qi
8aa0940eef
Update submodules on '5.7' in qt5
...
Change-Id: I5bc3cdd755a3e29c936c1db7c51d0e1418be3a97
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-25 20:38:40 +00:00
Frederik Gladhorn
a7c6550fff
Add basic Ubuntu 16.04 provisioning
...
Change-Id: Iaae5bb295bfd48cc5bc036baef9b0fa899d393ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-25 11:05:49 +00:00
Liang Qi
a2762b0f57
Update submodules on '5.6' in qt5
...
Change-Id: I65e6b60cdc03f25d050854c68220fa96ee140bf6
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-25 05:25:56 +00:00
Liang Qi
c28672909f
Update submodules on '5.8' in qt5
...
Change-Id: I3c22d33c28648ff6a9992200629e827533186fe1
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-24 06:36:11 +00:00
Konstantin Tokarev
7a1f4adf31
Update Ruby on Win7
...
QtWebKit requires newer Ruby than version installed on Windows 7 builders.
Install the same version as is installed on Windows 10 builders.
Task-number: QTQAINFRA-997
Change-Id: Id8e5d47028ef8403bb28daf1446d95dc8f2ab564
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-23 20:49:49 +00:00
Konstantin Tokarev
8114c71554
Added conan zlib package for MinGW on Windows 7
...
Change-Id: I48d904e95fce905b15b0099fee956c06773c4a75
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-23 08:46:30 +00:00
Liang Qi
c32c2d4238
Update submodules on '5.6' in qt5
...
Change-Id: I885a6ee78c480bda7f325a21d73d3f95863f9ad4
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-23 04:19:54 +00:00
Liang Qi
6caace33b4
Update submodules on 'dev' in qt5
...
Change-Id: I301370485589fd11d69a3722e29818f037c75b43
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-22 20:07:31 +00:00
Liang Qi
0f8f2edbbb
Update submodules on '5.7' in qt5
...
Change-Id: I96e1ca64b6c2f6d4abb318d8e55f865eb24d4465
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-22 19:38:13 +00:00
Tony Sarajärvi
e0912a9cea
Provision OPENSSL env variable for openSUSE 13.1
...
Fix building on OpenSuse after openssl update.
Every linux distro seems to patch openssl in a different way to deal with
broken/outdated SSL issues. We seem unable to detect what suse did when
running configure, so this is a stop-gap measure.
Change-Id: I5e375e9c5c1615358dbce0b8dd91476cb4f4e45b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-22 14:29:51 +00:00
Liang Qi
ae782a7f22
Update submodules on '5.8' in qt5
...
Change-Id: Ife77ec1889a7791fec833343329fc0c6b3345b34
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-22 09:07:06 +00:00
Liang Qi
b87529c258
Update submodules on '5.6' in qt5
...
Change-Id: I73b32ee6ef5a643c78bb297230fb675a5a3dd64f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-22 07:08:26 +00:00
Qt Submodule Update Bot
7039b9f58b
Update submodules on '5.8.0' in qt5
...
Change-Id: Icffc85eb59ad4aca8eae32d74eb5ad34be37580e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-11-22 06:46:55 +00:00
Oswald Buddenhagen
bf4f3a434a
Adjust submodule branches
...
Change-Id: I154feb1976da9853cb4de7e70a4962ad0a6b4067
2016-11-21 12:48:41 +01:00
Liang Qi
53334e89e1
Update submodules on '5.7' in qt5
...
Change-Id: Ibd8707fd3c3219d7777bb4a82cfbbbf31837e960
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-20 23:39:13 +00:00
Liang Qi
4a9271061a
Update submodules on '5.8' in qt5
...
Change-Id: I5bb5f2c2af231ce4e5d483448cb000c3d20e1cf1
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-18 22:28:49 +00:00
Konstantin Tokarev
fa00780be3
When installing Python ensure that pip is installed too
...
If Python is not deinstalled cleanly (01-windows_removethemall.ps1
just erases installation directory) pip is not bootstrapped by new
installation. Fix it by running ensurepip module.
Change-Id: I3a7ed87eed30118876d7022eed94b8a571677529
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-18 22:19:26 +00:00
Konstantin Tokarev
aafc3f8644
Use full paths for invoking stuff from Python27\Scripts
...
Change-Id: I52094cc4b27b9e3a6fe3dd12c504777b8bb7bc75
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-18 22:19:23 +00:00
Konstantin Tokarev
a561a58bb6
Fixed broken conan manifest in qtci-windows-7-x86
...
Change-Id: I5c88b0d6e8ee6d8599b800a713d65111fbb4ad2a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-18 22:19:20 +00:00
Konstantin Tokarev
48507e9e3c
Provisioning should fail in case of conan errors
...
Change-Id: I54ee86f5cf0f39cd7bafe71682b93a2a3c8fce5c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-18 22:19:18 +00:00
Konstantin Tokarev
1bf242603c
Rename conan.ps1 and python.ps1 file in configuration dirs too
...
Order of files really matters in configuration directories, but I
renamed only main implementations in previous commit. Fixed that.
Change-Id: Ia541fa8fd36b3d52580ba9814e9f4c38aadce460
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-18 22:19:14 +00:00
Liang Qi
98861ac13d
Update submodules on '5.7' in qt5
...
Change-Id: I158e1550ffa19117258088b718dfaaa9d3f110df
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-18 08:05:04 +00:00
Liang Qi
8894622064
Update submodules on '5.6' in qt5
...
Change-Id: I6635f499760dbd4b58e0c65150c886b64ece8391
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-18 08:04:38 +00:00
Liang Qi
e75eff13f1
Update submodules on 'dev' in qt5
...
Change-Id: I0c6056a80c3b5a078f8fe7e3a28206d50856fcb0
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-17 21:01:11 +00:00
Liang Qi
1e73f4067c
Update submodules on '5.8' in qt5
...
Change-Id: Ic90a01c01d497d9041dadc892ed95c4b55cc3dd8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-17 17:55:40 +00:00
Liang Qi
acd40269d3
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: I1c5420f9d0a192f55623b2d46aec7a15b7877609
2016-11-17 11:41:55 +01:00
Qt Submodule Update Bot
42e9690d41
Update submodules on '5.8' in qt5
...
Change-Id: I9ce3b5468ba7249b07fefbe8cf015e7f136dfc12
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-17 08:24:41 +00:00
Konstantin Tokarev
f8e075a679
Install conan from pip instead of exe
...
This allows us to get it working on 32-bit Windows.
Also renamed conan.ps1 and python.ps1 to get proper provisioning order.
Change-Id: I2f21db7dd0edbacb4e44024d1c70b315fba55801
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-16 21:25:32 +00:00
Konstantin Tokarev
f910b2bbf9
Added MinGW support to conan.ps1, and conanfile for MinGW on Win 7
...
Change-Id: I0442437b33afd0195745a03301440e5eea6d4897
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-16 21:25:26 +00:00
Konstantin Tokarev
19c10b941c
Verify conan manifests when installing packages
...
This check allows us to ensure authenticity of installed files.
Manifests are sorted to minimize diffs in future updates.
Manifests lack trailing newline, because adding it would break manifest
parser of conan 0.15.0.
Task-number: QTQAINFRA-998
Change-Id: I6db75a78ce552da29d63cc4ac03726df326b7be2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-16 21:25:21 +00:00
Konstantin Tokarev
93240adad1
Fixed conanfile options after packages were renamed
...
Change-Id: I4dbd3ec43bb6edfff7b9f98ac697cc7b70b09cda
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-16 21:25:15 +00:00
Qt Submodule Update Bot
77741d7d6c
Update submodules on '5.7' in qt5
...
Change-Id: Ia039f19c48f0e6140da7113288cd4c3b5e71ffd9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-16 07:06:30 +00:00
Qt Submodule Update Bot
98c92cc95f
Update submodules on '5.6' in qt5
...
Change-Id: Ieda66165e735256fa25f335804f54d3574bdcd25
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-16 05:23:01 +00:00
Qt Submodule Update Bot
b308713d63
Update submodules on '5.8' in qt5
...
Change-Id: I15c7339a78428a167ac1f8fb74faa08d622b957c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-15 11:05:09 +00:00
Oswald Buddenhagen
6773d4ef94
produce less ugly paths to the commit template in submodules
...
Change-Id: I7ebf3c46088e193c8f4605532c1f4a1b6d62d230
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io >
2016-11-14 12:17:36 +00:00
Oswald Buddenhagen
357d29a002
add --no-fetch option
...
there is no point in re-fetching all repositories just because an update
failed due to local modifications.
Change-Id: Ie9883586d77f3310058353844f0bbcfb0b775ebb
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2016-11-14 12:17:33 +00:00
Qt Submodule Update Bot
f9ef2cad3c
Update submodules on 'dev' in qt5
...
Change-Id: Ic6fdae41e0064726fa0349e6d153ce1ce6cabdba
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-13 07:21:47 +00:00
Qt Submodule Update Bot
7f78ad5d04
Update submodules on '5.7' in qt5
...
Change-Id: I78258b727f35536b5ec7852a175922f0852653cf
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-12 18:24:59 +00:00
Qt Submodule Update Bot
1807cf7a38
Update submodules on '5.8' in qt5
...
Change-Id: I7ad982a779dd3b1856f6bfd1b1e769022a1b27a7
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-11 23:12:51 +00:00
Qt Submodule Update Bot
d9141a32be
Update submodules on '5.6' in qt5
...
Change-Id: Ib475bf7c1fcab721cc884313a6c9dd1426a46ad6
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-11 23:12:26 +00:00
Liang Qi
4846460da8
Update submodules on 'dev' in qt5
...
Change-Id: I8cd3169f2fd6d00006175b8012134450e44b3bb3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-11 06:56:35 +00:00
Qt Submodule Update Bot
aba872f2dd
Update submodules on '5.8' in qt5
...
Change-Id: I6514b942b7346a91ba3ad88af968286b6a859044
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-10 05:37:07 +00:00
Konstantin Tokarev
b1964fc7e5
Upgraded conan to 0.15.0
...
Change-Id: I9219094dfffb4edd90fcab00fb28c8b7658cfb42
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-09 18:33:39 +00:00
Liang Qi
b198efeffb
Update submodules on '5.8' in qt5
...
Change-Id: I77ff5ade4c00778ccecf52667e9f514712344680
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-09 16:25:01 +00:00
Qt Submodule Update Bot
70fd49d277
Update submodules on '5.8' in qt5
...
Change-Id: I813d7017a69fc6550787880e6211f07dd9979851
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-07 16:53:43 +00:00
Konstantin Tokarev
daa8653121
Upgrade CMake to 3.6.2 on Windows 7 builder
...
Task-number: QTQAINFRA-996
Change-Id: I84867a5b630c4cf1e712047c58c6cad9e5e43800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-07 11:59:05 +00:00
Konstantin Tokarev
05f4779eae
Update package names and options in qtwebkit conanfiles
...
Task-number: QTQAINFRA-997
Change-Id: I19634c06041286fe44c787efe038d5ab24888b1f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-07 11:59:03 +00:00
Qt Submodule Update Bot
829820f51a
Update submodules on '5.7' in qt5
...
Change-Id: I8c0dd734d7e74a7ccd6419211de705be4bf5dd25
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-05 20:06:05 +00:00
Qt Submodule Update Bot
2c1bc72b22
Update submodules on '5.8' in qt5
...
Change-Id: Ida45b8f7371489e823fae95759835895805600b7
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-05 08:58:46 +00:00
Oswald Buddenhagen
71ed40b0ac
fix cloning of tagged versions
...
the .gitmodules of tagged commits typically refers to a release branch
which was deleted shortly after the release. consequently, git clone
--branch is bound to fail.
of course, cloning a fixed sha1/tag requires no branch in the first
place, so revert back to using git clone --no-checkout in that case.
amends ac6168c0c .
Task-number: QTBUG-49133
Change-Id: Ica032f1d07a70ad89f16b23bdf5cdab785612fdc
Reviewed-by: Robert Loehning <robert.loehning@qt.io >
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io >
2016-11-04 12:42:26 +00:00
Qt Submodule Update Bot
4cbc319413
Update submodules on '5.6' in qt5
...
Change-Id: Ic9d3ad8264dfc543f8bac4bda81b82c7f92fe176
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-04 12:42:22 +00:00
Qt Submodule Update Bot
d483ed9fd1
Update submodules on '5.8' in qt5
...
Change-Id: I08e288a112a342efec122fdd6ceabe8c6ad9ea94
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-03 17:54:55 +00:00
Qt Submodule Update Bot
647afd7f41
Update submodules on '5.6' in qt5
...
Change-Id: I3f4f3b15e3528c319c1479759282571759477faf
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-03 11:37:11 +00:00
Qt Submodule Update Bot
0cacec9365
Update submodules on '5.7' in qt5
...
Change-Id: I7b50d64a16e3dfbfdfc153cc06c2dd0af73734f5
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-03 08:24:39 +00:00
Qt Submodule Update Bot
8835d34cae
Update submodules on '5.8' in qt5
...
Change-Id: I2671f23d719d22a3e330a9b6f1eb271d7da74e1a
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-03 05:36:58 +00:00
Frederik Gladhorn
fbd782636b
Clean up usage of qtsvg as dependency
...
There is no build dependency on QtSvg in qtdeclarative or qtquick1, so
don't recommend it for builds. QtSensors on the other hand has an
example that does need svg.
This does not change anything in the big picture, the svg module will be
built as always and svg files will be displayed. The change is the
ordering of builds (leave more room for parallelization).
Change-Id: I50e527e03a75742036d5f914611d0b34437a8e3a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2016-11-02 21:09:02 +00:00
Qt Submodule Update Bot
6fd9e533a3
Update submodules on '5.6' in qt5
...
Change-Id: Ib4bc5819e056a5571967aa9919d5a092834c28a7
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-31 08:16:44 +00:00
Qt Submodule Update Bot
6fe694ef9e
Update submodules on '5.8' in qt5
...
Change-Id: I24dadef83afb66c4cc6d3ee96cb753e9c12c6e87
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-30 12:03:53 +00:00
Qt Submodule Update Bot
3ec0bc3251
Update submodules on '5.6' in qt5
...
Change-Id: I4ef33095de23bbf2878f796e036ad6fd5e7d69df
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-29 16:55:04 +00:00
Qt Submodule Update Bot
7cf1472896
Update submodules on '5.7' in qt5
...
Change-Id: Ib7052a661f2b881e5dd45e7e0660ac3b9f2be0b0
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-29 12:04:28 +00:00
Qt Submodule Update Bot
1121bd050b
Update submodules on '5.8' in qt5
...
Change-Id: I762434e6bb122ac5118e73672ce443bb3009d829
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-10-28 01:50:03 +00:00
Qt Submodule Update Bot
d84827a04c
Update submodules on '5.6' in qt5
...
Change-Id: I4ecaec417836737c4d428dbfe69261666d1330eb
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-27 18:25:25 +00:00
Liang Qi
d4330b54d9
Update submodules on '5.8' in qt5
...
Change-Id: Iedd29491fc105df54ab9e670bea8f1d0becb1e23
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-27 11:16:24 +00:00
Fredrik Orderud
e0d82e099c
Update qtquick1 submodule on '5.8' in qt5
...
Fixes broken build caused by qtquick1 not being in sync with interface
changes in qtbase.
Task-number: QTBUG-56642
Change-Id: I972bcef2564c4f9bd7abe1a3e38c77339aaf30e9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-24 09:37:11 +00:00
Qt Submodule Update Bot
dffdec4c38
Update submodules on '5.7' in qt5
...
Change-Id: I346c0d758f888c917e57c5e784063d26fc87ccb4
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-23 06:26:57 +00:00
Qt Submodule Update Bot
79f1945c39
Update submodules on 'dev' in qt5
...
Change-Id: Ic719d17edc11df7808a381627695655ba659148f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-22 06:29:43 +00:00
Qt Submodule Update Bot
5706c177a2
Update submodules on '5.6' in qt5
...
Change-Id: Iefe7bd1ea3f99dee7503a8ae2bc62ce965121029
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-22 06:28:46 +00:00
Qt Submodule Update Bot
9f921b9cc3
Update submodules on '5.8' in qt5
...
Change-Id: I70a3a9621a800f655406d4827f533c2378963312
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-21 17:00:51 +00:00
Qt Submodule Update Bot
161dcd9117
Update submodules on '5.8' in qt5
...
Change-Id: Ia4c6e9eae9eab645779dfc31818527fcef3e5fe2
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-21 04:45:36 +00:00
Qt Submodule Update Bot
6f7ad4c6f5
Update submodules on 'dev' in qt5
...
Change-Id: I1aa41dfd34b34f97a515a2969f512c41386137e3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-20 07:29:55 +00:00
Qt Submodule Update Bot
feae87fc48
Update submodules on 'dev' in qt5
...
Change-Id: I9fb801475eb21c37d5d33b4fb14d4700554a5149
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-19 12:47:10 +00:00
Liang Qi
b5e7776935
Update submodules on '5.8' in qt5
...
Exclude qtbase to avoid QTBUG-56580.
Change-Id: I70cd6027112a94824fdea2264866bfaeda8ee41c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-18 16:06:27 +00:00
Liang Qi
d541bad5b0
Update submodules on '5.8' in qt5
...
Change-Id: I30d63257b6a095fd75c41bf97e24f584374eb542
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-17 21:42:40 +00:00
Qt Submodule Update Bot
f2bae3b27d
Update submodules on '5.7' in qt5
...
Change-Id: I37d33578ba4b2e48403226c8a41ff289f77ebf1a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-15 19:28:06 +00:00
Qt Submodule Update Bot
7f941c05ca
Update submodules on '5.7' in qt5
...
Change-Id: If8ce107ce65ebde81732c1ccbc1b2212eb2ac89b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-14 14:39:48 +00:00
Qt Submodule Update Bot
683e24bd51
Update submodules on '5.6' in qt5
...
Change-Id: Id6ff55fb87154f79a136784c5fe4f63711183fa4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-14 06:48:35 +00:00
Liang Qi
6d2714d6be
Update submodules on '5.8' in qt5
...
One more without qtdeclarative update.
Change-Id: I45afafd217da9153c7ce18336f9ab1d5d9530d8b
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-13 07:33:24 +00:00
Qt Submodule Update Bot
4796403663
Update submodules on 'dev' in qt5
...
Change-Id: Ic0831856c7b3d9014068c48f10d776085e16ba7c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-12 01:30:52 +00:00
Qt Submodule Update Bot
a54d8b1f30
Update submodules on '5.6' in qt5
...
Change-Id: I62cae7b521df5e7c9073c3361017a74d3355a1e0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-11 23:09:35 +00:00
Frederik Gladhorn
837f579a8c
Update submodules on '5.8' in qt5
...
Since qtdeclarative seems to trigger a crash in qtquickcontrols' tests,
leave it out for now, just to see some progress.
Change-Id: I8799f0ae70ad9b78f5be4cb7a53cbeac7df3295b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-10-11 20:58:19 +00:00
Qt Submodule Update Bot
f2fc36b021
Update submodules on '5.7' in qt5
...
Change-Id: Ib91dfec2ce8b7e794a26367f658581672d5cc2e2
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-10 05:44:06 +00:00
Qt Submodule Update Bot
bb9da70be6
Update submodules on '5.6' in qt5
...
Change-Id: Iefa745df986d2794dfdcb7454733122334d5192c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-09 14:26:21 +00:00
Qt Submodule Update Bot
d6fcb8ba76
Update submodules on '5.6' in qt5
...
Change-Id: I186da5a92032e37abcfbaa96e393f2dd2304d181
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-08 08:40:25 +00:00
Liang Qi
766a4f11ea
Update submodules on 'dev' in qt5
...
Change-Id: I33398bb5031c34b1afb24d992fdaebca86e987d1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-07 22:37:57 +00:00
Qt Submodule Update Bot
0750f2b6ce
Update submodules on '5.7' in qt5
...
Change-Id: I0fcbfa1705b1c2a93f5ced9a07d300e18ae9b7b3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-07 21:17:31 +00:00
Liang Qi
741efb1f91
Merge remote-tracking branch 'origin/5.8' into dev
...
Change-Id: Ib37d1a012dad4bcb3b830d2557dab1ed6cb091ea
2016-10-07 08:23:05 +02:00
Liang Qi
bf9ed6466f
Update submodules on '5.8' in qt5
...
Change-Id: I423324fe84f2bb434fad8a717d05eae680a94e69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-06 17:41:36 +00:00
Liang Qi
bb430e6222
Merge remote-tracking branch 'origin/5.7' into 5.8
...
Change-Id: Ic1d8d79b979cb77fe93acae2c279cf8a4f4e2a71
2016-10-06 12:11:18 +02:00
Konstantin Tokarev
5b0a9d688b
Log arguments passed to Start-Process in Run-Conan-Install
...
Task-number: QTQAINFRA-998
Change-Id: Ic27762a0403132cb8c2dcdb9f5a83ae9292e2d2a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-05 21:25:43 +00:00
Konstantin Tokarev
cf257c2869
Pass compiler.runtime setting to conan
...
When MSVC is not autodected, necessary setting compiler.runtime has
undefined value, breaking installation of packages. This setting is not
supported by MinGW, so it should be optional.
Task-number: QTQAINFRA-998
Change-Id: Ia1a09eee14275314c160c7c45cd6ab276367dcdb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-05 21:25:35 +00:00
Konstantin Tokarev
433f6dddb5
Execute Conan installer synchronously
...
PowerShell runs .exe's asynchronously by default, unlike all other commands.
This behavior creates race condition when conanfile processing starts before
conan installation is completed. Addition of "| Out-Null" to installer
invocation makes it synchronous.
Task-number: QTQAINFRA-998
Change-Id: Ic423514f15886e6ad9eb5c9422dd5382a3362380
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-05 21:25:28 +00:00
Liang Qi
e5627e6de3
Update submodules on '5.7' in qt5
...
Change-Id: Ifb5d6145b2c4b4bf881cf6414d2b5c76382c8757
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io >
2016-10-05 14:38:22 +00:00
Liang Qi
eb78767825
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Conflicts:
coin/provisioning/common/helpers.ps1
Change-Id: I9bf6180f7d2ee1ff1c7722eed3c21d416ba7410e
2016-10-04 11:10:59 +02:00
Qt Submodule Update Bot
7b8fe9c0ed
Update submodules on 'dev' in qt5
...
Change-Id: I737902b8cc54ce8394c377f6cdafe14c49c2a588
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-04 04:57:22 +00:00
Qt Submodule Update Bot
bc65857c58
Update submodules on '5.7' in qt5
...
Change-Id: Icb268cea1648c3219be1bb2ac8d9819971e9a033
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-02 20:52:35 +00:00
Liang Qi
538d7a0538
Update submodules on 'dev' in qt5
...
Change-Id: Id24be2272e6fe7256c6f96c1c54c2baf933f793f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-01 13:03:28 +00:00
Qt Submodule Update Bot
6ddf18df95
Update submodules on '5.8' in qt5
...
Change-Id: I3edb8eeb7f599148ba577aea3c6677e8e6423d69
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-01 08:48:43 +00:00
Konstantin Tokarev
680c596ca0
Revert "Changed slash direction in CI_CONAN_BUILDINFO_DIR"
...
This actually breaks conan integration in Coin instead of fixing it.
This reverts commit b0b0c9c471 .
Change-Id: Ifbdc9dbfd89d5b670221463e6d303691ad45936d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-01 06:35:46 +00:00
Liang Qi
0e4688d36e
Merge remote-tracking branch 'origin/5.8' into dev
...
Conflicts:
.gitmodules
Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
2016-09-30 16:13:52 +02:00
Liang Qi
792f91dc87
Merge remote-tracking branch 'origin/5.6.2' into 5.6
...
Conflicts:
.gitmodules
Change-Id: Ifffec3df90687a6ad84547bb0f603b0446bf0e9d
2016-09-30 14:36:23 +02:00
Heikki Halmet
c9d71e9eeb
Python to provisioning for Windows
...
Installs Python version 2.7.10.
Python is required for building Qt 5 from source. More
specifically qtdeclarative and qtwebkit require it.
Change-Id: I63c8f3294a8a4799df5e52fbd41a36db8686950e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-09-30 08:31:18 +00:00
Liang Qi
a5b6125466
Merge remote-tracking branch 'origin/5.7' into 5.8
...
Change-Id: I4060b0ddeb5a77c40b31e1ce1dafd2e878b48e12
2016-09-30 09:27:59 +02:00
Konstantin Tokarev
77eeee64a4
Upgrade CMake to 3.6.2
...
QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on
Windows 10 machines.
Task-number: QTQAINFRA-996
Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-30 07:20:41 +00:00
Simon Hausmann
6fabd34960
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: Ibf285f0d67fc5125c1c7da6dfc5b62b834d34867
2016-09-28 16:41:56 +02:00
Qt Submodule Update Bot
657cab9312
Update submodules on '5.7' in qt5
...
Change-Id: Id084a6f6a3ce4109beb1f36088afe2914ffa7735
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-09-28 04:43:38 +00:00
Simo Fält
1148171a5d
COIN Provisioning: Install ICU to RHEL 7.2
...
Change-Id: I9d99c9e8a10b89f430fd6a07932b9330cfb49726
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-28 04:36:48 +00:00
Simo Fält
06c59b27db
COIN Provisioning: Disable selinux in rhel 7.2
...
Change-Id: I03c2b70e4c05440c6cf1a6d355f5800c67f62bb7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-28 04:36:40 +00:00
Qt Submodule Update Bot
40399ae1cc
Update submodules on '5.8' in qt5
...
Change-Id: Ia2e717ea4f71a3032146f3fc8b98f96d141f1f92
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-09-28 04:36:31 +00:00
Qt Submodule Update Bot
5ee2290c0c
Update submodules on '5.6' in qt5
...
Change-Id: I76cd6f71dd61e2478b73d39163e7fbe4b8f6afe6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-09-27 04:59:22 +00:00
Konstantin Tokarev
b0b0c9c471
Changed slash direction in CI_CONAN_BUILDINFO_DIR
...
Change-Id: I13bea231301f12a3992abc11119fc34543e75ab2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-26 13:51:15 +00:00
Qt Submodule Update Bot
c5557d43ee
Update submodules on '5.6.2' in qt5
...
Change-Id: I337a9d4897efe57d3ac09d9981bb2b07f96a9d87
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-09-25 14:19:10 +00:00
Qt Submodule Update Bot
ec6d9b53b4
Update submodules on '5.7' in qt5
...
Change-Id: I10f0169fa184c4f0c297af4b8f8795a711d88e58
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-25 14:00:21 +00:00
Qt Submodule Update Bot
cce1584b78
Update submodules on '5.8' in qt5
...
Change-Id: Iec230ba54c75039fe1b0506540e52a598fff2510
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-25 09:53:20 +00:00
Qt Submodule Update Bot
dcc26dafad
Update submodules on '5.7' in qt5
...
Change-Id: I2a5733b235e381990aa51c87af3d69fa2582541f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-25 09:04:39 +00:00
Qt Submodule Update Bot
233d142e8e
Update submodules on '5.6' in qt5
...
Change-Id: Ifa9a8c1e59cf8e286c4a52b6936720da76f92073
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-09-24 22:00:52 +00:00
Qt Submodule Update Bot
3f7e68f8c0
Update submodules on '5.6' in qt5
...
Change-Id: I66d3689ab56b1b8b1c754ced12456ff7e86052f7
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-24 04:30:02 +00:00
Qt Submodule Update Bot
69d08a86b0
Update submodules on '5.8' in qt5
...
Change-Id: Ie862b6f2ec78e6c24f8f5bd0ee959e598f3d33d8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-24 04:28:05 +00:00
Qt Submodule Update Bot
0ad453a0fd
Update submodules on '5.6.2' in qt5
...
Change-Id: I47372eb19e0f038e1ec1999a183125ed1c5300c7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-09-23 09:12:36 +00:00
Qt Submodule Update Bot
7c6a3f423a
Update submodules on '5.7' in qt5
...
Change-Id: I0471e3be4be3b6109fe2afab79ba26915eede933
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-09-23 08:23:40 +00:00
Qt Submodule Update Bot
cb480a3860
Update submodules on '5.8' in qt5
...
Change-Id: Ic9386ba7ad3b9a28180719440af6eeb64f4483ff
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-22 05:15:15 +00:00
Kari Oikarinen
0536958614
Provision libusb-1.0 for Linux
...
It is a dependency of tqtc-boot2qt/qdb, which will join CI soon.
Change-Id: I3b205877e705f554202ab7171f9d828491b95ac6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2016-09-21 09:45:21 +00:00
Liang Qi
891afe7066
Update submodules on '5.7' in qt5
...
Change-Id: Ibdccfa62d894d5e2b3a72bf09d72b4c9c7ff1981
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-20 20:47:42 +00:00
Qt Submodule Update Bot
2d61b0871d
Update submodules on '5.8' in qt5
...
Change-Id: Ic49edc7055336d6717fdd985798f665db3803384
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-20 20:47:04 +00:00
Qt Submodule Update Bot
6a8a0abf9e
Update submodules on '5.6' in qt5
...
Change-Id: Id7fba5c79f44c2081ed49ce8f7050b8eacfb76ef
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-18 09:07:30 +00:00
Konstantin Tokarev
23d1112839
Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows
...
Change-Id: I841783122edf82739826cc0a7672d8c809870e97
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-18 05:57:54 +00:00
Konstantin Tokarev
e1bfa77391
Do not use qmake and cmake generator automatically for each conanfile
...
Keep conanfiles self-contained. "txt" generator is not going to be used
by coin internally, drop it.
Task-number: QTQAINFRA-998
Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-17 11:06:44 +00:00
Konstantin Tokarev
fd6fe04cad
Added cmake_installer, imports and explicit library types to conanfiles
...
Task-number: QTQAINFRA-997
Change-Id: I70b51a47c12928944d9f48be13332fce12296af1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-17 11:06:40 +00:00
Konstantin Tokarev
0958cc4cca
Changed BuildinfoDir of conan to use Coin-compatible compiler name
...
Task-number: QTQAINFRA-998
Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-17 11:06:35 +00:00
Qt Submodule Update Bot
efc461a174
Update submodules on '5.6.2' in qt5
...
Change-Id: I623adf43a36ff5cd8de844ae533063523efe2b02
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-09-16 18:30:36 +00:00
Frederik Gladhorn
b5944e9485
Make sure to install gtk 3 and gstreamer on RHEL 7
...
Change-Id: I95c570431c5b78e24754b6e08be0172071da3c51
Reviewed-by: Simo Fält <simo.falt@theqtcompany.com >
2016-09-15 09:47:32 +00:00
Qt Submodule Update Bot
387e428e9a
Update submodules on '5.8' in qt5
...
Change-Id: Ibe4e45b892e4e1caae53808b916bc13630ab88f9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-15 09:47:18 +00:00
Oswald Buddenhagen
64cc947ded
automatically launch new configure system in top-level builds
...
this includes moving the -skip option here, where it belongs.
the implementation is a bit hacky, but the proper one would be vastly
more complex: we'd have to load all modules, then parse the command
line properly (the -skip parsing would be a custom callback, to avoid
needing to process features), then discard all now excluded modules
again, then re-process the command line (so we can complain about
options which are now invalid), and only now proceed with the actual
feature processing.
that seems a bit over the top, so we accept that -skip cannot be the
argument of another option, which seems quite reasonable.
Change-Id: I0053658e6d7e11b82cdfe55893cb553b664a9298
Reviewed-by: Jake Petroules <jake.petroules@qt.io >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-09-15 06:52:35 +00:00
Konstantin Tokarev
78a764ee65
Install conan dependencies if there is conanfile.txt for module
...
Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-14 22:31:17 +00:00
Konstantin Tokarev
b6414f7d08
Added conanfiles for qtwebkit
...
Task-number: QTQAINFRA-997
Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-14 22:31:11 +00:00
Konstantin Tokarev
99ff42545f
Install Conan on Win10
...
QtWebKit will use Conan to install 3rd party dependencies like ICU.
Task-number: QTQAINFRA-997
Change-Id: I4b9bfeb86b28abfdef52afcf249428c3ec41f32a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-14 22:31:01 +00:00
Konstantin Tokarev
90f5a25c66
Update Ruby on Win10
...
QtWebKit requires newer Ruby than version installed on Windows 10 builders.
Task-number: QTQAINFRA-997
Change-Id: Id4f917a824daaab4aeb1445a3a16906663208b6d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-14 22:30:52 +00:00
Qt Submodule Update Bot
8cdb619bce
Update submodules on '5.6' in qt5
...
Change-Id: Id80b5734e19aa6f15d90b11abef9f9c183290292
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-09-13 18:02:05 +00:00
Eskil Abrahamsen Blomfeldt
25b385764e
Add Qt Android Extras as dependency for Qt Purchasing
...
Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
2016-09-13 10:28:43 +00:00
Liang Qi
3e5229c689
Merge remote-tracking branch 'origin/5.7' into 5.8
...
Change-Id: I62235fec5e9b8b81e41d64bfcf58067dc1213d0c
2016-09-13 12:14:43 +02:00
Liang Qi
4477c49291
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Conflicts:
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh
Change-Id: Ib972234bb644353db6920b2dcbe1fd4775ef1779
2016-09-12 15:09:56 +02:00
Heikki Halmet
f1de674fd9
Android sdk and ndk to provisioning for qt5.6
...
Install latest Android sdk and ndk.
It also runs update for SDK API level 18, latest SDK- and platform-
tools and build-tools version 23.0.3.
Build-tools version 23.0.3 is the latest usable version
for Red Hat 6. Newer version of build-tools, version 24.x.x,
requires GLIBC_2.14, which is not available in Red Hat 6.
Change-Id: Iddc353674a65e0af7a9036d9296b9c2933fa114f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-12 09:47:22 +00:00
Qt Submodule Update Bot
1c06b83ff0
Update submodules on '5.8' in qt5
...
Change-Id: I4bd1038cd3ee8cefcfb27179527511c41a0af799
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-08 04:27:50 +00:00
Qt Submodule Update Bot
33feec0dc8
Update submodules on '5.7' in qt5
...
Change-Id: Ic053fa3b81c674e4a63419bdab848e362b2a93a6
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-07 04:20:09 +00:00
Qt Submodule Update Bot
2fb27862aa
Update submodules on 'dev' in qt5
...
Change-Id: I4e7a32798c5b37f63776f8c8ee5e21e9d198895f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-06 17:14:38 +00:00
Qt Submodule Update Bot
25ee5c337c
Update submodules on '5.6' in qt5
...
Change-Id: I1f0e77afca353b07420ed8da001cfbbaaa738dce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-06 05:13:43 +00:00
Qt Submodule Update Bot
4faee20713
Update submodules on '5.6.2' in qt5
...
Change-Id: Ie03202844e195a89cb536fde6b3c357929737cf8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-09-05 16:47:08 +00:00
Qt Submodule Update Bot
72c617cf91
Update submodules on '5.8' in qt5
...
Change-Id: Ic507adbb59d9a95afa4c188223f8e0a5d2d5d03c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-05 04:38:30 +00:00
Qt Submodule Update Bot
cb6b46a516
Update submodules on '5.6' in qt5
...
Change-Id: I34bab96a9ec73aa07e1295250aa85528f306a679
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-09-04 15:16:38 +00:00
Qt Submodule Update Bot
64f62b4b95
Update submodules on '5.7' in qt5
...
Change-Id: I8309b4fd697efb7b539c84d0c351b25c230a4950
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-09-03 23:30:51 +00:00
Qt Submodule Update Bot
68a5a649ab
Update submodules on '5.6' in qt5
...
Change-Id: I565078e5d2d1d8b6a9111d3f063eaebafe008c6f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-02 18:06:20 +00:00
Qt Submodule Update Bot
5b7def1433
Update submodules on '5.8' in qt5
...
Change-Id: I457d16bb5c82d98dfc0995e84c08fee89d872e89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-01 03:23:21 +00:00
Qt Submodule Update Bot
66ffe13b50
Update submodules on '5.6' in qt5
...
Change-Id: I45ed20f8f12335ac2d7aa315329a25c8fbac94fa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-30 04:00:57 +00:00
Qt Submodule Update Bot
70361aac02
Update submodules on '5.8' in qt5
...
Change-Id: I165c8b4ae2709d009462b7fa5b91561759524e5f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-08-29 04:29:14 +00:00
Qt Submodule Update Bot
85771ddaaa
Update submodules on '5.8' in qt5
...
Change-Id: I558721d2b7a630453ce794e7b7b97e1fca5ef3dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-08-28 17:43:30 +00:00
Simon Hausmann
31d8277404
Remove qtsystems from the list of recommended modules in qtlocation
...
QtSystems is not a supported module at the moment, and the code in
QtLocation to utilize QtSystems is behind an #ifdef and destined for
removal.
Change-Id: Ide44f138638ccd751044c13c289f1e116641a23e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io >
2016-08-28 17:43:26 +00:00
Qt Submodule Update Bot
42ed864856
Update submodules on '5.7' in qt5
...
Change-Id: I726579f7e3e25774dc882c1c9d4780ccf23deaed
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-26 19:04:36 +00:00
Qt Submodule Update Bot
7831d61e82
Update submodules on '5.8' in qt5
...
Change-Id: I188c217abff06c901f6da7561bc7ed1f3c12d8b1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-08-24 18:02:48 +00:00
Jani Heikkinen
56fc6bc77b
Removed TP status from qtscxml and qtserialbus
...
Change-Id: I8ed4edcdf9eab48ec1ac278d3e8de38149b0fd8d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2016-08-24 18:02:44 +00:00
Oswald Buddenhagen
71524c78f6
Merge remote-tracking branch 'origin/dev' into 5.8
...
Note that this also contains the adjustment of the branch for the
latecomers qtspeech and qtnetworkauth.
Change-Id: Ia77eb4d47a6ad66cb35e50ae03af751f46a805a8
2016-08-24 19:54:10 +02:00
Oswald Buddenhagen
9584900b5c
Adjust submodule branches
...
Change-Id: Ibc4de8e8a06cf2391ae33be2d02fc21f4e3ab70f
2016-08-24 11:52:19 +02:00
Qt Submodule Update Bot
2dcb31a181
Update submodules on '5.6' in qt5
...
Change-Id: I1104beac8bafb324731879efdb752a1cebbb9512
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-22 16:37:59 +00:00
Jesus Fernandez
b78f3579af
Add qtnetworkauth
...
Change-Id: I4cd81725d0aec29ff3252a84504a81a44d1b60eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
2016-08-22 09:03:20 +00:00
Oswald Buddenhagen
6cfd3a2118
fix branches of qtpim and qtsystems
...
these repos were definitely _not_ branched for 5.7.
Change-Id: Ib31d4e07f2651cfba0a7d31a9db1f1a812061313
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io >
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-18 04:29:08 +00:00
Qt Submodule Update Bot
af364a39aa
Update submodules on '5.7' in qt5
...
Change-Id: I8b849ebf5685a65206d1c60d1c3f7b85e3e6716d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-18 04:28:57 +00:00
Frederik Gladhorn
80ee813a03
Make QtSpeech a tech preview release for Qt 5.8
...
Change-Id: I144109a45bece4b2283c24ad7aae64c098f86963
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io >
2016-08-17 08:37:40 +00:00
Qt Submodule Update Bot
9410b99b16
Update submodules on 'dev' in qt5
...
Change-Id: Ie425f3f5a64e83702a6987d2892fbfa68bea5844
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-17 07:26:42 +00:00
Qt Submodule Update Bot
2556777f36
Update submodules on '5.6' in qt5
...
Change-Id: I3fbdb4edc4d37a8b25fdaff52853d672c951891d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-16 11:53:15 +00:00
Qt Submodule Update Bot
2ed6386fe3
Update submodules on '5.6' in qt5
...
Change-Id: I4821c386e318139e13ad228983c43c1b1d978494
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-13 10:06:10 +00:00
Qt Submodule Update Bot
40e137cbee
Update submodules on '5.7' in qt5
...
Change-Id: I5494d36a2b93a85acbc5825f5bd73d032a4098a9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-11 23:30:46 +00:00
Qt Submodule Update Bot
b0bfbf3bf0
Update submodules on '5.6' in qt5
...
Change-Id: I166e0f9a092f7e293d50d7efb12df54bcee5ec13
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-10 12:05:33 +00:00
Oswald Buddenhagen
7efeb26af7
Adjust submodule branches
...
Change-Id: I6e8c8e91b7e17efa93b24e8026fa3f340bd10e9d
2016-08-08 11:06:22 +02:00
Qt Submodule Update Bot
5c5e807018
Update submodules on '5.7' in qt5
...
Change-Id: I0f7724142af344e35897035016b03ce046c8164e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-07 23:30:49 +00:00
Qt Submodule Update Bot
fc1d30a447
Update submodules on '5.7' in qt5
...
Change-Id: I59475dd0549f9c4c83ad830a76b3b5225aa90eda
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-06 23:30:51 +00:00
Qt Submodule Update Bot
acafa69d57
Update submodules on '5.7' in qt5
...
Change-Id: I92e5272d0d0662bfed36e2fa51d25b729e89a172
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-06 10:01:05 +00:00
Liang Qi
23f5d41bec
Merge remote-tracking branch 'origin/5.7' into dev
...
Change-Id: I91cf0b6132a73c34c63d83a0bee1c028f2f819f8
2016-08-06 06:20:21 +02:00
Qt Submodule Update Bot
525a85bd6d
Update submodules on 'dev' in qt5
...
Change-Id: I5c05b788003c8c274914ad5533d1eb7971c6e823
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-05 18:20:17 +00:00
Liang Qi
95ff2f4870
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: I1a08537bcd4748ebbb3e5a670e3a099779f33945
2016-08-05 09:04:05 +02:00
Qt Submodule Update Bot
b385314451
Update submodules on '5.7' in qt5
...
Change-Id: I203ab93ecfa295c0a8051b85855333e5a92030c8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-05 05:49:36 +00:00
Qt Submodule Update Bot
3fb555a773
Update submodules on '5.6' in qt5
...
Change-Id: I32152358542e406f773d106abba25ee5609c6469
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-04 22:00:58 +00:00
Tony Sarajärvi
19b472f1ff
Fix Coin provisioning in RHEL 6 regarding sslclientkey values
...
There was a bug in RHELs subscription manager that caused yum
not to work by fetching incorrect data into the sslclientkey repository
parameter value.
This provisioning script fetches new data for the repository and thus
fixes yum. Naturally by not having a template where a bad repository
exists, this script would be obsolete. Also, as this needs to be run
before any other scripts using yum, prefixes were added to the scripts.
Change-Id: I5c6ed1d43451d2918f9b6dad22b0106339f36aea
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-08-03 10:28:52 +00:00
Qt Submodule Update Bot
67754033cf
Update submodules on '5.7' in qt5
...
Change-Id: I03f7c07e68856947471fe9976ff996b680c9fabf
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-03 01:55:05 +00:00
Qt Submodule Update Bot
6fe0028baa
Update submodules on '5.7' in qt5
...
Change-Id: I65292231de671b660f232f0ccac7aeb4ae700f59
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-02 05:34:43 +00:00
Qt Submodule Update Bot
8a8134e878
Update submodules on '5.6' in qt5
...
Change-Id: Ie6bd9ea82d5e67fee7645dccd9b07ceac5755582
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-07-30 07:16:36 +00:00
Qt Submodule Update Bot
447361eb68
Updated submodules
...
Change-Id: Id18ec0d487df664c69aff8a8fe8a2ceff64ab42d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-19 10:42:19 +00:00
Qt Submodule Update Bot
d5e52dbe26
Updated submodules
...
Change-Id: I4e1ec0bbeccad560b49b39b4280950684209445d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-15 08:17:10 +00:00
Qt Submodule Update Bot
ddae625e19
Updated submodules
...
Change-Id: If0b6c9e8ddac98085848e44d84ad26e9cc403043
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-14 11:17:44 +00:00
Qt Submodule Update Bot
a4280c4f44
Updated submodules
...
Change-Id: If321cd042d8edc2a0532352d2c994e1c2614c9a0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-12 11:40:31 +00:00
Qt Submodule Update Bot
24961e9f2c
Updated submodules
...
Change-Id: Ia252cef752425c836304bd94fd00de3532b79813
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-06 08:53:10 +00:00
Qt Submodule Update Bot
1240baedcc
Updated submodules
...
Change-Id: Idf41e8902a32fd125c7c88c99e052aef7a2a703e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-05 10:46:44 +00:00
Qt Submodule Update Bot
6fbf179f73
Updated submodules
...
Change-Id: Ia80e4d39f9772e32952685008380cc348f481c6c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-04 22:00:50 +00:00
Qt Submodule Update Bot
e00d0be179
Updated submodules
...
Change-Id: I5443b0f4d97cfc076e3a642ae78770b38661e983
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-04 13:30:37 +00:00
Kai Koehne
8ccf739ae0
README: Update Windows build requirements
...
Change-Id: I9e29d0728db35f65822aff9d709cd93a6b3b7ab2
Task-number: QTBUG-54084
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-07-04 07:39:52 +00:00
Kai Koehne
828c7e9e4e
README: Qt 5.7 requires C++11 compliant compiler
...
Task-number: QTBUG-54084
Change-Id: I127fe637791f05f8310988a4c09fc9584e194f53
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-07-04 07:39:50 +00:00
Qt Submodule Update Bot
acf5c9d0ff
Updated submodules
...
Change-Id: Ie27b2f6daddc68e72b09d779beaf1f61a8a29aa6
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-07-02 20:55:05 +00:00
Qt Submodule Update Bot
d445febd14
Updated submodules
...
Change-Id: I48fca93fd045323752c79abd2710e9307ea85b3a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-01 10:35:37 +00:00
Qt Submodule Update Bot
f7ef3ff7f0
Updated submodules
...
Change-Id: Ib7650cfe43602d9337ed7892af9a6649a6dd2f6f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-07-01 09:31:12 +00:00
Qt Submodule Update Bot
ca7708f22e
Updated submodules
...
Change-Id: I64b5898838652d6a785a45136947f7d55fa3d3f1
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-06-30 07:46:13 +00:00
Qt Submodule Update Bot
9c2315789d
Updated submodules
...
Change-Id: I23f310f80837c73fee1fff2618e1253c6b80b74b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-06-30 05:12:12 +00:00
Qt Submodule Update Bot
7b77cbc4df
Updated submodules.
...
Change-Id: I5a2524a408eaf6f808c0e1242583e83bf01b42b0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-06-29 11:59:46 +00:00
Frederik Gladhorn
f4c6a9c97c
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
2016-06-28 15:58:17 +00:00
Qt Submodule Update Bot
f78835e062
Updated submodules.
...
Change-Id: I12a0a7f2f8174541a1d3c572478c3d0fb765a35d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-06-28 15:58:12 +00:00
Qt Submodule Update Bot
388494d7ee
Updated submodules.
...
Change-Id: I5a780a47ccfcea17e64eda0ed922ca57079ea0ea
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-06-25 02:39:35 +00:00
Liang Qi
39a03d3d6a
Merge remote-tracking branch 'origin/5.7' into dev
...
Change-Id: I5ed83c8f42be099c545dfdcc96a34f7d33cfcda7
2016-06-24 07:10:02 +02:00
Qt Submodule Update Bot
3727ce11ac
Updated submodules.
...
Change-Id: Icb8aad2382e3106db016485d404d7e8afc987399
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-06-23 20:08:48 +00:00
Qt Submodule Update Bot
fdbccea88a
Updated submodules.
...
Change-Id: I67cbc0f3327aeaf3c84e2eb52432a362f0e7c64a
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-06-23 12:34:18 +00:00
Qt Submodule Update Bot
e06238e996
Updated submodules.
...
Change-Id: I5a29cb5e04135debd8e7293594eb540e6acd23dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-06-21 14:08:07 +00:00
Liang Qi
e205785b5c
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: I2e0204f745b482e4faa210ec7f8b95463267b3ca
2016-06-20 21:35:34 +02:00
Sze Howe Koh
49f1a7f0a6
Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"
...
See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771
Change-Id: Iebda5d9a886f4c0f16fe4906cf6dc4c81f2c3c90
Reviewed-by: Lars Knoll <lars.knoll@qt.io >
2016-06-20 16:35:21 +00:00
Qt Submodule Update Bot
0b10bd3657
Updated submodules.
...
Change-Id: Ia5d6e51574251dbd0e9f9cf3f41aac2de56471c4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-06-20 16:35:18 +00:00
Qt Submodule Update Bot
02df76bf07
Updated submodules.
...
Change-Id: I3d25d26bebe88a542f794c29bcda413302432874
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-06-18 15:25:48 +00:00
Qt Submodule Update Bot
6bed56a680
Updated submodules.
...
Change-Id: I86dfc95bd06101ed826d139fd577ccfa662ad0b7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-06-17 13:52:32 +00:00
Frederik Gladhorn
0536b1e9e4
Clean up Windows provisioning scripts
...
The execution policy is set by the CI. The command usually fails as it
is in the scritps right now since it must be run as admin.
Change-Id: Ie31cb7fc15720cc6d76646bf475b3d60a02014d8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
2016-06-16 10:15:18 +00:00
Frederik Gladhorn
8ddc3c1254
Add script to patch QNX SDK headers for Qt atomics
...
Applies http://www.qnx.com/download/feature.html?programid=27555
to the QNX SDK on our continuous integration machines.
Change-Id: I6d24b5024b3e5981c30bbf9a26a1bb4dfaca4e80
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
2016-06-16 08:40:11 +00:00
Qt Submodule Update Bot
b3bc77fc73
Updated submodules.
...
Change-Id: Ia573d0de926441bc63b4c3871e075eb342e294c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-06-16 04:26:54 +00:00
Liang Qi
bbe0a01fde
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: I4a97d7f5b12f9f5e082c44dea279e39417ccf1c4
2016-06-14 20:25:20 +02:00
Kai Koehne
9b6d296096
README: Do not take deprecated modules as an example
...
Task-number: QTBUG-54084
Change-Id: I03c81822a05fb9a3bda975421228b460c2a00fe2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-06-14 16:20:56 +00:00
Kai Koehne
5778d17a68
README: Remove platform specific build requirements
...
The list is not up to date (e.g. ICU is not required on Windows anymore),
and woefully incomplete. Better just link to the wiki/documentation.
Task-number: QTBUG-54084
Change-Id: I6b22fc1c84d40b892503085cb023a7db25fd19c8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-06-14 16:20:53 +00:00
Qt Submodule Update Bot
70b3b02977
Updated submodules.
...
Change-Id: I8358eadfea5f3bf8ff8615d3c468201acd58f1b5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-06-14 16:20:50 +00:00
Qt Submodule Update Bot
451f93e26b
Updated submodules.
...
Change-Id: I5ad7c931f77a167ca4574fd20eb6fe783d95a297
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-06-12 17:43:06 +00:00
Qt Submodule Update Bot
4f64747383
Updated submodules.
...
Change-Id: If1195243a052f8cd20079345dbc7b2783e7bf459
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-06-11 07:42:47 +00:00
Liang Qi
e568a942ec
Merge remote-tracking branch 'origin/5.7.0' into 5.7
...
Conflicts:
.gitmodules
Change-Id: Ibb7ae7927cfd3371bdb77d88df409e6982e43985
2016-06-10 12:32:03 +02:00
Qt Submodule Update Bot
6a4d5e4bc8
Updated submodules.
...
Change-Id: Ia6457dbccce18d960274b0a1774c3d646dfbc6b9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-06-07 17:59:57 +00:00
Qt Submodule Update Bot
51cf8dcf3b
Updated submodules.
...
Change-Id: Iec9d13ae71c8660baec5ca6cfee57aeee3b33922
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-06-05 11:04:42 +00:00
Qt Submodule Update Bot
801066c40d
Updated submodules.
...
Change-Id: If3be9830f7bdbb5508e3b3a962afcc7402b433b2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-06-03 06:24:37 +00:00
Erik Verbruggen
3529d894ba
OSX: Switch crash reporting to server mode.
...
Meaning: to unattended use, so no crash dialogs will pop up. In a later
change we can suppress QTest from generating stack traces when this
setting is *not* in server mode (meaning: the OS will take care of the
stack traces).
Change-Id: Idee9311f866228cd35ecb07889f1c19424981221
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-06-02 14:37:12 +00:00
Jędrzej Nowacki
928c491397
Export CI_JOM_PATH variable on all templates with jom
...
That is needed to change provisioning way in Coin, as currently it
depends on variables hard-coded in Coin agent.
Change-Id: I0bc5c76717e994824b85a4353a7218db4b648344
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-05-30 14:08:24 +00:00
Jędrzej Nowacki
a97874523f
Export CI_ICU_PATH variables on all windows templates
...
That is needed to change provisioning way in Coin, as currently it
depends on variables hard-coded in Coin agent.
Change-Id: I15068bec57dd9d67be05ef753d566b456fb8a2fc
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-05-30 14:08:22 +00:00
Jędrzej Nowacki
2be9656332
Coin provisioning: overwrite files while unzipping
...
Change-Id: I5cf59322f5a34cffe9fe8668755800bccb8cc13a
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-05-30 14:08:20 +00:00
Qt Submodule Update Bot
82873b1b1e
Updated submodules.
...
Change-Id: Iec0cece6ec1ca471593c4acd32595b59dc64a651
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-05-30 13:30:27 +00:00
Qt Submodule Update Bot
e96f60a228
Updated submodules.
...
Change-Id: I5093e1ed41b58628b9a67e3bc8c9ed737c9e5523
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-05-30 10:07:21 +00:00
Qt Submodule Update Bot
4e02d96116
Updated submodules.
...
Change-Id: I89a5dc174641a9e4fc7c99e31794c92575179c49
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-05-30 08:13:51 +00:00
Qt Submodule Update Bot
0c66994ae9
Updated submodules.
...
Change-Id: Ia44a5bc2e6e42cd00524dc82c01d5f59726475f3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-05-28 07:36:05 +00:00
Simon Hausmann
ad474f110f
Fix status of qtquick1 and enginio
...
The right term is "ignore" in order to ignore the module, not "ignored".
Change-Id: Idd4a887834fc98fffb2b9e8385308aa676ba3adf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2016-05-26 23:13:14 +00:00
Jani Heikkinen
30f22b8351
Set qtquick and enginio to ignored state
...
It was agreed at the Qt Contributor Summit 2015 that QtQuick1 will be
removed completely from the packages and not even compiled during
qt5.git integration.
Enginio is also removed from 5.7.0 so ignoring it as well
Change-Id: I80ac88d28f811fbf731e33d4d4353a249ad6d29a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-05-24 11:53:12 +00:00
Ilia Kirianovskii
9443890d60
Fix git_install_hooks for relative gitdir
...
Previously we expected gitdir to be always absolute. This patch fixes
git_install_hooks in case of relative gitdir.
Change-Id: Ia0883af18229703aaa22c62fd2181ed56d9f2fce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2016-05-24 04:39:24 +00:00
Qt Submodule Update Bot
e50f5b9150
Updated submodules.
...
Change-Id: I9b4f1c3daedf21ab201027d5793aa162710c84af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-05-21 06:44:36 +00:00
Qt Submodule Update Bot
4ace6667f2
Updated submodules.
...
Change-Id: I32a473f951d4c00b98263d570ebadbd368fa78ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-05-18 19:18:50 +00:00
Oswald Buddenhagen
23824d231b
Adjust submodule branches
...
Change-Id: I3457cdb3ec2a645fb542039a62e6d107e1bbb812
2016-05-13 13:28:52 +02:00
Oswald Buddenhagen
777967f97b
Merge remote-tracking branch 'origin/5.6' into 5.7
...
skipped all sha1 updates.
Change-Id: I1f741cf7bea806ab238b4f1b5585bb440dafd4f7
2016-05-13 13:22:16 +02:00
Qt Submodule Update Bot
868e545eb2
Updated submodules.
...
Change-Id: Iac472068ce186e1e1a0a8a58c7050451171eee37
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-05-11 18:54:26 +00:00
Qt Submodule Update Bot
9812986913
Updated submodules.
...
Change-Id: I092e0b94eb77397708ab6d196357ec6b3b141326
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-05-11 13:58:19 +00:00
Qt Submodule Update Bot
c07377e739
Updated submodules.
...
Change-Id: I5ea896b0ec6b9837fda44eb7b7a61aa3c6e42db5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-05-09 04:09:45 +00:00
Frederik Gladhorn
cef159accd
Add script to install freeopcua on Ubuntu 14.04
...
Change-Id: Ia13362cf9aa17fbc0e85ac61b1f2897101903aaf
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-05-06 10:43:53 +00:00
Oswald Buddenhagen
a1ec8795c6
make it actually possible to specify 'ignore' as a class
...
another thing the doc claims to be possible - also quite reasonably.
Change-Id: I2220245b10f02a778345b6549e345b2486630ffd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-05-05 20:02:39 +00:00
Oswald Buddenhagen
c41d854254
make it actually possible to exclude classes
...
the doc - quite reasonably - claims that it is possible.
Change-Id: I4668b3feafe721f1db4deb65848206d8197962c8
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-05-05 20:02:38 +00:00
Qt Submodule Update Bot
9b9801b7d4
Updated submodules.
...
Change-Id: I6230a59c886114184d74ad34651f04f0d296ade0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-05-05 05:40:27 +00:00
Frederik Gladhorn
3afd172a25
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: If598cf5987b52450a43fab93702b717c96b17ad2
2016-04-28 12:25:11 +02:00
Jędrzej Nowacki
3963056f63
Add script that install icu on RHEL 6.6
...
That is translation from coin-setup golang code to sh script
Change-Id: Ic26d3877e56feb8b7f8e3ccd3405a044fb6afd8e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
2016-04-28 07:54:50 +00:00
Frederik Gladhorn
54f1bfd10c
Add script to install jom through powershell
...
Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
2016-04-28 07:54:48 +00:00
Frederik Gladhorn
2aff311423
Add coin provisioning directory
...
Change-Id: I76c5c5b7a1ca41758964923d3eb5c9e644f468be
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2016-04-26 15:50:53 +00:00
Qt Submodule Update Bot
d61ac6c2f0
Updated submodules.
...
Change-Id: I1586fb62199695f918f016ec9437810b0f9515e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-04-25 08:15:10 +00:00
Qt Submodule Update Bot
b7c2e9a846
Updated submodules.
...
Change-Id: Id24e1017eee9828e7d6245f1241f241662cc48ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-04-21 05:55:42 +00:00
Iikka Eklund
3df0a5837c
Update qtquickcontrols2 status as "addon" for Qt 5.7
...
qtquickcontrols2 is not in preview state anymore for Qt 5.7.
Change-Id: Ib9d3616e7605beabb9bb9f0b0cb1b79a8d499ebd
Reviewed-by: J-P Nurmi <jpnurmi@qt.io >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-04-21 05:55:37 +00:00
Qt Submodule Update Bot
499c5390b3
Updated submodules.
...
Change-Id: I72e29c8b66acba249f6a274e6428e00a9804b4dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-04-21 04:26:15 +00:00
Dominik Holland
a9752d68ed
Added qtdeclarative and qtmultimedia as optional dependencies for qtspeech
...
Change-Id: I20602133a2156b162e99432f868e4925469c7ff5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
2016-04-13 14:00:38 +00:00
Qt Submodule Update Bot
e23b244494
Updated submodules.
...
Change-Id: I875e16060956af433e20acff4fbdcfb54d0d9923
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-04-13 14:00:35 +00:00
Qt Submodule Update Bot
273e5b82cf
Updated submodules.
...
Change-Id: Idc9529f02cc9a5ad4cd300a745b559fea9c94ed4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-04-11 06:57:46 +00:00
Jani Heikkinen
7251401281
Update 5.7 module status
...
In Qt 5.7 enginio is obsolete and Qt3D addon, not TP anymore
Change-Id: I019f76162cfcc853b542695245a983f151f1b072
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
Reviewed-by: Sean Harmer <sean.harmer@kdab.com >
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2016-04-11 06:57:42 +00:00
Liang Qi
5758a88e59
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Conflicts:
.gitmodules
Change-Id: If63e4f4f7d9a7ddba01d4e621fe6bfbc60838d26
2016-04-05 09:52:18 +02:00
Qt Submodule Update Bot
e80d89059c
Updated submodules.
...
Change-Id: I983429d487f7667c36553d24037639abee660b42
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-04-04 13:21:35 +00:00
Qt Submodule Update Bot
a550ad21bf
Updated submodules.
...
Change-Id: I1c0bcd2c582276c04e44e88169807cc7cf5b43c3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-04-04 07:23:53 +00:00
Liang Qi
c80e96bb09
Merge remote-tracking branch 'origin/5.6.0' into 5.6
...
Conflicts:
.gitmodules
Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580
2016-03-31 09:53:10 +02:00
Qt Submodule Update Bot
f05fece2f7
Updated submodules.
...
Change-Id: I85bb46a7180a32c1808574d0a54c51703d4cee12
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-03-29 10:38:52 +00:00
Qt Submodule Update Bot
d9beab9abd
Updated submodules.
...
Change-Id: Ie0c625f6a48fe8d05150bd12f4d92beb2a359ec7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-03-29 04:19:17 +00:00
Qt Submodule Update Bot
20dcf55e7d
Updated submodules.
...
Change-Id: I5622046dbc1f8eee0cda929627fb8873d525b02a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-03-08 18:24:09 +00:00
Iikka Eklund
84a1676ed6
Update .gitmodules for automated release src package creation
...
Introduce new "deprecated" value for status attribute.
We have two flavors of big source packages we need to produce:
qt-everywhere-* which needs to include:
- essential
- addon
- preview
- deprecated (e.g. qtscript and qtenginio for Qt5.6 release)
Installer only specific source package:
- essential
- addon
The rest (deprecated, preview, ...) need to be shown as split src
packages in the installer.
The above leads to the following changes:
qtscript: addon -> deprecated
Needs to be part of big src packages but excluded from installer
specific big source package.
qtenginio: obsolete -> deprecated
We can't exclude this module from qt-everywhere src packages.
qtwayland: preview -> addon
Needs to be part of installer specific big src package and the
module status is not preview anymore.
Change-Id: I52e10629bf81860f56ebc4ce9d395e0ca54c4264
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-03-08 17:54:29 +00:00
Qt Submodule Update Bot
5e15831271
Updated submodules.
...
Change-Id: Id993273e16fbbffd43d958419ab103a857fd1346
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-03-04 04:26:10 +00:00
Qt Submodule Update Bot
53b920dc69
Updated submodules.
...
Change-Id: I94c3646dc3309f71f577c6f41241cb2570d0c598
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-03-03 10:05:02 +00:00
Qt Submodule Update Bot
d74af1270a
Updated submodules.
...
Change-Id: I49c2a3948ba6c7e8a12f1077b96ddbde1453f67e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-03-03 00:11:54 +00:00
BogDan Vatra
534d63e652
QQC2 doesn't depend on QQC1
...
QQC2 depends on qtgraphicaleffects.
Change-Id: I6cc53d46cf9f4a140dff570801f13556da0d3961
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com >
2016-02-28 06:41:54 +00:00
Qt Submodule Update Bot
e6076450e1
Updated submodules.
...
Change-Id: I3459d79f2daa9d681759f0cb7b8c841aeae7179a
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-02-27 20:21:00 +00:00
Qt Submodule Update Bot
e785abbec1
Updated submodules.
...
Change-Id: Id60487a24eb193207d4d8837a91cef1abc19f97f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-02-25 18:49:52 +00:00
Qt Submodule Update Bot
211080722e
Updated submodules.
...
Change-Id: I633ba6875269578aae2f9d28062d3fa78924a5fc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-02-24 15:41:25 +00:00
Simon Hausmann
30236c3f15
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
2016-02-24 15:41:16 +00:00
BogDan Vatra
18e84e7c06
Enable QtGamepad usage in Qt3D
...
If Qt3D finds QtGamepad, it will use it to build gamepad support.
Change-Id: Ifbc40e5e04a6030d25c2d429878d4fb3a3dd11a6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2016-02-22 12:40:29 +00:00
Simon Hausmann
d4bb786963
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: I2bc1389ece7f12efc334f0292edbbea837f9adc2
2016-02-19 09:21:52 +01:00
Qt Submodule Update Bot
fb1345171a
Updated submodules.
...
Change-Id: Ife7e51372a57f53efefc1fe0c8c805442908d8d9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-02-19 05:24:28 +00:00
Oswald Buddenhagen
fdf1b3cc8d
rework hook installation
...
the primary purpose of this change is making it work with new-style
submodules (1.7+) and git-worktree (2.5+). this means resolving '.git'
and 'commondir' files.
we avoid calling git commands, because a) it's slow on windows, b) some
of them are unavailable in older git versions and it's tedious to deal
with that and c) their output is not necessarily optimal (not always
absolute paths).
we also don't use relative paths for the hook locations any more, as
that's too tedious to deal with.
Change-Id: Ie341e748e56d6bef40856e4a49ac368850028d83
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-02-17 20:18:48 +00:00
Qt Submodule Update Bot
c2549708e5
Updated submodules.
...
Change-Id: I020482ae1107cdd56fad485007622cb4b62b8032
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-02-17 20:18:34 +00:00
Qt Submodule Update Bot
6bdec75429
Updated submodules.
...
Change-Id: I6ad2f0dfbfb78f8f4d9c20f81a84803472a4b31c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-02-16 12:15:51 +00:00
Qt Submodule Update Bot
6efabf6dfe
Updated submodules.
...
Change-Id: I444b4f3ddbb851d94abda55e2e2dfcfee3921d94
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
2016-02-15 10:26:46 +00:00
Qt Submodule Update Bot
3fa8726fa7
Updated submodules.
...
Change-Id: I5861620b6214dc5ff124672ce21dd4dd5b25ce85
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-02-15 06:57:00 +00:00
Oswald Buddenhagen
81523d838c
Adjust submodule branches
...
Change-Id: I3484da8952951d818e9f584bf9b57e9bb9b1e430
2016-02-12 17:40:00 +01:00
Qt Submodule Update Bot
7a8c874231
Updated submodules.
...
Change-Id: I6901259b7a01e57d0c8ca2a9f40d9501635f5cc0
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-02-12 11:11:07 +00:00
Simon Hausmann
e52c7efa4c
Fix datavis3d dependencies
...
The qtmultimedia dependency was missing for datavis3d.
Change-Id: I91007c210e58aa9985844a8234781356391bfbad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
2016-02-12 11:11:01 +00:00
Oswald Buddenhagen
c6d04d68bd
add qtgamepad, qtscxml, and qtspeech
...
Change-Id: I14bc475d44367a9102e896976eba5bd191ee232d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-02-12 11:10:57 +00:00
Oswald Buddenhagen
4007fc7a26
Merge remote-tracking branch 'origin/5.6.0' into 5.6
...
Conflicts:
.gitmodules
Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03
2016-02-12 11:18:27 +01:00
Qt Submodule Update Bot
37c75a23e8
Updated submodules.
...
Change-Id: I8740e98ba27c1f554366a5183c6972207f0b0061
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
2016-02-10 23:22:34 +00:00
Oswald Buddenhagen
3cfe8712ae
fix branches of some modules
...
all repos which are released (whichever way) need release branches.
and vice versa.
also, it needs to be the *right* release branch.
Task-number: QTBUG-50695
Change-Id: Id7b5d106d2d9bdf70e9d5276e205a3c7ea827144
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com >
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-02-07 09:10:14 +00:00
Qt Submodule Update Bot
b680c074d1
Updated submodules.
...
Change-Id: Ic407bd126cc4c0a557ec7769d41394aa68c0cbee
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-02-07 09:09:35 +00:00
Oswald Buddenhagen
d1d52b5c1e
properly complain about invalid entries in --module-subset
...
Change-Id: I13ec7a6acdc8a47efea14bfabf0413d8a3570870
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-02-07 09:09:30 +00:00
Oswald Buddenhagen
3de19487d9
replace 'initrepo' with more fine-grained 'status'
...
instead of a simple bool, we now have five states: preview, active,
addon, obsolete, and ignore (the default). the default includes the
first three.
the CI system is expected to use --module-subset=all,-ignore to include
everything that is expected to build (in some configurations).
Change-Id: Ifb43412054a8e42db0425f24f8e53acfce363caa
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-02-07 09:09:27 +00:00
Miikka Heikkinen
2c53e3d08c
Add charts, data visualization and virtual keyboard modules
...
Change-Id: I53cbc4ce3c2e44687ce454498f5def820614db85
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-01-25 14:41:07 +00:00
Oswald Buddenhagen
f5ba19c3f0
Adjust submodule branches
...
Change-Id: Id78b6c131063a8d25616282cd3b76815323e8048
2016-01-25 11:38:54 +01:00
Qt Submodule Update Bot
b93073ecc9
Updated submodules.
...
Change-Id: I790e982492004e93953bed503a1d777d27c28b6f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-01-23 11:12:30 +00:00
Qt Submodule Update Bot
1fcdb6cafc
Updated submodules.
...
Change-Id: I88b34da37a589451ae32c6f736f4dc863715b339
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-01-22 19:11:52 +00:00
Simon Hausmann
d758a3b055
Merge remote-tracking branch 'origin/5.6' into dev
...
Change-Id: I62519dfde84c16a7dfe1b6f225e40e6f16d3105c
2016-01-22 10:42:38 +01:00
Qt Submodule Update Bot
273821d69c
Updated submodules.
...
Change-Id: I2c671f50d878e8ed03418c2a59c8c997ed3bd6f4
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-01-22 04:26:30 +00:00
Oswald Buddenhagen
06c3d40cc9
move module dependencies from qt.pro to .gitmodules
...
this removes the last redundant module list.
the module build order which is not determined by dependencies is pretty
random now. this is avoided for a few heavy and "less relevant" modules
by setting a priority to built them as late as possible.
Change-Id: Ie8ef9777d050a4915cd2282dc9ccb48fcdbc02d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-01-22 04:26:12 +00:00
Qt Submodule Update Bot
f47e82703c
Updated submodules.
...
Change-Id: Ie0cf0058a5e8f383be4608a5c094b610b9a575af
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-01-19 19:11:07 +00:00
Qt Submodule Update Bot
bb9eebce48
Updated submodules.
...
Change-Id: Ia4dbb4d02b5c32c76cd9cbdc320709af668dc4bc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-01-18 19:58:29 +00:00
Qt Submodule Update Bot
0e2ec253d8
Updated submodules.
...
Change-Id: I3ce0cb4e9ea44dcd860b48d3a6ecaad0eb31964f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-01-17 17:40:06 +00:00
Qt Submodule Update Bot
63d305bb7d
Updated submodules.
...
Change-Id: Iff91870d954d24d2649334d2eeb8357e483009b3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-01-12 19:50:06 +00:00
Qt Submodule Update Bot
bcebc106f1
Updated submodules.
...
Change-Id: Ibacf35a5fb113f9b54a96c10d52aa70e2e64f8da
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-01-05 12:50:44 +00:00
Oswald Buddenhagen
2e134da46c
don't use POD, to restore msysgit perl compatibility
...
Change-Id: I360a6d5246e33dcf3f72bc83f2790905af8c1463
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-12-25 08:07:16 +00:00
Oswald Buddenhagen
c3e404fffd
don't use GetOptionsFromArray, to restore msysgit perl compatibility
...
Change-Id: Ic02a5d8b5a8a813a23bed1c0b45bcb8ee47e3edb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-12-25 08:07:10 +00:00
Oswald Buddenhagen
43135d6e33
make qtandroidextras a regular optional dependency of qtconnectivity
...
we want to move to a purely declarative way to declare submodules, so
the conditional has to go.
instead, use an optional dependency to ensure build order, while the
module excludes itself via requires() if its dependency is missing.
Change-Id: I615382700ff601c9ab003d131b2cc600441c514c
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com >
2015-12-25 08:07:00 +00:00
Qt Submodule Update Bot
cda5de797b
Updated submodules.
...
Change-Id: Icf4a1303edde9048adcb9bb40ced1b503a170f22
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-12-24 18:06:50 +00:00
Simon Hausmann
d2b26ede9c
Updated submodules.
...
Change-Id: I5d7279982a017ef903991faa89c79ca10e717497
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-12-17 21:01:44 +00:00
Simon Hausmann
90b08b1c6d
Updated submodules.
...
Change-Id: I701ce99cb7eb7fa8daffa67699920f51a7ab2087
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-12-17 06:52:41 +00:00
Liang Qi
2051c2987e
Enable qtpurchasing by default
...
Change-Id: I4030b9f446a865e758492e2f07b8adb19052e91d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com >
2015-12-16 20:08:35 +00:00
Simon Hausmann
f8ae5ee3b6
Updated submodules.
...
Change-Id: I806a9fb4b31adf8c02e00c2320d53f7d7fe3669e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-12-16 09:49:14 +00:00
Liang Qi
c485f3e4a7
Manually update qtpurchasing
...
Change-Id: I7385116d7c6e9a7f9b7b2be4b76468b8459299dd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-12-16 09:38:11 +00:00
Liang Qi
7b30d85bdc
Merge remote-tracking branch 'origin/5.6' into dev
...
Change-Id: Ibd5caf0448c9eba9251bc9395fe647f1955743f0
2015-12-15 19:05:02 +01:00
Liang Qi
e4ff528bb6
Updated submodules.
...
Change-Id: I54527e1c5ad138ac63d38d8eabcf158d11b0286d
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-12-15 12:13:58 +00:00
Simon Hausmann
a93760f957
Updated submodules.
...
Change-Id: Iba5d9c28367748258013888c93ab773eb05bb0ee
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-12-15 07:35:22 +00:00
Simon Hausmann
d678e02936
Updated submodules.
...
Change-Id: Ia00cca2d8c22ff96a4f871d70eaa9eb55f6391b0
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-12-10 05:05:50 +00:00
Antti Kokko
1c04b1f7bd
Updated submodules.
...
Change-Id: Ic83700e48f40b0ee8e76f4b4e44b28b4c85bebb7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-12-08 04:54:41 +00:00
Oswald Buddenhagen
2a46300588
error-check dependency declarations
...
Change-Id: I98ad68d8be608b144c5f2ff422aaf7baab9907e8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
2015-12-01 14:00:46 +00:00
Antti Kokko
d527415ac6
Updated submodules.
...
Change-Id: Id124a31338548d9a76baa908b281b3bb6ede168a
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com >
2015-12-01 14:00:43 +00:00
Frederik Gladhorn
f128a9a7e1
Updated submodules.
...
Change-Id: Id3463e24f1aecc6e2d4d040bc7878ad1d48f6327
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-11-16 05:29:51 +00:00
Oswald Buddenhagen
83b45e9030
declare mandatory dep serialbus => serialport
...
Change-Id: I35c5f18b7c8856071413e50590308f402be7e528
Reviewed-by: Rolf Eike Beer <eb@emlix.com >
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com >
2015-11-13 09:22:22 +00:00
Jędrzej Nowacki
1197dbb1db
Updated submodules.
...
Change-Id: I8e348f3cab39f75acb68b2bdc388cd37927424bb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-11-12 19:05:33 +00:00
Frederik Gladhorn
d55a9e3a66
Updated submodules.
...
Change-Id: I0793599392d2e64ceabe8d0f24ba7cb0abc76b84
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
2015-11-07 14:00:12 +00:00
Jani Heikkinen
4aabf3e19d
Updated submodules.
...
Change-Id: I4f71eed2d556219480490f433323db4c151b4ba7
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-10-31 09:29:59 +00:00
Fredrik Orderud
ddcc9b234e
Update Qt3d manually
...
Fixes a crash at destruction.
Change-Id: Ie773b3def96cc1e55baa36b9ff7cf697770d479e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com >
2015-10-28 20:25:26 +00:00
Simon Hausmann
95a89a8b5a
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 >
2015-10-27 12:15:41 +00:00
Fredrik Orderud
98717e27d0
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 >
2015-10-26 18:22:04 +00:00
Simon Hausmann
5197447fd0
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 >
2015-10-23 18:46:03 +00:00
Laszlo Agocs
a0309a7a43
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 >
2015-10-22 05:00:55 +00:00
Simon Hausmann
17c6369c9e
Updated submodules.
...
Change-Id: I3094692e61e5a41116d69053d1f296eac46e545b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-10-22 05:00:52 +00:00
Jani Heikkinen
6f0713adf6
Updated submodules.
...
Change-Id: Ifc06de16a694d8d24bdea3a81e796a0c460e1864
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-10-12 10:43:55 +00:00
Oswald Buddenhagen
0c4ec778f5
declare qtgraphicaleffects before qtquickcontrols
...
otherwise the dependency is botched.
amends 30e19df5b .
Change-Id: I8e17d2f91c7c55c49be6239268f928ae4577d17c
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com >
2015-10-12 05:25:39 +00:00
Iikka Eklund
6382845a6d
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 >
2015-10-12 05:25:20 +00:00
Edward Welbourne
383b2585e3
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 >
2015-10-12 05:24:50 +00:00
Laszlo Agocs
ee443af314
Add qtserialport as dependency for qtlocation
...
Task-number: QTBUG-48082
Change-Id: I7b90777bfdd1286f6340caf756562146772d0bb3
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com >
2015-10-09 12:05:04 +00:00
Jani Heikkinen
d16a8656f9
Updated submodules.
...
Change-Id: I871b519649bb6130db128d7ae4c0916ee2e48146
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-10-06 17:21:56 +00:00
Simon Hausmann
c78fc65631
Updated submodules.
...
Change-Id: Ia0a52a43a8c5fa7516c1469241a449c457153040
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-09-26 11:22:38 +00:00
Simon Hausmann
ae1dc7aa3e
Updated submodules.
...
Change-Id: Ic5ea73d6ca0ea2e174cd592226a16885a73aeed1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-09-25 19:35:21 +00:00
Thiago Macieira
942ae1dd82
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 >
2015-09-24 05:22:45 +00:00
Frederik Gladhorn
d7f477d1cd
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 >
2015-09-24 05:22:42 +00:00
Simon Hausmann
c42dd3462b
Updated submodules.
...
Change-Id: If0045fccac1af79e858831c75c7808fe6997e37e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
2015-09-22 16:40:33 +00:00
Qt Submodule Update Bot
a2a6cf11a7
Updated submodules.
...
Change-Id: I1d3966833b5f27fb262f2d3727557ef2c8947828
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-09-21 18:02:48 +00:00
Jani Heikkinen
944aa6bcbb
Updated submodules.
...
Change-Id: I3c4cdbef3f8fbc016757fdd6a4b5bb8eb6a644df
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-09-21 13:24:01 +00:00
Oswald Buddenhagen
2068af50ca
Merge remote-tracking branch 'origin/5.6' into dev
...
Conflicts:
.gitmodules
qtquickcontrols2
qtwebview
Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
2015-09-18 12:00:07 +02:00
Simon Hausmann
a89c6ef703
Manual update of qttools to remove webkit dependency
...
Change-Id: I6cf6ae75cedb0945c46fd9b3fa63bd21a9ce4806
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-09-18 06:33:36 +00:00
Simon Hausmann
2ebfdb4ca8
Updated submodules.
...
Change-Id: I03bbaedeb88ad76df39ce10f6828ebf5c8b8dadf
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-09-17 11:37:09 +00:00
Oswald Buddenhagen
9bde440225
Merge remote-tracking branch 'origin/5.5' into 5.6
...
Change-Id: I7a28bcaeb5538763274fdef20f8c8ca81b9b21ad
2015-09-10 14:24:15 +02:00
Qt Submodule Update Bot
dd1aeea722
Updated submodules.
...
Change-Id: I0ba6e6ce435be779865b0ace08d74dd29800be9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-09-04 04:24:15 +00:00
Frederik Gladhorn
e734941df8
Add QtQuickControls2 as submodule
...
Change-Id: I435fb765b48a978763384226e399b33448a40502
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
2015-09-03 22:45:29 +00:00
Alex Blasche
c5cb9d2d89
Hook qtserialbus into qt5.git
...
Change-Id: I17c8c55205f852b3e79f279cad7b87f403d7fbe7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-09-03 17:40:25 +00:00
Frederik Gladhorn
4c520caa69
Add qtwebview as submodule
...
Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com >
2015-09-03 17:40:17 +00:00
Jani Heikkinen
4116ec2474
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 >
2015-09-03 17:40:10 +00:00
Simon Hausmann
3e1fd2cb31
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 >
2015-09-03 17:40:03 +00:00
Simon Hausmann
1a46c456eb
Updated submodules.
...
Change-Id: Ie8c296b8e64fe0083ab5ec1584a42c7165fbe3ab
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-09-03 17:39:54 +00:00
Andrew Knight
7bbe464617
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 >
2015-09-01 05:56:07 +00:00
Qt Submodule Update Bot
0ba6e6ce43
Updated submodules.
...
Change-Id: I1497a398e34e18abb18f705b2294464840629ca1
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-09-01 05:56:00 +00:00
Jani Heikkinen
812ff69df4
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 >
2015-08-27 19:44:22 +00:00
Qt Submodule Update Bot
1497a398e3
Updated submodules.
...
Change-Id: I56e7af096e889d56ef67baabf38529c0ccb8d8b5
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-08-25 04:33:00 +00:00
Liang Qi
c9425926e1
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
2015-08-24 16:18:23 +02:00
Qt Submodule Update Bot
56e7af096e
Updated submodules.
...
Change-Id: Icf1e00c471aea0ce5228165735195a9f0f76fe36
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-08-21 09:43:42 +00:00
Qt Submodule Update Bot
cf1e00c471
Updated submodules.
...
Change-Id: Id60882b0bc98875361477cb5aaf7d12c2693f900
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-08-18 04:24:52 +00:00
Thiago Macieira
d7b8b62cb3
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 >
2015-08-14 13:39:09 +02:00
Oswald Buddenhagen
bf5c38f136
Merge remote-tracking branch 'origin/5.4' into 5.5
...
Change-Id: I5b894e7f72ad81e62a6ea0777e6713dfa36c8a68
2015-08-14 13:38:53 +02:00
Oswald Buddenhagen
3f2ff8b460
Merge remote-tracking branch 'origin/5.4.2' into 5.4
...
Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19
2015-08-14 13:34:32 +02:00
Mitch Curtis
30e19df5bf
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 >
2015-08-13 11:52:55 +00:00
Andrew Knight
3d7fe3b822
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 >
2015-08-13 04:45:21 +00:00
Qt Submodule Update Bot
d60882b0bc
Updated submodules.
...
Change-Id: Idbdb4ce40f9456898ac9148dc08473f636f34f1d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-08-13 04:45:15 +00:00
Oswald Buddenhagen
f587983764
fix qtcanvas3d submodule reference
...
Change-Id: I67d89f5e8d04a1e60ff0aedc33e29da7a58df620
2015-08-12 16:31:03 +02:00
Oswald Buddenhagen
cab251cd8d
Adjust submodule branches
...
Change-Id: I7755bb88167297aef9defaa6b66639fde6e9804d
2015-08-10 16:53:39 +02:00
Qt Submodule Update Bot
dbdb4ce40f
Updated submodules.
...
Change-Id: I20beccb62815f3c6948d888ccfad0b69c42b55e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-08-07 06:55:47 +00:00
Qt Submodule Update Bot
20beccb628
Updated submodules.
...
Change-Id: Ie77fe47fcec71a13d3640059d1e0ce66a47fc0b2
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-07-14 03:17:43 +00:00
Qt Submodule Update Bot
e77fe47fce
Updated submodules.
...
Change-Id: I22c7d89fd93a256c4051f49b9a9b89789e697df6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-07-11 09:46:26 +00:00
Qt Submodule Update Bot
1d3966833b
Updated submodules.
...
Change-Id: Idc11a328839163ffae5e72f2e43860b12f19c668
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-07-11 03:32:32 +00:00
Qt Submodule Update Bot
22c7d89fd9
Updated submodules.
...
Change-Id: Ideafacc193da59a1db25e006b16630b74535cbee
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-30 18:19:55 +00:00
Kai Koehne
345e4356b7
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 >
2015-06-30 18:19:33 +00:00
Qt Submodule Update Bot
deafacc193
Updated submodules.
...
Change-Id: Ibc862a8b12e46042819341229b31883bc9a1462e
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-29 19:59:42 +00:00
Aaron McCarthy
fb5e3cc2d3
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 >
2015-06-26 06:46:09 +00:00
Qt Submodule Update Bot
bc862a8b12
Updated submodules.
...
Change-Id: Ie231e8be72006172dd80ec9f1df8f57e7fc54891
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-26 05:37:28 +00:00
Qt Submodule Update Bot
dc11a32883
Updated submodules.
...
Change-Id: Ic5910fb0b28553d1eb0815e578381fd358e342fc
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-25 19:31:21 +00:00
Qt Submodule Update Bot
e231e8be72
Updated submodules.
...
Change-Id: Icc425a6784ea3ae379716ddb1e79a8a07ccd8d74
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-25 19:31:02 +00:00
Qt Submodule Update Bot
cc425a6784
Updated submodules.
...
Change-Id: I88f32b10ee95f967686bf9c3295887b4ebb62eba
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-24 07:00:47 +00:00
Qt Submodule Update Bot
c5910fb0b2
Updated submodules.
...
Change-Id: Ic5e879665945d79c0fcdb27c2c00978b7abdeef6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-23 19:28:08 +00:00
Qt Submodule Update Bot
c5e8796659
Updated submodules.
...
Change-Id: I5c321f6626e9bf6f64f2c120e8281547e2561880
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-21 11:31:31 +00:00
Qt Submodule Update Bot
5c321f6626
Updated submodules.
...
Change-Id: I3009287ec75bfa7b3084fad32a75552656845434
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-20 17:13:47 +00:00
Qt Submodule Update Bot
88f32b10ee
Updated submodules.
...
Change-Id: Ibc644efc00d00f43c1d202106bae6facf015c7fb
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-20 06:59:07 +00:00
Qt Submodule Update Bot
0d60d720f8
Updated submodules.
...
Change-Id: I00defc7101f1cabc0cc540a84846ec9b7933f599
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-19 18:49:53 +00:00
Qt Submodule Update Bot
3009287ec7
Updated submodules.
...
Change-Id: I7257e86c7381f5237c2c135a4395e88b65735cd3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-06-18 04:43:56 +00:00
Qt Submodule Update Bot
bc644efc00
Updated submodules.
...
Change-Id: Ia820c1611af25853deb8161041adf39b7bfa61db
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-17 12:04:07 +00:00
Qt Submodule Update Bot
7257e86c73
Updated submodules.
...
Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-06-09 04:27:26 +00:00
Qt Submodule Update Bot
a820c1611a
Updated submodules.
...
Change-Id: I5384ff79efab1a68cfb665f1e764d7f5ee73fcba
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-07 05:40:06 +00:00
Michael Olbrich
935ffc2e5f
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 >
2015-06-05 19:05:46 +00:00
Qt Submodule Update Bot
5384ff79ef
Updated submodules.
...
Change-Id: I4fc367abe95ee78166067047d0f229bba9991956
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-06-04 20:03:11 +00:00
Qt Submodule Update Bot
4fc367abe9
Updated submodules.
...
Change-Id: I88af8ac70704e63a2154b3fe22b51483a69d84c3
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-05-31 06:59:17 +00:00
Qt Submodule Update Bot
00defc7101
Updated submodules.
...
Change-Id: Ib62714f88c3cd381cbbf8758c7b1029c2fa254ed
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-05-31 06:58:29 +00:00
Qt Submodule Update Bot
88af8ac707
Updated submodules.
...
Change-Id: I57641bf25f49f0f8eb55ccb08a4ede2d6a7af499
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-05-29 19:19:51 +00:00
Oswald Buddenhagen
4a5968ce75
Merge branch '5.4' into 5.4.2
...
Change-Id: I33d967b5f668c672a55ad93ac314340453850521
2015-05-29 20:12:13 +02:00
Oswald Buddenhagen
843a3407f2
Merge tag 'v5.4.1' into 5.4
...
Qt 5.4.1 Release
2015-05-29 15:53:05 +02:00
Oswald Buddenhagen
5400507252
Merge tag 'v5.4.0' into 5.4
...
Qt 5.4.0 Release
2015-05-29 15:52:28 +02:00
Qt Submodule Update Bot
210493d641
Updated submodules.
...
Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-05-29 09:18:21 +00:00
Qt Submodule Update Bot
670466b6a3
Updated submodules.
...
Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-05-28 11:33:18 +00:00
Andrew Knight
ea14bacdc8
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 >
2015-05-27 16:13:29 +00:00
Qt Submodule Update Bot
57641bf25f
Updated submodules.
...
Change-Id: I31ee12ede4defe80e20dd49b9ca7b425b6758965
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-05-27 16:13:26 +00:00
Qt Submodule Update Bot
07856d73e1
Updated submodules.
...
Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-05-23 06:51:36 +00:00
Qt Submodule Update Bot
31ee12ede4
Updated submodules.
...
Change-Id: I833cf03a1efe7ef6fa8f11020826063804ebddaa
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-05-19 09:48:15 +00:00
Qt Submodule Update Bot
dfffbfdc26
Updated submodules.
...
Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-05-16 04:57:35 +00:00
Qt Submodule Update Bot
833cf03a1e
Updated submodules.
...
Change-Id: I619984c9c8d142c465bb86a571d101ac564676d2
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-05-15 10:34:29 +00:00
Qt Submodule Update Bot
b62714f88c
Updated submodules.
...
Change-Id: I68b5c48282234a27f7c96595c8d84a4dc0bb3871
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-05-14 14:37:56 +00:00
Qt Submodule Update Bot
24f1b3219d
Updated submodules.
...
Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-05-13 15:55:59 +00:00
Qt Submodule Update Bot
619984c9c8
Updated submodules.
...
Change-Id: I56a80384b1c5fef07b53d41bcc8567177f6f43db
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-05-09 16:06:13 +00:00
Qt Submodule Update Bot
f7cb995d04
Updated submodules.
...
Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-05-09 12:22:09 +00:00
Qt Submodule Update Bot
56a80384b1
Updated submodules.
...
Change-Id: I359f9925da5f735a654ab18efbc68305f5dadfd2
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-05-07 05:58:41 +00:00
Qt Submodule Update Bot
359f9925da
Updated submodules.
...
Change-Id: Ic38d3b26e9a53fb6b0671ebfdbd05f6a925fe668
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-05-03 07:57:46 +00:00
Qt Submodule Update Bot
11963ba9f0
Updated submodules.
...
Change-Id: I39ce0228dad0d141df17ea5f911046130f823467
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-05-03 07:57:31 +00:00
Qt Submodule Update Bot
c38d3b26e9
Updated submodules.
...
Change-Id: I0d362ee5568abc3943a83b10ae8b6444103ff8c3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-04-29 17:37:59 +00:00
Qt Submodule Update Bot
39ce0228da
Updated submodules.
...
Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-04-28 10:58:28 +00:00
Qt Submodule Update Bot
0d362ee556
Updated submodules.
...
Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-04-28 04:35:07 +00:00
Frederik Gladhorn
9edcb24889
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
2015-04-21 16:26:04 +02:00
Sergio Ahumada
95bb29e243
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 >
2015-04-16 09:42:01 +00:00
Qt Submodule Update Bot
68b5c48282
Updated submodules.
...
Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-04-15 09:16:10 +00:00
Qt Submodule Update Bot
976ffd988e
Updated submodules.
...
Change-Id: I1d66817cbc1f67e7fd8e2d3f92ec39af344a2f43
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-04-14 04:20:21 +00:00
Oswald Buddenhagen
451f0a193b
Adjust submodule branches
...
Change-Id: Ib30d8a8c4691787c460fe6540b64e2d593422c68
2015-04-10 12:10:34 +02:00
Qt Submodule Update Bot
59e3021a52
Updated submodules.
...
Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-04-09 09:28:44 +00:00
Qt Submodule Update Bot
1d66817cbc
Updated submodules.
...
Change-Id: I95930e98758f357598c5aaa8fce39ca7f3f549a4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-04-09 04:45:52 +00:00
Qt Submodule Update Bot
95930e9875
Updated submodules.
...
Change-Id: I8ad3df2f5d5e93ea8b6e9b823a83e9738f3bf489
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-04-07 10:28:48 +00:00
Caroline Chao
697291ef10
Remove specific rules for QtWayland
...
Let the module handle the platforms by itself.
See QtWayland change: 0448026b4ee75
Change-Id: I622d17d6219e71fb0ad014442763b515e58079af
Reviewed-by: Sergio Ahumada <sahumada@texla.cl >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2015-04-01 04:27:17 +00:00
Andrew Knight
98c4f1bbeb
Upgrade win_flex/win_bison to 2.5.5 (bison 3.0)
...
This version is required by upstream ANGLE. win_bison conveniently uses a
different executable name as the existing bison copy, avoiding conflicts.
Change-Id: I2897ce97aef6795933d3ab8b5570a8494a55523e
Reviewed-by: Lars Knoll <lars.knoll@digia.com >
2015-04-01 04:27:00 +00:00
Qt Submodule Update Bot
8ad3df2f5d
Updated submodules.
...
Change-Id: Ie0b703ccb7081240278fd803d18d3da11bc3b1b7
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-04-01 04:26:47 +00:00
Simon Hausmann
b34e3669ff
Prospective fix for unnecessary submodule cloning
...
When cloning qtdeclarative, we end up also cloning qtdeclarative-testsuites,
which is not intentional for users of Qt (and init-repository). The init-repository
script checks for the submodule "repo".update key and skips the sub module if the value
is "ignore". However according to the documentation no checkout is to be done if the value
is "none", which is also what qtdeclarative's .gitmodules specifies for the ecmascript
test suite.
Change-Id: Ieb37607ae4ea7c32d6af886d3e2533fb9dea1f13
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-03-27 10:04:11 +00:00
Jani Heikkinen
1b9d3e4ec0
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
2015-03-27 10:04:06 +00:00
Qt Submodule Update Bot
b02397e9df
Updated submodules.
...
Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-03-27 10:03:59 +00:00
Qt Submodule Update Bot
e0b703ccb7
Updated submodules.
...
Change-Id: Icdc3bf5bd941362d1291566b94a67e6d6456a1ad
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-03-26 05:26:21 +00:00
Qt Submodule Update Bot
cdc3bf5bd9
Updated submodules.
...
Change-Id: I43a2c55cdea1098a23221915571445c1d5f23c2b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-03-20 20:52:06 +00:00
Oswald Buddenhagen
4afaae4020
Merge remote-tracking branch 'origin/5.5' into dev
...
Change-Id: I44a6915c1212bb636456368a2b5dc36b9c26fe01
2015-03-20 13:17:05 +01:00
Qt Submodule Update Bot
43a2c55cde
Updated submodules.
...
Change-Id: I1b9965bf167e4a510bb8662ea11e6ee71a566772
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-03-18 12:41:19 +00:00
Qt Submodule Update Bot
1b9965bf16
Updated submodules.
...
Change-Id: I9a9865ce282d870f755e08438ba187061a41ed9d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-03-13 18:29:44 +00:00
Jani Heikkinen
cb28f324e5
Added Qt3D as a part of qt5.git default repositories
...
Change-Id: I0e74e6c6ab6c347396c449859b1cf24752a42fb8
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com >
2015-03-13 18:29:34 +00:00
Oswald Buddenhagen
a5edc40176
Merge remote-tracking branch 'origin/5.4' into 5.5
2015-03-09 12:28:37 +01:00
Oswald Buddenhagen
ac6168c0cb
use git clone --branch instead of --no-checkout
...
git submodule update does not cause an actual checkout if HEAD matches
the recorded submodule sha1 even if it was not actually checked out.
it would be possible to work around this by calling git checkout HEAD in
each submodule if no files are checked out, but that seems hacky.
instead, just make the module cloning already check out the desired
branch. this produces checkouts that are within a few commits of the
final sha1, so isn't too bad.
Change-Id: I435c1a2e24f39fd8c0d65f0d90df0216715668b7
2015-03-04 12:23:13 +01:00
Oswald Buddenhagen
4b962aee82
Merge remote-tracking branch 'origin/dev' into 5.5
...
Conflicts:
.gitmodules
Change-Id: I45e015a2c4eb3778d2346569de9b7f09e72a58bf
2015-03-03 11:21:03 +01:00
Jani Heikkinen
c2d151522b
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: Ieb3be34b0d4061fb8dc886991528951f59dbd67e
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com >
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com >
2015-02-25 03:23:07 +00:00
Qt Submodule Update Bot
9a9865ce28
Updated submodules.
...
Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-02-25 03:22:48 +00:00
Alex Blasche
811a77a53c
Add qtdeclarative as optional dependency for qtlocation
...
Change-Id: Id6d406cd98b64ba111d1eb9cb0b03360a05fbca7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2015-02-17 06:42:55 +00:00
Qt Submodule Update Bot
e3cd5bb368
Updated submodules.
...
Change-Id: I0badf6179237bb89ffc57c7387cbf21ebc3b6665
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-02-16 19:57:25 +00:00
Oswald Buddenhagen
f46b8dc760
Merge remote-tracking branch 'origin/5.5' into dev
...
Change-Id: Ie7b1685080b978cc1d8790823f79e98e930ca147
2015-02-16 16:24:40 +01:00
Oswald Buddenhagen
f900f38f71
Merge remote-tracking branch 'origin/5.4' into 5.5
...
Conflicts:
qtandroidextras
qtbase
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtmacextras
qtmultimedia
qtquick1
qtscript
qtsensors
qtserialport
qtsvg
qttools
qtwayland
qtwebchannel
qtwebengine
qtwebkit
qtwebsockets
qtwinextras
qtx11extras
qtxmlpatterns
Change-Id: I98b5e8165cd8575888d18198d8d8e8412e7bfaf0
2015-02-16 16:19:22 +01:00
Oswald Buddenhagen
122d4551b5
Adjust submodule branches
...
Change-Id: I952bb9255a393baec2d9ede1cabfca7a47e2dc93
2015-02-16 15:50:02 +01:00
Qt Submodule Update Bot
be35b9f9af
Updated submodules.
...
Change-Id: Idc93c0d4d7c8e30258fb3ad9f4735e4c9d07457c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-02-14 11:18:41 +00:00
Qt Submodule Update Bot
0badf61792
Updated submodules.
...
Change-Id: I98737b388b9898507bebcd8d05a86e7d916b6d25
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-02-14 08:54:49 +00:00
Qt Submodule Update Bot
2c39898934
Updated submodules.
...
Change-Id: I9347499e78f03710eaf24af3c1e7ac650d0ef81d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-02-13 15:11:39 +00:00
Pasi Keranen
682766b9fa
Add qtcanvas3d as submodule
...
[ChangeLog][General] Added QtCanvas3D module, a JavaScript 3D rendering API for QtQuick.
Change-Id: I9448f87ba8c8ccfb2dd6cf790d29bb561b9e9740
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com >
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-02-13 15:11:19 +00:00
Qt Submodule Update Bot
98737b388b
Updated submodules.
...
Change-Id: I9fb1a2e12fb6562c22dbac5fbca06d33046a5030
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-02-13 04:29:58 +00:00
Pierre Rossi
3e40bbd114
QtWebEngine: add dependency on QtWebChannel
...
To allow using the integration that makes use of a custom transport over
Chromium IPC.
Also add QtLocation as an optional dependency for correctness, and
update the pinned sha1
Change-Id: I71d88be0859a74ad82f539d00f02b51d1c3e5218
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com >
2015-02-11 21:59:19 +00:00
Qt Submodule Update Bot
9fb1a2e12f
Updated submodules.
...
Change-Id: Ib71478c424ed0a6fd8d058513aa9a68dda71336f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-02-10 09:18:23 +00:00
Qt Submodule Update Bot
b71478c424
Updated submodules.
...
Change-Id: I81efb6de3c49e6779556b1d1dfe06f1e1bc574f6
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-02-06 17:00:48 +00:00
Qt Submodule Update Bot
dc93c0d4d7
Updated submodules.
...
Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-02-06 06:24:23 +00:00
Oswald Buddenhagen
34c7caab3f
don't fetch again when updating submodules
...
we already did it a moment ago.
this should affect only the --remote case, but there is no harm in
always specifying it.
Change-Id: I3ef0854c790726772fb63ab7829b59ef85ac4f18
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-02-06 06:24:10 +00:00
Oswald Buddenhagen
9ebad7830d
don't checkout when cloning
...
we will subsequently do a submodule update with a possibly different
sha1 anyway.
Change-Id: I4950f3727e4263a73c32eff8460962d5796bc5f3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-02-06 06:24:06 +00:00
Oswald Buddenhagen
1ad0a17fa0
make manual fetching sane
...
it is in no way said that the remote's HEAD will contain the commit to
be checked out - in fact, it's pretty much guaranteed that it won't for
anything but the default branch. fetching the whole remote avoids
additional roundtrips and makes the --branch feature actually work
reasonably.
Change-Id: I20de2da848b12aea8c5b2784307fe9860252009b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-02-06 06:24:03 +00:00
Oswald Buddenhagen
d553fc4fa9
always check out the target branch when using --branch
...
a submodule update with --remote will use the tip of the remote's
branch, but it won't actually switch to the branch if HEAD doesn't point
to it yet.
Change-Id: If13e31da2646683dfb9e832eaab929190acb0167
Reviewed-by: Sergio Ahumada <sahumada@texla.cl >
2015-02-06 06:23:59 +00:00
Oswald Buddenhagen
b236ef6aef
fix --branch without --no-update
...
clearly, i botched the syntax, but i can't even tell how. that's perl.
the new version is more readable anyway.
Change-Id: Ic3e93c2cf30ee92f368808070899af4b9f7809a3
Reviewed-by: Sergio Ahumada <sahumada@texla.cl >
2015-02-06 06:23:54 +00:00
Alex Blasche
f36d7e5d9b
QtLocation doesn't depend on QtMultimedia anymore.
...
Change-Id: Id75a7fc591064639a38694149517924dd33b56fb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2015-02-04 06:15:03 +00:00
Qt Submodule Update Bot
81efb6de3c
Updated submodules.
...
Change-Id: Ief1f126ddc66293b041fe5658d57056761eefe05
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-02-03 11:14:37 +00:00
Qt Submodule Update Bot
9347499e78
Updated submodules.
...
Change-Id: I25db2aa87f437c03d7929959c3e6d94d9fc0d541
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-01-29 09:13:14 +00:00
Qt Submodule Update Bot
ef1f126ddc
Updated submodules.
...
Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2015-01-29 04:28:53 +00:00
Oswald Buddenhagen
c3a6185b7e
Adjust submodule branches
...
Change-Id: I6f2358370d81238f462d26388d85aa5f74a8b455
2015-01-08 12:53:09 +01:00
Sean Harmer
6fd8d9ffd5
Qt3D depends upon qtimageformats module
...
Qt3D makes use of the webp image format in its examples to minimize
the size of assets. Support for webp is provided by qtimageformats.
Change-Id: Id70b584123dc6174848947029ee034593ccc42e0
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2014-12-30 13:24:35 +01:00
Qt Submodule Update Bot
0163cb617a
Updated submodules.
...
Change-Id: I9ca0c5251312fbb7b83264eff28ef98287c7f70d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-12-23 11:41:25 +01:00
Qt Submodule Update Bot
25db2aa87f
Updated submodules.
...
Change-Id: Ia68a6b964f770fef3ea3d52f29d0c7a86186e80c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-12-18 08:14:43 +01:00
Qt Submodule Update Bot
9ca0c52513
Updated submodules.
...
Change-Id: Ia68a6b964f770fef3ea3d52f29d0c7a86186e80c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-12-15 08:29:57 +01:00
Oswald Buddenhagen
7943697cdd
adjust submodule branch names for dev branch
...
Change-Id: I65ea644943aa345b8f0fd1d5fcdfccf8f86ed914
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com >
2014-12-05 14:53:15 +01:00
Oswald Buddenhagen
028bfeeee3
Merge remote-tracking branch 'origin/5.4' into dev
...
Change-Id: Ia8938b7bb2c0393c1799b64309c3cadc7293ad8e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com >
2014-12-05 14:51:59 +01:00
Alex Blasche
a22e673995
Revert "Skip not supported modules on wince."
...
The decision to exclude wince builds from Qt is one the modules
have to do and not the "build system". While there might be
justification to do this for some modules the decision is a module
decision and as such the individual modules should make it.
This reverts commit d870bd65b0 .
Change-Id: I60fd9944a71968c819a27da91fdc58923bbbb776
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2014-12-05 14:50:34 +01:00
Qt Submodule Update Bot
3439140073
Updated submodules.
...
Change-Id: I1998742ceac59b50864ccec46a6c2f255871ab30
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-12-05 10:51:00 +01:00
Qt Submodule Update Bot
1998742cea
Updated submodules.
...
Change-Id: Ib1885ea72539f3bd2df4d4131f0b164b02d4b59f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-12-04 13:50:13 +01:00
Qt Submodule Update Bot
a68a6b964f
Updated submodules.
...
Change-Id: I968f8a2a5ef20c47184d15b8f9e92a795176fcb2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2014-12-02 12:15:22 +01:00
Oswald Buddenhagen
663f814c24
adjust submodule branch names for 5.4 branch
...
Change-Id: I1621fee44becf1940d7d50a604fa8c91f3be78d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
2014-12-02 12:15:15 +01:00
Qt Submodule Update Bot
b1885ea725
Updated submodules.
...
Change-Id: I338ee26271c05b612fc58381270ca471db12aaef
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-11-27 06:41:45 +01:00
Oswald Buddenhagen
6040cb2ff5
Merge remote-tracking branch 'origin/5.4.0' into 5.4
...
Change-Id: I5b2910fc4e8fece8fad42eb200ed6dffdd24f751
2014-11-25 18:00:25 +01:00
Qt Submodule Update Bot
338ee26271
Updated submodules.
...
Change-Id: I77f387bc89c06d870b7d41516734ee3f1c68e71a
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-11-25 05:39:27 +01:00
Qt Submodule Update Bot
77f387bc89
Updated submodules.
...
Change-Id: I7c0bc2305680fac216bbaa72ac83f65b04feffff
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-11-21 09:26:31 +01:00
Qt Submodule Update Bot
968f8a2a5e
Updated submodules.
...
Change-Id: Icafd720586cfe92d6e5773d553f6e70594f6c7dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-11-20 09:02:53 +01:00
Qt Submodule Update Bot
7c0bc23056
Updated submodules.
...
Change-Id: I4b199501287c5a5961405ae0667c04dc1188af44
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-11-20 07:00:26 +01:00
Qt Submodule Update Bot
4b19950128
Updated submodules.
...
Change-Id: I96d903eec0ee9d2fd76e1e3f1ebfd868ad937dbe
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-11-19 05:46:17 +01:00
Qt Submodule Update Bot
96d903eec0
Updated submodules.
...
Change-Id: Ie8053418e43127327f6df892ae774a1707a9ae97
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-11-12 22:35:27 +01:00
Oswald Buddenhagen
38cfc8ec95
don't fetch unless we are updating
...
it's just wasting time.
Change-Id: I541cc535c5c95b0140cfa14d7cb042dbe029525e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
2014-11-12 10:49:16 +01:00
Kai Koehne
402bf7aec2
Fix cloning with mirrors
...
Commit 486f5f37761 broke the cloning with one of the mirror options:
git ls-remote git://mirror/qt/qtactiveqt.git.git test/if/mirror/exists
fatal: The remote end hung up unexpectedly
Change-Id: Ia154ee34dd10e35b24676777d8dde98ef0790ee1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2014-11-12 10:49:07 +01:00
Kai Koehne
8f35cb2886
Fix description of --mirror argument
...
The argument actually requires a trailing slash.
Change-Id: Idc2567746d2b3f4ebf31c2bce5ec683d2a1f425b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2014-11-12 10:48:54 +01:00
Oswald Buddenhagen
d5946d420f
teach init-repository about branches
...
specifically, add the --branch option and the necessary keys to
.gitmodules.
Change-Id: I09e2df6bd012629f76a35238d66697637bdffe44
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-11-12 10:48:37 +01:00
Qt Submodule Update Bot
e8053418e4
Updated submodules.
...
Change-Id: I201b4c135a571bdf2621cbac03a9ab46a352b60f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-11-10 06:41:19 +01:00
Qt Submodule Update Bot
cafd720586
Updated submodules.
...
Change-Id: I201b4c135a571bdf2621cbac03a9ab46a352b60f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-11-07 12:28:28 +01:00
Qt Submodule Update Bot
201b4c135a
Updated submodules.
...
Change-Id: Ica7018cd4f892d0b6938ab276305f6ae02dcc07b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-11-04 08:00:22 +01:00
Jan Arve Saether
00a3c36bc1
Ignore alternate if its not a git repo
...
Don't just check if the submodule folder exist, since that doesn't
qualify it for being a valid git repo.
Change-Id: Ia3902714a0554908c0b8fd3228ed6fc2cfddd344
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2014-11-03 12:50:42 +01:00
Qt Submodule Update Bot
ca7018cd4f
Updated submodules.
...
Change-Id: I00e3f00b799e15d95895f70887cf5b1b6d3bc372
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2014-11-03 07:59:03 +01:00
Qt Submodule Update Bot
00e3f00b79
Updated submodules.
...
Change-Id: Ia87766e218ab82cd1da216ea2cd023790fea6e8c
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-10-31 06:50:24 +01:00
Qt Submodule Update Bot
a87766e218
Updated submodules.
...
Change-Id: Ib54838f4a5c3ad05843c680252c45458a4572fb5
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-10-30 06:39:30 +01:00
Qt Submodule Update Bot
b54838f4a5
Updated submodules.
...
Change-Id: I18cc387deb811a2870842837353d6322511e1872
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-10-29 06:46:07 +01:00
Qt Submodule Update Bot
18cc387deb
Updated submodules.
...
Change-Id: I86f7d9ce9873b5c6897e99763aba5765640ceba3
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-10-28 06:54:29 +01:00
Qt Submodule Update Bot
86f7d9ce98
Updated submodules.
...
Change-Id: I3f0739b279123e0a049d52da455f40ad1a20b4ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-10-23 17:46:28 +02:00
Bruno Coudoin
cd12d1f202
fix to let init-repository work on non english locale
...
This patch forces the C locale before calling 'git submodule'
in order to get the non localized string 'Entering' that we filter out.
Change-Id: I46d3770956a6b07e574ad15549bbb8942285b800
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2014-10-17 13:26:43 +02:00
Qt Submodule Update Bot
3f0739b279
Updated submodules.
...
Change-Id: Id8a40d65705b36a269accb68f7d82d7ee5fa925f
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-10-17 13:26:35 +02:00
Qt Submodule Update Bot
a17124e831
Updated submodules.
...
Change-Id: I869fce8a6bd6db20b58facdd2a476dacdf3b7d69
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-10-16 11:27:42 +02:00
Qt Submodule Update Bot
d8a40d6570
Updated submodules.
...
Change-Id: I2f80b640ab55f99b2379a41e6ce8c7df30f138a4
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com >
2014-10-13 09:08:32 +02:00
Qt Submodule Update Bot
2f80b640ab
Updated submodules.
...
Change-Id: Ib927255703d49def6c732f196a6265f6ed08a691
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-10-01 12:35:05 +02:00
Qt Submodule Update Bot
b927255703
Updated submodules.
...
Change-Id: I361f771ae66d1128f407992c228c1c76b0e69e4c
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com >
2014-09-30 17:52:01 +02:00
Qt Submodule Update Bot
361f771ae6
Updated submodules.
...
Change-Id: Ie6af514f7185fc618f5093accedfb4f0937e5039
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-09-25 06:59:10 +02:00
Matti Paaso
d063e757b1
Adding qtquick1 and qtwayland also into submodule initialization
...
Without these components, src package creation fails in packaging.
Change-Id: I402c9c49642bccf821c3719206d1dea9415760c6
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com >
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
Reviewed-by: Antti Kokko <antti.kokko@digia.com >
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2014-09-25 06:58:45 +02:00
Qt Submodule Update Bot
e6af514f71
Updated submodules.
...
Change-Id: Ib2e577904b850ea2ba3a8223688b05a21b4921f7
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-09-24 06:49:56 +02:00
Joerg Bornemann
597bb62d2b
remove qtjsondb
...
It's dead, Jim.
Change-Id: Id8e1ddb266018bfd582af27bb7eb860287e4567c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com >
Reviewed-by: Marco Bubke <marco.bubke@digia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2014-09-23 20:29:32 +02:00
Oswald Buddenhagen
0af9ceef91
properly recurse submodule initialization
...
Change-Id: Icd438b9da9af0275dd508186a265bc211d9d01ce
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-09-23 20:29:12 +02:00
Oswald Buddenhagen
934651b766
don't unnecessarily initialize unwanted submodules
...
it wastes time and causes output noise.
Change-Id: Ifee01150293431b3c528f30a46280bd142e30b22
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-09-23 20:29:06 +02:00
Oswald Buddenhagen
836f00a76e
don't uninit submodules before re-initing
...
git-submodule init will simply not touch the already initialized
submodules. this is just fine, as we'll overwrite the config entries
with our own urls (and remove the obsolete ones) afterwards anyway.
Change-Id: I6372bd48be9792e456899dc829226921990140c4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-09-23 20:29:04 +02:00
Oswald Buddenhagen
6ab23f16f5
keep information about default repos in .gitmodules
...
it's backwards to keep this in the script itself.
Change-Id: I4248ba3fef984bdff5d034cb2e6db6cae3209d68
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-09-23 20:29:02 +02:00
Oswald Buddenhagen
485f5f3776
don't pass around url unnecessarily
...
we now have everything we need to construct it on the fly.
Change-Id: I129e49bbcf46428d0fcef31ab8188df9d6a4026c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-09-23 20:29:01 +02:00
Oswald Buddenhagen
4553d9ec11
get submodule urls from .gitmodules
...
keeping a redundant copy in the script is plain backwards.
Change-Id: Ibdd1bab9d2cb5af7d7747d5caa2afc7d6e7571ad
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-09-23 20:28:59 +02:00
Oswald Buddenhagen
3ade7c4567
rewrite submodule exclusion logic
...
instead of doing multiple passes over the submodules, do everything in
one go.
as a bonus, as the internal structure uses exclusion entries in the
module list, we can make that feature user-accessible just as well.
Change-Id: I8bfb30c8051a9150f92e2e124ff52f64e3efe03c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-09-23 20:28:58 +02:00
Oswald Buddenhagen
93f173b3c5
nuke the --http option
...
it was a vestige from the times when the submodules had absolute urls
pointing at git://gitorious.org. as we now use relative urls, things
work just fine without that option.
Change-Id: I5e93ff8cd2497a27cfbdd53dbcf9db3cd0c4cd1d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-09-23 20:28:56 +02:00
Qt Submodule Update Bot
b2e577904b
Updated submodules.
...
Change-Id: I919c0332ff9f5ad1979de3105721c2ba5aacf634
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-09-23 15:10:43 +02:00
Qt Submodule Update Bot
919c0332ff
Updated submodules.
...
Change-Id: I1e275c54ea722d4f882cf329b65b749aa4d45fb2
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-09-15 17:09:26 +02:00
Qt Submodule Update Bot
869fce8a6b
Updated submodules.
...
Change-Id: Ie3a3e5d05bb46e1f80d1c83d4d3c564040a6ae14
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-09-12 20:16:37 +02:00
Qt Submodule Update Bot
1e275c54ea
Updated submodules.
...
Change-Id: I5fdb4490cb85b3470bdbd81de9dccbe6bcb96460
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-09-11 16:30:52 +02:00
Jocelyn Turcotte
1ae0689829
init-repository: Support cases where $submodule/.git is a file
...
Since git 1.7.8 the $GIT_DIR of the submodule can be a reference to the
super-module's $GIT_DIR/modules/<name>/
Test for existence instead of testing for a directory before attempting
a git clone there.
Change-Id: Ic539e770067da1417a2ad374c21253212473abe6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2014-09-10 18:24:13 +02:00
Qt Submodule Update Bot
5fdb4490cb
Updated submodules.
...
Change-Id: I74d7cf7e426ba4e1aa640ac986fbbe52d1e82897
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-09-07 16:17:49 +02:00
Qt Submodule Update Bot
74d7cf7e42
Updated submodules.
...
Change-Id: If16e291eea490110a9749b65fa4d21988376755a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-09-04 11:16:45 +02:00
Qt Submodule Update Bot
e3a3e5d05b
Updated submodules.
...
Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-09-02 20:36:04 +02:00
Qt Submodule Update Bot
f16e291eea
Updated submodules.
...
Change-Id: Iaa47c338f81e080e1fde4501e72ee48c9330e1be
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-09-02 20:34:14 +02:00
Qt Submodule Update Bot
aa47c338f8
Updated submodules.
...
Change-Id: I2159de889d951926d780041338d948f4a1281aa3
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-09-01 17:06:23 +02:00
Qt Submodule Update Bot
2159de889d
Updated submodules.
...
Change-Id: Ifefebb996cc9dcb2cc2b06f57315a4a679f96420
Reviewed-by: Andrew Knight <andrew.knight@digia.com >
2014-08-31 14:59:32 +02:00
Qt Submodule Update Bot
fefebb996c
Updated submodules.
...
Change-Id: I2c3556629bab77b013eabcf6535512e902837e40
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-08-30 05:11:09 +02:00
Jani Heikkinen
59c32b2db8
Updated license files in Qt5
...
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL
Change-Id: I49f5a4bf3481d6cd712301092f5f20a5dac470cf
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com >
Reviewed-by: Lars Knoll <lars.knoll@digia.com >
2014-08-30 05:10:46 +02:00
Frederik Gladhorn
22e5c8ce25
Add qtwebengine as submodule
...
qtwebkit is listed as an optional dependency for
qtwebengine to ensure that qtwebkit and qtwebengine
are not linked in parallel on the CI system.
Otherwise we could run out of memory.
Change-Id: Ib80d72407df03037c928d99f55c8e04e98e506d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com >
2014-08-29 14:28:35 +02:00
Bjoern Breitmeyer
d870bd65b0
Skip not supported modules on wince.
...
Change-Id: I6ac73c759453813718c6d96c7d6cb27bcbf9815b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
2014-08-28 08:34:39 +02:00
Qt Submodule Update Bot
2c3556629b
Updated submodules.
...
Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-08-27 20:33:00 +02:00
Frederik Gladhorn
64b0e38032
Add QtWayland to default checkout
...
QtWayland is going to be released with Qt 5.4.
Change-Id: I9a9bead92c6c34324510007ad844c9fdf633690d
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net >
2014-08-20 12:56:30 +02:00
Milian Wolff
be6de20889
Add QtWebChannel as optional dependency of QtWebKit.
...
This is required to prepare the merge of the integration patch.
The QtWebChannel and QtWebSockets lines in qt.pro are moved such
that they occur before their first use in QtWebKit.
Change-Id: Ie8137da57827776fe7b1434538df6b08108b0349
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com >
2014-08-15 09:03:39 +02:00
Jocelyn Turcotte
633051d095
init-repository: Support submodules more than one dir deep
...
Change-Id: I8783ded72032dda42bc24a855e190e0a2e699b01
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com >
2014-08-15 09:03:24 +02:00
Jocelyn Turcotte
ce45f45dfb
init-repository: Make sure that we update a submodule before we recurse
...
Unless we do so, doing git submodule init in a submodule would use the
currently checked out version of its .gitmodule instead of the one of
its pinned SHA1.
Change-Id: I88de421c8d24748dcaa5334c82da2aac4b12b2ad
Reviewed-by: Andras Becsi <andras.becsi@digia.com >
2014-08-15 09:03:16 +02:00
Jocelyn Turcotte
8801fd0258
Let init-repository build the mirror URL from the original URL
...
This allows repositories that have a different submodule name than their
URL file part to be using the mirror.
i.e. qtwebengine's src/3rdparty mapped to .../qt/qtwebengine-chromium.git
Change-Id: Ibea9cb9db701c95fc6f8b0e2457de74823aeeba5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2014-08-15 09:02:58 +02:00
Frederik Gladhorn
48cd6bb500
Build Wayland on Linux (except Android)
...
Change-Id: Ief1276f88837885637d0e60c90c4713bd12f6c85
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net >
2014-08-14 14:25:13 +02:00
Andras Becsi
ed9a5c8a62
initialize qtwebengine's chromium submodule after cloning it
...
Change-Id: I7e3ef09eb437f700c6fe010ce44a711118e8bd75
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com >
2014-08-12 16:03:32 +02:00
Frederik Gladhorn
9677483cdc
Add qtwebchannel as submodule
...
This also updates the qtwebsockets revision since
that's needed to compile.
Change-Id: I9f3564c78d08abdca73ce395f31b3031a829e502
Reviewed-by: Milian Wolff <milian.wolff@kdab.com >
2014-08-08 19:50:01 +02:00
Qt Submodule Update Bot
e073b25926
Updated submodules.
...
Change-Id: I6ccb1f47aa3f394d6e2e80ffcd0dada345d1fea1
Reviewed-by: Antti Kokko <antti.kokko@digia.com >
2014-08-08 07:48:56 +02:00
Qt Submodule Update Bot
6ccb1f47aa
Updated submodules.
...
Change-Id: I091f46c34c950237bdd5054367b5c26e4c291fad
Reviewed-by: Antti Kokko <antti.kokko@digia.com >
2014-08-01 07:44:21 +02:00
Qt Submodule Update Bot
091f46c34c
Updated submodules.
...
Change-Id: Iffab81d96aa4e91c14fe3ff888dd4323092a261e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-07-30 08:04:43 +02:00
Alex Blasche
f81391639e
Remove jsondb from qtpim dependency list
...
Change-Id: Icf05e7857b02db74c7309d796be7ef259cf83e37
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com >
2014-06-18 16:23:26 +02:00
Qt Submodule Update Bot
ffab81d96a
Updated submodules.
...
Change-Id: If4479c349b595d28e0dd4985259d7d1ed00bb966
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com >
2014-06-17 22:54:51 +02:00
Sergio Ahumada
892e391cb0
Updated submodules.
...
Change-Id: I000a16c22c4c3dc7d0e02aeb370454f386bb09f1
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com >
2014-06-04 09:56:56 +02:00
Sergio Ahumada
7368b4b1e3
Merge remote-tracking branch 'origin/stable' into dev
...
Change-Id: Ib1694808847f26576cc3c7780bd1c6d3689a8a26
2014-05-26 15:44:48 +02:00
Qt Submodule Update Bot
f4479c349b
Updated submodules.
...
Change-Id: I620dc10e25cac7386182a6ff272b904f5f9f1a0d
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-05-25 11:15:55 +02:00
Qt Submodule Update Bot
620dc10e25
Updated submodules.
...
Change-Id: I64f379141c59c193e3ebba5816495498c1ed0e64
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-05-21 06:51:08 +02:00
Oswald Buddenhagen
3fb8e1301a
don't claim that multimedia needs quick
...
it's a soft dependency and it appears to be properly checked in the
subprojects.
Task-number: QTBUG-38616
Change-Id: I5ada1f91247ba3668015e95d6da9c5996f1a138c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com >
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com >
2014-05-13 18:49:52 +02:00
Qt Submodule Update Bot
64f379141c
Updated submodules.
...
Change-Id: Ic9eb01ba38cca9c77a533f32d5f2f0519ec56aa3
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com >
2014-05-13 18:49:40 +02:00
Qt Submodule Update Bot
c9eb01ba38
Updated submodules.
...
Change-Id: I25acd00fedc81040b0b108120b21deedafcf7fa4
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com >
2014-05-04 13:24:01 +02:00
Qt Submodule Update Bot
25acd00fed
Updated submodules.
...
Change-Id: I055e2822456ad09cc939c628e4a86105eda5dade
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-04-26 19:55:35 +02:00
Qt Submodule Update Bot
055e282245
Updated submodules.
...
Change-Id: I56a5eee34a20e5de06ee8b430afa5c32ca6b94c6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-04-09 17:34:51 +02:00
Qt Submodule Update Bot
afd8acb9dc
Updated submodules.
...
Change-Id: I9b93bd0fa9b5011b27ab351ed143e6ada2ee643b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-04-09 07:07:13 +02:00
Qt Submodule Update Bot
56a5eee34a
Updated submodules.
...
Change-Id: I2c0f1cfb71d44eed5fb4eaacc93d931e46df9512
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-04-04 21:01:59 +02:00
Qt Submodule Update Bot
9b93bd0fa9
Updated submodules.
...
Change-Id: I2c06e806a22480919b27133b080281cad06ebf26
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com >
2014-04-04 10:53:08 +02:00
Qt Submodule Update Bot
2c0f1cfb71
Updated submodules.
...
Change-Id: I4fadcf5d88abca2ae886dd4483ca2838bfdbce19
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-04-03 07:14:33 +02:00
Alex Blasche
60f5070d97
Remove qt3d from qtlocation's dependency list
...
QtLocation no longer depends on Qt3D.
Change-Id: I0418dcc93a97722948bddcdd4f754914d7eaa019
Reviewed-by: Robin Burchell <robin+qt@viroteck.net >
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com >
2014-04-02 12:12:44 +02:00
Qt Submodule Update Bot
2c06e806a2
Updated submodules.
...
Change-Id: Ib2385231c40547a3d6de2acaad978a2f5700ed36
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-04-02 06:54:36 +02:00
Qt Submodule Update Bot
4fadcf5d88
Updated submodules.
...
Change-Id: Ifb66951776e8decb8784c80fb7ed02864253065b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-04-01 19:29:23 +02:00
Qt Submodule Update Bot
fb66951776
Updated submodules.
...
Change-Id: I55e55c405f6e950dcc623b1f7d7faa09bc8c950f
Reviewed-by: Antti Kokko <antti.kokko@digia.com >
2014-03-28 07:34:43 +01:00
Qt Submodule Update Bot
55e55c405f
Updated submodules.
...
Change-Id: I982ee75828244f44a1f27b4aa2d5a2a5dabbcd63
Reviewed-by: Antti Kokko <antti.kokko@digia.com >
2014-03-27 20:38:00 +01:00
Qt Submodule Update Bot
982ee75828
Updated submodules.
...
Change-Id: I06d2b3a720c1aa819e35ddd51c6cd5211d2748a6
Reviewed-by: Antti Kokko <antti.kokko@digia.com >
2014-03-26 07:43:18 +01:00
Qt Submodule Update Bot
06d2b3a720
Updated submodules.
...
Change-Id: Ib065abc7fd89c5766c5a060b295ea19154c02f64
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-03-22 12:56:43 +01:00
Sergio Ahumada
67400663f8
Add qtenginio#stable as part of the default modules
...
Also update qtenginio to the latest stable sha1.
Change-Id: Ia60a65c1a66a1b157240cc7ef519dc0c20d36567
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com >
2014-03-21 13:16:20 +01:00
Qt Submodule Update Bot
b065abc7fd
Updated submodules.
...
Change-Id: Ie045c5319823add1aeca81b2ca44ce913cac4f74
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-03-21 13:16:16 +01:00
Qt Submodule Update Bot
e045c53198
Updated submodules.
...
Change-Id: I6d47ef2b92d142bd2777a8c0d2abc4c758fbcb8b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-03-19 19:52:59 +01:00
Qt Submodule Update Bot
6d47ef2b92
Updated submodules.
...
Change-Id: I74af16bd0da5e2dc9e5b265d26e564201cc31b78
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-03-18 05:42:39 +01:00
Qt Submodule Update Bot
74af16bd0d
Updated submodules.
...
Change-Id: I556a3377ffb8348cdc2301b45c445c2f244ccf6a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-03-16 13:12:02 +01:00
Qt Submodule Update Bot
556a3377ff
Updated submodules.
...
Change-Id: I8ce1937883833b7e66453e3764e390d0dc44b925
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-03-15 14:00:16 +01:00
Qt Submodule Update Bot
8ce1937883
Updated submodules.
...
Change-Id: Ie198c124d3259dea657fcfa4c9b9b43bcd2d9fd0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-03-10 07:03:48 +01:00
Qt Submodule Update Bot
e198c124d3
Updated submodules.
...
Change-Id: I7704ce065db8050837d8bf97f8f4c1798b6d92fb
Reviewed-by: Antti Kokko <antti.kokko@digia.com >
2014-03-07 20:37:07 +01:00
Qt Submodule Update Bot
7704ce065d
Updated submodules.
...
Change-Id: I592415857ca8c6cbd2854dd9de0a573f29842161
Reviewed-by: Antti Kokko <antti.kokko@digia.com >
2014-03-06 18:47:48 +01:00
Qt Submodule Update Bot
592415857c
Updated submodules.
...
Change-Id: Ie169f588d85737831df044e2661484cb734b19eb
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com >
2014-03-05 18:36:01 +01:00
Qt Submodule Update Bot
e169f588d8
Updated submodules.
...
Change-Id: I6380ce86f1f835ca6d6398fef301fbfb9748137a
Reviewed-by: Antti Kokko <antti.kokko@digia.com >
2014-03-04 11:28:56 +01:00
Qt Submodule Update Bot
6380ce86f1
Updated submodules.
...
Change-Id: Ied6175da93a16e2733c2dcc266761ba91f225ada
Reviewed-by: Antti Kokko <antti.kokko@digia.com >
2014-03-03 14:50:47 +01:00
Oswald Buddenhagen
9372697001
automatically install hooks
...
Change-Id: I2fabc610dd69730cfdac45046d4bbc6f53822fc4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
2014-02-28 14:17:21 +01:00
Qt Submodule Update Bot
ed6175da93
Updated submodules.
...
Change-Id: I63200543dde700d6b0fd343800793adb6e180bad
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-02-28 07:07:01 +01:00
Qt Submodule Update Bot
63200543dd
Updated submodules.
...
Change-Id: I0a23321599c73357c6f724f204b480ba7311e51a
2014-02-26 07:33:29 +02:00
Oswald Buddenhagen
4e92039103
nuke qlalr submodule
...
it was merged back into qtbase.
Change-Id: Ia5e6252ac13b0f821807c825eea611d484c1dd7b
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com >
2014-02-22 18:22:38 +01:00
Qt Submodule Update Bot
0a23321599
Updated submodules.
...
Change-Id: Idc199e37d59beb8a4801a599dd5a0ff9ee2c23f8
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-02-21 07:16:40 +01:00
Oswald Buddenhagen
6b22ad702d
remove reviewed-by template
...
unlike previously thought, gerrit does not remove recognized reviewers
who did not actually make a review. so better not suggest adding
potentially misleading footers.
Change-Id: I92d2833ca8888a2c2c09dfacb0cff122cad1eb15
2014-02-20 12:21:07 +01:00
Oswald Buddenhagen
a3152cb8f1
Merge remote-tracking branch 'gerrit/dev' into stable
...
Change-Id: I7e15ecc9ce71063757677e5c8b07e3c0167c857c
2014-02-19 16:13:02 +01:00
Qt Submodule Update Bot
dc199e37d5
Updated submodules.
...
Change-Id: Ife236cc44c61eab39bec31a5ac9c0647934b03af
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-02-17 20:44:41 +01:00
Frederik Gladhorn
a7dc6fd595
Add qtwebsockets as submodule
...
This just adds the module, it doesn't yet make it part of Qt 5.3
or anything like that
Change-Id: Icd42c4d2366e31298758a6ef82924bfb64a9f814
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
Reviewed-by: Lars Knoll <lars.knoll@digia.com >
2014-02-17 06:32:17 +01:00
Qt Submodule Update Bot
fe236cc44c
Updated submodules.
...
Change-Id: I7befa702530b486531fbbc2ef7ed4d3195e2ad54
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-02-16 08:11:37 +01:00
Qt Submodule Update Bot
b2385231c4
Updated submodules.
...
Change-Id: Iae9c68d190f22ef0e32546c7a3f513e9175ef3fc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-02-15 17:13:03 +01:00
Qt Submodule Update Bot
7befa70253
Updated submodules.
...
Change-Id: I805c735b027c237245a0083a1d827bb9f64c21ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-02-15 17:12:38 +01:00
Qt Submodule Update Bot
805c735b02
Updated submodules.
...
Change-Id: Ib25883ebaafe1b86077d77d5598355d1f9320a5a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-02-13 10:31:05 +01:00
Qt Submodule Update Bot
ae9c68d190
Updated submodules.
...
Change-Id: I3b525e1235e9ec27db475fac6086a884297d1634
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-02-10 14:03:43 +01:00
Friedemann Kleint
ef51fe0ebb
Merge "Merge branch 'stable' into dev" into refs/staging/dev
2014-02-06 08:46:01 +01:00
Qt Submodule Update Bot
3b525e1235
Updated submodules.
...
Change-Id: If37564a74908846d69141b95c7edd938f4fc2379
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-02-05 12:46:41 +01:00
Frederik Gladhorn
76e16b228e
Merge branch 'stable' into dev
...
Conflicts:
qtactiveqt
qtandroidextras
qtbase
qtconnectivity
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtwinextras
qtx11extras
qtxmlpatterns
Change-Id: I404135b8463e4cdfc6a235f8c2203ea8ddfa3df5
2014-01-29 13:52:49 +01:00
Oswald Buddenhagen
604f330cd2
don't unnecessarily confuse qt creator
...
our CONFIG+=build_pass hack has the side effect that qmake does not emit
the calling command line to the makefile, which makes creator unable to
detect the build. so revert the hack as soon as it did its deed.
Task-number: QTBUG-34788
Change-Id: I4c0fd28d661ca5049f31d5405e84525efb12fd4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
2014-01-23 07:18:25 +01:00
Qt Submodule Update Bot
b25883ebaa
Updated submodules.
...
Change-Id: Ia968d5d5314ac04835e90be462b1a71f8ab293e9
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com >
2014-01-20 18:37:41 +01:00
Qt Submodule Update Bot
a968d5d531
Updated submodules.
...
Change-Id: I5fd794ca6d89ea5787cb1b7d2dcabc6f7b75776a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-01-20 12:43:47 +01:00
Qt Submodule Update Bot
5fd794ca6d
Updated submodules.
...
Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-01-17 09:37:44 +01:00
Alex Blasche
4b256e249b
Add QtAndroidExtras to dependency list of QtConnectivity
...
We only need it for Android builds though.
Change-Id: I760dfd6038da2d4061326dd361ac517c9e674239
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
Reviewed-by: Alex Blasche <alexander.blasche@digia.com >
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
2014-01-14 14:19:38 +01:00
Qt Submodule Update Bot
f37564a749
Updated submodules.
...
Change-Id: Ibaac9b5129cd252d65ce5896bac05e96abe6859c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-01-11 11:59:15 +01:00
Qt Submodule Update Bot
c8d3a71d7c
Updated submodules.
...
Change-Id: I402457bcfbad53c6dd2214290c668ece693bbdcd
Reviewed-by: Matti Paaso <matti.paaso@digia.com >
2014-01-10 08:49:02 +01:00
Qt Submodule Update Bot
402457bcfb
Updated submodules.
...
Change-Id: I06d0fa240f6a0f99770e51969543608dbaf5f7e0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-01-09 18:00:53 +01:00
Qt Submodule Update Bot
baac9b5129
Updated submodules.
...
Change-Id: If7b7ff4f9fdd710ef78a953113e87393597e3e80
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2014-01-09 07:52:59 +01:00
Qt Submodule Update Bot
06d0fa240f
Updated submodules.
...
Change-Id: Ia250914fecb288f82db6a7b53e70d433898eb2f4
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2014-01-02 08:10:02 +01:00
Qt Submodule Update Bot
a250914fec
Updated submodules.
...
Change-Id: Iec0c8697aa573d7bdec000ab2e6fb0729c0793bc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2013-12-20 06:41:46 +01:00
Qt Submodule Update Bot
f7b7ff4f9f
Updated submodules.
...
Change-Id: Id00002337613fa6681aed81193565ed7a5a4e472
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com >
2013-12-16 12:41:55 +01:00
Qt Submodule Update Bot
ec0c8697aa
Updated submodules.
...
Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2013-12-16 11:26:06 +01:00
Oswald Buddenhagen
dbac1e77f7
try to make the ChangeLog template more inviting
...
move it even futher up and encourage integrating it into the rest of the
commit message.
Change-Id: I5aaa417a58d420c3d3a8d5ca80dcd9f265c64829
Reviewed-by: Sergio Ahumada <sahumada@gmail.com >
Reviewed-by: Marc Mutz <marc.mutz@kdab.com >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com >
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
2013-11-30 15:24:54 +01:00
Qt Submodule Update Bot
7c73e564bd
Updated submodules.
...
Change-Id: I749bc264b23ead54af325301479320766afce090
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2013-11-10 17:10:04 +01:00
Qt Submodule Update Bot
749bc264b2
Updated submodules.
...
Change-Id: I234dcbfcba1e934b05ed0da921f69700ca480ddf
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2013-11-06 12:19:01 +01:00
Qt Submodule Update Bot
234dcbfcba
Updated submodules.
...
Change-Id: Ib742f171c913b182d699270890599e3628d5df10
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2013-11-05 13:05:12 +01:00
Qt Submodule Update Bot
b742f171c9
Updated submodules.
...
Change-Id: Ibabbfd7ae348a5b96999eb09820c1abe7094bcf6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2013-11-04 21:57:31 +01:00
Qt Submodule Update Bot
babbfd7ae3
Updated submodules.
...
Change-Id: I5987a236d059243d05d411cdc9f0193448a006ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2013-11-04 08:13:47 +01:00
Frederik Gladhorn
cf08b0d109
Add qtenginio as submodule
...
Change-Id: Ida65ce0162fa65c37413ce6716eb6382e1593338
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2013-11-01 13:38:03 +01:00
Qt Submodule Update Bot
5987a236d0
Updated submodules.
...
Change-Id: I08e6aa58fbddc3b18407593ef1fd6886b20370a0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2013-11-01 07:32:42 +01:00
Qt Submodule Update Bot
08e6aa58fb
Updated submodules.
...
Change-Id: I8b4022260b5b1d1016979086d0fe7eeba44f8883
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-10-31 20:00:22 +01:00
Qt Submodule Update Bot
8b4022260b
Updated submodules.
...
Change-Id: Ic1160960655acf260a4ab47d9caea3b271a09bf6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
2013-10-31 11:03:11 +01:00
Allan Sandfeld Jensen
758d922716
Refine qt-module dependencies for massively parallel builds
...
QtWebKit should be build after QtMultimedia for multimedia support on Mac
and Windows.
QtScript should be build after QtTools because an example uses UiTools.
Change-Id: Id92efac72d8c2c2237f21fad1ab823c1c1ac95dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2013-10-24 18:48:58 +02:00
Qt Submodule Update Bot
c116096065
Updated submodules.
...
Change-Id: I7e2e8cad6636584f1d3fc9d213363e5fc6243ef2
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com >
2013-10-22 05:27:19 +02:00
Qt Submodule Update Bot
7e2e8cad66
Updated submodules.
...
Change-Id: Icb2d850b479fed9fed3c4a9fea698f924be942ef
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-10-16 18:38:03 +02:00
Sergio Ahumada
4c925babf9
Merge "Merge branch 'stable' into dev" into refs/staging/dev
2013-10-16 12:39:27 +02:00
Qt Submodule Update Bot
cb2d850b47
Updated submodules.
...
Change-Id: If9a5d1941655bd5cceaa7ded5893fea3206c5bea
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-10-15 21:01:19 +02:00
Qt Submodule Update Bot
d000023376
Updated submodules.
...
Change-Id: I1aa3ccbc4c789fb0ef265f88c9062b8bc591c449
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-10-15 20:33:49 +02:00
Sergio Ahumada
38b7c75f6b
Merge branch 'stable' into dev
...
Change-Id: I25b06e3ed27caab7b80c4e47a7e836559397c3c8
2013-10-15 12:13:50 +02:00
Qt Submodule Update Bot
1aa3ccbc4c
Updated submodules.
...
Change-Id: I270009dfde0be0080902b6ea6a220ccf4095cb0e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-10-14 17:52:01 +02:00
Qt Submodule Update Bot
f9a5d19416
Updated submodules.
...
Change-Id: I7f523a7aa3a00d2190cbe7ca4c52a9a30cb67ea0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2013-10-12 23:23:49 +02:00
Mandeep Sandhu
728cd2e173
Ignore auto-generated file .qmake.super
...
Added rule in .gitignore for .qmake.super.
This file is generated when building Qt from the root dir.
Task-number: QTBUG-33439
Change-Id: Ic15b10e9c7cb175f2ff102f75d08110acf13a0cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2013-10-08 15:45:02 +02:00
Oswald Buddenhagen
f09783bb80
move changelog entry before the real footers
...
the change-id will be added at the end, which will look just plain
stupid if the other "real" footers come above the changelog.
also, a smart log author would integrate the changelog entry into the
flow of the message, so further up in the template is more natural.
Change-Id: I053840a81ea62f2e0ad1bd133f2e7a2692a6f2d6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com >
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
2013-10-08 15:44:55 +02:00
Sergio Ahumada
bc6bcaa323
qt.pro: Fix dependencies for qtconnectivity
...
Remove the hard dependency on qtsystems and changing it
with a hard dependency on qtbase and a optional dependency
on qtdeclarative instead.
Change-Id: I96a4d3b38df588489e5ff4a704ea1e4fcbdb620c
Reviewed-by: Alex Blasche <alexander.blasche@digia.com >
2013-10-08 15:44:50 +02:00
Qt Submodule Update Bot
7f523a7aa3
Updated submodules.
...
Change-Id: Ie937791dcbe07d65728ab2cea1d590ab1eec8922
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-10-08 10:50:26 +02:00
J-P Nurmi
bf0bfeb991
Mark qtmultimedia as an optional dependency for qtwinextras
...
The QtWinExtras Music Player example uses QtMultimedia.
Change-Id: Ib720710a8563d6bfa39aec8b82e9a87517b7e015
Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com >
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-10-08 10:48:23 +02:00
Qt Submodule Update Bot
e937791dcb
Updated submodules.
...
Change-Id: I2f20faa052b66b7e85802368cd42447f09d8e321
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-10-07 09:03:53 +02:00
Sergio Ahumada
0d22f2d30d
Add new qtandroidextras repository
...
Also adding it as part of the default modules.
Change-Id: I899ba6eec9ba6ab7103ecc6dba5245da16e01a32
Reviewed-by: Christian Stromme <christian.stromme@digia.com >
2013-09-27 12:53:47 +02:00
Sergio Ahumada
f3636c9757
Add qtmacextras#stable as part of the default modules
...
Also updating the sha1 to the latest one that has passed
the CI already.
Change-Id: I88d803a738be59c377ef4c2315a855d2675331d4
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com >
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com >
2013-09-27 12:53:41 +02:00
Qt Submodule Update Bot
2f20faa052
Updated submodules.
...
Change-Id: Ie39f4e8b4be5da3d549c740ba396576bff7f952d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-09-26 08:00:01 +02:00
Sergio Ahumada
433e143b23
Merge branch 'dev' into stable
...
Conflicts:
qtjsbackend
2013-09-23 12:24:59 +02:00
Sergio Ahumada
acd97fec50
Updated submodules.
...
Change-Id: Iaaf1ec8b87ff1558d0cd5025bd4faf39a1b21e77
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-09-20 22:44:49 +02:00
Sergio Ahumada
2bcd8e1a9f
Add qtlocation#dev as part of the default modules
...
Change-Id: I6f684aa4b3a1fbefbaa89d8452035d9e93cd2b04
Reviewed-by: Alex Blasche <alexander.blasche@digia.com >
2013-09-20 08:40:57 +02:00
Sergio Ahumada
23101c9dd5
Updated qtlocation submodule
...
Change-Id: I40d980381231ed8a5103200b82570f284915e121
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-09-19 16:06:33 +02:00
Qt Submodule Update Bot
e39f4e8b4b
Updated submodules.
...
Change-Id: I770893c71b179aa87c1bf2d83318ba62c8c2aa96
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-09-16 18:34:26 +02:00
Qt Submodule Update Bot
270009dfde
Updated submodules.
...
Change-Id: I3840892d83b4c825c0a19a4326f5f392a2352585
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-09-13 12:44:52 +02:00
Sergio Ahumada
f3ee66d9b2
Merge "Merge branch 'stable' into dev" into refs/staging/dev
2013-09-12 09:02:30 +02:00
Qt Submodule Update Bot
3840892d83
Updated submodules.
...
Change-Id: Iea9702923e86fc3decadbc831e31b349bd40ac44
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-09-12 08:25:26 +02:00
Sergio Ahumada
4072c25a70
Merge branch 'stable' into dev
...
Conflicts:
qt.pro
Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82
2013-09-11 13:31:41 +02:00
Qt Submodule Update Bot
ea9702923e
Updated submodules.
...
Change-Id: I70c2051332bb3404f4a63ec3ddc16e22bde13bd9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-09-10 20:35:21 +02:00
Sergio Ahumada
96bd21c4c4
Add qtconnectivity#dev as part of the default modules
...
Change-Id: I5c3885e411a1e097da7aa161ef678d85fc606191
Reviewed-by: Alex Blasche <alexander.blasche@digia.com >
2013-09-10 20:11:42 +02:00
Qt Submodule Update Bot
70c2051332
Updated submodules.
...
Change-Id: I85d30ddaa31fc6067d5741286c056981eec1a7e3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-09-09 12:33:41 +02:00
Qt Submodule Update Bot
85d30ddaa3
Updated submodules.
...
Change-Id: I6ca2fbea871d34e2dcd8f616599c34da7fe6f8dc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-09-06 13:30:53 +02:00
Qt Submodule Update Bot
770893c71b
Updated submodules.
...
Change-Id: Idd9853b3cb6c7f8d1f015b82a06283b3942bf9bf
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-08-31 09:31:33 +02:00
Sergio Ahumada
c0594e303e
Add qtwinextras#dev as part of the default modules
...
Change-Id: Ic0f6d569576186abdf4f81f3b2f19d6805cba579
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
2013-08-29 17:24:09 +02:00
Qt Submodule Update Bot
6ca2fbea87
Updated submodules.
...
Change-Id: Ib6faaac71302be0c47b9904be5481c4b281e9008
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-08-29 17:24:04 +02:00
Frederik Gladhorn
33b6b2677e
Add ChangeLog template.
...
Change-Id: Ic0dfc0180634b630ac1359298f3d251b3d23e0a7
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
Reviewed-by: Richard J. Moore <rich@kde.org >
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
2013-08-26 08:52:03 +02:00
Qt Submodule Update Bot
b6faaac713
Updated submodules.
...
Change-Id: Ifb2020a44f9cddd7b969e038c611bf7cbadfeac8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2013-08-21 20:39:31 +02:00
Alex Blasche
941dd92e5b
Add --oslo option to init-repository
...
Oslo devs can use a local git mirror.
Change-Id: Id6f919ff65ddf0c0b5839316014f51d2293008fd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
Reviewed-by: Alex Blasche <alexander.blasche@digia.com >
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
2013-08-21 09:42:07 +02:00
Alex Blasche
824cfe84a8
Cleanup of init-repository
...
Removes old Nokia URLs and options associated with Nokia infrastructure
Change-Id: Id5a28d7ed14fe069ceff6afbe372aa69dda80475
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
Reviewed-by: Alex Blasche <alexander.blasche@digia.com >
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2013-08-20 08:37:04 +02:00
Oswald Buddenhagen
e8816c8ef4
purge qtjsbackend
...
Change-Id: Ic761324c7b7afdfd509bea1db0d75ba259f8fb94
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-08-17 00:50:29 +02:00
Qt Submodule Update Bot
fb2020a44f
Updated submodules.
...
Change-Id: Ie3de6338ce0362c3d85ebb06e7b304521b27a1bd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2013-08-15 22:59:54 +02:00
Qt Submodule Update Bot
e3de6338ce
Updated submodules.
...
Change-Id: Iad241de71b1302fedbe37c20fad2da71632ec46f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-08-13 14:27:57 +02:00
Simon Hausmann
2ede7f403a
Remove qtjsbackend as dependency for qtdeclarative
...
This is the first step. The next step is to remove it from qtdeclarative's
sync.profile after this integrates.
Change-Id: Ice1424f3d01d8eb4082200900498bbb19392492b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2013-08-13 02:52:05 +02:00
Qt Submodule Update Bot
ad241de71b
Updated submodules.
...
Change-Id: I51c0a11ff3a3914cac1baf2a4fa6ef826089860f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-08-12 20:49:57 +02:00
Qt Submodule Update Bot
dd9853b3cb
Updated submodules.
...
Change-Id: I35fe76d9c343f98ec55c7cacd8c402e90d91ef38
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-08-07 10:33:43 +02:00
Nico Vertriest
a145dba334
Doc: specified how to install documentation
...
Added command "make install_docs"
Task-number: QTBUG-32212
Change-Id: Ic5bfd76bf7233565616b8c248ce3ccdeb05f8803
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com >
Reviewed-by: Martin Smith <martin.smith@digia.com >
2013-08-06 13:26:59 +02:00
J-P Nurmi
94eef4e5f7
qtwinextras: add qtdeclarative as an optional dependency
...
qtwinextras contains optional QML types, so qtdeclarative must
be listed as an optional dependency to avoid build breaks.
Change-Id: I7d7f3bfca73c6599699a1da9c8795e6ac9ca4a74
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2013-08-04 18:45:19 +02:00
Qt Submodule Update Bot
35fe76d9c3
Updated submodules.
...
Change-Id: I23c300afd1395538d8702d0f188ca7031fbcf9d6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2013-07-30 06:43:51 +02:00
Qt Submodule Update Bot
51c0a11ff3
Updated submodules.
...
Change-Id: Id06469a62635d263631c308ffa2d16a794a6b75f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2013-07-29 13:03:17 +02:00
Qt Submodule Update Bot
d06469a626
Updated submodules.
...
Change-Id: I292fa5832ffb6890479a220ee07c7020f313537c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2013-07-24 17:26:16 +02:00
Qt Submodule Update Bot
292fa5832f
Updated submodules.
...
Change-Id: If5e182de18267e8d54919b7e20d650582ff3f467
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2013-07-24 06:13:55 +02:00
Qt Submodule Update Bot
23c300afd1
Updated submodules.
...
Change-Id: I6d1d35416f07bb6dc4e4a43296ff5028e96495a3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-23 10:32:41 +02:00
Qt Submodule Update Bot
6d1d35416f
Updated submodules.
...
Change-Id: I6493c3d8137a4659814949f96465d374dbad1781
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-21 10:54:29 +02:00
Qt Submodule Update Bot
f5e182de18
Updated submodules.
...
Change-Id: I0927a9a0f8b0cedac8027eec865d3e2118078054
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-21 01:32:35 +02:00
Qt Submodule Update Bot
6493c3d813
Updated submodules.
...
Change-Id: I7b8a659ecc931702210ad0b10afa8b283f758632
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-20 18:39:58 +02:00
Qt Submodule Update Bot
7b8a659ecc
Updated submodules.
...
Change-Id: Ic3532a18c95b80d06c1e7d7875698ffc8b816140
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-20 09:46:23 +02:00
Qt Submodule Update Bot
0927a9a0f8
Updated submodules.
...
Change-Id: If350c3bb5172d5de13a162e9e5ba2720eb890c14
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-19 13:55:07 +02:00
Qt Submodule Update Bot
c3532a18c9
Updated submodules.
...
Change-Id: Ic57a761615178f0337f1609653798e268c1b7df1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-18 12:23:14 +02:00
Qt Submodule Update Bot
c57a761615
Updated submodules.
...
Change-Id: I8c4e0a4a952655b623dbff0ddf1a75d4a1d772f2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-17 15:12:10 +02:00
Qt Submodule Update Bot
f350c3bb51
Updated submodules.
...
Change-Id: Ia289ec8a0390ff4c0b957cd7f4d7c8cd726e2d1d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-14 11:08:56 +02:00
Sergio Ahumada
33aa233ae4
Merge "Merge branch 'stable' into dev" into refs/staging/dev
2013-07-14 11:07:55 +02:00
Qt Submodule Update Bot
8c4e0a4a95
Updated submodules.
...
Change-Id: I0b24bc3851237425f0738df422a20ade09095681
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-13 11:41:49 +02:00
Qt Submodule Update Bot
a289ec8a03
Updated submodules.
...
Change-Id: Ie9b62c8c6914428014c30be7e3cf0889372ee0b6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-13 00:19:56 +02:00
Qt Submodule Update Bot
0b24bc3851
Updated submodules.
...
Change-Id: Ie16cdebb775c1a7c3f35f7ea68e017c38ce3fd36
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-11 18:39:47 +02:00
Sergio Ahumada
6a0f795172
Merge branch 'stable' into dev
...
Conflicts:
qtactiveqt
qtbase
qtdeclarative
qtdoc
qtgraphicaleffects
qtjsbackend
qtmultimedia
qtquick1
qtquickcontrols
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtxmlpatterns
Change-Id: I5ca751a71375fba0c154db187e89bac6f3fa7ad1
2013-07-11 13:29:44 +02:00
Qt Submodule Update Bot
e16cdebb77
Updated submodules.
...
Change-Id: I8e11fdb9392d8fcff7b1b1b2673891ea77d6cf0e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-11 00:48:20 +02:00
Qt Submodule Update Bot
8e11fdb939
Updated submodules.
...
Change-Id: I9b68559f3cc82db32e93d4040fa2b17f8315397b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-10 18:34:53 +02:00
Oswald Buddenhagen
ef8000991e
leave makefile generation to the real configure
...
call it with the "secret" -top-level option, which shifts the makefile
generation one level up.
this makes the configure call the last thing we do, thus also avoiding
the problems we had with the -help switch (and the previous attempts at
fixing it).
Change-Id: I80ba4a09b260a140a9d1b976277c30fd1436b4d6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
2013-07-10 06:30:46 +02:00
Qt Submodule Update Bot
9b68559f3c
Updated submodules.
...
Change-Id: I20ecf7efa58302efc96b80a1da136a19e4946f4b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-09 04:46:44 +02:00
Qt Submodule Update Bot
20ecf7efa5
Updated submodules.
...
Change-Id: I5ae49dac5a57f3a691713781a7f5390a44d6c8ec
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-05 21:43:37 +02:00
Qt Submodule Update Bot
5ae49dac5a
Updated submodules.
...
Change-Id: I0e9f726baf60c4af7caa2ef403f087cb915b420b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-07-02 15:19:05 +02:00
Qt Submodule Update Bot
0e9f726baf
Updated submodules.
...
Change-Id: Ie9b62c8c6914428014c30be7e3cf0889372ee0b6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-29 16:25:54 +02:00
Sergio Ahumada
d060acfac5
Add qtmacextras and qtwinextras to qt5.git#stable
...
Change-Id: I440e8ad733feaadb07e74fb91342434f66bae160
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2013-06-26 05:48:00 +02:00
Sergio Ahumada
f3d6fe82ab
Merge branch 'stable' into dev
...
Conflicts:
qtactiveqt
qtbase
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
qtjsbackend
qtmultimedia
qtquick1
qtquickcontrols
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtx11extras
qtxmlpatterns
Change-Id: Ie3f5321de50ec76a7b3f5a0e2d2be1835abce527
2013-06-24 18:34:14 +02:00
Sergio Ahumada
76e3f3d2a6
Merge branch 'release' into stable
...
Conflicts:
qtbase
qtdeclarative
qtmultimedia
qtquick1
qtquickcontrols
qtsensors
qttools
Change-Id: I7b101efc32108484a4237b2fbf9908c9b92fa267
2013-06-24 08:40:03 +02:00
Sergio Ahumada
16e4fb6c98
configure: Fix srcpath when you run configure in the top-level dir
...
Using the absolute path to configure, otherwise you get:
[user@locahost qt5]$ ./configure -minimal
+ cd qtbase
+ ./qtbase/configure -minimal
./configure: line 58: ./qtbase/configure: No such file or directory
Change-Id: Ic7568cc571aaa52c56bcd28fa1b6bde8abb32c8e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2013-06-23 23:48:51 +02:00
Frederik Gladhorn
a3dd3624f9
Merge "Merge branch 'release' into stable" into refs/staging/stable
2013-06-23 14:17:44 +02:00
Qt Submodule Update Bot
e9b62c8c69
Updated submodules.
...
Change-Id: I375328584b6361cd9f364be05b29afa5f33ac318
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-22 22:17:17 +02:00
Qt Submodule Update Bot
66b6d8fc7d
Updated submodules.
...
Change-Id: I6670595185ea486237fe71c156e081ffe8bb40cc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-22 19:24:07 +02:00
Qt Submodule Update Bot
df0a7fd6dc
Updated submodules.
...
Change-Id: I7124fb036a5cdbc24eb8f818493deb2d13d1fe2d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-22 09:46:43 +02:00
Joerg Bornemann
8732a4c5cd
fix Berlin's mirror URL
...
Change-Id: Id3aaaa943370bece428a37dd8a1d89034fadeffd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
Reviewed-by: Liang Qi <liang.qi@digia.com >
2013-06-21 23:25:09 +02:00
Qt Submodule Update Bot
7124fb036a
Updated submodules.
...
Change-Id: If828e05a91be62763bb1872ba828f71012c96b06
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-21 20:34:56 +02:00
Qt Submodule Update Bot
6670595185
Updated submodules.
...
Change-Id: I6a60f386b899ec6a55dd780c40fa03f2738778de
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-21 17:33:02 +02:00
Alex Blasche
28460e497c
Remove JsonDB from QtSystems and QtLocation dependency list
...
There is no optional jsondb build anymore
Change-Id: I902464dec14555794e80dde9eb81ca2dad2baeda
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2013-06-21 07:56:06 +02:00
Sergio Ahumada
89e3b0deae
Merge branch 'release' into stable
...
Conflicts:
qtactiveqt
qtbase
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
qtjsbackend
qtmultimedia
qtquick1
qtquickcontrols
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtx11extras
qtxmlpatterns
Change-Id: I3abc0b033809366c993b0c358575e120c4f5953b
2013-06-20 22:53:54 +02:00
Oswald Buddenhagen
8c2518eea4
rewrite top-level configures without perl
...
otherwise the whole no-syncqt-and-thus-perl-needed stunt in qtbase would
be fairly useless for top-level builds.
Task-number: QTBUG-31786
Change-Id: I9f9b38091155a2d50ffec169267e0363fc24d3c0
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com >
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
Reviewed-by: Lars Knoll <lars.knoll@digia.com >
2013-06-20 14:58:18 +02:00
Sergio Ahumada
23a639d4cc
Don't include README.git in source packages
...
It doesn't make sense for non-git content anyways.
Change-Id: I9064de54657ab50caa526dab2830ee0d16054a9e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com >
2013-06-18 12:57:06 +02:00
Qt Submodule Update Bot
6a60f386b8
Updated submodules.
...
Change-Id: I511255ebfd7e046391e4b3f03f06f7ba84597cdb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-17 20:38:19 +02:00
Qt Submodule Update Bot
375328584b
Updated submodules.
...
Change-Id: I35350e9779e2cc0507d1e1dd749ce2d22d011205
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-17 16:25:13 +02:00
Sergio Ahumada
7661124ff1
Update LICENSE.PREVIEW.COMMERCIAL license
...
Change-Id: I2df37576f2bfda58d571e707c8b05c630848b769
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com >
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com >
2013-06-17 09:25:48 +02:00
Qt Submodule Update Bot
f828e05a91
Updated submodules.
...
Change-Id: I3a55bb51ac59f7e66b8a75f574e494a8da0a2754
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-16 20:33:57 +02:00
Qt Submodule Update Bot
35350e9779
Updated submodules.
...
Change-Id: I111d8165f6f30a93014fa8a5d34d0171df3eb286
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-16 15:22:59 +02:00
Sergio Ahumada
80d90b4862
Updated submodules.
...
Change-Id: If458a1b0946562ac8fea9f863a09862bba15527c
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com >
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-15 06:22:11 +02:00
Qt Submodule Update Bot
511255ebfd
Updated submodules.
...
Change-Id: I188bb452fd59f6c0b4be329fd82f88f603daae0f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-14 10:33:28 +02:00
Qt Submodule Update Bot
111d8165f6
Updated submodules.
...
Change-Id: I3918311aeb73f39e267beb8dd377c5822ae93536
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-13 07:44:22 +02:00
Qt Submodule Update Bot
188bb452fd
Updated submodules.
...
Change-Id: I3a770f5d4569edf4056b883d6533a7f4584b0ae1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-11 10:33:08 +02:00
Qt Submodule Update Bot
3918311aeb
Updated submodules.
...
Change-Id: I6a19225d751896cb5748cd20084a93bc62340cb8
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-11 05:45:22 +02:00
Qt Submodule Update Bot
6a19225d75
Updated submodules.
...
Change-Id: If1d7bdd44443aaf5b60a61667d84adf6df98aaf5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-09 08:48:03 +02:00
Qt Submodule Update Bot
f1d7bdd444
Updated submodules.
...
Change-Id: I7d1e12cc1e24ab3e4b2de27b8974071691a7d7a1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-08 02:21:57 +02:00
Qt Submodule Update Bot
7d1e12cc1e
Updated submodules.
...
Change-Id: Icfdf021c18de12f80907bbd366ae1e03a362c61c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-06 21:32:55 +02:00
Qt Submodule Update Bot
cfdf021c18
Updated submodules.
...
Change-Id: I641bab7bdec259a9aed5be4d5f643828254e1ac4
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com >
2013-06-05 17:04:46 +02:00
Qt Submodule Update Bot
641bab7bde
Updated submodules.
...
Change-Id: Ia11c7ef6709a97ea1352d2f3c10512da31700a2e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-04 08:56:06 +02:00
Qt Submodule Update Bot
3a770f5d45
Updated submodules.
...
Change-Id: I049006602743ca4903ee71ab20c6f69639fb6ae1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-06-01 12:39:19 +02:00
Qt Submodule Update Bot
0490066027
Updated submodules.
...
Change-Id: I3b9d57e4133feb47d847b928cfe54e2e15f1a186
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-31 22:30:32 +02:00
Qt Submodule Update Bot
a11c7ef670
Updated submodules.
...
Change-Id: Iad91faa3bdb0faa8c2d5b23b00addaf6af01989d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-31 13:11:06 +02:00
Qt Submodule Update Bot
3b9d57e413
Updated submodules.
...
Change-Id: I90ca6825c475bd22822edb3e95f78dcc5504038e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-31 11:48:44 +02:00
Sergio Ahumada
ecd64f626d
Add license files mandated by (L)GPL.
...
Change-Id: Id7a20353887bf50b7e39d5797fbaf31d2663921d
Reviewed-by: Janne Anttila <janne.anttila@digia.com >
2013-05-30 22:32:43 +02:00
Sergio Ahumada
f62ba0352b
Updated submodules.
...
This manually updates
qt3d
qtconnectivity
qtdocgallery
qtfeedback
qtjsondb
qtpim
qtsystems
Change-Id: I9e496ae3c108aa11bb9806d925200e0c5beac16b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
2013-05-29 14:29:39 +02:00
Qt Submodule Update Bot
ad91faa3bd
Updated submodules.
...
Change-Id: I292a7a74309c378c8164dba7de4264fe4ad341de
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-29 13:01:57 +02:00
David Faure
c28bacd49f
Update submodule qtlocation, to fix compilation error
...
(module version wasn't set)
Change-Id: I16ce30bf97b8e3e6613ac73fe0f3d5e7d8358ca7
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-28 15:44:39 +02:00
Sergio Ahumada
a0267228f9
Updated submodules.
...
Change-Id: If89dd01d1987cdbf3de9927227d7345f2a43bdf5
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com >
2013-05-28 13:30:54 +02:00
Qt Submodule Update Bot
90ca6825c4
Updated submodules.
...
Change-Id: I4fcad903b132fa253bbc202463d99fceae64b220
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-28 08:28:39 +02:00
Qt Submodule Update Bot
3a55bb51ac
Updated submodules.
...
Change-Id: If9fc16a5b48771a056b8156e6ebeb5a17ac09a45
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-27 20:45:03 +02:00
Qt Submodule Update Bot
4fcad903b1
Updated submodules.
...
Change-Id: I7627c87948ff36902852a491177bd6ce9a9c6875
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-27 14:19:02 +02:00
Qt Submodule Update Bot
7627c87948
Updated submodules.
...
Change-Id: I7e979b67af985dcd16b12199d3b8d29a6a0f5438
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-27 09:24:29 +02:00
Qt Submodule Update Bot
f9fc16a5b4
Updated submodules.
...
Change-Id: Ifbd69b7602a9b8fd114d9c20583adc47fad27124
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-27 09:24:15 +02:00
Qt Submodule Update Bot
fbd69b7602
Updated submodules.
...
Change-Id: Ib25fcb31a7e0b315ea7090e2d4c45fd684313439
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-26 19:48:54 +02:00
Qt Submodule Update Bot
7e979b67af
Updated submodules.
...
Change-Id: I47fb446cbe5c8d85fbe29168adddd80abdc4963f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-26 18:34:30 +02:00
Qt Submodule Update Bot
47fb446cbe
Updated submodules.
...
Change-Id: Ieafc5686a62071ab835129ba97860ae13979758f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-26 06:07:56 +02:00
Sergio Ahumada
da69011610
Updated submodules.
...
Change-Id: I80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2013-05-25 20:22:21 +02:00
Qt Submodule Update Bot
eafc5686a6
Updated submodules.
...
Change-Id: I7473ab6b3c111bbbce8a53420ee196b614850dc2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-25 02:33:37 +02:00
Qt Submodule Update Bot
7473ab6b3c
Updated submodules.
...
Change-Id: I123cf8b2cb48921ac0eb73786efc1ddc3a7b4826
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-24 21:17:11 +02:00
Qt Submodule Update Bot
123cf8b2cb
Updated submodules.
...
Change-Id: Ibbc5dca735c3651ea01e6fd860348a2ad841ae1a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-24 16:28:01 +02:00
Qt Submodule Update Bot
bbc5dca735
Updated submodules.
...
Change-Id: Ibb9e60870c825fa336e1816f2402d72df4efabaa
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-24 11:28:06 +02:00
Qt Submodule Update Bot
bb9e60870c
Updated submodules.
...
Change-Id: Icbe70b9b60cb57634b6ef3e07f34983e6cc2738f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-23 21:57:11 +02:00
Qt Submodule Update Bot
cbe70b9b60
Updated submodules.
...
Change-Id: I3814e96edd8db204eb93396c46b5d2812fb8898d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-23 16:43:12 +02:00
Sergio Ahumada
f89dd01d19
Merge branch 'stable' into release
...
Conflicts:
README
qtwebkit-examples-and-demos
Change-Id: I23089d0f8a555d78e14f88bc55a48a78fe4a0e53
2013-05-23 15:46:50 +02:00
Qt Submodule Update Bot
3814e96edd
Updated submodules.
...
Change-Id: I292a7a74309c378c8164dba7de4264fe4ad341de
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-23 11:29:54 +02:00
Qt Submodule Update Bot
292a7a7430
Updated submodules.
...
Change-Id: I38dc5b49f6ba2b0c7053856ee815d58d7e2decd2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-23 00:47:23 +02:00
Qt Submodule Update Bot
38dc5b49f6
Updated submodules.
...
Change-Id: Ie78aad71e6d584fc4b8f0a831ed74370d85201ba
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-22 19:54:16 +02:00
Sergio Ahumada
45b8f5c7fc
Updated qtquickcontrols submodule.
...
Change-Id: If52b3428957e1e4ce8163696eb818f5cac1c4d3a
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com >
2013-05-11 19:02:05 +02:00
Qt Submodule Update Bot
e78aad71e6
Updated submodules.
...
Change-Id: I80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-05-09 12:22:54 +02:00
Oswald Buddenhagen
bbb720486f
Merge branch 'stable' into dev
...
the sha1s of existing modules were skipped (the update bot will handle
them as usual). all newly appeared modules got their sha1s forward-merged.
Conflicts:
.gitmodules
qt.pro
<plenty of submodules>
Change-Id: I724998c2011f274c3aea5996a7fdbe303d246551
2013-05-02 15:16:06 +02:00
Oswald Buddenhagen
33072afc58
use relative submodule specs
...
this saves various trouble.
this syntax is supported since git 1.7.0.
Change-Id: I5bbc31c2ba01e7ec0129bf45b9f704c380bf11a3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com >
Reviewed-by: Simo Fält <simo.falt@digia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2013-05-01 06:12:31 +02:00
Oswald Buddenhagen
730e330068
renamed qtwebkit-examples-and-demos => qtwebkit-examples
...
Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
Reviewed-by: Simo Fält <simo.falt@digia.com >
2013-05-01 06:12:16 +02:00
Qt Submodule Update Bot
b25fcb31a7
Updated submodules.
...
Change-Id: I18aaac18064518a3bf03ac624ff0295817fc9418
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-04-29 23:17:16 +02:00
Qt Submodule Update Bot
18aaac1806
Updated submodules.
...
Change-Id: I09c3d8537e5dc8a7457cd7d7a0b284a0acf51069
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-04-21 18:45:04 +02:00
Qt Submodule Update Bot
09c3d8537e
Updated submodules.
...
Change-Id: Icfbfb612338958b30f0abe2d00c919de693f10c9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-04-20 02:49:49 +02:00
Oswald Buddenhagen
7b034fec34
skip modules whose mandatory dependencies are missing
...
so that for example "-skip webkit" will also skip qtwebkit-examples.
Task-number: QTBUG-30307
Change-Id: I730830781ea5dabdccab88d19e82165f30dca8fe
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com >
2013-04-18 19:09:07 +02:00
Qt Submodule Update Bot
cfbfb61233
Updated submodules.
...
Change-Id: I6d08e322c7e5f8d32b4a951e47b4288c2654c64c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-04-18 12:43:32 +02:00
Qt Submodule Update Bot
6d08e322c7
Updated submodules.
...
Change-Id: Ifced9b8199a57c0e29fc2029a5705d01f023f673
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-04-17 18:38:52 +02:00
Qt Submodule Update Bot
fced9b8199
Updated submodules.
...
Change-Id: I3e26038d5c8cf10900e30dee4b3780ea2dce5f68
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-04-17 13:18:36 +02:00
Qt Submodule Update Bot
8e64df0756
Updated submodules.
...
Change-Id: Iec1a2c155705e9448566b9c543384a6e422e26fb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-04-12 20:46:09 +02:00
Qt Submodule Update Bot
ec1a2c1557
Updated submodules.
...
Change-Id: Icd769b2d31fb4f3703352b01316ba3c697a579cd
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com >
2013-04-12 14:36:51 +02:00
Qt Submodule Update Bot
3f9837797d
Updated submodules.
...
Change-Id: If618a97229d55cf58fb668fbeaa4a7b0b47f3b14
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-04-09 12:27:22 +02:00
Qt Submodule Update Bot
3e26038d5c
Updated submodules.
...
Change-Id: I2f8a096c9cf722978f7995097fd2807445898f58
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-04-05 18:38:42 +02:00
Sergio Ahumada
80c8ed3c21
Add new modules (qtquickcontrols, qtserialport and qtx11extras)
...
Also adding qtsensors as part of the default modules and updating
its sha1.
Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da
Reviewed-by: David Faure (KDE) <faure@kde.org >
2013-04-04 17:25:51 +02:00
Qt Submodule Update Bot
f618a97229
Updated submodules.
...
Change-Id: I696ab3466b90a23906ec5d609bb504f073eef21f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-04-04 09:42:52 +02:00
Oswald Buddenhagen
66ed87fc67
re-add a bunch of modules
...
this allows for easy cloning and build system maintenance also for
modules which are currently irrelevant, thus hopefully keeping the
barrier to their revival low. it does not affect the casual developer or
the CI system, as init-repository will not clone these modules.
This (abstractly) reverts commits
41c3f2cb5f ,
725a51b1d8 and
1117d4da2c .
Change-Id: Iabc750642fc1c163f3ebc96cf6edaa9b04378094
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-04-03 20:47:18 +02:00
Oswald Buddenhagen
ec783bb21e
clone only a specific subset of repositories by default
...
the list corresponds to the current contents of .gitmodules.
this will allow us to re-add more modules to the supermodule without
bothering people and the qt5 integration with unmaintained modules.
Change-Id: I8bc429fed8e4d1f729b375b302531472d3c4e267
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-04-03 20:47:07 +02:00
Qt Submodule Update Bot
696ab3466b
Updated submodules.
...
Change-Id: I231887b543d339740f1d1d49f96fc2f07f173030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-03-30 13:42:58 +01:00
Qt Submodule Update Bot
2f8a096c9c
Updated submodules.
...
Change-Id: Id3d46ac7b315145cfce399450e5f99a2c16dd41b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-03-27 16:01:20 +01:00
Qt Submodule Update Bot
231887b543
Updated submodules.
...
Change-Id: Ib47a94b9fbb092770db220b59f13e6d64d0007c3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-03-26 12:07:50 +01:00
Qt Submodule Update Bot
b47a94b9fb
Updated submodules.
...
Change-Id: I3a3420b02efdbc26843a5b84f81399d059ed84a6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-03-25 19:18:06 +01:00
Qt Submodule Update Bot
3a3420b02e
Updated submodules.
...
Change-Id: I5c752f164a19a781b4afb66a9fe4f0b4d7bd7a70
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-03-25 10:40:58 +01:00
Qt Submodule Update Bot
5c752f164a
Updated submodules.
...
Change-Id: Ib99b4bc0701257d213af7d1a02d03c047bacd46e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-03-22 14:10:50 +01:00
Qt Submodule Update Bot
b99b4bc070
Updated submodules.
...
Change-Id: Ice407c128354a3c45d3894f852b8977c78ffe96b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-03-19 14:11:54 +01:00
Qt Submodule Update Bot
ce407c1283
Updated submodules.
...
Change-Id: I585c525fd1d770cee6967f1c722e78fd5a0976c5
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com >
2013-03-05 14:15:26 +01:00
Qt Submodule Update Bot
d3d46ac7b3
Updated submodules.
...
Change-Id: I3d960ec9a9f11da295f603ca6fbfe80ee3681ae9
Reviewed-by: Liang Qi <liang.qi@digia.com >
2013-02-27 19:44:42 +01:00
Laszlo Papp
2ef82978ca
README: Update with the reference platforms and remove the mingw entry
...
Change-Id: I1e43a52dc31c1103c91f61e423c6850697bc3540
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2013-02-23 02:14:55 +01:00
Oswald Buddenhagen
08ec2c7a62
make it possible to explicitly exclude particular modules
...
Task-number: QTBUG-26697
Change-Id: Id3f091be5803d922e129e6c3b5d9dfcdd297d18f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2013-02-20 22:55:13 +01:00
Oswald Buddenhagen
aeed8ce504
semi-automate adding submodules
...
this way adding a module actually becomes a one-liner
Change-Id: Ie31039d36e948094c3ec241758eaab330304b194
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2013-02-20 22:55:09 +01:00
Oswald Buddenhagen
0089431326
don't make webkit build conditional on ICU
...
webkit now contains its own configure magic to disable itself.
Change-Id: Ibb962fac8ea6275400879c15f24d21f0f8dee855
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2013-02-20 22:55:06 +01:00
Frederik Gladhorn
8b6ae1cdd9
Merge remote-tracking branch 'origin/stable' into dev
...
All submodules are kept at their dev branch version.
Conflicts:
qtactiveqt
qtbase
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
qtjsbackend
qtmultimedia
qtqa
qtquick1
qtrepotools
qtscript
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples-and-demos
qtxmlpatterns
Change-Id: Ib9086eb5fef5580792286c9c6efd0f30e186543d
2013-02-20 10:40:05 +01:00
David Faure
ff63f0f3dc
Add module qtx11extras to qt5.git
...
QX11Info was part of the Qt4 API, it should be part of the Qt5 API too.
Change-Id: I08810ce25d0a91805a7fe4de5c8cb8f1b4ab3686
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com >
2013-02-08 15:55:18 +01:00
Qt Submodule Update Bot
cd769b2d31
Updated submodules.
...
Change-Id: I6207f23126d98141aefe4523cc785ca88fb6d0ff
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-31 12:37:37 +01:00
Qt Submodule Update Bot
585c525fd1
Updated submodules.
...
Change-Id: Ib3ef11f427b3e47b9e725c66a60f64acb532aced
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-30 10:14:08 +01:00
Qt Submodule Update Bot
b3ef11f427
Updated submodules.
...
Change-Id: I347949e258d3c75ad506aefa2a28712266007c15
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-28 21:41:39 +01:00
Qt Submodule Update Bot
347949e258
Updated submodules.
...
Change-Id: I79193d2b4d9b58e1b4928857156e1523ea970b74
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-27 13:38:39 +01:00
Qt Submodule Update Bot
79193d2b4d
Updated submodules.
...
Change-Id: I2f43917c1d4b3648615c52d4fe012d44561e5d0c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-26 19:59:26 +01:00
Jerome Pasion
6623ffc4ec
Doc: Added information about the documentation in qt5/README file.
...
-added basic information and links to wiki and qtbase/doc/README file.
Task-number: QTBUG-29057
Change-Id: I21d4dbaf7c1d03b63949af1fa303cb6fcbee8949
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com >
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-25 15:44:40 +01:00
Qt Submodule Update Bot
2f43917c1d
Updated submodules.
...
Change-Id: I371d08eb4a1e748e042c09a872af9bcb6e03b405
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-25 15:44:37 +01:00
Qt Submodule Update Bot
6207f23126
Updated submodules.
...
Change-Id: I6ff7fbc6859f27ffebb0289fed485ed13d2aef79
Reviewed-by: David Faure (KDE) <faure@kde.org >
2013-01-25 15:37:04 +01:00
Qt Submodule Update Bot
371d08eb4a
Updated submodules.
...
Change-Id: I319b198bbf22c551bc05a308211cb1666f520d89
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-22 11:59:35 +01:00
Qt Submodule Update Bot
3d960ec9a9
Updated submodules.
...
Change-Id: Id7ca18632a1fe4ef542e131aafd3ebb9e854b363
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-22 11:59:05 +01:00
Qt Submodule Update Bot
6ff7fbc685
Updated submodules.
...
Change-Id: I713cc7fcc2e6d636117200f7df4a845af4ec06e9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2013-01-21 10:43:42 +01:00
Qt Submodule Update Bot
319b198bbf
Updated submodules.
...
Change-Id: I3f1cc2e9387ac936ad9d02cff409798da9cd9835
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-19 06:01:32 +01:00
Qt Submodule Update Bot
713cc7fcc2
Updated submodules.
...
Change-Id: I79f9d60b77248a97d6ec999566d3aa8ce7058926
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2013-01-18 08:01:14 +01:00
Qt Submodule Update Bot
3f1cc2e938
Updated submodules.
...
Change-Id: Ia0270c339333b78457e2397709353c86483ce8ae
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-17 21:38:33 +01:00
Qt Submodule Update Bot
a0270c3393
Updated submodules.
...
Change-Id: Iafb0caec7665e3d3f7b0c8e8c00ed4616734f163
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-16 21:37:23 +01:00
Qt Submodule Update Bot
d7ca18632a
Updated submodules.
...
Change-Id: I9e7460525d8ca86a4578e602d7ce8f71c103ecb3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-16 18:58:16 +01:00
Qt Submodule Update Bot
afb0caec76
Updated submodules.
...
Change-Id: I7514c6e0f62ccd168c0081f83c9e4c0248e7e130
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-15 23:38:15 +01:00
Qt Submodule Update Bot
9e7460525d
Updated submodules.
...
Change-Id: Id2b2b92d49eae167d99879306523ab1e9ccde7cb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-14 18:56:22 +01:00
Qt Submodule Update Bot
7514c6e0f6
Updated submodules.
...
Change-Id: Ia2d9fb7323ba08ccd1cf08752073efd212012da4
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-14 00:46:25 +01:00
Jan Arve Saether
c639fec072
Add ruby to the list of new dependencies for Qt 5 on Windows
...
Change-Id: Ieb168e8cd21633216fdb141907047da4e41c5091
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com >
2013-01-13 15:55:59 +01:00
Qt Submodule Update Bot
d2b2b92d49
Updated submodules.
...
Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-13 09:53:12 +01:00
Sergio Ahumada
0381f7bd54
Updated submodules.
...
Change-Id: Ic95561b551e1b777dd164d5dfc865f6f02f1c0b4
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-13 01:27:30 +01:00
Qt Submodule Update Bot
a2d9fb7323
Updated submodules.
...
Change-Id: I56d9eaba8f6699c6635f76277aedde7a2fbb992b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-12 07:14:30 +01:00
Qt Submodule Update Bot
56d9eaba8f
Updated submodules.
...
Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-11 18:58:49 +01:00
Qt Submodule Update Bot
1652b1e10a
Updated submodules.
...
Change-Id: If565e02bdbdf8d2e3f08f45db96224c20074f168
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-09 23:32:19 +01:00
Qt Submodule Update Bot
79f9d60b77
Updated submodules.
...
Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-01 20:47:40 +01:00
David Faure
ba4baee789
Update win_flex.exe from sourceforge
...
This fixes compilation on Windows XP.
The previous binary must have been made with a more recent
version of Windows.
Change-Id: I17f392069199f01d603524c8166d940ff1da93bb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-12-19 11:10:03 +01:00
Sergio Ahumada
901fd28fd8
Updated submodules.
...
Change-Id: Ifd3ee8634a28f7e769ac6b59c4b7738091210c39
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-12-12 21:53:21 +01:00
Sergio Ahumada
fd3ee8634a
Updated submodules.
...
Change-Id: I56e6962ad7de00811c1d45484666b86829e75600
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-12-12 16:09:59 +01:00
Sergio Ahumada
56e6962ad7
Updated submodules.
...
Change-Id: Ie653efe17d14880969d4089e0cdf89ea5b3825a1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-12-10 22:44:33 +01:00
Sergio Ahumada
e653efe17d
Updated submodules.
...
Change-Id: If0efc5c5cc5c3942409a347e826b60108bfea1cc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-12-10 16:04:01 +01:00
Sergio Ahumada
f0efc5c5cc
Updated submodules.
...
Change-Id: I238c0f5ce080825f5d82a883c0b39d0cf04ea720
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-12-06 13:05:44 +01:00
Sergio Ahumada
238c0f5ce0
Updated submodules.
...
Change-Id: I8d77ff1ef2422259dd6baed5cae9815260e5bee2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-12-06 07:15:44 +01:00
Sergio Ahumada
8d77ff1ef2
Updated submodules (stable)
...
Change-Id: I5a3bcda566072f6c78968eecafdfd904f7986fc0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-12-04 15:33:37 +01:00
Oswald Buddenhagen
495c7a13f7
(re-)add top-level 'check' target
...
Change-Id: I61316db0575bccf168525c7ff9230f675e7db78c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-12-04 15:33:34 +01:00
Sergio Ahumada
f67e9c6bf2
Updated submodules (stable)
...
Change-Id: Ibf84cdee0f17a0d295a34fcb3b2b4155fb16face
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-12-02 14:46:28 +01:00
Oswald Buddenhagen
039f8c8555
remove special handling of qtwebkit
...
the svn mirror is now CI-controlled on gerrit and mirrored to gitorious
like any other qt module.
Change-Id: I05ead0a4aaa4fc5348a3e3d39d9ee7db734580f4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com >
Reviewed-by: Simo Fält <simo.falt@digia.com >
2012-11-30 11:14:52 +01:00
Qt Submodule Update Bot
8cb6c9373f
Updated submodules.
...
Change-Id: I5e8c47946af5049d4e66fab451941b2e0dbb6100
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-30 11:14:46 +01:00
Oswald Buddenhagen
c409a85bb8
re-instate a top-level docs target
...
now that it's not in default_post any more, each concerned repo needs to
request it explicitly. as this is not a regular qt module, it happens a
bit differently than elsewhere.
Change-Id: I47f741e09add302fb4b1146be73da2f26a67a5af
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com >
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com >
2012-11-30 00:17:42 +01:00
Qt Submodule Update Bot
5e8c47946a
Updated submodules.
...
Change-Id: Ic18c2a76ef0fb08f53052b2c7ecea1004cfe508e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-29 08:57:37 +01:00
Qt Submodule Update Bot
c18c2a76ef
Updated submodules.
...
Change-Id: Ia41ce6cb4f8b4210b01677e524026a91935ab99e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-28 12:29:41 +01:00
Qt Submodule Update Bot
a41ce6cb4f
Updated submodules.
...
Change-Id: I97d477d4ffa52107e5fb35ad50a9f09197b71bef
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-11-27 03:54:51 +01:00
Qt Submodule Update Bot
97d477d4ff
Updated submodules.
...
Change-Id: I471842d8f4cd096ce426723dac19c293421ae61a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-26 16:44:08 +01:00
Simon Hausmann
af96eba3e7
WebKit update
...
A new snapshot bringing in new bug fixes :)
Change-Id: Ia15c388a3f9190102c8de41aec53911c493830e5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-11-23 22:03:54 +01:00
Sergio Ahumada
bf8311f879
Updated submodules.
...
Change-Id: Ia5e0c2d4327fee6c375dc515b8150cce9679b7e3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-22 21:27:42 +01:00
Joerg Bornemann
9eefa9fb9a
Fix parallel builds in WebKit
...
The parallel builds aborts because parallel execution of flex breaks
due to the usage of the same temporary file names. This stems from
using a hard coded temp file name "~flex_temp_out_main" and
"random numbers" based on constants in mkstempFILE.
Fixing those issues by embedding the current PID into the temp file
names. Patch is in gnuwin32/patches/win_flex.patch
Change-Id: I6c0cd499b3c9c35128280ec0fee5e450a9ca097f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-11-22 14:58:19 +01:00
Qt Submodule Update Bot
471842d8f4
Updated submodules.
...
Change-Id: Ib335981ca0a5a59be4bd6ac26dff44621b915ae3
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-11-21 23:50:45 +01:00
Qt Submodule Update Bot
b335981ca0
Updated submodules.
...
Change-Id: Ib1c03b44976747909ffd3236385ba1e8b14a5ef9
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-11-21 13:53:56 +01:00
Samuel Rødal
24031b2120
Merge remote-tracking branch 'gerrit/newdocs' into HEAD
...
Change-Id: I1eeb68710f8129660f8d83dae924b23eda1401a5
2012-11-20 11:00:40 +01:00
Qt Submodule Update Bot
b1c03b4497
Updated submodules.
...
Change-Id: Ia9e3e72b2ee5ede0ca3ea04912d437230861d8c5
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-11-20 03:46:39 +01:00
Qt Submodule Update Bot
a9e3e72b2e
Updated submodules.
...
Change-Id: Ib9f3ea418aaac3bccbb3c0086da96315c10d3cc2
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-11-17 12:13:19 +01:00
Qt Submodule Update Bot
b9f3ea418a
Updated submodules.
...
Change-Id: I766ed506501759259b123a11e66bcf52fc2ef123
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-11-17 02:27:40 +01:00
Qt Submodule Update Bot
766ed50650
Updated submodules.
...
Change-Id: I0f161019779eb76fd26d5119a9ea6b1601862fcf
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-11-14 12:48:25 +01:00
Qt Submodule Update Bot
0f16101977
Updated submodules.
...
Change-Id: I2ad41f3ba71831b1a2634a616f7985de27af89cf
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-11-14 05:52:00 +01:00
Oswald Buddenhagen
db59699011
brisbane is no more
...
the berlin mirror is currently dysfunct as well, but i'm leaving the
code in in the expectation that it will finally re-surface (under a
different url).
Change-Id: Ifee885a6ba17c5ef3502b6547ffd850bc5f742a5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
Reviewed-by: Lars Knoll <lars.knoll@digia.com >
2012-11-14 05:51:47 +01:00
Oswald Buddenhagen
b9b8db0745
fix argument quoting when invoking "proper" configure
...
Change-Id: Idd22f7d267b83e1a4f2cc6df9994d82a5d361df7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
2012-11-14 05:51:43 +01:00
Qt Submodule Update Bot
2ad41f3ba7
Updated submodules.
...
Change-Id: I371ae019fce042b40715196f7744cea1c525dbf6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-12 22:02:41 +01:00
Qt Submodule Update Bot
371ae019fc
Updated submodules.
...
Change-Id: Icb530cbe807c4d973493034072e4a09988f3a676
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-11 11:41:03 +01:00
Qt Submodule Update Bot
cb530cbe80
Updated submodules.
...
Change-Id: I8dfa5d43e1347ae5a884310145cb9b0c838bc42a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-10 19:40:52 +01:00
Qt Submodule Update Bot
8dfa5d43e1
Updated submodules.
...
Change-Id: I4ec68bcba5d8e93510407100220b8d5d54caae94
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-10 11:20:22 +01:00
Qt Submodule Update Bot
4ec68bcba5
Updated submodules.
...
Change-Id: I7319eb06fd842b08a53e357b2ffe9a8af8569312
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-09 06:22:14 +01:00
Qt Submodule Update Bot
7319eb06fd
Updated submodules.
...
Change-Id: Ie605d1675e403023c9e5e7ec3ba51f6fb42a1a9e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-08 17:18:07 +01:00
Qt Submodule Update Bot
e605d1675e
Updated submodules.
...
Change-Id: Ia6254526d84f43ad810e364fb3af1837c30f3da1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-07 17:40:11 +01:00
Sergio Ahumada
7a9722d3ab
Updated submodules
...
Change-Id: Ic85275847cf5005ee4e3394c1ceced66ba80895c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-11-07 11:46:40 +01:00
Simon Hausmann
76d59a3fa4
Manual update of qtbase from master for qt5.git
...
Change-Id: I6649832b9a395cda862a032b910ed69479964895
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-11-06 15:55:11 +01:00
Qt Submodule Update Bot
a6254526d8
Updated submodules.
...
Change-Id: I01b8ffb28fe160d3b5ac47605a31534366dfd79f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-11-06 10:53:06 +01:00
Qt Submodule Update Bot
01b8ffb28f
Updated submodules.
...
Change-Id: I2b92b3ea1f9c2f7abd0a2e55513597a5d3b3886f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-05 20:09:22 +01:00
Qt Submodule Update Bot
2b92b3ea1f
Updated submodules.
...
Change-Id: Ia1f4d9db151183d2ec37a5f9d4bcf0edc21839e6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-11-01 12:30:27 +01:00
Sergio Ahumada
0125076d12
Updated submodules.
...
Change-Id: Ib672f1a1fa973d87b0c23c881f195ef2b4c6869a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com >
2012-10-30 16:21:37 +01:00
Stephen Kelly
41c3f2cb5f
Remove submodules which are not part of Qt 5.0.
...
Task-number: QTBUG-27736
Change-Id: I737515d2cfe687448a03b67ce9f2c14d108f2a1d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
Reviewed-by: Lars Knoll <lars.knoll@digia.com >
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-10-30 16:21:34 +01:00
Qt Submodule Update Bot
a1f4d9db15
Updated submodules.
...
Change-Id: Ic0772fa7a5f5904ced225960897a512053d23a1b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-10-26 18:44:56 +02:00
Simon Hausmann
71c071399a
Minor WebKit update to fix 64-bit Windows build
...
Just three patches on top that should fix the 64-bit build that uses
C-Loop LLInt for JSC.
Change-Id: I9dc87416dbf0ee3e3b47b46d6529dd951e5c15e0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-10-25 16:08:34 +02:00
Tor Arne Vestbø
c72a240108
Add prepare_docs to CONFIG as preparation to two-pass doc builds
...
Won't have any effect until the corresponding patch lands in qtbase.
Change-Id: I807ca48d3e2ab671f0d56eea27f72455304d367b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com >
2012-10-25 12:19:13 +02:00
Qt Submodule Update Bot
c0772fa7a5
Updated submodules.
...
Change-Id: If81bf2b5ee9af76fd053392d1504dbbbeea3e4e9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-10-25 11:41:03 +02:00
Simon Hausmann
98a605eb6b
Single update of QtWebKit/QtQuick1 module to include WebKitWidgets changes
...
Change-Id: I6f6f74c68127ee552bfd008c9afd2f61b8305155
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-10-23 03:46:47 +02:00
Qt Submodule Update Bot
f81bf2b5ee
Updated submodules.
...
Change-Id: I0e169c8e8b8bc7c129bb1ef40a33c8345a2ca536
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-10-19 19:38:01 +02:00
Tor Arne Vestbø
0e1169ca2d
Tweak name of Makefile for QtWebKit to just 'Makefile', not 'Makefile.WebKit'
...
Change-Id: I8399f640d5e5f14b4453a97b543db602859d6278
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-10-19 19:37:52 +02:00
Qt Submodule Update Bot
0e169c8e8b
Updated submodules.
...
Change-Id: I34f1dbc74a893db80786a7723c6a90ff2cf7d7b7
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-10-15 15:19:50 +02:00
Qt Submodule Update Bot
34f1dbc74a
Updated submodules.
...
Change-Id: I21f9eaf60e83dd3b8376129c1d96bcdad943c4c9
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-10-15 03:06:59 +02:00
Qt Submodule Update Bot
21f9eaf60e
Updated submodules.
...
Change-Id: Ida8730bf218cde1186e8f8e3307c82b26fed1609
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-10-14 08:11:21 +02:00
Qt Submodule Update Bot
da8730bf21
Updated submodules.
...
Change-Id: I749b83f337ec82eff305ed8ac85473ad984c84fa
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-10-13 23:51:35 +02:00
Qt Submodule Update Bot
749b83f337
Updated submodules.
...
Change-Id: I508072fb031ffb6beea94c77d41b29bfedf3874f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-10-02 21:13:38 +02:00
Qt Submodule Update Bot
508072fb03
Updated submodules.
...
Change-Id: Icd3a4676c81eb1096b3dbea9129bebf45e527b38
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-10-02 02:04:22 +02:00
Qt Submodule Update Bot
cd3a4676c8
Updated submodules.
...
Change-Id: I008fb07a0f735a1416e6594737505becc671de39
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-10-01 14:52:13 +02:00
Qt Submodule Update Bot
008fb07a0f
Updated submodules.
...
Change-Id: Id3a55bf0aa240a26cedd2e8415f81849d6d65fc1
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-09-30 02:35:49 +02:00
Qt Submodule Update Bot
d3a55bf0aa
Updated submodules.
...
Change-Id: I58acd59fa661739b4bd3a39d85841f7bea61caa8
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-09-29 08:15:48 +02:00
Jonathan Liu
600b295f2c
Revert "Check for a non-error, non-continue case."
...
This reverts commit 6bd52260c8 .
Running configure -help should not break builds by removing
.qmake.cache.
Change-Id: I9754ea891a445a9b67a1f9ad0adac85cb36338fe
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
2012-09-28 18:19:12 +02:00
Qt Submodule Update Bot
58acd59fa6
Updated submodules.
...
Change-Id: I8f9fcfdcb58075a211d1fb0de2fece6d5cb74dbd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-09-28 13:01:26 +02:00
Qt Submodule Update Bot
8f9fcfdcb5
Updated submodules.
...
Change-Id: I4865835418f8faaf3ab7635e07b790bc3b4d9cbd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-09-27 21:02:49 +02:00
Simon Hausmann
e4d841490b
Introduce dependency: QtQuick1 needs QtWebKit
...
The QML1 WebKit integration is moved to the QtQuick1 module, so this
dependency needs to be expressed in qt.pro.
It is technically an optional dependency, because the module can be built
without, but if WebKit is available then it should be built before QtQuick1.
Change-Id: Iae69339827afe6449a7af8fd6ae7de62632f30ed
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-09-26 15:30:47 +02:00
Simon Hausmann
a2d6af491e
WebKit update for MinGW build fix
...
Change-Id: I5b541d144a91a8bebece62a6f3abd4108848ca39
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-09-25 20:53:47 +02:00
Iikka Eklund
4e87fe89ce
Change copyrights from Nokia to Digia
...
Change copyrights and license headers from Nokia to Digia
Change-Id: Ieac8fb85896427cd5e3c6d91698c455a0dc9e495
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
Reviewed-by: Janne Anttila <janne.anttila@digia.com >
Reviewed-by: Lars Knoll <lars.knoll@digia.com >
2012-09-25 14:31:30 +02:00
Qt Submodule Update Bot
4865835418
Updated submodules.
...
Change-Id: Ibf4c64ada0a1afe7bc8fdaf076b076c0e9b40fb0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-09-24 20:48:32 +02:00
Simon Hausmann
58178a8a0e
New WebKit snapshot with build fixes for latest qtbase
...
Change-Id: Id44a58e47a0a715bf65b51c6a8d2e73ebb4a6766
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-09-24 13:08:58 +02:00
Qt Submodule Update Bot
bf4c64ada0
Updated submodules.
...
Change-Id: I8fbf48fd93fb696b5255f6835872a9e83df5d706
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-09-24 13:08:53 +02:00
Simon Hausmann
6ccb808ef6
WebKit update
...
This should fix the build errors that "looked" like errors from Qt3D
but were triggered through an incorrect QtWebKit module master header file,
as well as the supposed linking errors related to WebKit2.
Also disable the WebKit build if ICU is not available instead of breaking
the build when reaching WebKit.
Change-Id: I109b4152c081250c8950ef62dd7278129b716f76
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-09-21 16:45:16 +02:00
Oswald Buddenhagen
c0626490d1
don't tell people to add qtbase/bin to PATH
...
there is no reason whatsoever to do this (any more).
Change-Id: Ib68c60ef137db0d68100f51a4efcaa27dd3c72e3
Reviewed-by: Yuchen Deng <loaden@gmail.com >
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-09-21 16:45:11 +02:00
Oswald Buddenhagen
be16d21a80
delete build script
...
the modularized build system is now good enough
Change-Id: Idcc3fb2b6d6201ad7ecbb8e91bd257530797762b
Reviewed-by: Yuchen Deng <loaden@gmail.com >
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
Reviewed-by: Lars Knoll <lars.knoll@digia.com >
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
2012-09-21 16:45:06 +02:00
Oswald Buddenhagen
0e1c9d3724
remove traces of webkit build being claimed to be special
...
Change-Id: I72a36c7aedf7f364a3bd53755af17b803c532cf2
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-09-21 16:45:02 +02:00
Oswald Buddenhagen
aa7ff01d60
remove outdated blurb about shadow builds being 2nd class citizens
...
Change-Id: Iee86330dd182d346673b9b21f408d944709f2ce5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-09-21 16:44:56 +02:00
Simon Hausmann
837c3e68a0
Fix path to Qt 5 WebKit mirror for Brisbane
...
Point to the small module that contains snapshots of WebKit instead of
of to the repo that contains several gigabytes of history.
Change-Id: I96df293c8c6de76ea6e56836a0d6018c25f6bb0a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2012-09-21 16:44:53 +02:00
Sergio Ahumada
23701ec556
Updated qtwebkit-examples-and-demos submodule
...
Change-Id: I0860a4e43ee3fadb765835d22f51474b40b99c1a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-09-21 16:44:48 +02:00
Simon Hausmann
138fb6e22e
WebKit update with various build fixes
...
Change-Id: I47639d78003214f3eafc1499ae35408fb39b5df0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2012-09-18 20:30:25 +02:00
Qt Submodule Update Bot
8fbf48fd93
Updated submodules.
...
Change-Id: I2e1a8b49f437a68e8be5f44351116aa4d9638994
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com >
2012-09-17 13:47:16 +02:00
Qt Submodule Update Bot
2e1a8b49f4
Updated submodules.
...
Change-Id: Ic1a3e0c2f2b9ecb16299a2e6d1f757e0c66fd1e7
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com >
2012-09-15 23:25:05 +02:00
Thiago Macieira
c4c9ca640a
Don't include init-repository and .gitmodules in the package either
...
Even though qt5.git will not be packaged either.
Change-Id: I9bc02170dde1262aeb839741722d275bdb9e4b46
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-09-14 17:31:34 +02:00
Simon Hausmann
5de69ba432
Update WebKit
...
This updates WebKit to the latest snapshot that enables the build of WebKit2
on Windows and also drastically simplifies the build of WebKit within Qt
to be built the same way as the other modules, i.e. using qmake && make
Change-Id: I6e82e75ae0c3b62aff879f4339fcdce39e7f6954
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com >
2012-09-14 17:31:31 +02:00
Qt Submodule Update Bot
c1a3e0c2f2
Updated submodules.
...
Change-Id: I34904ca89dbda946e557121ad4f58ac0f9777d9b
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-09-13 01:04:58 +02:00
Simon Hausmann
34cf394226
Add win_flex to the convenience GNU tools for the WebKit build on Windows
...
The latest builds of ANGLE in WebKit require a version of flex that is newer
than what GnuWin32 can provide. The only distribution I've found that doesn't
pull in all of CygWin is winflexbison.
This patch adds the binary of it along with a README explaining the purpose
of this gnuwin32 directory altogether.
Change-Id: Ia00fa5d628891c9d4c30586f42274c7c602362ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-09-12 15:36:31 +02:00
Simon Hausmann
10d5a02dcd
Another WebKit update
...
This one should fix the qtquick2 detection and prepare for the removal
of qtwebkit.pri in favour of qmake && make as way of building WebKit
Change-Id: Ie78a4c68c2e58343cf9e2c603e8f126a65a124b3
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-09-12 06:37:14 +02:00
Simon Hausmann
c83a5d49a3
WebKit update to catch up with latest source incompatible changes in qtbase
...
Change-Id: Ic00da49b7947d29582fa76a4b1b375a962f92bc4
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-09-10 19:51:00 +02:00
Corentin Jabot
9b19587959
Cut some build dependencies
...
A lot of modules had a hard depency on qtdeclarative
(for extra qml components or qml examples).
Now, these modules can be build without the need of qtdeclarative.
These modules are:
qttools (since 3b9ac2dc08310aa13b121274afea130fa4f7c6f8 )
qtmultimedia (since 02f144ba6f50bb7d404e2808b9bb4fa32a206aea )
qtsystems (since 12408d021af8b9f8e0afad7ae67f389974ed0607 )
qtlocation (since fa404bfb7a83ecb01deb4df16d5ac72a8c5ab066 )
qtsensors ( since 3c069e5e4a720582f37f0b2d053d19632f6ddfe2 )
Also, useless dependencies are cut, and the dependencies declared
in build.dependencis mirror more accurately what is done is qt.pro
Those modifications allow an easier and faster build for people who
do not use qml.
Note that qtdelarative will still be needed to build the tests
of each of the modules listed above
Change-Id: Icf7711c07d041b8ef836f213fadeebb9328877d5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-09-08 23:18:52 +02:00
Qt Submodule Update Bot
34904ca89d
Updated submodules.
...
Change-Id: I36e84c61a13aa5cf7d40ced02b46879822fc4b6e
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-09-07 03:33:39 +02:00
Thiago Macieira
0b501b19de
Update the git-archive export options
...
The .gitattributes, .gitignore, .commit-template files do not need to be
present in packaged sources, as they are for people using the Git
repository. People who download tarballs usually don't reimport into
Git -- they should just download the actual repositories.
Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store
the SHA-1 of the commit being packaged.
Change-Id: Ib70cba174211ff75d69ec6ba30b680e0757ab369
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-09-05 14:33:37 +02:00
Qt Submodule Update Bot
36e84c61a1
Updated submodules.
...
Change-Id: Ibd1716005ac279cf0d8416e20aace26025fa503d
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-09-05 08:29:34 +02:00
Qt Submodule Update Bot
bd1716005a
Updated submodules.
...
Change-Id: Ied65966d5d176f5d354b17a8fa1f50fead14ccaa
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-09-03 20:14:21 +02:00
Christian Strømme
5fc7879313
Splitting up the README files
...
Moved git related information over to README.git,
and polished the README file slightly.
Change-Id: I863e2c2ef9c2020964185e96ddb87a05d82c30a6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-09-03 07:02:20 +02:00
Kai Koehne
3913643642
README: Fix "Building Qt 5 from Git" link
...
Building_Qt_5_from_Git is a redirect to the version with '-' nowadays.
Change-Id: I48e7919c54af4adfb478ea64c93c844b107fbc4e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com >
2012-08-31 13:55:57 +02:00
Qt Submodule Update Bot
ed65966d5d
Updated submodules.
...
Change-Id: I5a109341ca30e1914732304a15c11a04f61d380f
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-08-29 02:15:24 +02:00
Simon Hausmann
877cec0228
Fix make install with WebKit
...
Avoid running "make install" through build-webkit and therefore risk
accidentally rebuilding the lot. We call build-webkit either with --release
or without, but we never pass --debug. Therefore the build directory is
always WebKitBuild/Release.
This is a stop-gap for the Qt 5 beta. After the release we'll get rid of
qtwebkit.pri altogether and WebKit will be built with just qmake and make.
Change-Id: I21ff7ef8420b67cf466d5bca5efd7a1245bf4131
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-08-28 13:02:06 +02:00
Lars Knoll
f4f66ff107
Updated submodules.
...
Change-Id: I8e407c602cda9c30eda458b0aacb7465787f22c4
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-08-28 13:01:56 +02:00
Lars Knoll
725a51b1d8
Remove qtjsondb from qt5.git
...
The jsondb module has been ongoing research work. But it won't be done
in time for Qt 5.0, and is currently also less relevant. It's also
currently not being actively worked on. So let's remove it
from the list of modules compiled with qt5.git and keep it as
research.
The module can still be compiled stand-alone on top of the Qt essentials.
Change-Id: I6fd4524cae43b803a842788ff22a7525dc7bc0e6
Reviewed-by: Yuchen Deng <loaden@gmail.com >
Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com >
2012-08-28 07:42:17 +02:00
Simon Hausmann
f00429b71a
Disable WebKit2 for the Qt 5 beta
...
Disable all of WebKit2 until https://bugs.webkit.org/show_bug.cgi?id=94914 is fixed.
Change-Id: Iffc11efdba7c2c6ad4fe92437c28c77fd5d5a2bf
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-08-27 12:13:42 +02:00
Qt Submodule Update Bot
5a109341ca
Updated submodules.
...
Change-Id: Id20cb51b5d6b7aa239becf2dda1e49f89c0b5c24
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-08-27 00:53:36 +02:00
Lars Knoll
016d5d856f
Update qtbase submodule.
...
Change-Id: Ifdadb7a8a25c6845cc775aea3f3f4d1af516f2a1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-08-26 08:59:32 +02:00
Qt Submodule Update Bot
d20cb51b5d
Updated submodules.
...
Change-Id: Ic0036e77b2b6700a6f177e4dbf07feec4d6b7167
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com >
2012-08-25 17:18:17 +02:00
Lars Knoll
93dbfad341
Updated submodules.
...
Change-Id: I077d126ef7a7b6490a625c971f72357614aeeb3f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-08-24 20:56:11 +02:00
Qt Submodule Update Bot
c0036e77b2
Updated submodules.
...
Change-Id: I1fdd777ae919214aac4f3f4951439739eb65644c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-08-24 05:46:45 +02:00
Lars Knoll
3ad7be1929
Updated submodules.
...
Change-Id: I36e3af2d6a1b8727754e705e470f4d541cb110a0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-08-23 22:04:33 +02:00
Simon Hausmann
ec77419ac8
New WebKit snapshot with various build fixes
...
Include make install on Windows (prospective), build on OS X 10.6 and
without QML2
Change-Id: I4e0448287af203d6a391c17b73ad1ba45dd7a164
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-08-23 17:14:33 +02:00
Qt Submodule Update Bot
1fdd777ae9
Updated submodules.
...
Change-Id: I25ca35fc58f272d17bde1e97d055762c2075daeb
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-08-23 02:17:17 +02:00
Simon Hausmann
002f18fd52
New WebKit snapshot with 64-bit MSVC build fix
...
Change-Id: I8d62d99047e5516f235c9f02769f6780b8c2b82a
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-08-22 13:39:23 +02:00
Lars Knoll
2a5067e6cc
Updated submodules.
...
Change-Id: Ifbf37f388c053bf377b04a2a19fe0da8e3e257b1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-08-21 23:36:17 +02:00
Simon Hausmann
9867c4af7b
New WebKit snapshot
...
Includes build fixes for newer Qt 5
Change-Id: Ib32a0c6ef2b3b3891cb51104dc089597876566fa
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-08-21 16:03:42 +02:00
Qt Submodule Update Bot
25ca35fc58
Updated submodules.
...
Change-Id: I5d79b1f86dc3b073e6ca5565cd5676debd6ebe29
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-08-20 13:15:21 +02:00
Simon Hausmann
4541cd9f60
New WebKit snapshot
...
Fixes build issues with qwindowsysteminterface header file moves and
removes need for extra patches on top of WK1 MSVC build.
Change-Id: Iebf4e1727a79f8b9c857f7270ee2341eca8d9985
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-08-12 09:33:44 +02:00
Qt Submodule Update Bot
5d79b1f86d
Updated submodules.
...
Change-Id: I263f260d580b7d66ee67419ecbab777b86227d99
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-08-08 15:29:41 +02:00
Lars Knoll
1117d4da2c
Remove docgallery from qt5.git
...
The document gallery has been pretty much unmaintained for a year
now and the only backends we have are for tracker (ie. the N9),
the deprecated jsondb client API and the simulator. it doesn't
work anywhere else currently.
Change-Id: I5c12e23be7ed8862e891e996fbd6191e79f4fdef
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com >
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com >
2012-08-06 13:45:32 +02:00
Qt Submodule Update Bot
263f260d58
Updated submodules.
...
Change-Id: I05561273d53f0c197f528183fa0e6be09b8e3c0c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-08-02 07:09:41 +02:00
Qt Submodule Update Bot
05561273d5
Updated submodules.
...
Change-Id: I742353c43c52e58f4a7f21c721c43b62c46d6e5b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-08-02 00:32:15 +02:00
Qt Submodule Update Bot
742353c43c
Updated submodules.
...
Change-Id: If7f4b927e892a034697729dd0818211ef2487b3f
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-08-01 03:53:40 +02:00
Qt Submodule Update Bot
f7f4b927e8
Updated submodules.
...
Change-Id: Ie19caf122b2dd4d29119fb4d0367b1cf504c594c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-31 09:36:25 +02:00
Lars Knoll
5fb5e0dfc7
Remove phonon as discussed on the mailing list
...
phonon's upstream is in KDE's repositories and the port
to Qt 5 on qt-project is not maintained. So it's only
logical to remove it. KDE frameworks 5 will hopefully
provide a phonon module for Qt 5 again in the future.
Change-Id: I30189d921913868f2253841648ba57b2aaf3650c
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com >
2012-07-30 17:23:22 +02:00
Simon Hausmann
898848326a
New WebKit snapshot with prospective Mac OS X Mountain Lion build fix
...
Change-Id: I1b526d3113cc99123758259b0c632512199c2648
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-07-30 11:41:41 +02:00
Simon Hausmann
ec904560e7
New WebKit snapshot that follows latest Qt API changes
...
Change-Id: I526701439f1768681b6b3424f07f3a5931aae1eb
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-07-24 17:08:04 +02:00
Simon Hausmann
65079e2706
New WebKit snapshot with better configure tests
...
Change-Id: I6de43b46f6d62a2dc68ef196bee60f6a79e743fa
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-07-23 09:34:26 +02:00
Laszlo Papp
654fcc335c
Follow the protocol requests for webkit (special treatment for internal)
...
It is currently not possible to successfully run the init-repository script with
certain protocols, like "http", since those requests does not apply for
qtwebkit. Hence, the cloning of qtwebkit fails behind the corporate rules which
is against the original purpose of those command line options.
If the requested protocol is "internal", then the replacement of qtwebkit
should still be excluded since that would potentially cause breakages.
Change-Id: I738738f1c367cf1b4f18ffed05f37715a78e94ae
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-07-19 15:56:54 +02:00
Qt Submodule Update Bot
e19caf122b
Updated submodules.
...
Change-Id: I2b4b350459cfab4638b5fd5b276f0b0d206120c8
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-19 15:55:50 +02:00
Qt Submodule Update Bot
2b4b350459
Updated submodules.
...
Change-Id: Id5fe783fda5471f3244c8c871cb0eb7f603c2458
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-19 06:15:55 +02:00
Qt Submodule Update Bot
d5fe783fda
Updated submodules.
...
Change-Id: I1e7d6ecc9d7834f134a6050bc16f3245208b12a6
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-18 19:11:45 +02:00
Simon Hausmann
c9fd867234
New snapshot that should fix the recently introduced rendering issues
...
Change-Id: Ie41f043dbe1693a620b1b03a975056ee0802adb1
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-07-18 14:04:30 +02:00
Rohan McGovern
34f300fd4b
init-repository: fixed incorrect example for --mirror option
...
The full gerrit project name (including e.g. 'qt/' prefix) is appended
to the mirror. The previous example implied that only the last portion
was appended.
Change-Id: I6313427edc8e3dac0e9819ebec9de1d71763e07f
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
Reviewed-by: Laszlo Papp <lpapp@kde.org >
2012-07-18 07:38:00 +02:00
Qt Submodule Update Bot
1e7d6ecc9d
Updated submodules.
...
Change-Id: If3e608ac5908ec87daf9ec5fabbb53131215ca6e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-17 01:12:09 +02:00
Simon Hausmann
bb7e88b0fb
New WebKit snapshot with more Windows build fixes
...
Change-Id: I1945e611879ad24824db31d3fa208cf05cd5da00
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-07-16 16:19:47 +02:00
Qt Submodule Update Bot
f3e608ac59
Updated submodules.
...
Change-Id: Ib8aa817f803d8cb96e76c9f5ada24a6c5c8439ae
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-16 07:34:27 +02:00
Qt Submodule Update Bot
b8aa817f80
Updated submodules.
...
Change-Id: Ife4e459e44de1a90eb14498604e112d4ead4cb45
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-12 00:12:19 +02:00
Simon Hausmann
1d63be4b88
New WebKit snapshot that contains fixes needed after qtbase buildsystem changes
...
Change-Id: Ie9fc20e45b649422065da870dcd644e0b7497093
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-07-11 14:31:08 +02:00
Aaron McCarthy
107515b047
Add soft dependency on Qt Multimedia to Qt Location.
...
The Qt Location mapviewer example makes use of Qt Multimedia.
Task-number: QTBUG-26468
Change-Id: Ifa6e71ef582e32866567ca318903e2359248a3d0
Reviewed-by: Laszlo Papp <lpapp@kde.org >
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-07-11 08:59:38 +02:00
Qt Submodule Update Bot
fe4e459e44
Updated submodules.
...
Change-Id: I15426edcf0b62b2ec8ed114c2d5296f3b9d9d6f6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-07-11 05:19:15 +02:00
Qt Submodule Update Bot
15426edcf0
Updated submodules.
...
Change-Id: I30214b8ee280d9845928ea867e0d7ab6f4adf70e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-11 00:20:29 +02:00
Qt Submodule Update Bot
30214b8ee2
Updated submodules.
...
Change-Id: I9e7d0c7a0d3ce5f15c48d3884dab10fc3026c160
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-10 00:22:18 +02:00
Qt Submodule Update Bot
9e7d0c7a0d
Updated submodules.
...
Change-Id: Iaf77a620f74fa17a3b072356b2a5a1647bfad83b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-07-09 03:24:44 +02:00
Qt Submodule Update Bot
af77a620f7
Updated submodules.
...
Change-Id: I7e062e5d1ac6d8cce52e66b566fcc64480f5b377
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-07-06 07:56:18 +02:00
Qt Submodule Update Bot
7e062e5d1a
Updated submodules.
...
Change-Id: Iec8eecbaf8909e9d79921955cedd4417b2f0b4d4
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-05 08:05:58 +02:00
Qt Submodule Update Bot
ec8eecbaf8
Updated submodules.
...
Change-Id: Ic6db6da949fb476b6623de5f8d5a57f64dde8de3
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-05 01:00:29 +02:00
Qt Submodule Update Bot
c6db6da949
Updated submodules.
...
Change-Id: I16ac53f263ea10a71064a9c93979bb28299845b2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-04 14:28:21 +02:00
Qt Submodule Update Bot
16ac53f263
Updated submodules.
...
Change-Id: Ia6f6e65088e3d5180e317f3d5894165b4a4016b7
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-04 06:11:21 +02:00
Qt Submodule Update Bot
a6f6e65088
Updated submodules.
...
Change-Id: Ic5ceab9842c1778504fe8b064a1b08424e00cfc4
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-04 00:59:10 +02:00
Qt Submodule Update Bot
c5ceab9842
Updated submodules.
...
Change-Id: Ia5eb50d59cb1465bb1c28c1e29212bf4f188d0cc
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-03 14:37:30 +02:00
Qt Submodule Update Bot
a5eb50d59c
Updated submodules.
...
Change-Id: Ic6fba546d194cef5b538a33e444330c28d64684c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-07-03 05:25:43 +02:00
Qt Submodule Update Bot
c6fba546d1
Updated submodules.
...
Change-Id: Ib18a0dcff0d2bcaf249fddf9aa73469d23f3c694
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-07-03 00:39:26 +02:00
Qt Submodule Update Bot
b18a0dcff0
Updated submodules.
...
Change-Id: I758fc0b6db4d360ea5ea3d0e814b0212aa2fe8ac
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-02 14:40:04 +02:00
Qt Submodule Update Bot
758fc0b6db
Updated submodules.
...
Change-Id: Ic1e727e30db05eda41f7f7ecf7c248ad9b6390d9
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-02 02:16:21 +02:00
Qt Submodule Update Bot
c1e727e30d
Updated submodules.
...
Change-Id: I5ac094341e0fb108507b9375f16c12814e52a00a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-01 13:48:06 +02:00
Qt Submodule Update Bot
5ac094341e
Updated submodules.
...
Change-Id: I6e0b3836f392b1c5fdb4f2c06113c1649e1404ec
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-07-01 03:37:17 +02:00
Qt Submodule Update Bot
6e0b3836f3
Updated submodules.
...
Change-Id: I677c8c5b68bc779ffdf1d755fe764cd4394f5caf
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-06-30 16:31:47 +02:00
Qt Submodule Update Bot
677c8c5b68
Updated submodules.
...
Change-Id: I94e7f7bcb98cb8543505d2e8c43cd0021604b354
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-06-30 09:16:37 +02:00
Marko Niemelä
ce9400d52d
Enabled installation of QtGraphicalEffects add-on module.
...
Default installation has been disabled during alpha/beta
phase of qt5, but there should not be any reasons that
prevents it to be installed along other essential and
add-on modules.
Change-Id: I9cca7526a773f470fe697de918485328befc6100
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com >
2012-06-29 07:01:26 +02:00
Qt Submodule Update Bot
94e7f7bcb9
Updated submodules.
...
Change-Id: I78b8403e415e7e8d9405daebc9619c4a7cb85910
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-06-29 03:42:02 +02:00
Oswald Buddenhagen
1317419aa2
create top-level .qmake.super instead of .qmake.cache
...
at this point, the cache is needed only to aggregate the modules,
not to "export" qtbase internals. the modules now have private caches
for "real" config data.
Change-Id: I4c70d220bbc054023710680545a04c171e238aff
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com >
2012-06-29 03:41:41 +02:00
Oswald Buddenhagen
7c0959338e
webkit-examples depends on qttools (uitools)
...
Change-Id: I4e94785003feedd7db904eec659bb5794a7b433b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-06-29 03:41:39 +02:00
Oswald Buddenhagen
cf26eb0812
remove stale workaround for circular dependency
...
webkit does not depend on quick1 anymore
Change-Id: I6e813dd773e37c4fed66a8ff096c77365c64fcb2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-06-29 03:41:37 +02:00
Oswald Buddenhagen
ac8b26c0b2
fix SUBDIRS sorting according to dependencies again
...
quick1 depends on tools now
Change-Id: I1575c03af2e6af1244f75d3c9e72481536d1a913
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-06-29 03:41:35 +02:00
Simon Hausmann
222a346249
Update WebKit
...
This removes the QtScript dependency and prepares for a future build flag
to ensure -Werror remains disabled.
Change-Id: I95cf773c1e21d08d3afe881458c352398e3c9e84
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-06-19 10:19:06 +02:00
Qt Submodule Update Bot
78b8403e41
Updated submodules.
...
Change-Id: I40f8c17b0f1e85cad0794c348c2aca043fc2ece8
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-06-19 05:39:07 +02:00
Rohan McGovern
5f8a034a48
Updated qtquick1, qttools.
...
The dependencies between these modules have recently been reversed (from
qttools depending on qtquick1 to qtquick1 depending on qttools).
Having a different dependency order when building the qt5.git versions
of the modules, vs building the latest master of the modules, is
confusing and disruptive. Therefore, explicitly update these two
modules separately from the usual submodule update procedure.
Change-Id: Ibdf4eb543c395c90317296d289199c91f8153970
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-06-13 01:07:39 +02:00
Lars Knoll
ed97a0d3b9
Fix dependencies between quick1 and tools
...
Change-Id: I80ace901a2fc57f72ce9bb1d20cfa90f3faa1870
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-06-13 01:07:37 +02:00
Lars Knoll
93310ed069
qtquick1 now depends on qttools, not the other way round
...
This depends on https://codereview.qt-project.org/#change,28044
and https://codereview.qt-project.org/#change,28047
Change-Id: I1587b0c4b8f3d3b25acf6106aedf0824270da98d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com >
2012-06-08 15:06:56 +02:00
Lars Knoll
fd18c7da23
Remove doc gallery dependency onto QtScript
...
Change-Id: Ide27d6e19a386ce1af5ee4b44b3366aaa430546c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-06-07 01:10:15 +02:00
Lars Knoll
008a5daf77
Cleanup build dependencies
...
Change-Id: Ibee6b46db3c10d80790af170470dd3439e1b6f88
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-06-07 01:10:12 +02:00
Jyri Tahtela
c9ac88fec8
Qt5: change wiki address in README
...
Fix old wiki address to point to new wiki.
Change-Id: Ia5361288cb0afd9ef172b669e894d6a61ca831da
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-06-07 00:37:01 +02:00
Qt Submodule Update Bot
40f8c17b0f
Updated submodules.
...
Change-Id: I2bd9baf5193b93c048c7fe3ee0a4c27f15a20642
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-06-05 13:14:20 +02:00
Qt Submodule Update Bot
2bd9baf519
Updated submodules.
...
Change-Id: I3f0b6f886b36befe64fee98af3fa4d4617b41170
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-06-04 21:28:21 +02:00
Qt Submodule Update Bot
3f0b6f886b
Updated submodules.
...
Change-Id: Ifa716b77c11c4bbc59e92540d166f65887ed7d74
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-06-04 13:23:32 +02:00
Tasuku Suzuki
5c14da5a7b
qt.pro: update modules dependency on qtxmlpatterns
...
remove the dependency from qtjsondb and qtgraphicaleffects
change qtdeclarative and qtquick1 dependency on it to optional
Change-Id: I6d1b60417d54c378c018d20d48fa6ce45776fbda
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-06-02 08:49:55 +02:00
Qt Submodule Update Bot
fa716b77c1
Updated submodules.
...
Change-Id: I03000b0a8af2c5947fb0b7a36f5c4aaaae85cab6
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-06-02 08:49:37 +02:00
Simon Hausmann
530f63916b
Update WebKit
...
This snapshot should include the fix to do -Werror only in developer builds
Change-Id: I5de3494cdf9396d7a734e69d3a44c0195101166f
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-06-01 22:34:45 +02:00
Qt Submodule Update Bot
03000b0a8a
Updated submodules.
...
Change-Id: Ic52bc09b9afa99140b8f6858bf63347e1adf1576
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-06-01 16:24:33 +02:00
Simon Hausmann
97ef09db37
WebKit update
...
Change-Id: I925f1d2cf4322b3db6848534d0fe2f18bd8183a2
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-06-01 11:42:33 +02:00
Qt Submodule Update Bot
c52bc09b9a
Updated submodules.
...
Change-Id: I28a3353168fd7ed94df89acbcc76893ddfa2a867
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-06-01 06:48:20 +02:00
Qt Submodule Update Bot
28a3353168
Updated submodules.
...
Change-Id: I5df103be25453280cdcf5807336546cbf833f133
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-06-01 00:36:15 +02:00
Qt Submodule Update Bot
5df103be25
Updated submodules.
...
Change-Id: I316b2b51e3fc6c47106e467fb0d88a10bcdaf245
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-05-30 16:07:24 +02:00
Qt Submodule Update Bot
316b2b51e3
Updated submodules.
...
Change-Id: I3578d99ff1b522b84bb7b1e5a146dea8c4680e9e
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-05-28 22:12:49 +02:00
Qt Submodule Update Bot
3578d99ff1
Updated submodules.
...
Change-Id: I2ac6eb7166756b0fde9a890e7344d7a574ca6d0b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-05-28 08:33:11 +02:00
Simon Hausmann
d412547ef3
WebKit update that includes build fix
...
Change-Id: Ia9e2bd9ec5f3efe804b1cb6e3d5705692752f119
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-05-27 21:57:51 +02:00
Qt Submodule Update Bot
2ac6eb7166
Updated submodules.
...
Change-Id: I6a99d4b30d4086ea6800f28baf739a4c4993316a
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com >
2012-05-27 07:14:11 +02:00
Qt Submodule Update Bot
6a99d4b30d
Updated submodules.
...
Change-Id: I67a552a66fef59f25b08493593c353aadefbda05
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com >
2012-05-26 16:22:06 +02:00
Qt Submodule Update Bot
67a552a66f
Updated submodules.
...
Change-Id: I3c804ae3da2737bec6f37ef523a3b95bb3be47ad
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-05-25 19:01:04 +02:00
Simon Hausmann
8c37b00fbd
Updated WebKit to a newer snapshot that builds
...
Also removed the --no-netscape-plugin part, because the WebKit build system
now detects whether it supports plugins or not (on X11 it sort of does).
Change-Id: I4aa4517d175de24efdf67593d9c6212ccb893086
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-05-25 19:00:30 +02:00
Toby Tomkins
9985003ac4
qt.pro: change qtfeedback dependency on qtmultimedia to optional.
...
qtfeeback currently has a hard dependency on qtmultimedia. qtfeedback
only uses multimedia in the mmk plugin. This change modifies the build
system only as all the required infrastructure changes in qtfeedback
are already present.
Change-Id: Ie9884dfd51fb040cde3e29247f1f51ea7f0bd637
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com >
2012-05-23 00:15:45 +02:00
Toby Tomkins
0c57b507f3
qt.pro: Fix dependencies for qtgraphicaleffects.
...
Change-Id: If96ee9b43cafbe3139234fa4ce822d282e7cff43
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com >
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com >
2012-05-23 00:15:45 +02:00
Qt Submodule Update Bot
3c804ae3da
Updated submodules.
...
Change-Id: Ic6b525dafe4436f17a870b69bd07caf3625ef363
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-05-22 13:33:33 +02:00
Qt Submodule Update Bot
c6b525dafe
Updated submodules.
...
Change-Id: I30d3e4549515ce82cf63006cbeff06e6ea4b7a00
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-05-22 05:18:20 +02:00
Qt Submodule Update Bot
30d3e45495
Updated submodules.
...
Change-Id: I7a10dca9ee8bc2158e9d211feb4005a29fb7b419
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-05-16 09:52:10 +02:00
Aaron McCarthy
4b497e1de4
Fix Qt Location dependencies.
...
Qt Location has a soft dependency on qtjsondb.
Declare a new soft dependency on qtsystems. This dependency is
dependent on whether location shifting support for China is
enabled. By default it is not.
Change-Id: Id41451adb14e3c6cee0728ff343be85399fc4ac5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-05-15 09:10:56 +02:00
Rohan McGovern
f1409e7b02
Updated submodules.
...
qtdeclarative was held back to omit
35dd4cbd3 "Remove QtDeclarative compatibility module", which causes some
regressions still pending fixes.
Change-Id: I47e8da3a178579ac4c05feb66db9cfafc0fe64d6
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-05-15 04:18:42 +02:00
Qt Submodule Update Bot
47e8da3a17
Updated submodules.
...
Change-Id: Iae16a14cf831b35bfc58a4b14f2bc109b27b6813
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-05-14 02:02:10 +02:00
Qt Submodule Update Bot
ae16a14cf8
Updated submodules.
...
Change-Id: Idf4acd4b44261fed883c456b77e442a4234aa746
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-05-13 05:30:21 +02:00
Qt Submodule Update Bot
df4acd4b44
Updated submodules.
...
Change-Id: I432843fa50648b25b3bc6f172068dfb5a23af937
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-05-12 00:38:12 +02:00
Simon Hausmann
5146b9449d
Update WebKit to include QDeclarative* -> QQml* build fixes from Kent
...
Change-Id: Ie7a4018bed545a1e531b16fd163ff76fd73e3b3b
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com >
2012-05-11 17:23:39 +02:00
Friedemann Kleint
f40f4bb6d7
Remove dependency of qttools on qtscript from qt.pro.
...
The experimental scripting feature of QtUiLoader was removed.
Change-Id: Ied8ae2210815642ff6cc19f3546829736d5edacd
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-05-11 17:06:44 +02:00
Qt Submodule Update Bot
432843fa50
Updated submodules.
...
Change-Id: Ia4e416b1f43988378fe8d5e90c3fc6e724517176
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-05-10 21:08:58 +02:00
Simon Hausmann
e51fa873ca
Updated WebKit to a new (building) snapshot
...
Change-Id: I741623aa5eb79f27f2be8a49e8e427e21eb6d546
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com >
2012-05-07 17:50:59 +02:00
Qt Submodule Update Bot
a4e416b1f4
Updated submodules.
...
Change-Id: I0ab8650f7b5f700f5362eae4e652476d9b6801d1
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-05-07 05:11:59 +02:00
Qt Submodule Update Bot
0ab8650f7b
Updated submodules.
...
Change-Id: Ib77d8a94b6f66d212ce98f5b8847a8baa095371e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-05-06 01:55:13 +02:00
Qt Submodule Update Bot
b77d8a94b6
Updated submodules.
...
Change-Id: I10cd81046c17148437dccd87f3861c171cda6a6a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-05-05 16:27:53 +02:00
Oswald Buddenhagen
09a7cd16d9
remove pointless $$IN_PWD/ prefixes on subdirs
...
Change-Id: I26aac3952e9e2dea05be7db6300a5f97b44fe6e7
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com >
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-05-05 11:06:32 +02:00
Qt Submodule Update Bot
10cd81046c
Updated submodules.
...
Change-Id: I88442f81edb4464cc88ac7c970333e7e59f1d200
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-05-04 21:33:36 +02:00
Qt Submodule Update Bot
88442f81ed
Updated submodules.
...
Change-Id: I1968c54d4f7c96d2df40c0e2b416125adf217634
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-05-04 05:36:04 +02:00
Qt Submodule Update Bot
1968c54d4f
Updated submodules.
...
Change-Id: I6562d7b44dc104c482da1cbf9aaf7b20014da171
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-05-03 09:42:14 +02:00
Yuchen Deng
6d70a4f5cb
Remove unnecessary rules for .gitignore
...
Change-Id: I07293521a4088593750f08a298160e9b476a9d73
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
2012-04-24 15:20:08 +02:00
Marius Storm-Olsen
9894009117
Support the --continue option, ignoring build failures
...
Change-Id: I409f6b157cbe9de7c173ac1b8458b06548051db9
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-04-20 18:52:01 +02:00
Marius Storm-Olsen
dbf53d1ffb
Follow -j [n] documentation, where no [n] means unlimited
...
Change-Id: Icf5561d5405418da6fa132e65d460ebb176b6d12
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-04-20 18:51:56 +02:00
Marius Storm-Olsen
8ddc280393
Clean up exit/die/return mess for exe*()
...
The exe*() functions were inconsistent of where they exited. So, make
sure that all exe*() confesses upon errors, and let the calling
functions use eval{} to avoid the exception when needed.
Change-Id: Ia6e4edb22a83ac32d924b792e8a2eea657a6a149
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-04-20 18:51:50 +02:00
Marius Storm-Olsen
9fa0f5ddf4
Fix copy'n'paste and code move bugs
...
Change-Id: I9e8d059648c54cf2ffde7674d9f049d4821dbb0a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com >
2012-04-20 18:51:45 +02:00
Marius Storm-Olsen
9be91b36b5
Add documentation for the build script
...
Change-Id: I59fdf997971b0fbb2e4b41a18735fe72215e21c1
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com >
2012-04-20 18:51:40 +02:00
Marius Storm-Olsen
e400f9d6a6
Add --dry-run option to build script
...
The --dry-run option (-n for short) also allows levels of dry-run, where
the first level just shows what the build script itself will do. However
if you -n 2, then it will recurse the dry-run to the make as well, so
you can get a full dry-run of everything.
Change-Id: I3a3c8a844411219e7afe6a570bc9ef6718ba472f
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com >
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-04-20 18:51:36 +02:00
Marius Storm-Olsen
3dffd4e710
Just move functions closer to their logical place in the code
...
Makes it easier to read the code
Change-Id: I71ed3affa3d3fe4e2b782898c78f1c1a97371d26
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com >
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-04-20 18:51:30 +02:00
Oswald Buddenhagen
1e103533a0
override the remote refs only for /heads/
...
it's possible to add more refs, which makes git refuse to update the
configuration unless a value pattern to overwrite is specified.
Change-Id: I326c05a8ed200339bf8f3f45032409150570538c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-04-20 11:33:40 +02:00
Oswald Buddenhagen
c2543dc358
be explicit about qtbase/configure failing
...
so one has a base directory for paths it reports.
Task-number: QTBUG-25190
Change-Id: Ib222e2d7b07bf986a9eccd6934e51574b5a5a052
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-04-20 11:33:35 +02:00
Qt Submodule Update Bot
6562d7b44d
Updated submodules.
...
Change-Id: Iee405a2fc2ec148a1807752270d692e30a6d01a5
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-04-17 10:05:34 +02:00
Qt Submodule Update Bot
ee405a2fc2
Updated submodules.
...
Change-Id: I2ff258da4c471556c58008035f13f0aadfae2635
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-04-17 01:16:54 +02:00
Qt Submodule Update Bot
2ff258da4c
Updated submodules.
...
Change-Id: Id71eac3df29719dab31738d5ce6dd8a95cbe2642
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-04-16 01:06:21 +02:00
Qt Submodule Update Bot
d71eac3df2
Updated submodules.
...
Change-Id: I3ffb06482d9e956bbb211bf3d859f0c4fc4c0bbf
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-04-14 01:13:08 +02:00
Qt Submodule Update Bot
3ffb06482d
Updated submodules.
...
Change-Id: Ib56dc98feea2a1f3d08d3886bc37997aea5839b0
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com >
2012-04-13 09:52:54 +02:00
Qt Submodule Update Bot
b56dc98fee
Updated submodules.
...
Change-Id: I326ac549a1082e6aaf315fea0da08a7c40a225cd
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-04-13 00:47:06 +02:00
Marius Storm-Olsen
63124a31c7
Merge commit 'qt-v5.0.0-alpha1'
...
Change-Id: I182dae2e5c8622227751346b82822af0e90853c4
2012-04-11 13:24:27 -05:00
Oswald Buddenhagen
ba669e8f03
sort subdirs by dependencies
...
not just using $$sort_depends(), so that the independent modules are
still sorted more or less logically.
Change-Id: I0c9630e338395997f7ee3cb40ef3028b8754af11
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com >
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com >
2012-04-11 10:42:06 +02:00
Qt Submodule Update Bot
326ac549a1
Updated submodules.
...
Change-Id: I3d84b25eb5e300e427ef4c3e7329207f74dacd25
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-04-10 14:02:03 +02:00
Qt Submodule Update Bot
3d84b25eb5
Updated submodules.
...
Change-Id: I84dac570b9f422bd182b6389e58159a49349e260
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-04-10 03:38:16 +02:00
Qt Submodule Update Bot
84dac570b9
Updated submodules.
...
Change-Id: I51ca55ff29f53b909c3614b56609e067d2066124
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-04-07 00:45:35 +02:00
Qt Submodule Update Bot
51ca55ff29
Updated submodules.
...
Change-Id: If1a52c15fac028718d6f8ff6d2174a23cecb0e16
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-04-05 09:57:22 +02:00
Marius Storm-Olsen
1de59c1a07
Fix building on Windows and OSX
...
A problem with the dependency algorithm would make the top-most
dependent module not compile. Also affects building QtWayland on
Linux.
OSX has a problem when doing 'make install' on Qt configured with
prefix pointing to qtbase (no installation needed), so disable that
for the alpha, like on Windows.
Also, remove a redundant line in the script.
Change-Id: I368e80520977cf8a4bfcbbf13445f50c820aee9c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
2012-04-05 04:35:38 +02:00
Marius Storm-Olsen
6ab6bd8ff7
Avoid building webkit by default on Windows for now
...
WebKit still doesn't compile cleanly on Windows, so avoid it until
we have something which works.
Change-Id: I468dfbd01741705cd0bba3b035855d46acbb42e9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com >
2012-04-05 04:35:38 +02:00
Marius Storm-Olsen
e4ed3288e9
Add build dependency for qtwayland + make qtwayland non default module
...
Running
./build qtwayland
will build qtwayland and its dependencies.
Change-Id: I78f0b0cec6bc21a14f0d8d89e42080589d9b28b6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
2012-04-05 04:35:38 +02:00
Marius Storm-Olsen
72f4597c9d
Avoid 'make install' on Windows
...
We normally don't 'make install' on Windows, so avoid it for the alpha.
Change-Id: Ia5563791be249ea04abdda64b94e15afb2608add
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
2012-04-05 04:35:38 +02:00
Qt Submodule Update Bot
f1a52c15fa
Updated submodules.
...
Change-Id: Ifeb89e2305c7c378fe2ccb12f60e199822376f90
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-04-05 00:20:06 +02:00
Friedemann Kleint
38adcf8077
build: Do not clobber existing values of CL environment variable.
...
Change-Id: I88708560e0885fefa149aec7bd9789e585a79d57
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com >
2012-04-04 18:33:30 +02:00
Qt Submodule Update Bot
feb89e2305
Updated submodules.
...
Change-Id: I15f3399576bd433898f8e89bbcb3c1196e0da5b9
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-03-31 14:33:43 +02:00
Simon Hausmann
8660603bb6
WebKit build fix (backport of http://trac.webkit.org/changeset/110426 )
...
Change-Id: Id8c63524a068b8b604677c7115e7bdb2e6ab3b5c
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com >
2012-03-30 14:05:28 +02:00
Friedemann Kleint
74f7b7f74c
Fix build instructions (-j <n>).
...
Change-Id: Ib9b23fed10b687e67859058fb35f92b2250be98f
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com >
2012-03-29 16:23:47 +02:00
Qt Submodule Update Bot
15f3399576
Updated submodules.
...
Change-Id: I712875dc293a4f71fd0a99646c8cd9c36b183ecf
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com >
2012-03-29 10:13:09 +02:00