diff options
29 files changed, 39 insertions, 104 deletions
diff --git a/configure.json b/configure.json index d5610a6402..004d7777fd 100644 --- a/configure.json +++ b/configure.json @@ -236,7 +236,6 @@ "libraries": { "libatomic": { "description": "64 bit atomics in libatomic", - "export": "", "test": "common/atomic64", "sources": [ "-latomic" @@ -252,7 +251,6 @@ }, "doubleconversion": { "description": "DoubleConversion", - "export": "", "test": "unix/doubleconversion", "sources": [ "-ldouble-conversion" @@ -260,7 +258,6 @@ }, "pcre": { "description": "PCRE", - "export": "", "test": "unix/pcre", "sources": [ "-lpcre16" @@ -269,7 +266,6 @@ "zlib": { "description": "zlib", "test": "unix/zlib", - "export": "", "sources": [ { "libs": "-lzdll", "condition": "config.msvc" }, { "libs": "-lz", "condition": "!config.msvc" } @@ -277,7 +273,7 @@ }, "gnu_iconv": { "description": "GNU libiconv", - "export": "", + "export": "iconv", "test": "unix/gnu-libiconv", "sources": [ "-liconv" @@ -333,7 +329,6 @@ }, "libproxy": { "description": "libproxy", - "export": "", "test": "common/libproxy", "sources": [ "-lproxy" @@ -354,7 +349,6 @@ }, "cups": { "description": "CUPS", - "export": "", "test": "unix/cups", "sources": [ "-lcups" @@ -362,7 +356,6 @@ }, "libjpeg": { "description": "libjpeg", - "export": "", "test": "unix/libjpeg", "sources": [ { "libs": "-llibjpeg", "condition": "config.msvc" }, @@ -371,7 +364,6 @@ }, "libpng": { "description": "libpng", - "export": "", "test": "unix/libpng", "sources": [ { "type": "pkgConfig", "args": "libpng" }, @@ -430,7 +422,6 @@ }, "harfbuzz": { "description": "HarfBuzz", - "export": "", "test": "unix/harfbuzz", "sources": [ "-lharfbuzz" @@ -477,7 +468,6 @@ }, "tslib": { "description": "tslib", - "export": "", "test": "unix/tslib", "sources": [ "-lts" @@ -516,7 +506,6 @@ }, "xrender": { "description": "XRender", - "export": "", "test": "x11/xrender", "sources": [ "-lXrender" @@ -541,7 +530,6 @@ }, "xcb_xlib": { "description": "XCB Xlib", - "export": "", "test": "qpa/xcb-xlib", "sources": [ { "type": "pkgConfig", "args": "X11-xcb x11 xcb" }, @@ -550,7 +538,6 @@ }, "xcb_xkb": { "description": "XCB XKB >= 1.10", - "export": "", "test": "qpa/xcb-xkb", "sources": [ { "type": "pkgConfig", "args": "xcb-xkb >= 1.10 xcb" }, @@ -575,7 +562,6 @@ }, "x11sm": { "description": "X11 session management", - "export": "", "sources": [ { "type": "pkgConfig", "args": "sm ice" } ] @@ -612,7 +598,6 @@ }, "gbm": { "description": "GBM", - "export": "", "test": "qpa/gbm", "sources": [ { "type": "pkgConfig", "args": "gbm" } @@ -620,7 +605,6 @@ }, "drm": { "description": "KMS", - "export": "", "test": "qpa/kms", "sources": [ { "type": "pkgConfig", "args": "libdrm" }, @@ -685,7 +669,6 @@ }, "pps": { "description": "PPS", - "export": "", "test": "unix/pps", "sources": [ "-lpps" @@ -694,7 +677,6 @@ "lgmon": { "description": "lgmon", "test": "unix/lgmon", - "export": "", "sources": [ "-llgmon" ] @@ -2024,7 +2006,7 @@ }, "system-zlib": { "description": "Using system zlib", - "condition": "config.darwin || libs.zlib", + "condition": "libs.zlib", "output": [ "publicQtConfig" ] }, "iconv": { diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index 28af74b491..1a39c88425 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -35,7 +35,6 @@ QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread -QMAKE_LIBS_LIBUDEV = -ludev QMAKE_CFLAGS_WAYLAND = QMAKE_INCDIR_WAYLAND = diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri index 36abbfbe35..f39bb62381 100644 --- a/src/3rdparty/harfbuzz_dependency.pri +++ b/src/3rdparty/harfbuzz_dependency.pri @@ -1,5 +1,5 @@ contains(QT_CONFIG, system-harfbuzz) { - LIBS_PRIVATE += -lharfbuzz + QMAKE_USE_PRIVATE += harfbuzz } else: contains(QT_CONFIG, harfbuzz) { INCLUDEPATH += $$PWD/harfbuzz-ng/include LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix() diff --git a/src/3rdparty/pcre_dependency.pri b/src/3rdparty/pcre_dependency.pri index 2a3c99c7ed..fa7df4df0e 100644 --- a/src/3rdparty/pcre_dependency.pri +++ b/src/3rdparty/pcre_dependency.pri @@ -3,5 +3,5 @@ pcre { INCLUDEPATH += $$PWD/pcre LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtpcre$$qtPlatformTargetSuffix() } else { - LIBS_PRIVATE += -lpcre16 + QMAKE_USE_PRIVATE += pcre } diff --git a/src/3rdparty/png_dependency.pri b/src/3rdparty/png_dependency.pri index 2ec2e8929d..12dbfc5487 100644 --- a/src/3rdparty/png_dependency.pri +++ b/src/3rdparty/png_dependency.pri @@ -1,14 +1,5 @@ contains(QT_CONFIG, system-png) { - unix|mingw { - !contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG_PRIVATE += libpng - } else { - LIBS_PRIVATE += -lpng - } - } else { - LIBS += libpng.lib - } + QMAKE_USE_PRIVATE += libpng } else: contains(QT_CONFIG, png) { INCLUDEPATH += $$PWD/libpng LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtpng$$qtPlatformTargetSuffix() diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index 53e0b3ef39..11ad70621d 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/src/3rdparty/zlib_dependency.pri @@ -1,10 +1,6 @@ # zlib dependency satisfied by bundled 3rd party zlib or system zlib contains(QT_CONFIG, system-zlib) { - if(unix|mingw):LIBS_PRIVATE += -lz - else { - isEmpty(ZLIB_LIBS): LIBS += zdll.lib - else: LIBS += $$ZLIB_LIBS - } + QMAKE_USE_PRIVATE += zlib } else { INCLUDEPATH += $$PWD/zlib !no_core_dep { diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index 0f7c2b887b..2b9166f0a6 100644 --- a/src/corelib/arch/arch.pri +++ b/src/corelib/arch/arch.pri @@ -4,4 +4,4 @@ HEADERS += \ arch/qatomic_bootstrap.h \ arch/qatomic_cxx11.h -atomic64-libatomic: LIBS += -latomic +atomic64-libatomic: QMAKE_USE += libatomic diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index fdaec33c5a..275ade369a 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -46,7 +46,7 @@ contains(QT_CONFIG,icu) { SOURCES += codecs/qiconvcodec.cpp contains(QT_CONFIG, gnu-libiconv) { DEFINES += GNU_LIBICONV - LIBS_PRIVATE *= -liconv + QMAKE_USE_PRIVATE += iconv } else: contains(QT_CONFIG, sun-libiconv) { DEFINES += GNU_LIBICONV } diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index 8e45766f17..fea0d4ae2e 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -183,7 +183,7 @@ vxworks { } qqnx_pps { - LIBS_PRIVATE += -lpps + QMAKE_USE_PRIVATE += pps SOURCES += \ kernel/qppsattribute.cpp \ kernel/qppsobject.cpp diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 853827e032..252dcf9fdc 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -193,7 +193,7 @@ INCLUDEPATH += ../3rdparty/md5 \ ../3rdparty/sha3 contains(QT_CONFIG, system-doubleconversion) { - LIBS_PRIVATE += -ldouble-conversion + QMAKE_USE_PRIVATE += doubleconversion } else: contains(QT_CONFIG, doubleconversion) { include($$PWD/../../3rdparty/double-conversion/double-conversion.pri) } diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index 34d2f164e8..c3e546eabc 100644 --- a/src/network/kernel/kernel.pri +++ b/src/network/kernel/kernel.pri @@ -64,6 +64,6 @@ osx:SOURCES += kernel/qnetworkproxy_mac.cpp else:win32:SOURCES += kernel/qnetworkproxy_win.cpp else:contains(QT_CONFIG, libproxy) { SOURCES += kernel/qnetworkproxy_libproxy.cpp - LIBS_PRIVATE += -lproxy + QMAKE_USE_PRIVATE += libproxy } else:SOURCES += kernel/qnetworkproxy_generic.cpp diff --git a/src/platformsupport/glxconvenience/glxconvenience.pri b/src/platformsupport/glxconvenience/glxconvenience.pri index cc5b198f6c..29aa2f6242 100644 --- a/src/platformsupport/glxconvenience/glxconvenience.pri +++ b/src/platformsupport/glxconvenience/glxconvenience.pri @@ -1,6 +1,6 @@ contains(QT_CONFIG, xlib) { contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2) { - contains(QT_CONFIG, xrender): LIBS_PRIVATE += -lXrender + contains(QT_CONFIG, xrender): QMAKE_USE_PRIVATE += xrender LIBS_PRIVATE += $$QMAKE_LIBS_X11 HEADERS += $$PWD/qglxconvenience_p.h SOURCES += $$PWD/qglxconvenience.cpp diff --git a/src/platformsupport/input/tslib/tslib.pri b/src/platformsupport/input/tslib/tslib.pri index c9fef1ca8f..9efd126e13 100644 --- a/src/platformsupport/input/tslib/tslib.pri +++ b/src/platformsupport/input/tslib/tslib.pri @@ -4,4 +4,4 @@ HEADERS += \ SOURCES += \ $$PWD/qtslib.cpp -LIBS += -lts +QMAKE_USE += tslib diff --git a/src/plugins/generic/tslib/tslib.pro b/src/plugins/generic/tslib/tslib.pro index 200d231cc8..d6a0eea3a0 100644 --- a/src/plugins/generic/tslib/tslib.pro +++ b/src/plugins/generic/tslib/tslib.pro @@ -4,7 +4,7 @@ SOURCES = main.cpp QT += gui-private platformsupport-private -LIBS += -lts +QMAKE_USE += tslib OTHER_FILES += tslib.json diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index 8954cc6402..3cbf60ec8a 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/src/plugins/imageformats/jpeg/jpeg.pro @@ -6,10 +6,7 @@ SOURCES += main.cpp qjpeghandler.cpp HEADERS += main.h qjpeghandler_p.h contains(QT_CONFIG, system-jpeg) { - msvc: \ - LIBS += libjpeg.lib - else: \ - LIBS += -ljpeg + QMAKE_USE += libjpeg } else { include($$PWD/../../../3rdparty/libjpeg.pri) } diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro index 6670a4c0bc..70ff054172 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro @@ -11,13 +11,7 @@ INCLUDEPATH += $$PWD/../.. $$PWD/../eglfs_kms_support # Avoid X11 header collision, use generic EGL native types DEFINES += QT_EGL_NO_X11 -CONFIG += link_pkgconfig -!contains(QT_CONFIG, no-pkg-config) { - PKGCONFIG += libdrm gbm -} else { - LIBS += -ldrm -lgbm -} - +QMAKE_USE += gbm drm CONFIG += egl QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro index f613d68ecb..5f47b98369 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro @@ -7,13 +7,7 @@ INCLUDEPATH += $$PWD/../.. $$PWD/../eglfs_kms_support # Avoid X11 header collision, use generic EGL native types DEFINES += QT_EGL_NO_X11 -CONFIG += link_pkgconfig -!contains(QT_CONFIG, no-pkg-config) { - PKGCONFIG += libdrm -} else { - LIBS += -ldrm -} - +QMAKE_USE += drm CONFIG += egl QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/eglfs_kms_support.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/eglfs_kms_support.pro index cc77810793..464c64539f 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/eglfs_kms_support.pro +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/eglfs_kms_support.pro @@ -9,13 +9,7 @@ INCLUDEPATH += $$PWD/../.. # Avoid X11 header collision, use generic EGL native types DEFINES += QT_EGL_NO_X11 -CONFIG += link_pkgconfig -!contains(QT_CONFIG, no-pkg-config) { - PKGCONFIG += libdrm -} else { - LIBS += -ldrm -} - +QMAKE_USE += drm CONFIG += egl QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro index 17be384955..10af57e487 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro @@ -8,7 +8,7 @@ DEFINES += QT_EGL_NO_X11 INCLUDEPATH += $$PWD/../.. CONFIG += egl -LIBS += -lX11 -lX11-xcb -lxcb +QMAKE_USE += xcb_xlib QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF SOURCES += $$PWD/qeglfsx11main.cpp \ diff --git a/src/plugins/platforms/openwfd/openwf.pro b/src/plugins/platforms/openwfd/openwf.pro index 152e4f57d7..79f349f472 100644 --- a/src/plugins/platforms/openwfd/openwf.pro +++ b/src/plugins/platforms/openwfd/openwf.pro @@ -31,7 +31,8 @@ SOURCES += \ qopenwfdportmode.cpp \ qopenwfdwindow.cpp -LIBS += -lWFD -lgbm -lGLESv2 -lEGL +LIBS += -lWFD +QMAKE_USE += gbm opengl_es2 egl PLUGIN_TYPE = platforms PLUGIN_CLASS_NAME = QOpenWFDIntegrationPlugin diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro index 5a0f4f5c98..51ffa5624f 100644 --- a/src/plugins/platforms/qnx/qnx.pro +++ b/src/plugins/platforms/qnx/qnx.pro @@ -82,7 +82,7 @@ contains(QT_CONFIG, opengles2) { HEADERS += qqnxglcontext.h \ qqnxeglwindow.h - LIBS += -lEGL + QMAKE_USE += egl } CONFIG(qqnx_pps) { @@ -100,7 +100,7 @@ CONFIG(qqnx_pps) { qqnxnavigatoreventnotifier.h \ qqnxvirtualkeyboardpps.h - LIBS += -lpps + QMAKE_USE += pps !contains(DEFINES, QT_NO_CLIPBOARD): LIBS += -lclipboard CONFIG(qqnx_imf) { @@ -116,7 +116,7 @@ CONFIG(qqnx_pps) { lgmon { DEFINES += QQNX_LGMON SOURCES += qqnxlgmon.cpp - LIBS += -llgmon + QMAKE_USE += lgmon } OTHER_FILES += qnx.json diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri b/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri index 8fd57da29d..b60de79fa0 100644 --- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri +++ b/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri @@ -30,6 +30,6 @@ contains(QT_CONFIG, xcb-qt) { LIBS += -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix() QMAKE_USE += xcb } else { - !contains(DEFINES, QT_NO_XKB):LIBS += -lxcb-xkb + !contains(DEFINES, QT_NO_XKB): QMAKE_USE += xcb_xkb QMAKE_USE += xcb_syslibs } diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro index 67fd68765a..adac4b2e22 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro @@ -5,12 +5,11 @@ include(../gl_integrations_plugin_base.pri) #should be removed from the sources DEFINES += XCB_USE_GLX XCB_USE_XLIB -LIBS += -lxcb - contains(QT_CONFIG, xcb-glx) { DEFINES += XCB_HAS_XCB_GLX - LIBS += -lxcb-glx + QMAKE_USE += xcb_glx } +QMAKE_USE += xcb LIBS += $$QMAKE_LIBS_DYNLOAD diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index 1cf13c7795..b81d38fab1 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -42,12 +42,12 @@ DEFINES += QT_BUILD_XCB_PLUGIN # needed by Xcursor ... contains(QT_CONFIG, xcb-xlib) { DEFINES += XCB_USE_XLIB - LIBS += -lX11 -lX11-xcb + QMAKE_USE += xcb_xlib contains(QT_CONFIG, xinput2) { DEFINES += XCB_USE_XINPUT2 SOURCES += qxcbconnection_xi2.cpp - LIBS += -lXi + QMAKE_USE += xinput2 !isEmpty(QMAKE_XINPUT2_VERSION_MAJOR) { DEFINES += LIBXI_MAJOR=$$QMAKE_XINPUT2_VERSION_MAJOR \ LIBXI_MINOR=$$QMAKE_XINPUT2_VERSION_MINOR \ @@ -59,13 +59,13 @@ contains(QT_CONFIG, xcb-xlib) { # to support custom cursors with depth > 1 contains(QT_CONFIG, xcb-render) { DEFINES += XCB_USE_RENDER - LIBS += -lxcb-render -lxcb-render-util + QMAKE_USE += xcb_render } # build with session management support contains(QT_CONFIG, xcb-sm) { DEFINES += XCB_USE_SM - LIBS += -lSM -lICE + QMAKE_USE += x11sm SOURCES += qxcbsessionmanager.cpp HEADERS += qxcbsessionmanager.h } @@ -86,7 +86,7 @@ contains(QT_CONFIG, xcb-qt) { QMAKE_USE += xcb } else { LIBS += -lxcb-xinerama ### there is no configure test for this! - !contains(DEFINES, QT_NO_XKB):LIBS += -lxcb-xkb + !contains(DEFINES, QT_NO_XKB): QMAKE_USE += xcb_xkb QMAKE_USE += xcb_syslibs } diff --git a/src/plugins/printsupport/cups/cups.pro b/src/plugins/printsupport/cups/cups.pro index 757408e7f7..58bc11606b 100644 --- a/src/plugins/printsupport/cups/cups.pro +++ b/src/plugins/printsupport/cups/cups.pro @@ -3,7 +3,7 @@ MODULE = cupsprintersupport QT += core-private gui-private printsupport printsupport-private -LIBS_PRIVATE += -lcups +QMAKE_USE_PRIVATE += cups INCLUDEPATH += ../../../printsupport/kernel diff --git a/src/plugins/sqldrivers/db2/db2.pro b/src/plugins/sqldrivers/db2/db2.pro index 31822ef8dc..eef65fac66 100644 --- a/src/plugins/sqldrivers/db2/db2.pro +++ b/src/plugins/sqldrivers/db2/db2.pro @@ -3,11 +3,7 @@ TARGET = qsqldb2 HEADERS += $$PWD/qsql_db2_p.h SOURCES += $$PWD/qsql_db2.cpp $$PWD/main.cpp -unix { - !contains(LIBS, .*db2.*):LIBS += -ldb2 -} else { - !contains(LIBS, .*db2.*):LIBS += -ldb2cli -} +QMAKE_USE += db2 OTHER_FILES += db2.json diff --git a/src/plugins/sqldrivers/ibase/ibase.pro b/src/plugins/sqldrivers/ibase/ibase.pro index 8237245183..e5709207d1 100644 --- a/src/plugins/sqldrivers/ibase/ibase.pro +++ b/src/plugins/sqldrivers/ibase/ibase.pro @@ -3,13 +3,8 @@ TARGET = qsqlibase HEADERS += $$PWD/qsql_ibase_p.h SOURCES += $$PWD/qsql_ibase.cpp $$PWD/main.cpp -unix { - !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds -} else { - !contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) { - LIBS += -lgds32_ms - } -} +# FIXME: ignores libfb (unix)/fbclient (win32) - but that's for the test anyway +QMAKE_USE += ibase OTHER_FILES += ibase.json diff --git a/src/plugins/sqldrivers/oci/oci.pro b/src/plugins/sqldrivers/oci/oci.pro index a22d1181bf..e6ef71f20f 100644 --- a/src/plugins/sqldrivers/oci/oci.pro +++ b/src/plugins/sqldrivers/oci/oci.pro @@ -3,11 +3,8 @@ TARGET = qsqloci HEADERS += $$PWD/qsql_oci_p.h SOURCES += $$PWD/qsql_oci.cpp $$PWD/main.cpp -unix { - !contains(LIBS, .*clnts.*):LIBS += -lclntsh -} else { - LIBS *= -loci -} +QMAKE_USE += oci + darwin:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ OTHER_FILES += oci.json diff --git a/src/plugins/sqldrivers/sqlite2/sqlite2.pro b/src/plugins/sqldrivers/sqlite2/sqlite2.pro index d0ab0eef41..721facb5b8 100644 --- a/src/plugins/sqldrivers/sqlite2/sqlite2.pro +++ b/src/plugins/sqldrivers/sqlite2/sqlite2.pro @@ -3,7 +3,7 @@ TARGET = qsqlite2 HEADERS += $$PWD/qsql_sqlite2_p.h SOURCES += $$PWD/qsql_sqlite2.cpp $$PWD/smain.cpp -!contains(LIBS, .*sqlite.*):LIBS += -lsqlite +QMAKE_USE += sqlite2 OTHER_FILES += sqlite2.json |