Linux SDK support for building Natron 2.6 with QT5

tools/docker/natron-sdk-ubuntu24.04-apt/.gitignore

@@ -0,0 +1,30 @@
+build-Linux-installer.sh
+build-Linux-sdk.sh
+build-OSX-installer.sh
+build-Windows-installer.sh
+build-natron.sh
+build-plugins.sh
+checkout-repository.sh
+common.sh
+compiler-common.sh
+createBuildOptionsFile.sh
+ensure-ssh-identity.sh
+fixMacPortsDeps.sh
+gen-natron-doc.sh
+genDllVersions.sh
+gitRepositories.sh
+launchBuildMain.sh
+linuxStartupJenkins.sh
+macStartupJenkins.sh
+manageBuildOptions.sh
+manageLog.sh
+msysStartupJenkins.sh
+push.sh
+runUnitTests.sh
+uploadArtifactsMain.sh
+zip-python-mingw.sh
+zip-python.sh
+include
+pkg
+builds
+artifacts

tools/docker/natron-sdk-ubuntu24.04-apt/Dockerfile

@@ -0,0 +1,49 @@
+# Natron-SDK ubuntu 24.04 (apt) dockerfile.
+FROM ubuntu:24.04
+MAINTAINER https://github.com/NatronGitHub/Natron
+WORKDIR /home
+ARG SDK=/opt/Natron-sdk
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt update && apt install -y build-essential llvm xorg-dev libgl-dev libegl1-mesa-dev libglu-dev curl wget git valgrind zip python3 python3-dev libosmesa6-dev libboost-serialization-dev libboost-system-dev libexpat1-dev libcairo2-dev qt5-qmake qtbase5-dev libshiboken2-dev libpyside2-dev python3-pyside2.qtwidgets python3-qtpy qtdeclarative5-dev extra-cmake-modules libopenexr-dev libilmbase-dev libavcodec-dev libraw-dev libopenimageio-dev libopencolorio-dev libmagick++-dev libavformat-dev libcdr-dev libpoppler-glib-dev libpoppler-private-dev libpoppler-qt5-dev libpango1.0-dev libzip-dev libssl-dev libfftw3-dev && rm -rf /var/lib/apt/lists/*
+ENV WORKSPACE=/home \
+    GIT_URL=https://github.com/NatronGitHub/Natron.git \
+    GIT_BRANCH=RB-2.6 \
+    GIT_COMMIT= \
+    RELEASE_TAG=  \
+    SNAPSHOT_BRANCH= \
+    SNAPSHOT_COMMIT= \
+    UNIT_TESTS=true \
+    NATRON_LICENSE=GPL \
+    DISABLE_BREAKPAD=1 \
+    COMPILE_TYPE=release \
+    NATRON_DEV_STATUS=RC \
+    NATRON_CUSTOM_BUILD_USER_NAME= \
+    NATRON_EXTRA_QMAKE_FLAGS= \
+    BUILD_NAME=natron_github_RB2 \
+    DISABLE_RPM_DEB_PKGS=1 \
+    DISABLE_PORTABLE_ARCHIVE= \
+    BITS= \
+    DEBUG_SCRIPTS= \
+    EXTRA_PYTHON_MODULES_SCRIPT= \
+    BUILD_NUMBER=0
+
+COPY \
+    common.sh \
+    compiler-common.sh \
+    linuxStartupJenkins.sh \
+    launchBuildMain.sh \
+    manageBuildOptions.sh \
+    manageLog.sh \
+    createBuildOptionsFile.sh \
+    gitRepositories.sh \
+    checkout-repository.sh \
+    build-plugins.sh \
+    build-natron.sh \
+    build-Linux-installer.sh \
+    gen-natron-doc.sh \
+    zip-python.sh \
+    runUnitTests.sh \
+    uploadArtifactsMain.sh \
+    ./
+COPY include/ include/
+CMD ./launchBuildMain.sh

tools/docker/natron-sdk-ubuntu24.04-apt/build.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -xe
+
+cd `dirname "$0"`
+cp  ../../jenkins/*.sh .
+(cd ../../jenkins/; tar cf - include) | tar xf -
+export UBUNTU=24.04
+LABEL="natrongithub/natron-sdk-ubuntu24.04apt"
+#env GEN_DOCKERFILE=1 ../../jenkins/include/scripts/build-Linux-sdk.sh > Dockerfile
+docker build -t "${LABEL}:latest" .
+#docker build --no-cache -t "${LABEL}:latest" .
+echo "please execute:"
+#echo "docker-squash ${LABEL}:latest"
+echo "docker login"
+echo "docker tag ${LABEL}:latest ${LABEL}:$(date -u +%Y%m%d)"
+echo "docker push ${LABEL}:latest"
+echo "docker push ${LABEL}:$(date -u +%Y%m%d)"

tools/docker/natron-sdk-ubuntu24.04/.gitignore

@@ -0,0 +1,31 @@
+Dockerfile
+build-Linux-installer.sh
+build-Linux-sdk.sh
+build-OSX-installer.sh
+build-Windows-installer.sh
+build-natron.sh
+build-plugins.sh
+checkout-repository.sh
+common.sh
+compiler-common.sh
+createBuildOptionsFile.sh
+ensure-ssh-identity.sh
+fixMacPortsDeps.sh
+gen-natron-doc.sh
+genDllVersions.sh
+gitRepositories.sh
+launchBuildMain.sh
+linuxStartupJenkins.sh
+macStartupJenkins.sh
+manageBuildOptions.sh
+manageLog.sh
+msysStartupJenkins.sh
+push.sh
+runUnitTests.sh
+uploadArtifactsMain.sh
+zip-python-mingw.sh
+zip-python.sh
+include
+pkg
+builds
+artifacts

tools/docker/natron-sdk-ubuntu24.04/build.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+cd `dirname "$0"`
+cp  ../../jenkins/*.sh .
+(cd ../../jenkins/; tar cf - include) | tar xf -
+export UBUNTU=24.04
+LABEL="natrongithub/natron-sdk${UBUNTU+-ubuntu}${UBUNTU:-}${CENTOS+-centos}${CENTOS:-}${DTS+-dts}${DTS:-}"
+env GEN_DOCKERFILE=1 ../../jenkins/include/scripts/build-Linux-sdk.sh > Dockerfile
+docker build -t "${LABEL}:latest" .
+#docker build --no-cache -t "${LABEL}:latest" .
+echo "please execute:"
+#echo "docker-squash ${LABEL}:latest"
+echo "docker login"
+echo "docker tag ${LABEL}:latest ${LABEL}:$(date -u +%Y%m%d)"
+echo "docker push ${LABEL}:latest"
+echo "docker push ${LABEL}:$(date -u +%Y%m%d)"

tools/jenkins/build-Linux-installer.sh

@@ -42,17 +42,17 @@ popd () {
     command popd "$@" > /dev/null
 }
 
-LD_LIBRARY_PATH="${SDK_HOME}/lib:${FFMPEG_PATH}/lib:${SDK_HOME}/qt${QT_VERSION_MAJOR}/lib"
-PATH="${SDK_HOME}/gcc/bin:${SDK_HOME}/bin:$PATH"
+#LD_LIBRARY_PATH="${SDK_HOME}/lib:${FFMPEG_PATH}/lib:${SDK_HOME}/qt${QT_VERSION_MAJOR}/lib"
+#PATH="${SDK_HOME}/gcc/bin:${SDK_HOME}/bin:$PATH"
 export C_INCLUDE_PATH="${SDK_HOME}/gcc/include:${SDK_HOME}/include:${SDK_HOME}/qt${QT_VERSION_MAJOR}/include"
 export CPLUS_INCLUDE_PATH="${C_INCLUDE_PATH}"
 
-if [ "${ARCH}" = "x86_64" ]; then
-    LD_LIBRARY_PATH="${SDK_HOME}/gcc/lib64:${FFMPEG_PATH}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-else
-    LD_LIBRARY_PATH="${SDK_HOME}/gcc/lib:${FFMPEG_PATH}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-fi
-export LD_LIBRARY_PATH
+#if [ "${ARCH}" = "x86_64" ]; then
+#    LD_LIBRARY_PATH="${SDK_HOME}/gcc/lib64:${FFMPEG_PATH}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+#else
+#    LD_LIBRARY_PATH="${SDK_HOME}/gcc/lib:${FFMPEG_PATH}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+#fi
+#export LD_LIBRARY_PATH
 
 # Pretty architecture/platform identifier (used for breakpad symbol files)
 PKGOS_BITS="${PKGOS}-x86_${BITS}bit"

tools/jenkins/build-natron.sh

@@ -156,7 +156,7 @@ if [ "$QT_VERSION_MAJOR" = 5 ]; then
     rm Engine/Qt${QT_VERSION_MAJOR}/NatronEngine/* Gui/Qt${QT_VERSION_MAJOR}/NatronGui/* || true
     SHIBOKEN_INCLUDE_PATHS="-I. -I./Engine -I./Global -Ilibs/OpenFX/include -I${UNIX_SDK_HOME}/include -I${QTDIR}/include -I${QTDIR}/include/QtCore -I${UNIX_PYTHON_HOME}/include/python${PYVER} -I${UNIX_PYTHON_HOME}/include/PySide2 -I${UNIX_PYTHON_HOME}/include/PySide2/QtCore -I${UNIX_PYTHON_HOME}/include/PySide2/QtGui -I${UNIX_PYTHON_HOME}/lib/python${PYVER}/site-packages/PySide2/include -I${UNIX_PYTHON_HOME}/lib/python${PYVER}/site-packages/PySide2/include/QtCore -I${UNIX_PYTHON_HOME}/lib/python${PYVER}/site-packages/PySide2/include/QtGui"
     SHIBOKEN_TYPESYSTEM_PATHS="-T${UNIX_PYTHON_HOME}/share/PySide2/typesystems -T${UNIX_PYTHON_HOME}/lib/python${PYVER}/site-packages/PySide2/typesystems"
-    shiboken2 -std=c++17 --avoid-protected-hack --enable-pyside-extensions ${SHIBOKEN_INCLUDE_PATHS} ${SHIBOKEN_TYPESYSTEM_PATHS} --output-directory=Engine/Qt${QT_VERSION_MAJOR} Engine/Pyside2_Engine_Python.h  Engine/typesystem_engine.xml
+    shiboken2 -std=c++17 --avoid-protected-hack --enable-pyside-extensions ${SHIBOKEN_INCLUDE_PATHS} ${SHIBOKEN_TYPESYSTEM_PATHS} --output-directory=Engine/Qt${QT_VERSION_MAJOR} Engine/PySide2_Engine_Python.h  Engine/typesystem_engine.xml
 
     shiboken2 -std=c++17 --avoid-protected-hack --enable-pyside-extensions ${SHIBOKEN_INCLUDE_PATHS} -I${QTDIR}/include/QtWidgets -I${QTDIR}/include/QtGui -I${QTDIR}/include/QtCore  ${SHIBOKEN_TYPESYSTEM_PATHS} -T./Engine -T./Shiboken --output-directory=Gui/Qt${QT_VERSION_MAJOR} Gui/PySide2_Gui_Python.h  Gui/typesystem_natronGui.xml
 

tools/jenkins/build-plugins.sh

@@ -4,7 +4,7 @@
 
 set -e # Exit immediately if a command exits with a non-zero status
 set -u # Treat unset variables as an error when substituting.
-#set -x # Print commands and their arguments as they are executed.
+set -x # Print commands and their arguments as they are executed.
 
 source common.sh
 source manageBuildOptions.sh
@@ -63,18 +63,18 @@ fi
 # Setup env
 CXXFLAGS_EXTRA=
 if [ "$PKGOS" = "Linux" ]; then
-    export OPENJPEG_HOME="$SDK_HOME"
-    export THIRD_PARTY_TOOLS_HOME="$SDK_HOME"
-    export LD_LIBRARY_PATH="$SDK_HOME/lib:$FFMPEG_PATH/lib"
-    export PATH="$SDK_HOME/gcc/bin:$SDK_HOME/bin:$SDK_HOME/cmake/bin:$PATH"
-    if [ "$ARCH" = "x86_64" ]; then
-        export LD_LIBRARY_PATH="$SDK_HOME/gcc/lib64:$LD_LIBRARY_PATH"
-    else
-        export LD_LIBRARY_PATH="$SDK_HOME/gcc/lib:$LD_LIBRARY_PATH"
-    fi
-    export C_INCLUDE_PATH="${SDK_HOME}/gcc/include:${SDK_HOME}/include:${FFMPEG_PATH}/include:$LIBRAW_PATH/include"
-    export CPLUS_INCLUDE_PATH="${C_INCLUDE_PATH}"
-
+    echo "skipping setting env vars for linux"
+    #export OPENJPEG_HOME="$SDK_HOME"
+    #export THIRD_PARTY_TOOLS_HOME="$SDK_HOME"
+    #export LD_LIBRARY_PATH="$SDK_HOME/lib:$FFMPEG_PATH/lib"
+    #export PATH="$SDK_HOME/gcc/bin:$SDK_HOME/bin:$SDK_HOME/cmake/bin:$PATH"
+    #if [ "$ARCH" = "x86_64" ]; then
+    #    export LD_LIBRARY_PATH="$SDK_HOME/gcc/lib64:$LD_LIBRARY_PATH"
+    #else
+    #    export LD_LIBRARY_PATH="$SDK_HOME/gcc/lib:$LD_LIBRARY_PATH"
+    #fi
+    #export C_INCLUDE_PATH="${SDK_HOME}/gcc/include:${SDK_HOME}/include:${FFMPEG_PATH}/include:$LIBRAW_PATH/include"
+    #export CPLUS_INCLUDE_PATH="${C_INCLUDE_PATH}"
 elif [ "$PKGOS" = "Windows" ]; then
     export OPENJPEG_HOME="$SDK_HOME"
     export THIRD_PARTY_TOOLS_HOME="$SDK_HOME"
@@ -161,7 +161,9 @@ if [ "$BUILD_MISC" = "1" ] && [ -d "$TMP_PATH/openfx-misc" ]; then
     if [ -s "$OSMESA_PATH/lib/libMangledOSMesa32.a" ]; then
         MESALIB="-lMangledOSMesa32"
     fi
-    GLULIB="-lMangledGLU"
+    if [ "$PKGOS" != "Linux" ]; then
+        GLULIB="-lMangledGLU"
+    fi
 
     # Build static on Windows so that openfx-misc are usable on other hosts without DLL's and manifests (note Shadertoy will require osmesa dll)
     # Could/Should also be done on OSX?
@@ -212,7 +214,7 @@ if [ "$BUILD_MISC" = "1" ] && [ -d "$TMP_PATH/openfx-misc" ]; then
             LDFLAGS_ADD="${BUILDID:-} ${EXTRA_LDFLAGS_OFXMISC:-}" \
             HAVE_CIMG=0 \
             ${OMP} \
-            CXXFLAGS_EXTRA="-DHAVE_OSMESA ${CXXFLAGS_EXTRA}" \
+            CXXFLAGS_EXTRA="${CXXFLAGS_EXTRA}" \
             make -j"${MKJOBS}" ${MAKEFLAGS_VERBOSE:-}
         set +x
 
@@ -319,7 +321,8 @@ if [ "$BUILD_IO" = "1" ] && [ -d "$TMP_PATH/openfx-io" ]; then
             BITS="${BITS}" \
             LDFLAGS_ADD="${BUILDID:-}" \
             CXXFLAGS_EXTRA="${CXXFLAGS_EXTRA}" \
-            make -j"${MKJOBS}" ${MAKEFLAGS_VERBOSE:-}
+            make -j"${MKJOBS}" ${MAKEFLAGS_VERBOSE:-} \
+            SUBDIRS_NOMULTI="EXR FFmpeg OCIO OIIO PFM PNG" nomulti # Skip SeExpr2 which doesn't support Qt5
         ${CP_OR_MV} ./*/*-*-*/*.ofx.bundle "$TMP_BINARIES_PATH/OFX/Plugins/"
         set +x
         echo "Info: build openfx-io using make... done!"

tools/jenkins/common.sh

@@ -96,7 +96,8 @@ if [ "$PKGOS" = "Linux" ]; then
     else
         exit 1
     fi
-    SDK_HOME="/opt/Natron-$SDK_VERSION"
+    #SDK_HOME="/opt/Natron-$SDK_VERSION"
+    SDK_HOME="/usr"
     # Path where GPL builds are stored
     CUSTOM_BUILDS_PATH="$SDK_HOME"
 
@@ -330,21 +331,8 @@ if [ "$PKGOS" = "Windows" ]; then
         LIBRAW_PATH="$CUSTOM_BUILDS_PATH/libraw-lgpl"
     fi
 elif [ "$PKGOS" = "Linux" ]; then
-    if [ "${NATRON_LICENSE:-}" = "GPL" ]; then
-        if [ -d "$CUSTOM_BUILDS_PATH/ffmpeg-gpl" ]; then
-            FFMPEG_PATH="$CUSTOM_BUILDS_PATH/ffmpeg-gpl"
-        elif [ -d "$CUSTOM_BUILDS_PATH/ffmpeg-gpl2" ]; then
-            FFMPEG_PATH="$CUSTOM_BUILDS_PATH/ffmpeg-gpl2"
-        else
-            (>&2 echo "FFmpeg cannot be found in $SDK_HOME/ffmpeg-gpl or $SDK_HOME/ffmpeg-gpl2")
-            (>&2 echo "Info: Setting FFMPEG_PATH=$SDK_HOME/ffmpeg-gpl2")
-            FFMPEG_PATH="$SDK_HOME/ffmpeg-gpl2"
-        fi
-        LIBRAW_PATH="$CUSTOM_BUILDS_PATH/libraw-gpl2"
-    elif [ -z "${NATRON_LICENSE+x}" ] || [ "${NATRON_LICENSE:-}" = "COMMERCIAL" ]; then
-        FFMPEG_PATH="$CUSTOM_BUILDS_PATH/ffmpeg-lgpl"
-        LIBRAW_PATH="$CUSTOM_BUILDS_PATH/libraw-lgpl"
-    fi
+    FFMPEG_PATH="/usr"
+    LIBRAW_PATH="/usr"
 elif [ "$PKGOS" = "OSX" ]; then
     LIBRAW_PATH="$SDK_HOME"
     FFMPEG_PATH="$SDK_HOME"
@@ -371,13 +359,17 @@ if [ -d "$SDK_HOME/osmesa" ]; then
     OSMESA_PATH="$SDK_HOME/osmesa"
 elif [ -d "/opt/osmesa" ]; then
     OSMESA_PATH="/opt/osmesa"
+elif [ "$PKGOS" = "Linux" ]; then
+    OSMESA_PATH="/usr"
 else
     (>&2 echo "Warning: OSMesa cannot be found in $SDK_HOME/osmesa or /opt/osmesa")
     (>&2 echo "Info: Setting OSMESA_PATH=$SDK_HOME/osmesa")
     OSMESA_PATH="$SDK_HOME/osmesa"
 fi
 
-if [ -n "${LLVM_PREFIX:-}" ]; then
+if [ "$PKGOS" = "Linux" ]; then
+    LLVM_PATH="/usr"
+elif [ -n "${LLVM_PREFIX:-}" ]; then
     LLVM_PATH="${LLVM_PREFIX}"
 elif [ -d "$SDK_HOME/llvm" ]; then
     LLVM_PATH="$SDK_HOME/llvm"
@@ -396,6 +388,8 @@ elif [ -d "$SDK_HOME/libexec/qt${QT_VERSION_MAJOR}" ]; then
     QTDIR="$SDK_HOME/libexec/qt${QT_VERSION_MAJOR}"
 elif [ -x "$SDK_HOME/bin/qmake" ] || [ -x "$SDK_HOME/bin/qmake.exe" ]; then
     QTDIR="$SDK_HOME"
+elif [ "$PKGOS" = "Linux" ]; then
+    QTDIR="/usr"
 else
     (>&2 echo "Warning: Qt cannot be found in $SDK_HOME or $SDK_HOME/qt${QT_VERSION_MAJOR}")
     (>&2 echo "Info: setting QTDIR=$SDK_HOME/qt${QT_VERSION_MAJOR}")
@@ -407,24 +401,29 @@ BOOST_ROOT="$SDK_HOME"
 
 PKG_CONFIG_PATH=
 if [ "$PKGOS" = "Linux" ]; then
-    PATH="$SDK_HOME/bin:$QTDIR/bin:$SDK_HOME/gcc/bin:$FFMPEG_PATH/bin:$LIBRAW_PATH/bin:$PATH"
-    LIBRARY_PATH="$SDK_HOME/lib:$QTDIR/lib:$SDK_HOME/gcc/lib64:$SDK_HOME/gcc/lib:$FFMPEG_PATH/lib:$LIBRAW_PATH/lib"
-    LD_LIBRARY_PATH="$SDK_HOME/lib:$QTDIR/lib:$SDK_HOME/gcc/lib64:$SDK_HOME/gcc/lib:$FFMPEG_PATH/lib:$LIBRAW_PATH/lib"
+    echo "skipping using Natron SDK, deferring to ubuntu system libraries"
+    #PATH="$SDK_HOME/bin:$QTDIR/bin:$SDK_HOME/gcc/bin:$FFMPEG_PATH/bin:$LIBRAW_PATH/bin:$PATH"
+    #LIBRARY_PATH="$SDK_HOME/lib:$QTDIR/lib:$SDK_HOME/gcc/lib64:$SDK_HOME/gcc/lib:$FFMPEG_PATH/lib:$LIBRAW_PATH/lib"
+    #LD_LIBRARY_PATH="$SDK_HOME/lib:$QTDIR/lib:$SDK_HOME/gcc/lib64:$SDK_HOME/gcc/lib:$FFMPEG_PATH/lib:$LIBRAW_PATH/lib"
     #LD_RUN_PATH="$SDK_HOME/lib:$QTDIR/lib:$SDK_HOME/gcc/lib:$FFMPEG_PATH/lib:$LIBRAW_PATH/lib"
-    PKG_CONFIG_PATH="$SDK_HOME/lib/pkgconfig:$SDK_HOME/share/pkgconfig:$SDK_HOME/libdata/pkgconfig:$FFMPEG_PATH/lib/pkgconfig:$LIBRAW_PATH/lib/pkgconfig:$OSMESA_PATH/lib/pkgconfig:$PYTHON_HOME/lib/pkgconfig:$QTDIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
+    #PKG_CONFIG_PATH="$SDK_HOME/lib/pkgconfig:$SDK_HOME/share/pkgconfig:$SDK_HOME/libdata/pkgconfig:$FFMPEG_PATH/lib/pkgconfig:$LIBRAW_PATH/lib/pkgconfig:$OSMESA_PATH/lib/pkgconfig:$PYTHON_HOME/lib/pkgconfig:$QTDIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
 elif [ "$PKGOS" = "Windows" ]; then
     PKG_CONFIG_PATH="$FFMPEG_PATH/lib/pkgconfig:$LIBRAW_PATH/lib/pkgconfig:$OSMESA_PATH/lib/pkgconfig:$(cygpath -u ${PYTHON_HOME})/lib/pkgconfig:$QTDIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
 elif [ "$PKGOS" = "OSX" ]; then
     PKG_CONFIG_PATH="$FFMPEG_PATH/lib/pkgconfig:$LIBRAW_PATH/lib/pkgconfig:$OSMESA_PATH/lib/pkgconfig:$PYTHON_HOME/lib/pkgconfig:$QTDIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
 fi
 export LD_LIBRARY_PATH LD_RUN_PATH DYLD_LIBRARY_PATH LIBRARY_PATH CPATH PKG_CONFIG_PATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH BOOST_ROOT
 
-if [ "${QT_VERSION_MAJOR}" = 4 ]; then
-    QT_VERSION=$(pkg-config --modversion QtCore)
-else
-    QT_VERSION=$(pkg-config --modversion Qt${QT_VERSION_MAJOR}Core)
-fi
-QT_VERSION_MINOR=$(echo $QT_VERSION | cut -d. -f2)
+# [Troy] This is unnecessary and breaks the linux build because pkg-config
+# is used to find the Qt5 version before Qt5 is actually built/installed into
+# $SDK_HOME.
+#
+#if [ "${QT_VERSION_MAJOR}" = 4 ]; then
+#    QT_VERSION=$(pkg-config --modversion QtCore)
+#else
+#    QT_VERSION=$(pkg-config --modversion Qt${QT_VERSION_MAJOR}Core)
+#fi
+#QT_VERSION_MINOR=$(echo $QT_VERSION | cut -d. -f2)
 
 # Load compiler related stuff
 source $CWD/compiler-common.sh