diff --git a/Formula/qt5.rb b/Formula/qt5.rb
index 685e3b7e430d1..1434c030565f6 100644
--- a/Formula/qt5.rb
+++ b/Formula/qt5.rb
@@ -14,9 +14,8 @@ def message; <<-EOS.undent
class Qt5 < Formula
desc "Version 5 of the Qt framework"
homepage "https://www.qt.io/"
- url "https://download.qt.io/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.tar.xz"
- mirror "https://www.mirrorservice.org/sites/download.qt-project.org/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.tar.xz"
- sha256 "ce08a7eb54661705f55fb283d895a089b267c688fabe017062bd71b9231736db"
+ url "https://download.qt.io/official_releases/qt/5.6/5.6.2/single/qt-everywhere-opensource-src-5.6.2.tar.xz"
+ sha256 "83e61bfc78bba230770704e828fa4d23fe3bbfdcfa4a8f5db37ce149731d89b3"
head "https://code.qt.io/qt/qt5.git", :branch => "5.6", :shallow => false
@@ -27,28 +26,6 @@ class Qt5 < Formula
sha256 "73d33dd2563c39542844c276a7bd43463f2974fde141e7afeb3057168adbe606" => :mavericks
end
- # Restore `.pc` files for framework-based build of Qt 5 on OS X. This
- # partially reverts merged
- # between the 5.5.1 and 5.6.0 releases. (Remove this as soon as feasible!)
- #
- # Core formulae known to fail without this patch (as of 2016-03-17):
- # * mkvtoolnix (with `--with-qt5` option, silent build failure)
- # * poppler (with `--with-qt5` option)
- # * wireshark (with `--with-qt5` option)
- patch do
- url "https://raw.githubusercontent.com/Homebrew/formula-patches/e8fe6567/qt5/restore-pc-files.patch"
- sha256 "48ff18be2f4050de7288bddbae7f47e949512ac4bcd126c2f504be2ac701158b"
- end
-
- # Fix build error due to missing Mac QtBase widget example targets, detected
- # by logic introduced in and
- # corrected in .
- # Should land in either 5.6.2 and/or 5.7.1.
- patch do
- url "https://raw.githubusercontent.com/Homebrew/formula-patches/6ffd0e250d374193613a51beda8830dda9b67e56/qt5/QTBUG-54110.patch"
- sha256 "2cf77b820f46f0c404284882b4a4a97bf005b680062842cdc53e107a821deeda"
- end
-
keg_only "Qt 5 conflicts Qt 4"
option "with-docs", "Build documentation"
@@ -74,8 +51,20 @@ class Qt5 < Formula
resource "qt-webkit" do
# http://lists.qt-project.org/pipermail/development/2016-March/025358.html
- url "https://download.qt.io/community_releases/5.6/5.6.1/qtwebkit-opensource-src-5.6.1.tar.gz"
- sha256 "f5ba5afc5846fc755575dd04081a90a9536f920e312f18f6fb1f5a0c33f477b0"
+ url "https://download.qt.io/community_releases/5.6/5.6.2/qtwebkit-opensource-src-5.6.2.tar.xz"
+ sha256 "528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966"
+ end
+
+ # qtconnectivity bluetooth fix
+ patch do
+ url "https://gist.githubusercontent.com/ilovezfs/9d9f17b166b37a68f5f33a1df381675f/raw/5dd9b3ee82d486fc78373ca1e8bd16bbbc1ff84f/gistfile1.txt"
+ sha256 "41fd73cba0018180015c2be191d63b3c33289f19132c136f482f5c7477620931"
+ end
+
+ # qtwebengine bluetooth fix
+ patch do
+ url "https://gist.githubusercontent.com/ilovezfs/eedb11ddbceaaa5eb1f4ffd8baa40c32/raw/f2518f204a459da5f200739ce7553f1a8f151215/gistfile1.txt"
+ sha256 "218b8682d7e8a3f74618d0bd87e4797e13fc2cbfe49c21a2845e64da3fe8868a"
end
def install
@@ -159,13 +148,6 @@ def install
end
end
- def post_install
- # Upstream "configure and mkspecs: Don't try to find xcrun with xcrun"
- # https://code.qt.io/cgit/qt/qtbase.git/patch/?id=77a71c32c9d19b87f79b208929e71282e8d8b5d9
- inreplace prefix/"mkspecs/features/mac/default_pre.prf",
- "xcrun -find xcrun", "xcrun -find xcodebuild"
- end
-
def caveats; <<-EOS.undent
We agreed to the Qt opensource license for you.
If this is unacceptable you should uninstall.