Installation folder can be made.

BUILD_WIN.md

@@ -81,7 +81,7 @@ Remove `CMakeCache.txt` found in the `%HIFI_DIR%\build` directory.
 
 #### CMake can't find OpenSSL
 
-Remove `CMakeCache.txt` found in the `%HIFI_DIR%\build` directory.  Verify that your VCPKG_ROOT environment variable is set and pointing to the correct location.  Verify that the file `${VCPKG_ROOT}/installed/x64-windows/include/openssl/ssl.h` exists.
+Remove `CMakeCache.txt` found in the `%HIFI_DIR%\build` directory.  Verify that your HIFI_VCPKG_BASE environment variable is set and pointing to the correct location.  Verify that the file `${HIFI_VCPKG_BASE}/installed/x64-windows/include/openssl/ssl.h` exists.
 
 #### Qt is throwing an error
 

hifi_vcpkg.py

@@ -171,6 +171,11 @@ endif()
         if not self.args.android:
             print("Installing build dependencies")
             self.run(['install', '--triplet', self.triplet, 'hifi-client-deps'])
+            
+        # If not android, install our Qt build
+        if not self.args.android:
+            print("Installing Qt")
+            self.installQt()
 
     def cleanBuilds(self):
         # Remove temporary build artifacts
@@ -232,3 +237,9 @@ endif()
         print("Not implemented")
 
 
+    def installQt(self):
+        print("install Qt")
+        if not os.path.isdir(os.path.join(self.path, 'installed', 'hifi-qt5')):
+            dest = os.path.join(self.path, 'installed')
+            url = "https://hifi-qa.s3.amazonaws.com/hifi-qt5.tar.gz"
+            hifi_utils.downloadAndExtract(url, dest)

tools/qt-builder/README.md

