Skip to content

Commit 80fa53d

Browse files
committed
chore(qt)[sc-97670]: use our prebuilt Qt6.7 to fix linker errors inside qtwebkit
1 parent 53838ed commit 80fa53d

File tree

2 files changed

+8
-33
lines changed

2 files changed

+8
-33
lines changed

.devcontainer/setup.sh

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ sudo apt install bash-completion
88
# Install tools/libraries required to build
99
sudo apt-get install -y \
1010
gyp \
11+
libdbus-1-dev \
1112
libegl1-mesa-dev \
1213
libglib2.0-dev \
1314
libgstreamer1.0-dev \
@@ -20,38 +21,12 @@ sudo apt-get install -y \
2021
libxslt1-dev \
2122
libwebpdemux2 \
2223
libwoff1 \
23-
24-
# Install Qt
25-
sudo apt-get install -y \
26-
libqt6core5compat6-dev \
27-
libqt6sensors6-dev \
28-
qt6-base-dev \
29-
qt6-declarative-dev \
30-
qt6-multimedia-dev \
31-
qt6-positioning-dev \
32-
33-
# Qt executables go through "qtchooser" by default. It is broken. Just replace the "qtchooser" versions with a link to the executable we actually want to run
34-
# If you see an error of "thng: could not find a Qt installation of ''" then that means that `thng` is another executable that needs the following treatment.
35-
sudo rm /usr/bin/qmake
36-
sudo ln -s /usr/lib/qt6/bin/qmake /usr/bin/qmake
37-
sudo rm /usr/bin/moc
38-
sudo ln -s /usr/lib/qt6/libexec/moc /usr/bin/moc
39-
sudo rm /usr/bin/uic
40-
sudo ln -s /usr/lib/qt6/libexec/uic /usr/bin/uic
24+
libxkbcommon-dev \
4125

4226
# Alias python3 to python so the build script can find it
4327
sudo ln -s /usr/bin/python3 /usr/bin/python
4428

29+
# Download our prebuilt version of Qt
30+
curl -L https://github.com/constructpm/qt-build/releases/download/v6.7.1-1/qt-6.7.1-cpp17-ubuntu-22.04-x64.tar.gz | sudo tar xvJ -C /opt
4531
# Download our prebuilt version of QtWebkit
46-
curl -L https://github.com/constructpm/qtwebkit-build/releases/download/v6.212.0-1/qtwebkit-ee690e4-cpp17-ubuntu-22.04-x64.tar.gz | sudo tar xvJ -C /usr/include/x86_64-linux-gnu
47-
48-
# Move the files we downloaded so their locations match the locations used by the other Qt libraries we installed earlier
49-
sudo mv /usr/include/x86_64-linux-gnu/qt6/include/* /usr/include/x86_64-linux-gnu/qt6/
50-
sudo rmdir /usr/include/x86_64-linux-gnu/qt6/include/
51-
52-
sudo mv /usr/include/x86_64-linux-gnu/qt6/lib/cmake/* /usr/lib/x86_64-linux-gnu/cmake/
53-
sudo rmdir /usr/include/x86_64-linux-gnu/qt6/lib/cmake/
54-
sudo mv /usr/include/x86_64-linux-gnu/qt6/lib/pkgconfig/* /usr/lib/x86_64-linux-gnu/pkgconfig/
55-
sudo rmdir /usr/include/x86_64-linux-gnu/qt6/lib/pkgconfig/
56-
sudo mv /usr/include/x86_64-linux-gnu/qt6/lib/* /usr/lib/x86_64-linux-gnu/
57-
sudo rmdir /usr/include/x86_64-linux-gnu/qt6/lib/
32+
curl -L https://github.com/constructpm/qtwebkit-build/releases/download/v6.212.0-1/qtwebkit-ee690e4-cpp17-ubuntu-22.04-x64.tar.gz | sudo tar xvJ -C /opt

wd.gypi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
'WD_CONFIG_QUICK': '1',
77
'WD_CONFIG_PLAYER': '0',
88
'WD_CONFIG_ONE_KEYRELEASE': '0',
9-
'QT_INC_PATH': '/usr/include/x86_64-linux-gnu/qt6',
10-
'QT_BIN_PATH': '/usr/bin',
11-
'QT_LIB_PATH': '/usr/lib/x86_64-linux-gnu'
9+
'QT_INC_PATH': '/opt/qt6/include',
10+
'QT_BIN_PATH': '/opt/qt6/libexec',
11+
'QT_LIB_PATH': '/opt/qt6/lib'
1212
},
1313
}

0 commit comments

Comments
 (0)