aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorMike McQuaid2014-01-11 19:37:42 +0000
committerMike McQuaid2014-01-11 19:37:42 +0000
commitb5de898a95715c563c0de32e70fccce1a6bc065a (patch)
tree8110956e6a872b151572eb6fd3f23510d0ce5cda /Library/Formula
parent9aa801ec67bb9ea34191cb7949cd21965cc8f9aa (diff)
downloadhomebrew-b5de898a95715c563c0de32e70fccce1a6bc065a.tar.bz2
Revert "qt5: add qtscript libc++ patch"
This reverts commit 5b9142314b9c03e936a21afa3064eeade5a73c33.
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/qt5.rb21
1 files changed, 0 insertions, 21 deletions
diff --git a/Library/Formula/qt5.rb b/Library/Formula/qt5.rb
index 2c2c2a8ed..1b4ff53c3 100644
--- a/Library/Formula/qt5.rb
+++ b/Library/Formula/qt5.rb
@@ -44,12 +44,6 @@ class Qt5 < Formula
odie 'qt5: --with-demos-examples is no longer supported' if build.include? 'with-demos-examples'
odie 'qt5: --with-debug-and-release is no longer supported' if build.include? 'with-debug-and-release'
- def patches
- # Fix QtScript linking against libstdc++
- # https://codereview.qt-project.org/#change,74777
- DATA if MacOS.version >= :mavericks
- end
-
def install
ENV.universal_binary if build.universal?
args = ["-prefix", prefix,
@@ -127,18 +121,3 @@ class Qt5 < Formula
EOS
end
end
-
-__END__
-diff --git a/qtscript/src/script/script.pro b/qtscript/src/script/script.pro
-index 8cb2f62..e48abac 100644
---- a/qtscript/src/script/script.pro
-+++ b/qtscript/src/script/script.pro
-@@ -75,8 +75,4 @@ integrity {
- CFLAGS += --diag_remark=236,82
- }
-
--# WebKit doesn't compile in C++0x mode
--*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
--CONFIG -= c++11
--
- TR_EXCLUDE = $$WEBKITDIR/*