From ba7aa5ea9c58249f99264cf219090cadb4a971ef Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 12 Oct 2021 16:40:36 +0200
Subject: [PATCH] Docker: Also add Qt Quick stuff to test image

Had to tweak things a bit, and the QML part doesn't start up yet:

Starting docker://e5813ba3db76/data/dev/sessions/docker-quick-cmake/docker-quick-cmake...
QML debugging is enabled. Only use this in a safe environment.
QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-'
QQmlApplicationEngine failed to load component
qrc:/main.qml:2 module "QtQuick.Window" is not installed
qrc:/main.qml:1 module "QtQuick" is not installed
qrc:/main.qml:2 module "QtQuick.Window" is not installed
qrc:/main.qml:1 module "QtQuick" is not installed

Change-Id: If7ec4aebee27880e01af6184ae22509e97054137
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 .../docker/Dockerfile-qt-5-ubuntu-20.04-build | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build b/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build
index be10684ac3f..6aa5aad09ea 100644
--- a/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build
+++ b/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build
@@ -1,10 +1,10 @@
 
 FROM ubuntu:20.04
 
-RUN apt update && \
-    apt upgrade -y && \
-    apt dist-upgrade -y && \
-    apt install -y gpg wget software-properties-common
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get dist-upgrade -y && \
+    apt-get install -y gpg wget software-properties-common
 
 RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
     | gpg --dearmor - \
@@ -12,13 +12,17 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
 
 RUN apt-add-repository -y 'deb https://apt.kitware.com/ubuntu/ focal main'
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y \
     git \
     openssh-client \
     sudo \
     vim \
     cmake \
     qtbase5-dev \
+    qtdeclarative5-dev \
+    qtquickcontrols2-5-dev \
+    qtdeclarative5-dev-tools \
     libqt5core5a \
     libqt5widgets5 \
     libqt5quick5 \
@@ -30,5 +34,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
     nim \
     linux-tools-common \
     valgrind \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
+ && apt-get clean
+
+# && rm -rf /var/lib/apt/lists/*