diff options
| author | Robert Löhning <robert.loehning@qt.io> | 2020-02-07 14:04:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-07 05:04:25 -0800 |
| commit | 4e3c99909126f4663ec308e5fb391b85be56b292 (patch) | |
| tree | e5ec0b69fd9421d1a66caa1de2779f5c3768e516 /projects/qt | |
| parent | b036df0ce156022abd686dbaa0de4e919768d0dd (diff) | |
| download | oss-fuzz-4e3c99909126f4663ec308e5fb391b85be56b292.tar.gz | |
[qt] Remove temporary compile fix (#3359)
...when the proper fix was merged upstream.
Diffstat (limited to 'projects/qt')
| -rw-r--r-- | projects/qt/Dockerfile | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/projects/qt/Dockerfile b/projects/qt/Dockerfile index 216ff3a9c..4b0dbf968 100644 --- a/projects/qt/Dockerfile +++ b/projects/qt/Dockerfile @@ -20,13 +20,6 @@ RUN apt-get update && apt-get install -y build-essential python libxcb-xinerama0 RUN git clone --branch 5.15 --depth 1 git://code.qt.io/qt/qt5.git qt WORKDIR qt RUN perl init-repository --module-subset=qtbase - -# temporary compile fix -WORKDIR qtbase -RUN git config user.name qt-local -RUN git config user.email qt-local@oss-fuzz -RUN git fetch "https://codereview.qt-project.org/qt/qtbase" refs/changes/90/289190/2 && git cherry-pick FETCH_HEAD - WORKDIR $SRC RUN git clone --depth 1 git://code.qt.io/qt/qtqa.git COPY build.sh $SRC/ |