chore(qt)[sc-97669]: stop using our prebuilt Qt. It doesnt have everything webdriver needs.

Author: brstrutt

.devcontainer/setup.sh

@@ -5,7 +5,7 @@ sudo apt-get -y update
 # Enable tab autocomplete in terminal
 sudo apt install bash-completion
 
-# Install tools required to build
+# Install tools/libraries required to build
 sudo apt-get install -y \
     gyp \
     libegl1-mesa-dev \
@@ -18,9 +18,29 @@ sudo apt-get install -y \
     libpng-dev \
     libxslt1-dev \
 
+# Install Qt
+sudo apt-get install -y \
+    qtbase5-dev \
+    qtdeclarative5-dev \
+    qtmultimedia5-dev \
+    qtpositioning5-dev \
+    libqt5sensors5-dev \
+    libqt5webchannel5 \
+    qt5-qmake \
+
 # Alias python3 to python so the build script can find it
 sudo ln -s /usr/bin/python3 /usr/bin/python
 
-# Download our prebuilt version of Qt
-curl -L https://github.com/constructpm/qt-build/releases/download/v5.15.8-lts-lgpl-1/qt-5.15.8-lts-lgpl-cpp17-ubuntu-22.04-x64.tar.gz | sudo tar -xJC /opt
-curl -L https://github.com/constructpm/qtwebkit-build/releases/download/v5.212.0-1/qtwebkit-d1c854e-cpp17-ubuntu-22.04-x64.tar.gz | sudo tar xvJ -C /opt
+# Download our prebuilt version of QtWebkit
+curl -L https://github.com/constructpm/qtwebkit-build/releases/download/v5.212.0-1/qtwebkit-d1c854e-cpp17-ubuntu-22.04-x64.tar.gz | sudo tar xvJ -C /usr/include/x86_64-linux-gnu
+
+# Move the files we downloaded so their locations match the locations used by the other Qt libraries we installed earlier
+sudo mv /usr/include/x86_64-linux-gnu/qt5/include/* /usr/include/x86_64-linux-gnu/qt5/
+sudo mv /usr/include/x86_64-linux-gnu/qt5/lib/* /usr/lib/x86_64-linux-gnu/
+sudo mv /usr/include/x86_64-linux-gnu/qt5/lib/cmake/* /usr/lib/x86_64-linux-gnu/cmake/
+sudo mv /usr/include/x86_64-linux-gnu/qt5/lib/pkgconfig/* /usr/lib/x86_64-linux-gnu/pkgconfig/
+
+sudo rmdir /usr/include/x86_64-linux-gnu/qt5/include/
+sudo rmdir /usr/include/x86_64-linux-gnu/qt5/lib/cmake/
+sudo rmdir /usr/include/x86_64-linux-gnu/qt5/lib/pkgconfig/
+sudo rmdir /usr/include/x86_64-linux-gnu/qt5/lib/

wd.gypi

@@ -2,12 +2,12 @@
     'variables': {
         'QT5': '1',
         'WD_CONFIG_QWIDGET_BASE': '1',
-        'WD_CONFIG_WEBKIT': '0',
+        'WD_CONFIG_WEBKIT': '1',
         'WD_CONFIG_QUICK': '1',
         'WD_CONFIG_PLAYER': '0',
         'WD_CONFIG_ONE_KEYRELEASE': '0',
-        'QT_INC_PATH': '/opt/qt5/include',
-        'QT_BIN_PATH': '/opt/qt5/bin',
-        'QT_LIB_PATH': '/opt/qt5/lib'
+        'QT_INC_PATH': '/usr/include/x86_64-linux-gnu/qt5',
+        'QT_BIN_PATH': '/usr/bin',
+        'QT_LIB_PATH': '/usr/lib/x86_64-linux-gnu'
     },
 }