Updated Qt conversion to build on mac/linux.

Signed-off-by: Chris Galvan <[email protected]>

package-system/Qt/build.sh

@@ -40,7 +40,7 @@ fi
 cd $BUILD_PATH
 
 echo Configuring Qt...
-../configure \
+../src/configure \
 -prefix ${TARGET_INSTALL_ROOT} \
 -opensource \
 -nomake examples \

package-system/Qt/build_config.json

@@ -27,23 +27,23 @@
         },
         "Darwin": {
             "Mac": {
+                "package_version": "5.15.2-rev5",
                 "custom_build_cmd": [
-                    "install_miniconda.py",
-                    "sh build.sh"
+                    "./build.sh"
                 ],
                 "custom_install_cmd": [
-                    "copy_platform_cmakes.py"
+                    "{python} copy_platform_cmakes.py"
                 ]
             }
         },
         "Linux": {
             "Linux": {
+                "package_version": "5.15.2-rev5",
                 "custom_build_cmd": [
-                    "install_miniconda.py",
-                    "sh build.sh"
+                    "./build.sh"
                 ],
                 "custom_install_cmd": [
-                    "copy_platform_cmakes.py"
+                    "{python} copy_platform_cmakes.py"
                 ]
             }
         }

package-system/Qt/docker/linux-build.Dockerfile

@@ -11,7 +11,7 @@ RUN apt-get -y install vim
 # O3DE build dependencies
 RUN apt-get -y install build-essential
 RUN apt-get -y install libgl-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libsdl2-2.0-0 libsdl2-dev
-RUN apt-get -y install clang-6.0 libc++-dev libc++abi-dev uuid-dev libz-dev libncurses5-dev libcurl4-openssl-dev libjpeg-dev libjbig-dev libpython3.7
+RUN apt-get -y install clang-12 libc++-dev libc++abi-dev uuid-dev libz-dev libncurses5-dev libcurl4-openssl-dev libjpeg-dev libjbig-dev libpython3.7
  
 RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100
 RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100

package_build_list_host_darwin.json

@@ -39,6 +39,7 @@
         "mcpp-2.7.2_az.2-rev1-mac": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.2-rev1",
         "mikkelsen-1.0.0.4-mac": "package-system/mikkelsen/build_package_image.py --platform mac",
         "mikkelsen-1.0.0.4-ios": "package-system/mikkelsen/build_package_image.py --platform ios",
+        "qt-5.15.2-rev5-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Mac --package-root ../../package-system --clean",
         "zlib-1.2.11-rev5-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Mac --package-root ../../package-system --clean",
         "zlib-1.2.11-rev5-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name iOS --package-root ../../package-system --clean",
         "lz4-1.9.3-vcpkg-rev4-mac": "package-system/lz4/build_package_image.py --platform-name mac",

package_build_list_host_linux.json

@@ -29,6 +29,7 @@
         "tiff-4.2.0.15-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux --package-root ../../package-system --clean",
         "python-3.7.10-rev2-linux": "package-system/python/build_package_image.py",
         "mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py",
+        "qt-5.15.2-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux --package-root ../../package-system --clean",
         "zlib-1.2.11-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean",
         "lz4-1.9.3-vcpkg-rev4-linux": "package-system/lz4/build_package_image.py --platform-name linux"
     },