From e2415642f07421a9fce7156e68f052b7579ba3fa Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sun, 9 Mar 2014 00:10:31 -0800 Subject: [PATCH 1/5] temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager --- libraries/shared/src/AccountManager.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libraries/shared/src/AccountManager.cpp b/libraries/shared/src/AccountManager.cpp index 888d42ddda..7915a60690 100644 --- a/libraries/shared/src/AccountManager.cpp +++ b/libraries/shared/src/AccountManager.cpp @@ -35,7 +35,7 @@ const QString ACCOUNTS_GROUP = "accounts"; AccountManager::AccountManager() : _authURL(), - _networkAccessManager(new QNetworkAccessManager(this)), + _networkAccessManager(NULL), _pendingCallbackMap(), _accountInfo() { @@ -109,6 +109,11 @@ void AccountManager::authenticatedRequest(const QString& path, QNetworkAccessMan void AccountManager::invokedRequest(const QString& path, QNetworkAccessManager::Operation operation, const JSONCallbackParameters& callbackParams, const QByteArray& dataByteArray) { + + if (!_networkAccessManager) { + _networkAccessManager = new QNetworkAccessManager(this); + } + if (hasValidAccessToken()) { QNetworkRequest authenticatedRequest; @@ -229,6 +234,11 @@ bool AccountManager::checkAndSignalForAccessToken() { } void AccountManager::requestAccessToken(const QString& login, const QString& password) { + + if (!_networkAccessManager) { + _networkAccessManager = new QNetworkAccessManager(this); + } + QNetworkRequest request; QUrl grantURL = _authURL; From c6655382d6895decfdbff0b264db180405dce2dd Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 10 Mar 2014 10:52:46 -0700 Subject: [PATCH 2/5] Initialize scale to unity. Closes #2232. --- interface/src/renderer/Model.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp index c52e4d4603..f6cfb08816 100644 --- a/interface/src/renderer/Model.cpp +++ b/interface/src/renderer/Model.cpp @@ -21,6 +21,7 @@ using namespace std; Model::Model(QObject* parent) : QObject(parent), + _scale(1.0f, 1.0f, 1.0f), _shapesAreDirty(true), _lodDistance(0.0f), _pupilDilation(0.0f) { From 06a0332fd59622ed4b74f76fe433275dc290f49c Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 10 Mar 2014 16:44:33 -0700 Subject: [PATCH 3/5] remove space bar behavior from editrVoxels.js --- examples/editVoxels.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/examples/editVoxels.js b/examples/editVoxels.js index 4a194c0f5d..b083128485 100644 --- a/examples/editVoxels.js +++ b/examples/editVoxels.js @@ -927,13 +927,6 @@ function keyPressEvent(event) { } } - // do this even if not in edit tools - if (event.text == " ") { - // Reset my orientation! - var orientation = { x:0, y:0, z:0, w:1 }; - Camera.setOrientation(orientation); - MyAvatar.orientation = orientation; - } trackKeyPressEvent(event); // used by preview support } From 7080a5f50369771946dfcf2100d4d2a25d8c6794 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 10 Mar 2014 17:08:57 -0700 Subject: [PATCH 4/5] remove qt5 homebrew formula - it lives at highfidelity/homebrew-formulas --- qt5.rb | 116 --------------------------------------------------------- 1 file changed, 116 deletions(-) delete mode 100644 qt5.rb diff --git a/qt5.rb b/qt5.rb deleted file mode 100644 index 2e5a8c7c42..0000000000 --- a/qt5.rb +++ /dev/null @@ -1,116 +0,0 @@ -# this is a Qt5 formula patched to remove support for the CoreWLAN module on OS X -# which was causing us problems with constant WLAN scans - -# the change is a removal of the following line in bearer.pro -# mac:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan - -require 'formula' - -class Qt5HeadDownloadStrategy < GitDownloadStrategy - include FileUtils - - def support_depth? - # We need to make a local clone so we can't use "--depth 1" - false - end - - def stage - @clone.cd { reset } - safe_system 'git', 'clone', @clone, '.' - ln_s @clone, 'qt' - safe_system './init-repository', '--mirror', "#{Dir.pwd}/" - rm 'qt' - end -end - -class Qt5 < Formula - homepage 'http://qt-project.org/' - url 'https://highfidelity-public.s3.amazonaws.com/packages/qt-everywhere-opensource-nocorewlan-src-5.2.0.tar.gz' - sha1 '07ef1ca133db4a5168d8a716e99d145432832a24' - head 'git://gitorious.org/qt/qt5.git', :branch => 'stable', - :using => Qt5HeadDownloadStrategy - - keg_only "Qt 5 conflicts Qt 4 (which is currently much more widely used)." - - option :universal - option 'with-docs', 'Build documentation' - option 'developer', 'Build and link with developer options' - - depends_on "d-bus" => :optional - depends_on "mysql" => :optional - - odie 'qt5: --with-qtdbus has been renamed to --with-d-bus' if build.include? 'with-qtdbus' - 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 install - ENV.universal_binary if build.universal? - args = ["-prefix", prefix, - "-system-zlib", - "-confirm-license", "-opensource", - "-nomake", "examples", - "-release"] - - unless MacOS::CLT.installed? - # ... too stupid to find CFNumber.h, so we give a hint: - ENV.append 'CXXFLAGS', "-I#{MacOS.sdk_path}/System/Library/Frameworks/CoreFoundation.framework/Headers" - end - - # https://bugreports.qt-project.org/browse/QTBUG-34382 - args << "-no-xcb" - - args << "-L#{MacOS::X11.lib}" << "-I#{MacOS::X11.include}" if MacOS::X11.installed? - - args << "-plugin-sql-mysql" if build.with? 'mysql' - - if build.with? 'd-bus' - dbus_opt = Formula.factory('d-bus').opt_prefix - args << "-I#{dbus_opt}/lib/dbus-1.0/include" - args << "-I#{dbus_opt}/include/dbus-1.0" - args << "-L#{dbus_opt}/lib" - args << "-ldbus-1" - end - - if MacOS.prefer_64_bit? or build.universal? - args << '-arch' << 'x86_64' - end - - if !MacOS.prefer_64_bit? or build.universal? - args << '-arch' << 'x86' - end - - args << '-developer-build' if build.include? 'developer' - - system "./configure", *args - system "make" - ENV.j1 - system "make install" - - # Some config scripts will only find Qt in a "Frameworks" folder - cd prefix do - ln_s lib, frameworks - end - - # The pkg-config files installed suggest that headers can be found in the - # `include` directory. Make this so by creating symlinks from `include` to - # the Frameworks' Headers folders. - Pathname.glob(lib + '*.framework/Headers').each do |path| - framework_name = File.basename(File.dirname(path), '.framework') - ln_s path.realpath, include+framework_name - end - - Pathname.glob(bin + '*.app').each do |path| - mv path, prefix - end - end - - test do - system "#{bin}/qmake", "-project" - end - - def caveats; <<-EOS.undent - We agreed to the Qt opensource license for you. - If this is unacceptable you should uninstall. - EOS - end -end \ No newline at end of file From 8f13f3850248172a2ab613641112759dfe2407f1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 10 Mar 2014 17:09:32 -0700 Subject: [PATCH 5/5] update the BUILD guide to point to the new formula location --- BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.md b/BUILD.md index 1796aaa575..ccbe7d8cec 100644 --- a/BUILD.md +++ b/BUILD.md @@ -55,7 +55,7 @@ Should you choose not to install Qt5 via a package manager that handles dependen brew install cmake qt5 glm zlib -*High Fidelity has a [homebrew formula](https://raw.github.com/highfidelity/hifi/master/qt5.rb) for a patched version of Qt 5.2.0 stable that removes wireless network scanning that can reduce real-time audio performance. We recommended you use this formula to install Qt.* +*High Fidelity has a [homebrew formula](https://raw.github.com/highfidelity/homebrew-formulas/master/qt5.rb) for a patched version of Qt 5.2.0 stable that removes wireless network scanning that can reduce real-time audio performance. We recommended you use this formula to install Qt.* #####Xcode If Xcode is your editor of choice, you can ask CMake to generate Xcode project files instead of Unix Makefiles.