qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

employ QMAKE_USE: LIBS += $$QMAKE_LIBS_FOO 

this migrates the cases where the build system already made (some) use
of variables (possibly) set by configure.

Change-Id: I43a08caed481d5f887a3a40821e71a4797760e7e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-08-13 21:38:19 +02:00 committed by Lars Knoll
parent 15bf5ef8b8
commit d5dc46d319
23 changed files with 31 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.json
View File

@ -532,7 +532,6 @@
},
"xcb_syslibs": {
"description": "XCB (secondary)",
"export": "",
"test": "qpa/xcb-syslibs",
"sources": [
{ "type": "pkgConfig",
@ -702,7 +701,6 @@
},
"db2": {
"description": "DB2 (IBM)",
"export": "",
"test": "unix/db2",
"sources": [
{ "libs": "-ldb2cli", "condition": "config.win32" },
@ -711,7 +709,6 @@
},
"ibase": {
"description": "InterBase",
"export": "",
"test": "unix/ibase",
"sources": [
{ "libs": "-lgds32_ms", "condition": "config.win32" },
@ -748,7 +745,6 @@
},
"oci": {
"description": "OCI (Oracle)",
"export": "",
"test": "unix/oci",
"sources": [
{ "libs": "-loci", "condition": "config.win32" },
@ -766,7 +762,6 @@
},
"sqlite2": {
"description": "SQLite (version 2)",
"export": "",
"test": "unix/sqlite2",
"sources": [
"-lsqlite"

3
src/corelib/kernel/kernel.pri
View File

@ -157,8 +157,7 @@ unix|integrity {
kernel/qeventdispatcher_glib.cpp
HEADERS += \
kernel/qeventdispatcher_glib_p.h
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_GLIB
LIBS_PRIVATE +=$$QMAKE_LIBS_GLIB
QMAKE_USE_PRIVATE += glib
}
contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)

8
src/dbus/dbus.pro
View File

@ -1,17 +1,11 @@
TARGET = QtDBus
QT = core-private
CONFIG += link_pkgconfig
MODULE_CONFIG = dbusadaptors dbusinterfaces
!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 += $$QMAKE_CFLAGS_DBUS
contains(QT_CONFIG, dbus-linked) {
LIBS_PRIVATE += $$QMAKE_LIBS_DBUS
QMAKE_USE_PRIVATE += dbus
DEFINES += QT_LINKED_LIBDBUS
}

3
src/platformsupport/devicediscovery/devicediscovery.pri
View File

@ -3,8 +3,7 @@ HEADERS += $$PWD/qdevicediscovery_p.h
contains(QT_CONFIG, libudev) {
SOURCES += $$PWD/qdevicediscovery_udev.cpp
HEADERS += $$PWD/qdevicediscovery_udev_p.h
INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV
LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV
QMAKE_USE_PRIVATE += libudev
} else: contains(QT_CONFIG, evdev) {
SOURCES += $$PWD/qdevicediscovery_static.cpp
HEADERS += $$PWD/qdevicediscovery_static_p.h

3
src/platformsupport/eventdispatchers/eventdispatchers.pri
View File

@ -17,6 +17,5 @@ HEADERS +=\
contains(QT_CONFIG, glib) {
SOURCES +=$$PWD/qeventdispatcher_glib.cpp
HEADERS +=$$PWD/qeventdispatcher_glib_p.h
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_GLIB
LIBS_PRIVATE += $$QMAKE_LIBS_GLIB
QMAKE_USE_PRIVATE += glib
}

2
src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri
View File

@ -8,5 +8,5 @@ SOURCES += \
$$PWD/qevdevkeyboardmanager.cpp
contains(QT_CONFIG, libudev) {
LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV
QMAKE_USE_PRIVATE += libudev
}

2
src/platformsupport/input/evdevmouse/evdevmouse.pri
View File

@ -7,6 +7,6 @@ SOURCES += \
$$PWD/qevdevmousemanager.cpp
contains(QT_CONFIG, libudev) {
LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV
QMAKE_USE_PRIVATE += libudev
}

2
src/platformsupport/input/evdevtablet/evdevtablet.pri
View File

@ -7,5 +7,5 @@ SOURCES += \
$$PWD/qevdevtabletmanager.cpp
contains(QT_CONFIG, libudev) {
LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV
QMAKE_USE_PRIVATE += libudev
}

2
src/platformsupport/input/evdevtouch/evdevtouch.pri
View File

@ -9,7 +9,7 @@ SOURCES += \
INCLUDEPATH += $$PWD/../shared
contains(QT_CONFIG, libudev) {
LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV
QMAKE_USE_PRIVATE += libudev
}
contains(QT_CONFIG, mtdev) {

6
src/platformsupport/input/libinput/libinput.pri
View File

@ -10,14 +10,12 @@ SOURCES += \
$$PWD/qlibinputkeyboard.cpp \
$$PWD/qlibinputtouch.cpp
INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV $$QMAKE_INCDIR_LIBINPUT
LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV $$QMAKE_LIBS_LIBINPUT
QMAKE_USE_PRIVATE += libudev libinput
INCLUDEPATH += $$PWD/../shared
contains(QT_CONFIG, xkbcommon-evdev) {
INCLUDEPATH += $$QMAKE_INCDIR_XKBCOMMON_EVDEV
LIBS_PRIVATE += $$QMAKE_LIBS_XKBCOMMON_EVDEV
QMAKE_USE_PRIVATE += xkbcommon_evdev
} else {
DEFINES += QT_NO_XKBCOMMON_EVDEV
}

3
src/plugins/platforminputcontexts/compose/compose.pro
View File

@ -17,8 +17,7 @@ contains(QT_CONFIG, xkbcommon-qt): {
QT_CONFIG -= use-xkbcommon-x11support
include(../../../3rdparty/xkbcommon.pri)
} else {
LIBS += $$QMAKE_LIBS_XKBCOMMON
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
QMAKE_USE += xkbcommon
}
OTHER_FILES += $$PWD/compose.json

3
src/plugins/platforms/directfb/directfb.pro
View File

@ -2,8 +2,7 @@ TARGET = qdirectfb
QT += core-private gui-private platformsupport-private
LIBS += $$QMAKE_LIBS_DIRECTFB
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DIRECTFB
QMAKE_USE += directfb
SOURCES = main.cpp \
qdirectfbintegration.cpp \

9
src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri
View File

@ -21,18 +21,15 @@ contains(QT_CONFIG, xcb-sm) {
DEFINES += XCB_USE_SM
}
DEFINES += $$QMAKE_DEFINES_XCB
LIBS += $$QMAKE_LIBS_XCB
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
CONFIG += qpa/genericunixfontdatabase
contains(QT_CONFIG, xcb-qt) {
DEFINES += XCB_USE_RENDER
XCB_DIR = $$clean_path($$PWD/../../../../3rdparty/xcb)
INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude
LIBS += -lxcb -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix()
LIBS += -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix()
QMAKE_USE += xcb
} else {
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms
!contains(DEFINES, QT_NO_XKB):LIBS += -lxcb-xkb
QMAKE_USE += xcb_syslibs
}

15
src/plugins/platforms/xcb/xcb_qpa_lib.pro
View File

@ -72,26 +72,22 @@ contains(QT_CONFIG, xcb-sm) {
include(gl_integrations/gl_integrations.pri)
DEFINES += $$QMAKE_DEFINES_XCB
LIBS += $$QMAKE_LIBS_XCB
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
CONFIG += qpa/genericunixfontdatabase
contains(QT_CONFIG, dbus-linked) {
QT += dbus
LIBS += $$QMAKE_LIBS_DBUS
}
contains(QT_CONFIG, xcb-qt) {
DEFINES += XCB_USE_RENDER
XCB_DIR = ../../../3rdparty/xcb
INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude
LIBS += -lxcb -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix()
LIBS += -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix()
QMAKE_USE += xcb
} else {
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms -lxcb-xinerama
LIBS += -lxcb-xinerama ### there is no configure test for this!
!contains(DEFINES, QT_NO_XKB):LIBS += -lxcb-xkb
QMAKE_USE += xcb_syslibs
}
# libxkbcommon
@ -99,8 +95,7 @@ contains(QT_CONFIG, xkbcommon-qt) {
QT_CONFIG += use-xkbcommon-x11support
include(../../../3rdparty/xkbcommon.pri)
} else {
LIBS += $$QMAKE_LIBS_XKBCOMMON
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
QMAKE_USE += xkbcommon
}
load(qt_module)

3
src/plugins/platformthemes/gtk3/gtk3.pro
View File

@ -8,8 +8,7 @@ load(qt_plugin)
QT += core-private gui-private platformsupport-private
CONFIG += X11
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_GTK3
LIBS += $$QMAKE_LIBS_GTK3
QMAKE_USE += gtk3
HEADERS += \
qgtk3dialoghelpers.h \

14
src/plugins/sqldrivers/mysql/mysql.pro
View File

@ -3,19 +3,7 @@ TARGET = qsqlmysql
HEADERS += $$PWD/qsql_mysql_p.h
SOURCES += $$PWD/qsql_mysql.cpp $$PWD/main.cpp
QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_MYSQL
LIBS += $$QMAKE_LIBS_MYSQL
unix {
isEmpty(QMAKE_LIBS_MYSQL) {
!contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
use_libmysqlclient_r:LIBS += -lmysqlclient_r
else:LIBS += -lmysqlclient
}
}
} else {
!contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*):LIBS += -llibmysql
}
QMAKE_USE += mysql
OTHER_FILES += mysql.json

11
src/plugins/sqldrivers/odbc/odbc.pro
View File

@ -3,15 +3,8 @@ TARGET = qsqlodbc
HEADERS += $$PWD/qsql_odbc_p.h
SOURCES += $$PWD/qsql_odbc.cpp $$PWD/main.cpp
unix {
DEFINES += UNICODE
!contains(LIBS, .*odbc.*) {
osx:LIBS += -liodbc
else:LIBS += $$QMAKE_LIBS_ODBC
}
} else {
LIBS *= -lodbc32
}
QMAKE_USE += odbc
unix: DEFINES += UNICODE
OTHER_FILES += odbc.json

8
src/plugins/sqldrivers/psql/psql.pro
View File

@ -3,13 +3,7 @@ TARGET = qsqlpsql
HEADERS += $$PWD/qsql_psql_p.h
SOURCES += $$PWD/qsql_psql.cpp $$PWD/main.cpp
unix|mingw {
LIBS += $$QMAKE_LIBS_PSQL
!contains(LIBS, .*pq.*):LIBS += -lpq
QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_PSQL
} else {
!contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32
}
QMAKE_USE += psql
OTHER_FILES += psql.json

5
src/plugins/sqldrivers/sqlite/sqlite.pro
View File

@ -3,11 +3,10 @@ TARGET = qsqlite
HEADERS += $$PWD/qsql_sqlite_p.h
SOURCES += $$PWD/qsql_sqlite.cpp $$PWD/smain.cpp
!system-sqlite:!contains(LIBS, .*sqlite3.*) {
!system-sqlite {
include($$PWD/../../../3rdparty/sqlite.pri)
} else {
LIBS += $$QMAKE_LIBS_SQLITE
QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_SQLITE
QMAKE_USE += sqlite
}
OTHER_FILES += sqlite.json

8
src/plugins/sqldrivers/tds/tds.pro
View File

@ -3,13 +3,7 @@ TARGET = qsqltds
HEADERS += $$PWD/qsql_tds_p.h
SOURCES += $$PWD/qsql_tds.cpp $$PWD/main.cpp
unix|mingw: {
LIBS += $$QMAKE_LIBS_TDS
!contains(LIBS, .*sybdb.*):LIBS += -lsybdb
QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_TDS
} else {
LIBS *= -lNTWDBLIB
}
QMAKE_USE += tds
OTHER_FILES += tds.json

3
tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro
View File

@ -7,8 +7,7 @@ QT = core-private dbus-private testlib
contains(QT_CONFIG, dbus-linked) {
DEFINES += QT_LINKED_LIBDBUS
LIBS += $$QMAKE_LIBS_DBUS
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS
QMAKE_USE += dbus
} else {
SOURCES += ../../../../../src/dbus/qdbus_symbols.cpp
}

3
tests/auto/dbus/qdbustype/qdbustype.pro
View File

@ -4,8 +4,7 @@ QT = core-private dbus-private testlib
SOURCES += tst_qdbustype.cpp
contains(QT_CONFIG, dbus-linked) {
DEFINES += QT_LINKED_LIBDBUS
LIBS += $$QMAKE_LIBS_DBUS
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS
QMAKE_USE += dbus
} else {
SOURCES += ../../../../src/dbus/qdbus_symbols.cpp
}

3
tests/benchmarks/dbus/qdbustype/qdbustype.pro
View File

@ -3,8 +3,7 @@ QT -= gui
QT += core-private dbus-private testlib
contains(QT_CONFIG, dbus-linked) {
DEFINES += QT_LINKED_LIBDBUS
LIBS += $$QMAKE_LIBS_DBUS
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS
QMAKE_USE += dbus
} else {
SOURCES += ../../../../src/dbus/qdbus_symbols.cpp
}