Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix Qt 4.8.4 build when using Xcode 4.6's clang. #316

Closed
wants to merge 1 commit into from

2 participants

@nico

Backports https://bugreports.qt-project.org/browse/QTBUG-29373 .

./scripts/macosx-build-dependencies.sh -c finishes successfully for me with this change. Building without -c fails somewhere in boost. You probably want to turn on -c by default on mac, or mention on the README that it's required at least with recent Xcode versions.

@kintel
Owner

I already had this patch in a different branch, which has now been merged into master.

Could you clarify what issues you have with boost and Xcode 4.6 without clang?
I'm using Xcode 4.6 with gcc as my main compiler, but I'm still on 10.7, which could be different from your setup.
Perhaps open a new issue for the boost thing and close this one?

@kintel
Owner

oh, issue #315 deals with boost compile issues (catching up on issues..)
Closing this..

@kintel kintel closed this
@nico

I mentioned in issue #315 that I needed this patch to build with Xcode 4.6. I think pull request needs to be merged.

@kintel
Owner

I did merge an equivalent patch which was lying around in another branch. Could you check if it fixes your issue?
I'd also like to fix the gcc issue - will handle that in #315 once I can reproduce it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 16 additions and 0 deletions.
  1. +11 −0 patches/qt-4.8.4.patch
  2. +5 −0 scripts/macosx-build-dependencies.sh
View
11 patches/qt-4.8.4.patch
@@ -0,0 +1,11 @@
+--- src/gui/kernel/qt_cocoa_helpers_mac_p.h 2013-03-23 11:38:03.000000000 -0700
++++ src/gui/kernel/qt_cocoa_helpers_mac_p.h 2013-03-23 11:38:06.000000000 -0700
+@@ -155,7 +155,7 @@
+ void qt_dispatchModifiersChanged(void * /*NSEvent * */flagsChangedEvent, QWidget *widgetToGetEvent);
+ bool qt_mac_handleTabletEvent(void * /*QCocoaView * */view, void * /*NSEvent * */event);
+ inline QApplication *qAppInstance() { return static_cast<QApplication *>(QCoreApplication::instance()); }
+-struct ::TabletProximityRec;
++struct TabletProximityRec;
+ void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec);
+ Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags);
+ Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations);
View
5 scripts/macosx-build-dependencies.sh
@@ -53,6 +53,11 @@ build_qt()
fi
tar xzf qt-everywhere-opensource-src-$version.tar.gz
cd qt-everywhere-opensource-src-$version
+
+ if [ -f $OPENSCADDIR/patches/qt-$version.patch ]; then
+ patch -p0 < $OPENSCADDIR/patches/qt-$version.patch
+ fi
+
if $OPTION_32BIT; then
QT_32BIT="-arch x86"
fi
Something went wrong with that request. Please try again.