@@ -0,0 +1,154 @@
+# General
+This document describes the process to build Qt 5.12.3
+## Requirements
+### Windows
+1.  Visual Studio 2017  
+    If you don’t have Community or Professional edition of Visual Studio 2017, download [Visual Studio Community 2017](https://www.visualstudio.com/downloads/).  
+Install with defaults
+
+1.  python 2.7.16  
+Install from https://www.python.org/ftp/python/2.7.16/python-2.7.16.amd64.msi  
+Add path to python executable to PATH.  
+Verify that python runs python 2.7 (run “python --version”)
+
+NOTE:  our regular build uses python 3.  This will still work, because HIFI_PYTHON_EXEC points to the python 3 executable.
+
+1.  git >= 1.6  
+Verify by entering `git --version`
+1.  perl >= 5.14  
+Install from Strawberry Perl - http://strawberryperl.com/ - 5.28.1.1 64 bit to C:\Strawberry\  
+Verify by running `perl --version`
+1.  flex and bison  
+Download from https://sourceforge.net/projects/winflexbison/files/latest/download  
+Uncompress in C:\flex_bison  
+Rename win-bison.exe to bison.exe and win-flex.exe to flex.exe  
+Add C:\flex_bison to PATH  
+Verify by running `flex --version`  
+Verify by running `bison --version`
+1.  gperf  
+Install from http://gnuwin32.sourceforge.net/downlinks/gperf.php  
+Install  
+Add C:\Program Files (x86)\GnuWin32\bin to PATH  
+Verify by running `gperf --version`
+### Linux
+Tested on Ubuntu 18.04  
+1.  qt5 requirements  
+edit /etc/apt/sources.list (edit as root)  
+replace all *# deb-src* with *deb-src* (in vi `1,$s/# deb-src/deb-src/`)  
+`sudo apt-get update -y`  
+`sudo apt-get upgrade -y`  
+`sudo apt-get build-dep qt5-default`
+1.  git >= 1.6  
+Verify if needed entering `git --version`
+`sudo apt-get install -y git`  
+Verify again
+1.  python   
+Verify if needed running `python --version` - should return python 2.7.x
+`sudo apt-get install -y python` (not python 3!)  
+Verify again
+1.  gperf  
+Verify if needed running gperf --version
+`sudo apt-get install -y gperf`  
+Verify again
+1.  bison and flex  
+Verify if needed running `flex --version`  
+Verify if needed running `bison --version`
+`sudo apt-get install -y flex bison`  
+Verify again
+1.  pkg-config (needed for qtwebengine)  
+Verify if needed running `pkg-config --version`
+`sudo apt-get install -y pkg-config`
+Verify again
+1.  OpenGL  
+Verify (first install mesa-utils - `sudo apt install -y mesa-utils`) by `glxinfo | grep "OpenGL version"`
+`sudo apt-get install -y libgl1-mesa-dev`    
+`sudo ln -s /usr/lib/x86_64-linux-gnu/libGL.so.346.35 /usr/lib/x86_64-linux-gnu/libGL.so.1.2.0`  
+Verify again 
+1.  make  
+Verify by running `make --version`
+`sudo apt-get install -y make`  
+1.  g++  
+Verify by running `g++ --version`
+`sudo apt-get install -y g++`
+Verify again
+1.  dbus-1 (needed for qtwebengine)  
+`sudo apt-get install -y libdbus-glib-1-dev`  
+1.  nss (needed for qtwebengine)  
+`sudo apt-get install -y libnss3-dev`
+### Mac
+1.  git >= 1.6  
+Verify by entering git --version
+1.  pkg-config  
+brew fontconfig dbus-glib stall pkg-config
+1.  dbus-1  
+brew install dbus-glib
+## Build Process
+### General
+qt is cloned to the qt5 folder.  
+The build is performed in the qt5-build folder.  
+Build products are installed to the qt5-install folder.  
+Before running configure, make sure that the qt5-build folder is empty.
+
+**Only run the patches once!!!**
+### Windows
+Before building, verify that **HIFI_VCPKG_BASE_VERSION** points to a *vcpkg* folder containing *packages\openssl-windows_x64-windows*. If not, follow https://github.com/highfidelity/vcpkg to install *vcpkg* and then *openssl*.   
+
+git clone --recursive https://code.qt.io/qt/qt5.git -b 5.12.3 --single-branch
+
+*  Copy the **patches** folder to qt5  
+*  Copy the **qt5vars.bat** file to qt5  
+*  Apply the two patches to Qt  
+cd qt5  
+git apply --ignore-space-change --ignore-whitespace patches/qfloat16.patch
+git apply --ignore-space-change --ignore-whitespace patches/aec.patch  
+
+cd ..  
+mkdir qt5-install  
+mkdir qt5-build  
+cd qt5-build
+
+run ..\qt5\qt5vars.bat  
+cd ..\..\qt5-build  
+
+..\qt5\configure -opensource -confirm-license -opengl desktop -platform win32-msvc -openssl-linked  OPENSSL_LIBS="-lssleay32 -llibeay32"  -I %HIFI_VCPKG_BASE_VERSION%\packages\openssl-windows_x64-windows\include -L %HIFI_VCPKG_BASE_VERSION%\packages\openssl-windows_x64-windows\lib -nomake examples -nomake tests -skip qttranslations -skip qtserialport -skip qt3d -skip qtlocation -skip qtwayland -skip qtsensors -skip qtgamepad -skip qtspeech -skip qtcharts -skip qtx11extras -skip qtmacextras -skip qtvirtualkeyboard -skip qtpurchasing -skip qtdatavis3d -no-warnings-are-errors -no-pch -prefix ..\qt5-install
+
+nmake  
+nmake install
+### Linux
+git clone --recursive git://code.qt.io/qt/qt5.git -b 5.12.3 --single-branch
+
+*  Copy the **patches** folder to qt5  
+*   Apply the two patches to Qt  
+cd qt5  
+git apply --ignore-space-change --ignore-whitespace patches/qfloat16.patch  
+git apply --ignore-space-change --ignore-whitespace patches/aec.patch  
+cd ..
+
+mkdir qt5-install  
+mkdir qt5-build  
+cd qt5-build
+
+../qt5/configure -opensource -confirm-license -platform linux-g++-64 -nomake examples -nomake tests -skip qttranslations -skip qtserialport -skip qt3d -skip qtlocation -skip qtwayland -skip qtsensors -skip qtgamepad -skip qtspeech -skip qtcharts -skip qtx11extras -skip qtmacextras -skip qtvirtualkeyboard -skip qtpurchasing -skip qtdatavis3d -no-warnings-are-errors -no-pch -prefix ../qt5-install
+
+make  
+make install
+### Mac
+git clone --recursive git://code.qt.io/qt/qt5.git -b 5.12.3 --single-branch
+
+*  Copy the **patches** folder to qt5  
+*  Apply the two patches to Qt  
+cd qt5  
+git apply --ignore-space-change --ignore-whitespace patches/qfloat16.patch
+git apply --ignore-space-change --ignore-whitespace patches/aec.patch
+cd ..
+
+mkdir qt5-install  
+mkdir qt5-build  
+cd ../qt5-build
+
+../qt5/configure -opensource -confirm-license -nomake examples -nomake tests -skip qttranslations -skip qtserialport -skip qt3d -skip qtlocation -skip qtwayland -skip qtsensors -skip qtgamepad -skip qtspeech -skip qtcharts -skip qtx11extras -skip qtmacextras -skip qtvirtualkeyboard -skip qtpurchasing -skip qtdatavis3d -no-warnings-are-errors  -no-pch -prefix ../qt5-install
+
+make  
+make install
+## Problems
+*configure* errors, if any, may be viewed in **config.log** and **config.summary**

tools/qt-builder/patches/aec.patch

@@ -0,0 +1,40 @@
+diff --git a/qtmultimedia/src/plugins/opensles/qopenslesaudioinput.cpp b/qtmultimedia/src/plugins/opensles/qopenslesaudioinput.cpp
+index ad87cb0..54ed18a 100644
+--- a/qtmultimedia/src/plugins/opensles/qopenslesaudioinput.cpp
++++ b/qtmultimedia/src/plugins/opensles/qopenslesaudioinput.cpp
+@@ -117,6 +117,8 @@ QOpenSLESAudioInput::QOpenSLESAudioInput(const QByteArray &device)
+         m_recorderPreset = SL_ANDROID_RECORDING_PRESET_CAMCORDER;
+     else if (qstrcmp(device, QT_ANDROID_PRESET_VOICE_RECOGNITION) == 0)
+         m_recorderPreset = SL_ANDROID_RECORDING_PRESET_VOICE_RECOGNITION;
++    else if (qstrcmp(device, QT_ANDROID_PRESET_VOICE_COMMUNICATION) == 0)
++        m_recorderPreset = SL_ANDROID_RECORDING_PRESET_VOICE_COMMUNICATION;
+     else
+         m_recorderPreset = SL_ANDROID_RECORDING_PRESET_GENERIC;
+ #endif
+diff --git a/qtmultimedia/src/plugins/opensles/qopenslesaudioinput.h b/qtmultimedia/src/plugins/opensles/qopenslesaudioinput.h
+index ad84db0..35cc379 100644
+--- a/qtmultimedia/src/plugins/opensles/qopenslesaudioinput.h
++++ b/qtmultimedia/src/plugins/opensles/qopenslesaudioinput.h
+@@ -50,6 +50,7 @@
+ #define QT_ANDROID_PRESET_MIC "mic"
+ #define QT_ANDROID_PRESET_CAMCORDER "camcorder"
+ #define QT_ANDROID_PRESET_VOICE_RECOGNITION "voicerecognition"
++#define QT_ANDROID_PRESET_VOICE_COMMUNICATION "voicecommunication"
+ 
+ #endif
+ 
+diff --git a/qtmultimedia/src/plugins/opensles/qopenslesengine.cpp b/qtmultimedia/src/plugins/opensles/qopenslesengine.cpp
+index 1a16cc2..2577fb3 100644
+--- a/qtmultimedia/src/plugins/opensles/qopenslesengine.cpp
++++ b/qtmultimedia/src/plugins/opensles/qopenslesengine.cpp
+@@ -114,7 +114,8 @@ QList<QByteArray> QOpenSLESEngine::availableDevices(QAudio::Mode mode) const
+ #ifdef ANDROID
+         devices << QT_ANDROID_PRESET_MIC
+                 << QT_ANDROID_PRESET_CAMCORDER
+-                << QT_ANDROID_PRESET_VOICE_RECOGNITION;
++                << QT_ANDROID_PRESET_VOICE_RECOGNITION
++                << QT_ANDROID_PRESET_VOICE_COMMUNICATION;
+ #else
+         devices << "default";
+ #endif
+ 

tools/qt-builder/patches/qfloat16.patch

@@ -0,0 +1,44 @@
+diff --git a/qtbase/src/corelib/global/qfloat16.h b/qtbase/src/corelib/global/qfloat16.h
+index 3e50ad8467..2453ff8847 100644
+--- a/qtbase/src/corelib/global/qfloat16.h
++++ b/qtbase/src/corelib/global/qfloat16.h
+@@ -83,7 +83,9 @@ private:
+     Q_CORE_EXPORT static const quint32 shifttable[];
+ 
+     friend bool qIsNull(qfloat16 f) Q_DECL_NOTHROW;
++#if ! defined(QT_NO_FLOAT16_OPERATORS)
+     friend qfloat16 operator-(qfloat16 a) Q_DECL_NOTHROW;
++#endif
+ };
+ 
+ Q_DECLARE_TYPEINFO(qfloat16, Q_PRIMITIVE_TYPE);
+@@ -165,6 +167,7 @@ inline qfloat16::operator float() const Q_DECL_NOTHROW
+ }
+ #endif
+ 
++#if ! defined(QT_NO_FLOAT16_OPERATORS)
+ inline qfloat16 operator-(qfloat16 a) Q_DECL_NOTHROW
+ {
+     qfloat16 f;
+@@ -206,11 +209,12 @@ QF16_MAKE_ARITH_OP_INT(-)
+ QF16_MAKE_ARITH_OP_INT(*)
+ QF16_MAKE_ARITH_OP_INT(/)
+ #undef QF16_MAKE_ARITH_OP_INT
+-
++#endif
+ QT_WARNING_PUSH
+ QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
+ QT_WARNING_DISABLE_GCC("-Wfloat-equal")
+ 
++#if ! defined(QT_NO_FLOAT16_OPERATORS)
+ inline bool operator>(qfloat16 a, qfloat16 b)  Q_DECL_NOTHROW { return static_cast<float>(a) >  static_cast<float>(b); }
+ inline bool operator<(qfloat16 a, qfloat16 b)  Q_DECL_NOTHROW { return static_cast<float>(a) <  static_cast<float>(b); }
+ inline bool operator>=(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return static_cast<float>(a) >= static_cast<float>(b); }
+@@ -244,6 +248,7 @@ QF16_MAKE_BOOL_OP_INT(<=)
+ QF16_MAKE_BOOL_OP_INT(==)
+ QF16_MAKE_BOOL_OP_INT(!=)
+ #undef QF16_MAKE_BOOL_OP_INT
++#endif
+ 
+ QT_WARNING_POP
+ 

tools/qt-builder/qt5vars.bat

@@ -0,0 +1,17 @@
+@echo off
+
+REM Set up \Microsoft Visual Studio 2015, where <arch> is \c amd64, \c x86, etc.
+CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+
+REM Edit this location to point to the source code of Qt
+SET _ROOT=..\qt5
+
+SET PATH=%_ROOT%\qtbase\bin;%_ROOT%\gnuwin32\bin;%PATH%
+
+REM Uncomment the below line when using a git checkout of the source repository
+SET PATH=%_ROOT%\qtrepotools\bin;%PATH%
+
+SET _ROOT=
+
+REM Keeps the command line open when this script is run.
+cmd /k