~mscore-ubuntu/musescore/+git/qt5:wip/qt3dstudio/2.4

Last commit made on 2019-06-12
Get this branch:
git clone -b wip/qt3dstudio/2.4 https://git.launchpad.net/~mscore-ubuntu/musescore/+git/qt5

Branch merges

Branch information

Name:
wip/qt3dstudio/2.4
Repository:
lp:~mscore-ubuntu/musescore/+git/qt5

Recent commits

6e350af... by Antti Kokko <email address hidden>

ogl-runtime: instead of linking to qt5.txt use the actual configuration

Change-Id: I1b1d467f2c67026fc8039b7346ea8ca02250ba1c
Reviewed-by: Jani Heikkinen <email address hidden>

e926f95... by Qt Submodule Update Bot <email address hidden>

Update submodules on '5.12.4' in qt5

Change-Id: I2b8b3fc60e242872f1cfb850c6219a72b39d471a
Reviewed-by: Jani Heikkinen <email address hidden>

d87d4e0... by Heikki Halmet <email address hidden>

Disable MySQL from packaging builds

We can't link against 3rd party GPL libraries

Task-number: QTBUG-76081
Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241
Reviewed-by: Tony Sarajärvi <email address hidden>
(cherry picked from commit a05bd71ede9e2c67a66fd2d28fab8e9e9386e51c)

Change-Id: I97d1d06b266490080325126e2dd715436a91b01a
Reviewed-by: Simo Fält <email address hidden>

de41591... by Heikki Halmet <email address hidden>

Fix openssl 1.1 library configurations

Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <email address hidden>
Reviewed-by: Simo Fält <email address hidden>

0e454d2... by Qt Submodule Update Bot <email address hidden>

Update submodules on '5.12.4' in qt5

Change-Id: Id04721e958f15621a0a5b35aa0d44dc2d7238549
Reviewed-by: Jani Heikkinen <email address hidden>

01c38df... by Jani Heikkinen <email address hidden>

Use link to qt5.txt instead of copy in qt3d-runtime.txt

Change-Id: If61fe724af869fb35637321311bfb052d3009956
Reviewed-by: Antti Kokko <email address hidden>

(cherry picked from commit c5e443374aaa7d7cdfe90a69bbe3dc33604b5d32)
Reviewed-by: Jani Heikkinen <email address hidden>

1db94fc... by Antti Kokko <email address hidden>

Add platform configuration file for ogl-runtime repository

Use configuration from qt5.txt.

Change-Id: Ic788b70545169ee1fce5a97f016882cacd4a7908
Reviewed-by: Jukka Jokiniva <email address hidden>
Reviewed-by: Iikka Eklund <email address hidden>
Reviewed-by: Jani Heikkinen <email address hidden>

fb534d1... by Qt Submodule Update Bot <email address hidden>

Update submodules on '5.12.4' in qt5

Change-Id: Ic0a4f9340c23cc8a7b502870e690d1fccb54425f
Reviewed-by: Jani Heikkinen <email address hidden>

acff170... by Heikki Halmet <email address hidden>

Install prebuilded OpenSSL 1.1.1b for Windows 7

Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5
Reviewed-by: Jani Heikkinen <email address hidden>
(cherry picked from commit 247b429c3c435a62df3d6f94c96c7cd1b7c22299)

c8deeb3... by Juha Karjalainen <email address hidden>

Provision sed for windows 10

Sed is needed by webassembly build. Cannot use sed from msys as
having msys bin folder in path breaks webassembly build.

Task-number: QTQAINFRA-2835
Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618
Reviewed-by: Heikki Halmet <email address hidden>
(cherry picked from commit 230a73409a2fe58e7de0674107a2d870be0bf03d)
Reviewed-by: Jani Heikkinen <email address hidden>