diff --git a/Dockerfile_centos7_base b/Dockerfile_centos7_base index 21ba34e..717d99c 100644 --- a/Dockerfile_centos7_base +++ b/Dockerfile_centos7_base @@ -26,6 +26,7 @@ libXext-devel \ libXmu-devel \ libXpm-devel \ libX11-devel \ +qt5-qtwayland-devel \ make \ mesa-libEGL-devel \ numactl-libs \ diff --git a/docker-compose.yml b/docker-compose.yml index 2a7158b..a347708 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,7 +33,7 @@ services: - CUSTOM_STEP_POST_DEPLOY=/build/qtcreator_post_step.sh - EXTRA_QT_PLUGINS=printsupport;sql;designer - QML_SOURCES_PATHS=/qt-creator/qtcreator_build/share/qtcreator/ - - NOM_APPIMAGE=qtcreator_4.15.1 + - NOM_APPIMAGE=qtcreator_5.0.2 command : ["bash", "-c","/template.sh /qt-creator/qtcreator_build/bin/qtcreator /build"] git: diff --git a/qtcreator/Dockerfile_centos7_qtcreator b/qtcreator/Dockerfile_centos7_qtcreator index d46eab4..27ce94b 100644 --- a/qtcreator/Dockerfile_centos7_qtcreator +++ b/qtcreator/Dockerfile_centos7_qtcreator @@ -1,6 +1,6 @@ FROM cos7_base_qt -ARG QTCREATOR_VER=v4.15.1 +ARG QTCREATOR_VER=v5.0.2 RUN yum install -y patchelf && \ git clone --recursive https://code.qt.io/qt-creator/qt-creator.git && \ diff --git a/qtcreator/qtcreator_pre_step.sh b/qtcreator/qtcreator_pre_step.sh index 04180c9..311dd45 100755 --- a/qtcreator/qtcreator_pre_step.sh +++ b/qtcreator/qtcreator_pre_step.sh @@ -4,6 +4,6 @@ fichierIcon=/build/QtProject-qtcreator.svg fichierDesktop=/build/qtcreator.desktop QT_LIB=/qt/$QT_VER/gcc_64/lib/ -AUTRES_LIB="-l $QT_LIB/libQt5Help.so.5 -l $QT_LIB/libQt5QuickWidgets.so.5 -l $QT_LIB/libQt5DesignerComponents.so.5" +AUTRES_LIB="-l $QT_LIB/libQt5Help.so.5 -l $QT_LIB/libQt5QuickWidgets.so.5 -l $QT_LIB/libQt5DesignerComponents.so.5 -l $QT_LIB/libQt5WaylandClient.so.5.15.2" AUTRES_OPTIONS="-i $fichierIcon -d $fichierDesktop $AUTRES_LIB --plugin qt"