Thomas/outils_dev_appimage
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

màj qtcreator

Browse Source
This commit is contained in:
Thomas Briffard 2022-06-08 17:44:21 +02:00
parent 139ecce1f9
commit 76aa970cde
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile_centos7_base
View File

@ -26,6 +26,7 @@ libXext-devel \
libXmu-devel \ libXmu-devel \
libXpm-devel \ libXpm-devel \
libX11-devel \ libX11-devel \
qt5-qtwayland-devel \
make \ make \
mesa-libEGL-devel \ mesa-libEGL-devel \
numactl-libs \ numactl-libs \

2
docker-compose.yml
View File

@ -33,7 +33,7 @@ services:
- CUSTOM_STEP_POST_DEPLOY=/build/qtcreator_post_step.sh - CUSTOM_STEP_POST_DEPLOY=/build/qtcreator_post_step.sh
- EXTRA_QT_PLUGINS=printsupport;sql;designer - EXTRA_QT_PLUGINS=printsupport;sql;designer
- QML_SOURCES_PATHS=/qt-creator/qtcreator_build/share/qtcreator/ - 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"] command : ["bash", "-c","/template.sh /qt-creator/qtcreator_build/bin/qtcreator /build"]
git: git:

2
qtcreator/Dockerfile_centos7_qtcreator
View File

@ -1,6 +1,6 @@
FROM cos7_base_qt FROM cos7_base_qt
ARG QTCREATOR_VER=v4.15.1 ARG QTCREATOR_VER=v5.0.2
RUN yum install -y patchelf && \ RUN yum install -y patchelf && \
git clone --recursive https://code.qt.io/qt-creator/qt-creator.git && \ git clone --recursive https://code.qt.io/qt-creator/qt-creator.git && \

2
qtcreator/qtcreator_pre_step.sh
View File

@ -4,6 +4,6 @@ fichierIcon=/build/QtProject-qtcreator.svg
fichierDesktop=/build/qtcreator.desktop fichierDesktop=/build/qtcreator.desktop
QT_LIB=/qt/$QT_VER/gcc_64/lib/ 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" AUTRES_OPTIONS="-i $fichierIcon -d $fichierDesktop $AUTRES_LIB --plugin qt"