From da95152dfb968d815f898f3d190988a915f49142 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sun, 20 Mar 2016 23:07:46 +0100 Subject: Unify naming of LIBS/CFLAGS for 3rd party libraries Most libs use QMAKE_LIBS/CFLAGS, but some have other naming conventions. Unify them into using QMAKE_LIBS/CFLAGS. Change-Id: I39b188adc1f9a223a83b294c5315c3095a9c68de Reviewed-by: Oswald Buddenhagen --- configure | 178 ++++++++++----------- src/corelib/kernel/kernel.pri | 4 +- src/dbus/dbus.pro | 10 +- .../eventdispatchers/eventdispatchers.pri | 4 +- src/plugins/platforms/xcb/xcb_qpa_lib.pro | 2 +- src/plugins/platformthemes/gtk3/gtk3.pro | 4 +- src/plugins/sqldrivers/mysql/mysql.pro | 6 +- src/plugins/sqldrivers/odbc/odbc.pro | 2 +- src/plugins/sqldrivers/psql/psql.pro | 4 +- src/plugins/sqldrivers/sqlite/sqlite.pro | 4 +- src/plugins/sqldrivers/tds/tds.pro | 4 +- .../qdbusmarshall/qdbusmarshall/qdbusmarshall.pro | 4 +- tests/auto/dbus/qdbustype/qdbustype.pro | 4 +- tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 2 +- tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 2 +- tests/benchmarks/dbus/qdbustype/qdbustype.pro | 4 +- tools/configure/configureapp.cpp | 20 +-- 17 files changed, 129 insertions(+), 129 deletions(-) diff --git a/configure b/configure index 6e8cb70e6b..73e0cf7cb8 100755 --- a/configure +++ b/configure @@ -803,23 +803,23 @@ QT_HOST_DATA= QT_EXT_PREFIX= #flags for SQL drivers -QT_CFLAGS_PSQL= -QT_LFLAGS_PSQL= -QT_CFLAGS_MYSQL= -QT_LFLAGS_MYSQL= -QT_LFLAGS_MYSQL_R= -QT_CFLAGS_SQLITE= -QT_LFLAGS_SQLITE= -QT_LFLAGS_ODBC="-lodbc" -QT_LFLAGS_TDS= +QMAKE_CFLAGS_PSQL= +QMAKE_LIBS_PSQL= +QMAKE_CFLAGS_MYSQL= +QMAKE_LIBS_MYSQL= +QMAKE_LIBS_MYSQL_R= +QMAKE_CFLAGS_SQLITE= +QMAKE_LIBS_SQLITE= +QMAKE_LIBS_ODBC="-lodbc" +QMAKE_LIBS_TDS= # flags for libdbus-1 -QT_CFLAGS_DBUS= -QT_LIBS_DBUS= +QMAKE_CFLAGS_DBUS= +QMAKE_LIBS_DBUS= # flags for Glib (X11 only) -QT_CFLAGS_GLIB= -QT_LIBS_GLIB= +QMAKE_CFLAGS_GLIB= +QMAKE_LIBS_GLIB= # default qpa platform QT_QPA_DEFAULT_PLATFORM= @@ -4643,10 +4643,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do if [ "$CFG_SQL_mysql" != "no" ]; then [ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`"$WHICH" mysql_config` if [ -x "$CFG_MYSQL_CONFIG" ]; then - QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null | filterIncludeOptions` + QMAKE_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null | filterIncludeOptions` # -rdynamic should not be returned by mysql_config, but is on RHEL 6.6 - QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null | filterLibraryOptions | sed "s/-rdynamic//"` - QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null | filterLibraryOptions | sed "s/-rdynamic//"` + QMAKE_LIBS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null | filterLibraryOptions | sed "s/-rdynamic//"` + QMAKE_LIBS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null | filterLibraryOptions | sed "s/-rdynamic//"` QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null` QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1` fi @@ -4659,16 +4659,16 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do exit 101 else CFG_SQL_mysql="no" - QT_LFLAGS_MYSQL="" - QT_LFLAGS_MYSQL_R="" - QT_CFLAGS_MYSQL="" + QMAKE_LIBS_MYSQL="" + QMAKE_LIBS_MYSQL_R="" + QMAKE_CFLAGS_MYSQL="" fi else - if compileTest unix/mysql_r "MySQL (thread-safe)" $QT_LFLAGS_MYSQL_R $QT_CFLAGS_MYSQL; then + if compileTest unix/mysql_r "MySQL (thread-safe)" $QMAKE_LIBS_MYSQL_R $QMAKE_CFLAGS_MYSQL; then QMakeVar add CONFIG use_libmysqlclient_r CFG_SQL_mysql=yes - QT_LFLAGS_MYSQL="$QT_LFLAGS_MYSQL_R" - elif compileTest unix/mysql "MySQL (thread-unsafe)" $QT_LFLAGS_MYSQL $QT_CFLAGS_MYSQL; then + QMAKE_LIBS_MYSQL="$QMAKE_LIBS_MYSQL_R" + elif compileTest unix/mysql "MySQL (thread-unsafe)" $QMAKE_LIBS_MYSQL $QMAKE_CFLAGS_MYSQL; then CFG_SQL_mysql=yes else if [ "$CFG_SQL_mysql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4679,9 +4679,9 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do exit 101 else CFG_SQL_mysql=no - QT_LFLAGS_MYSQL="" - QT_LFLAGS_MYSQL_R="" - QT_CFLAGS_MYSQL="" + QMAKE_LIBS_MYSQL="" + QMAKE_LIBS_MYSQL_R="" + QMAKE_CFLAGS_MYSQL="" fi fi fi @@ -4692,14 +4692,14 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config` # Be careful not to use native pg_config when cross building. if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then - QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null | filterIncludePath` - QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath` + QMAKE_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null | filterIncludePath` + QMAKE_LIBS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath` fi - [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" - [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" + [ -z "$QMAKE_CFLAGS_PSQL" ] || QMAKE_CFLAGS_PSQL="-I$QMAKE_CFLAGS_PSQL" + [ -z "$QMAKE_LIBS_PSQL" ] || QMAKE_LIBS_PSQL="-L$QMAKE_LIBS_PSQL" # But, respect PSQL_LIBS if set - [ -z "$PSQL_LIBS" ] || QT_LFLAGS_PSQL="$PSQL_LIBS" - if compileTest unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $QT_CFLAGS_PSQL; then + [ -z "$PSQL_LIBS" ] || QMAKE_LIBS_PSQL="$PSQL_LIBS" + if compileTest unix/psql "PostgreSQL" $QMAKE_LIBS_PSQL $QMAKE_CFLAGS_PSQL; then CFG_SQL_psql=yes else if [ "$CFG_SQL_psql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4710,8 +4710,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do exit 101 else CFG_SQL_psql=no - QT_CFLAGS_PSQL="" - QT_LFLAGS_PSQL="" + QMAKE_CFLAGS_PSQL="" + QMAKE_LIBS_PSQL="" fi fi fi @@ -4722,7 +4722,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do CFG_SQL_odbc=yes else if compileTest unix/iodbc "iODBC"; then - QT_LFLAGS_ODBC="-liodbc" + QMAKE_LIBS_ODBC="-liodbc" CFG_SQL_odbc=yes else if [ "$CFG_SQL_odbc" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4757,9 +4757,9 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; tds) if [ "$CFG_SQL_tds" != "no" ]; then - [ -z "$SYBASE" ] || QT_LFLAGS_TDS="-L$SYBASE/lib" - [ -z "$SYBASE_LIBS" ] || QT_LFLAGS_TDS="$QT_LFLAGS_TDS $SYBASE_LIBS" - if compileTest unix/tds "TDS" $QT_LFLAGS_TDS; then + [ -z "$SYBASE" ] || QMAKE_LIBS_TDS="-L$SYBASE/lib" + [ -z "$SYBASE_LIBS" ] || QMAKE_LIBS_TDS="$QMAKE_LIBS_TDS $SYBASE_LIBS" + if compileTest unix/tds "TDS" $QMAKE_LIBS_TDS; then CFG_SQL_tds=yes else if [ "$CFG_SQL_tds" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4830,13 +4830,13 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do SQLITE_AUTODETECT_FAILED="no" if [ "$CFG_SQLITE" = "system" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then - QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null` - QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null` + QMAKE_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null` + QMAKE_LIBS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null` else - QT_CFLAGS_SQLITE= - QT_LFLAGS_SQLITE="-lsqlite3 -lz" + QMAKE_CFLAGS_SQLITE= + QMAKE_LIBS_SQLITE="-lsqlite3 -lz" fi - if compileTest unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $QT_CFLAGS_SQLITE; then + if compileTest unix/sqlite "SQLite" $QMAKE_LIBS_SQLITE $QMAKE_CFLAGS_SQLITE; then CFG_SQL_sqlite=yes QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite" else @@ -4930,20 +4930,20 @@ fi # runtime: no detection (cannot fail), load libdbus-1 at runtime if [ "$CFG_DBUS" = "auto" ] || [ "$CFG_DBUS" = "linked" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then - QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null` - QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null` + QMAKE_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null` + QMAKE_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null` else - QT_LIBS_DBUS="-ldbus-1" + QMAKE_LIBS_DBUS="-ldbus-1" fi - if compileTest unix/dbus "D-Bus" $QT_CFLAGS_DBUS $QT_LIBS_DBUS; then - QMakeVar set QT_LIBS_DBUS "$QT_LIBS_DBUS" - QMakeVar set QT_CFLAGS_DBUS "$QT_CFLAGS_DBUS" + if compileTest unix/dbus "D-Bus" $QMAKE_CFLAGS_DBUS $QMAKE_LIBS_DBUS; then + QMakeVar set QMAKE_LIBS_DBUS "$QMAKE_LIBS_DBUS" + QMakeVar set QMAKE_CFLAGS_DBUS "$QMAKE_CFLAGS_DBUS" # Try find correct host configuration for dbus tools when cross-compiling if [ "$QT_CROSS_COMPILE" = "yes" ] && env -i PATH="$PATH" \ pkg-config --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then - QT_CFLAGS_DBUS=`env -i PATH="$PATH" pkg-config --cflags dbus-1 2>/dev/null` + QMAKE_CFLAGS_DBUS=`env -i PATH="$PATH" pkg-config --cflags dbus-1 2>/dev/null` fi - QMakeVar set QT_HOST_CFLAGS_DBUS "$QT_CFLAGS_DBUS" + QMakeVar set QT_HOST_CFLAGS_DBUS "$QMAKE_CFLAGS_DBUS" CFG_DBUS=linked else # Failed to compile the test, so it's an error if CFG_DBUS is "linked" @@ -4982,13 +4982,13 @@ fi # auto-detect Glib support if [ "$CFG_GLIB" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then - QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null` - QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null` + QMAKE_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null` + QMAKE_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null` fi - if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then + if compileTest unix/glib "Glib" $QMAKE_CFLAGS_GLIB $QMAKE_LIBS_GLIB; then CFG_GLIB=yes - QMakeVar set QT_CFLAGS_GLIB "$QT_CFLAGS_GLIB" - QMakeVar set QT_LIBS_GLIB "$QT_LIBS_GLIB" + QMakeVar set QMAKE_CFLAGS_GLIB "$QMAKE_CFLAGS_GLIB" + QMakeVar set QMAKE_LIBS_GLIB "$QMAKE_LIBS_GLIB" else if [ "$CFG_GLIB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then echo "Glib support cannot be enabled due to functionality tests!" @@ -5006,15 +5006,15 @@ fi # auto-detect GTK style support if [ "$CFG_GLIB" = "yes" -a "$CFG_GTK" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then - QT_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null` - QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null` - QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null` + QMAKE_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null` + QMAKE_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null` + QMAKE_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null` fi - if [ -n "$QT_CFLAGS_QGTK3" ] ; then + if [ -n "$QMAKE_CFLAGS_QGTK3" ] ; then CFG_GTK=yes QT_CONFIG="$QT_CONFIG gtk3" - QMakeVar set QT_CFLAGS_QGTK3 "$QT_CFLAGS_QGTK3" - QMakeVar set QT_LIBS_QGTK3 "$QT_LIBS_QGTK3" + QMakeVar set QMAKE_CFLAGS_QGTK3 "$QMAKE_CFLAGS_QGTK3" + QMakeVar set QMAKE_LIBS_QGTK3 "$QMAKE_LIBS_QGTK3" else if [ "$CFG_GTK" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then echo "GTK theme support cannot be enabled due to functionality tests!" @@ -5053,13 +5053,13 @@ fi # Auto-detect PulseAudio support if [ "$CFG_PULSEAUDIO" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then - QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null` - QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null` + QMAKE_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null` + QMAKE_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null` fi - if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then + if compileTest unix/pulseaudio "PulseAudio" $QMAKE_CFLAGS_PULSEAUDIO $QMAKE_LIBS_PULSEAUDIO; then CFG_PULSEAUDIO=yes - QMakeVar set QT_CFLAGS_PULSEAUDIO "$QT_CFLAGS_PULSEAUDIO" - QMakeVar set QT_LIBS_PULSEAUDIO "$QT_LIBS_PULSEAUDIO" + QMakeVar set QMAKE_CFLAGS_PULSEAUDIO "$QMAKE_CFLAGS_PULSEAUDIO" + QMakeVar set QMAKE_LIBS_PULSEAUDIO "$QMAKE_LIBS_PULSEAUDIO" else if [ "$CFG_PULSEAUDIO" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then echo "PulseAudio support cannot be enabled due to functionality tests!" @@ -5217,16 +5217,16 @@ fi # auto-detect FontConfig support if [ "$CFG_FONTCONFIG" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then - QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null` - QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null` + QMAKE_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null` + QMAKE_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null` else - QT_CFLAGS_FONTCONFIG= - QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig" + QMAKE_CFLAGS_FONTCONFIG= + QMAKE_LIBS_FONTCONFIG="-lfreetype -lfontconfig" fi - if compileTest unix/fontconfig "FontConfig" $QT_CFLAGS_FONTCONFIG $QT_LIBS_FONTCONFIG; then + if compileTest unix/fontconfig "FontConfig" $QMAKE_CFLAGS_FONTCONFIG $QMAKE_LIBS_FONTCONFIG; then QT_CONFIG="$QT_CONFIG fontconfig" - QMakeVar set QMAKE_CFLAGS_FONTCONFIG "$QT_CFLAGS_FONTCONFIG" - QMakeVar set QMAKE_LIBS_FONTCONFIG "$QT_LIBS_FONTCONFIG" + QMakeVar set QMAKE_CFLAGS_FONTCONFIG "$QMAKE_CFLAGS_FONTCONFIG" + QMakeVar set QMAKE_LIBS_FONTCONFIG "$QMAKE_LIBS_FONTCONFIG" CFG_FONTCONFIG=yes CFG_FREETYPE=system else @@ -6809,29 +6809,29 @@ host_build { EOF echo "QT_COORD_TYPE = $CFG_QREAL" -if [ -n "$QT_CFLAGS_PSQL" ]; then - echo "QT_CFLAGS_PSQL = $QT_CFLAGS_PSQL" +if [ -n "$QMAKE_CFLAGS_PSQL" ]; then + echo "QMAKE_CFLAGS_PSQL = $QMAKE_CFLAGS_PSQL" fi -if [ -n "$QT_LFLAGS_PSQL" ]; then - echo "QT_LFLAGS_PSQL = $QT_LFLAGS_PSQL" +if [ -n "$QMAKE_LIBS_PSQL" ]; then + echo "QMAKE_LIBS_PSQL = $QMAKE_LIBS_PSQL" fi -if [ -n "$QT_CFLAGS_MYSQL" ]; then - echo "QT_CFLAGS_MYSQL = $QT_CFLAGS_MYSQL" +if [ -n "$QMAKE_CFLAGS_MYSQL" ]; then + echo "QMAKE_CFLAGS_MYSQL = $QMAKE_CFLAGS_MYSQL" fi -if [ -n "$QT_LFLAGS_MYSQL" ]; then - echo "QT_LFLAGS_MYSQL = $QT_LFLAGS_MYSQL" +if [ -n "$QMAKE_LIBS_MYSQL" ]; then + echo "QMAKE_LIBS_MYSQL = $QMAKE_LIBS_MYSQL" fi -if [ -n "$QT_CFLAGS_SQLITE" ]; then - echo "QT_CFLAGS_SQLITE = $QT_CFLAGS_SQLITE" +if [ -n "$QMAKE_CFLAGS_SQLITE" ]; then + echo "QMAKE_CFLAGS_SQLITE = $QMAKE_CFLAGS_SQLITE" fi -if [ -n "$QT_LFLAGS_SQLITE" ]; then - echo "QT_LFLAGS_SQLITE = $QT_LFLAGS_SQLITE" +if [ -n "$QMAKE_LIBS_SQLITE" ]; then + echo "QMAKE_LIBS_SQLITE = $QMAKE_LIBS_SQLITE" fi -if [ -n "$QT_LFLAGS_ODBC" ]; then - echo "QT_LFLAGS_ODBC = $QT_LFLAGS_ODBC" +if [ -n "$QMAKE_LIBS_ODBC" ]; then + echo "QMAKE_LIBS_ODBC = $QMAKE_LIBS_ODBC" fi -if [ -n "$QT_LFLAGS_TDS" ]; then - echo "QT_LFLAGS_TDS = $QT_LFLAGS_TDS" +if [ -n "$QMAKE_LIBS_TDS" ]; then + echo "QMAKE_LIBS_TDS = $QMAKE_LIBS_TDS" fi #dump in the OPENSSL_LIBS info diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index a8d1ec08a6..aa60e1686c 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -148,8 +148,8 @@ unix|integrity { kernel/qeventdispatcher_glib.cpp HEADERS += \ kernel/qeventdispatcher_glib_p.h - QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB - LIBS_PRIVATE +=$$QT_LIBS_GLIB + QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_GLIB + LIBS_PRIVATE +=$$QMAKE_LIBS_GLIB } contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri) diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 4c1aec7bb3..445ff48482 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -3,15 +3,15 @@ QT = core-private CONFIG += link_pkgconfig MODULE_CONFIG = dbusadaptors dbusinterfaces -!contains(QT_LIBS_DBUS, .*dbus-1.*) { - win32:CONFIG(debug, debug|release):QT_LIBS_DBUS += -ldbus-1d - else:QT_LIBS_DBUS += -ldbus-1 +!contains(QMAKE_LIBS_DBUS, .*dbus-1.*) { + win32:CONFIG(debug, debug|release):QMAKE_LIBS_DBUS += -ldbus-1d + else:QMAKE_LIBS_DBUS += -ldbus-1 } DEFINES += DBUS_API_SUBJECT_TO_CHANGE -QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS contains(QT_CONFIG, dbus-linked) { - LIBS_PRIVATE += $$QT_LIBS_DBUS + LIBS_PRIVATE += $$QMAKE_LIBS_DBUS DEFINES += QT_LINKED_LIBDBUS } diff --git a/src/platformsupport/eventdispatchers/eventdispatchers.pri b/src/platformsupport/eventdispatchers/eventdispatchers.pri index a0b37cae1a..6a4689eb19 100644 --- a/src/platformsupport/eventdispatchers/eventdispatchers.pri +++ b/src/platformsupport/eventdispatchers/eventdispatchers.pri @@ -17,6 +17,6 @@ HEADERS +=\ contains(QT_CONFIG, glib) { SOURCES +=$$PWD/qeventdispatcher_glib.cpp HEADERS +=$$PWD/qeventdispatcher_glib_p.h - QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB - LIBS_PRIVATE += $$QT_LIBS_GLIB + QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_GLIB + LIBS_PRIVATE += $$QMAKE_LIBS_GLIB } diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index f4a4e5a78a..8ae0b72cd7 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -81,7 +81,7 @@ CONFIG += qpa/genericunixfontdatabase contains(QT_CONFIG, dbus-linked) { QT += dbus - LIBS += $$QT_LIBS_DBUS + LIBS += $$QMAKE_LIBS_DBUS } contains(QT_CONFIG, xcb-qt) { diff --git a/src/plugins/platformthemes/gtk3/gtk3.pro b/src/plugins/platformthemes/gtk3/gtk3.pro index cd19e73ed8..ba459843f0 100644 --- a/src/plugins/platformthemes/gtk3/gtk3.pro +++ b/src/plugins/platformthemes/gtk3/gtk3.pro @@ -8,8 +8,8 @@ load(qt_plugin) QT += core-private gui-private platformsupport-private CONFIG += X11 -QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTK3 -LIBS += $$QT_LIBS_QGTK3 +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_QGTK3 +LIBS += $$QMAKE_LIBS_QGTK3 HEADERS += \ qgtk3dialoghelpers.h \ diff --git a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro index 442ad7f5a4..3bd8cd0040 100644 --- a/src/plugins/sqldrivers/mysql/mysql.pro +++ b/src/plugins/sqldrivers/mysql/mysql.pro @@ -3,11 +3,11 @@ TARGET = qsqlmysql HEADERS += $$PWD/qsql_mysql_p.h SOURCES += $$PWD/qsql_mysql.cpp $$PWD/main.cpp -QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL -LIBS += $$QT_LFLAGS_MYSQL +QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_MYSQL +LIBS += $$QMAKE_LIBS_MYSQL unix { - isEmpty(QT_LFLAGS_MYSQL) { + isEmpty(QMAKE_LIBS_MYSQL) { !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { use_libmysqlclient_r:LIBS += -lmysqlclient_r else:LIBS += -lmysqlclient diff --git a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro index e002f06576..0e49f1ac66 100644 --- a/src/plugins/sqldrivers/odbc/odbc.pro +++ b/src/plugins/sqldrivers/odbc/odbc.pro @@ -7,7 +7,7 @@ unix { DEFINES += UNICODE !contains(LIBS, .*odbc.*) { osx:LIBS += -liodbc - else:LIBS += $$QT_LFLAGS_ODBC + else:LIBS += $$QMAKE_LIBS_ODBC } } else { LIBS *= -lodbc32 diff --git a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro index 43eebab7d3..4a05266120 100644 --- a/src/plugins/sqldrivers/psql/psql.pro +++ b/src/plugins/sqldrivers/psql/psql.pro @@ -4,9 +4,9 @@ HEADERS += $$PWD/qsql_psql_p.h SOURCES += $$PWD/qsql_psql.cpp $$PWD/main.cpp unix|mingw { - LIBS += $$QT_LFLAGS_PSQL + LIBS += $$QMAKE_LIBS_PSQL !contains(LIBS, .*pq.*):LIBS += -lpq - QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL + QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_PSQL } else { !contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32 } diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro index 6b2c083878..c98655f85c 100644 --- a/src/plugins/sqldrivers/sqlite/sqlite.pro +++ b/src/plugins/sqldrivers/sqlite/sqlite.pro @@ -6,8 +6,8 @@ SOURCES += $$PWD/qsql_sqlite.cpp $$PWD/smain.cpp !system-sqlite:!contains(LIBS, .*sqlite3.*) { include($$PWD/../../../3rdparty/sqlite.pri) } else { - LIBS += $$QT_LFLAGS_SQLITE - QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE + LIBS += $$QMAKE_LIBS_SQLITE + QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_SQLITE } OTHER_FILES += sqlite.json diff --git a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro index 790c74de4e..b5d32ae5a8 100644 --- a/src/plugins/sqldrivers/tds/tds.pro +++ b/src/plugins/sqldrivers/tds/tds.pro @@ -4,9 +4,9 @@ HEADERS += $$PWD/qsql_tds_p.h SOURCES += $$PWD/qsql_tds.cpp $$PWD/main.cpp unix|mingw: { - LIBS += $$QT_LFLAGS_TDS + LIBS += $$QMAKE_LIBS_TDS !contains(LIBS, .*sybdb.*):LIBS += -lsybdb - QMAKE_CXXFLAGS *= $$QT_CFLAGS_TDS + QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_TDS } else { LIBS *= -lNTWDBLIB } diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro index b0442a0ee4..21e665fa37 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro @@ -7,8 +7,8 @@ QT = core-private dbus-private testlib contains(QT_CONFIG, dbus-linked) { DEFINES += QT_LINKED_LIBDBUS - LIBS += $$QT_LIBS_DBUS - QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS + LIBS += $$QMAKE_LIBS_DBUS + QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS } else { SOURCES += ../../../../../src/dbus/qdbus_symbols.cpp } diff --git a/tests/auto/dbus/qdbustype/qdbustype.pro b/tests/auto/dbus/qdbustype/qdbustype.pro index 17ae349675..e65b9ec5b3 100644 --- a/tests/auto/dbus/qdbustype/qdbustype.pro +++ b/tests/auto/dbus/qdbustype/qdbustype.pro @@ -4,8 +4,8 @@ QT = core-private dbus-private testlib SOURCES += tst_qdbustype.cpp contains(QT_CONFIG, dbus-linked) { DEFINES += QT_LINKED_LIBDBUS - LIBS += $$QT_LIBS_DBUS - QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS + LIBS += $$QMAKE_LIBS_DBUS + QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS } else { SOURCES += ../../../../src/dbus/qdbus_symbols.cpp } diff --git a/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro index 4bfa89a44e..fa232b323b 100644 --- a/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro @@ -2,7 +2,7 @@ CONFIG += testcase QT = core testlib dbus TARGET = tst_qdbuscpp2xml -QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS SOURCES += tst_qdbuscpp2xml.cpp \ diff --git a/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro index 8c29ff47c4..02910b0267 100644 --- a/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -2,4 +2,4 @@ CONFIG += testcase QT = core testlib TARGET = tst_qdbusxml2cpp SOURCES += tst_qdbusxml2cpp.cpp -QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS diff --git a/tests/benchmarks/dbus/qdbustype/qdbustype.pro b/tests/benchmarks/dbus/qdbustype/qdbustype.pro index d30bad8ce7..8d2f45edf8 100644 --- a/tests/benchmarks/dbus/qdbustype/qdbustype.pro +++ b/tests/benchmarks/dbus/qdbustype/qdbustype.pro @@ -3,8 +3,8 @@ QT -= gui QT += core-private dbus-private testlib contains(QT_CONFIG, dbus-linked) { DEFINES += QT_LINKED_LIBDBUS - LIBS += $$QT_LIBS_DBUS - QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS + LIBS += $$QMAKE_LIBS_DBUS + QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS } else { SOURCES += ../../../../src/dbus/qdbus_symbols.cpp } diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d5c47357fa..f5f4296000 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2124,11 +2124,11 @@ bool Configure::checkAvailability(const QString &part) if (dictionary[ "SQL_SQLITE_LIB" ] == "system") { if (platform() == QNX) { available = true; - dictionary[ "QT_LFLAGS_SQLITE" ] += "-lsqlite3 -lz"; + dictionary[ "QMAKE_LIBS_SQLITE" ] += "-lsqlite3 -lz"; } else { available = findFile("sqlite3.h") && findFile("sqlite3.lib"); if (available) - dictionary[ "QT_LFLAGS_SQLITE" ] += "sqlite3.lib"; + dictionary[ "QMAKE_LIBS_SQLITE" ] += "sqlite3.lib"; } } else { available = true; @@ -2733,8 +2733,8 @@ void Configure::generateOutputVars() if (!qmakeLibs.isEmpty()) qmakeVars += "LIBS += " + formatPaths(qmakeLibs); - if (!dictionary["QT_LFLAGS_SQLITE"].isEmpty()) - qmakeVars += "QT_LFLAGS_SQLITE += " + dictionary["QT_LFLAGS_SQLITE"]; + if (!dictionary["QMAKE_LIBS_SQLITE"].isEmpty()) + qmakeVars += "QMAKE_LIBS_SQLITE += " + dictionary["QMAKE_LIBS_SQLITE"]; if (dictionary[ "OPENGL" ] == "yes") qtConfig += "opengl"; @@ -2867,8 +2867,8 @@ void Configure::generateOutputVars() } if (dictionary[ "DBUS" ] == "linked") { if (!dbusPath.isEmpty()) { - qmakeVars += QString("QT_CFLAGS_DBUS = -I%1/include").arg(dbusPath); - qmakeVars += QString("QT_LIBS_DBUS = -L%1/lib").arg(dbusPath); + qmakeVars += QString("QMAKE_CFLAGS_DBUS = -I%1/include").arg(dbusPath); + qmakeVars += QString("QMAKE_LIBS_DBUS = -L%1/lib").arg(dbusPath); if (dbusHostPath.isEmpty()) qmakeVars += QString("QT_HOST_CFLAGS_DBUS = -I%1/include").arg(dbusPath); } @@ -2876,11 +2876,11 @@ void Configure::generateOutputVars() qmakeVars += QString("QT_HOST_CFLAGS_DBUS = -I%1/include").arg(dbusHostPath); } if (dictionary[ "SQL_MYSQL" ] != "no" && !mysqlPath.isEmpty()) { - qmakeVars += QString("QT_CFLAGS_MYSQL = -I%1/include").arg(mysqlPath); - qmakeVars += QString("QT_LFLAGS_MYSQL = -L%1/lib").arg(mysqlPath); + qmakeVars += QString("QMAKE_CFLAGS_MYSQL = -I%1/include").arg(mysqlPath); + qmakeVars += QString("QMAKE_LIBS_MYSQL = -L%1/lib").arg(mysqlPath); } if (!psqlLibs.isEmpty()) - qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1); + qmakeVars += QString("QMAKE_LIBS_PSQL=") + psqlLibs.section("=", 1); if (!zlibLibs.isEmpty()) qmakeVars += zlibLibs; @@ -2891,7 +2891,7 @@ void Configure::generateOutputVars() if (!sybaseLibs.isEmpty()) lflagsTDS += sybaseLibs.section("=", 1); if (!lflagsTDS.isEmpty()) - qmakeVars += QString("QT_LFLAGS_TDS=") + lflagsTDS.join(' '); + qmakeVars += QString("QMAKE_LIBS_TDS=") + lflagsTDS.join(' '); } if (!qmakeSql.isEmpty()) -- cgit v1.2.3