Set correct QT_LFLAGS_SQLITE for default cases.

In systems where no pkgconfig is available, such as QNX, we set
QT_LFLAGS_SQLITE to the default values.

cherry-picked from qt5/qtbase: a94e917eeb7b19eb19c3cf74d71a9b4cabfb1124

Change-Id: Iccf4e403a90e85b41c70895e1c91fe2d8f0eb573
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

2 files changed, 12 insertions, 4 deletions

diff --git a/configure b/configure
index 48b76d3..b6fea44 100755
--- a/configure
+++ b/configure
@@ -5555,6 +5555,9 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
                     if [ -n "$PKG_CONFIG" ]; then
                         QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
                         QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
+                    else
+                        QT_CFLAGS_SQLITE=
+                        QT_LFLAGS_SQLITE="-lsqlite3 -lz"
                     fi
                     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
                         if [ "$CFG_SQL_sqlite" = "auto" ]; then
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index cbf20f4..50c7c66 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2231,10 +2231,15 @@ bool Configure::checkAvailability(const QString &part)
             available = true; // Built in, we have a fork
     else if (part == "SQL_SQLITE_LIB") {
         if (dictionary[ "SQL_SQLITE_LIB" ] == "system") {
-            // Symbian has multiple .lib/.dll files we need to find
-            if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
-                available = true; // There is sqlite_symbian plugin which exports the necessary stuff
-                dictionary[ "QT_LFLAGS_SQLITE" ] += "-lsqlite3";
+            if (dictionary.contains("XQMAKESPEC")) {
+                // Symbian has multiple .lib/.dll files we need to find
+                if (dictionary["XQMAKESPEC"].startsWith("symbian")) {
+                    available = true; // There is sqlite_symbian plugin which exports the necessary stuff
+                    dictionary[ "QT_LFLAGS_SQLITE" ] += "-lsqlite3";
+                } else if (dictionary["XQMAKESPEC"].endsWith("qcc")) {
+                    available = true;
+                    dictionary[ "QT_LFLAGS_SQLITE" ] += "-lsqlite3 -lz";
+                }
             } else {
                 available = findFile("sqlite3.h") && findFile("sqlite3.lib");
                 if (available)