2 files changed, 9 insertions, 4 deletions
diff --git a/configure b/configure
index 941cee2..7134faf 100755
--- a/configure
+++ b/configure
@@ -7310,10 +7310,12 @@ elif [ "$CFG_DEBUG" = "no" ]; then
 fi
 if [ "$CFG_SHARED" = "yes" ]; then
     QMAKE_OUTDIR="${QMAKE_OUTDIR}-shared"
-    QMAKE_CONFIG="$QMAKE_CONFIG shared dll"
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG shared"
+    QT_CONFIG="$QT_CONFIG shared"
 elif [ "$CFG_SHARED" = "no" ]; then
     QMAKE_OUTDIR="${QMAKE_OUTDIR}-static"
-    QMAKE_CONFIG="$QMAKE_CONFIG static"
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG static"
+    QT_CONFIG="$QT_CONFIG static"
 fi
 if [ "$PLATFORM_QWS" = "yes" ]; then
     QMAKE_OUTDIR="${QMAKE_OUTDIR}-emb-$CFG_EMBEDDED"
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 5d64be4..73dc190 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3247,10 +3247,13 @@ void Configure::generateCachefile()
         QTextStream configStream(&configFile);
         configStream << "CONFIG+= ";
         configStream << dictionary[ "BUILD" ];
-        if (dictionary[ "SHARED" ] == "yes")
+        if (dictionary[ "SHARED" ] == "yes") {
             configStream << " shared";
-        else
+            qtConfig << "shared";
+        } else {
             configStream << " static";
+            qtConfig << "static";
+        }
 
         if (dictionary[ "LTCG" ] == "yes")
             configStream << " ltcg";