Depends: bump to qt 5.5 #6471

theuni commented at 1:22 AM on July 24, 2015: member

This is a continuation of #6314. Thanks to @welshjf for getting this rolling.

It's not as big/complicated as it looks at first glance, there are a few changes that add to the size:

Split sources are now used rather than the huge complete tarball. 225M -> 75M. Thanks again to @welshjf for that.
config options are now mostly one-per-line to make diffs easier to read

It's pretty straightforward otherwise.

Worth mentioning: I had to add 2 hacks for building with mingw. We need to make sure that all works well on win 8.1 and win10, as it looks like that's the path taken for the new (patched) code.

build: fix building against qt5.4/5.5 fe997dfd12

depends: split qt config options to separate lines

Helps ease of reading and comparison. Removed some duplicates.

5189fe3d88

depends: bump to qt 5.5 ab67dd7818

depends: make more qt flags explicit 2c52b56366

in depends/packages/qt.mk:None in 2c52b56366 outdated

  44 | -$(package)_config_opts += -skip qtwinextras -skip qtxmlpatterns -skip qtscript -skip qtdoc
  45 | -
  46 | -$(package)_config_opts += -prefix $(host_prefix) -bindir $(build_prefix)/bin
  47 | -$(package)_config_opts += -no-c++11 -openssl-linked  -v -static -silent -pkg-config
  48 | -$(package)_config_opts += -qt-libpng -qt-libjpeg -qt-zlib -qt-pcre
  49 | +$(package)_config_opts += -opensource -confirm-license

droark commented at 6:04 AM on July 24, 2015:

Just to be nit-picky, I assume this line needs to be split in two if it's going to be consistent with the style being used.

laanwj commented at 6:13 AM on July 24, 2015: member

Thanks! Needs to go into 0.11.1 as well for #6426 and #6384.

jonasschnelli commented at 9:32 AM on July 24, 2015: contributor

Great! Like to see this go in. Linux build over gitian somehow doesn't work atm: https://builds.jonasschnelli.ch/pulls/6471/build-linux.log

Windows and OSX build is okay. Now testing the Windows and Osx executables.

jonasschnelli commented at 9:51 AM on July 24, 2015: contributor

Testes on Win 8 and OSX 10.7 as well as on 10.10. Works fine. On OSX there is a tiny issue (coming in with Qt5.5 because they have fixed HiDPIness of QLabel) with the (new) bitcoin logo in the left top corner of the about screen (will PR).

laanwj commented at 11:22 AM on July 24, 2015: member

Get the following error on make inside depends, first line:

/bin/sh: 1: test: qtbase-opensource-src-5.5.0.tar.gz: unexpected operator

It does continue after it.

Edit: Works perfectly apart from that. I can confirm that this fixes #6426.

fixup: qt 5.5 snuck in another module that needs path hand-holding ee57108a11

theuni commented at 8:24 PM on July 24, 2015: member

@jonasschnelli wow, thanks for the extensive tests! I just pushed a new commit that should fix the Linux build. @laanwj That can be safely ignored for now, it's a trivial syntax thing. I'd like to fix it, but the fix requires touching funcs.mk, which will force a rebuild of all packages. I'll take care of it next time something in there needs to be changed.

jonasschnelli commented at 10:07 PM on July 24, 2015: contributor

Tested ACK. Gitian build works now also for linux. Tested on all three platforms.

laanwj added the label GUI on Jul 27, 2015

laanwj referenced this in commit f6850d58f7 on Jul 27, 2015

laanwj commented at 10:29 AM on July 27, 2015: member

Merged via f6850d58f7dd87de44dd25be0fc1067625fa8d3a - removed the duplicate -no-reduce-relocations

laanwj closed this on Jul 27, 2015

laanwj referenced this in commit 92401c2d90 on Jul 27, 2015

laanwj commented at 11:10 AM on July 27, 2015: member

Backported to 0.11 as 92401c2d9051e5d07b9f5608604925575ebaffef

welshjf commented at 2:14 AM on July 29, 2015: contributor

I've now tested this (as the 0.11 backport), and while my original 5.4 bump did not fix the systray icon on KDE 5, this one finally does. Yay.

theuni commented at 2:40 AM on July 29, 2015: member

@welshjf great news, thanks for testing.

luke-jr referenced this in commit f3995f0485 on Dec 8, 2015

tempgit9 referenced this in commit 3438795ed0 on Jan 16, 2017

Infernoman referenced this in commit fc4439ddc2 on Jan 31, 2017

cerebrus29301 referenced this in commit 3590d36387 on Feb 4, 2017

MarcoFalke locked this on Sep 8, 2021