Commit Graph

1664 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
c0a148bb7d Update submodules on 'dev' in qt5
Change-Id: I82c6dff79747702f65c17b094f2decad3f471cc6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-07 13:06:53 +00:00
Qt Submodule Update Bot
25113b3315 Update submodules on 'dev' in qt5
Change-Id: If1a1dc0efcd16aa0887622800394d45d11f120cb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-02 06:13:28 +00:00
Qt Submodule Update Bot
ddc800b37f Update submodules on 'dev' in qt5
Change-Id: Ic47ce220597dda941335d6e0ea5dab224c900af3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-31 06:37:34 +00:00
Liang Qi
37e3da674c Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I370742cb0aa2b362dded7131adb08bc7af44a02b
2017-03-28 10:20:15 +02: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
1da7bdd25e Update submodules on 'dev' in qt5
Change-Id: I5df7b6ba38a1e641aa8d154d8184a12cbd2f85bd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-23 20:50:56 +00:00
Liang Qi
8889075b0d Update submodules on 'dev' in qt5
Change-Id: I9ef55bdca766e92281b92011b63ba9781f4db53f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-22 15:30:04 +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
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
Liang Qi
e9d91a3949 Update submodules on 'dev' in qt5
Change-Id: Ie422699479ce2da8c94cde3987a4685348aa7a21
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-16 06:20:31 +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
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
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
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
f65308d371 Merge remote-tracking branch 'origin/5.9' into dev
This change also integrated latest dev branch of qtremoteobjects
and qtwebengine.

Conflicts:
	.gitmodules
	qtremoteobjects
        qtwebengine

Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
2017-03-07 19:40:36 +01: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
Liang Qi
82cea36531 Update submodules on 'dev' in qt5
Change-Id: Ia4717e7b16c135827c15e03bb8581d2a2f196547
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-01 19:53:58 +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
Liang Qi
92cec830f0 Update submodules on 'dev' in qt5
Change-Id: I789836bf447b14fe223489acea9fcb898d8a35aa
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-01 05:22:15 +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
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
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>
v5.9.0-alpha1
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