Qt5 compatibility #2721

pull laanwj wants to merge 1 commits into bitcoin:master from laanwj:2013_05_qt5 changing 17 files +90 −14

laanwj commented at 12:06 PM on May 31, 2013: member
This commit squashes all the changes in the Qt5 branch relative to master.

Backward compatibility with Qt4 is retained.

Original authors:
- Philip Kaufmann
- Jonas Schnelli

Qt5 compatibility

This commit squashes all the changes in the Qt5 branch
relative to master.

Backward compatibility with Qt4 is retained.

Original authors:

- Philip Kaufmann <phil.kaufmann@t-online.de>
- Jonas Schnelli <jonas.schnelli@include7.ch>

25c0cce7fb

in bitcoin-qt.pro:None in d015787913 outdated

  25 | @@ -25,9 +26,9 @@ UI_DIR = build
  26 |  # use: qmake "RELEASE=1"
  27 |  contains(RELEASE, 1) {
  28 |      # Mac: compile for maximum compatibility (10.5, 32-bit)
  29 | -    macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
  30 | -    macx:QMAKE_CFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
  31 | -    macx:QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
  32 | +    macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk

jonasschnelli commented at 12:12 PM on May 31, 2013:

oops. These x86 lines are wrong and should be removed. Can i somehow contribute to this pull request? By creating pull request to 2013_05_qt5? If it's more easy, just keep the line28-30 like they are on master.

laanwj commented at 12:18 PM on May 31, 2013:

No problem I'll just remove them from this pull

BitcoinPullTester commented at 12:39 AM on June 2, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/25c0cce7fb494fcb871d134e28b26504d30e34d3 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
laanwj referenced this in commit 34d03f2474 on Jun 2, 2013
laanwj merged this on Jun 2, 2013
laanwj closed this on Jun 2, 2013
laanwj deleted the branch on Apr 9, 2014
DrahtBot locked this on Sep 8, 2021

Contributors

laanwj

jonasschnelli

BitcoinPullTester