diff --git a/src/platformsupport/cglconvenience/cglconvenience.pri b/src/platformsupport/cglconvenience/cglconvenience.pri index f5e3d543ec2cd3e6f03f8426c41774e70421df93..0e86ddb208ddc4d16c7f794b461207df9e14549b 100644 --- a/src/platformsupport/cglconvenience/cglconvenience.pri +++ b/src/platformsupport/cglconvenience/cglconvenience.pri @@ -7,5 +7,5 @@ mac:!ios { OBJECTIVE_SOURCES += \ $$PWD/cglconvenience.mm - LIBS += -framework Cocoa -framework OpenGL + LIBS_PRIVATE += -framework Cocoa -framework OpenGL } diff --git a/src/platformsupport/devicediscovery/devicediscovery.pri b/src/platformsupport/devicediscovery/devicediscovery.pri index 9faf6f24dded1d206df9e073cfd4f619d41afa87..9a58eeedfe747e9539a4c9737799d6e74aa01b76 100644 --- a/src/platformsupport/devicediscovery/devicediscovery.pri +++ b/src/platformsupport/devicediscovery/devicediscovery.pri @@ -5,7 +5,7 @@ linux:contains(QT_CONFIG, evdev) { SOURCES += $$PWD/qdevicediscovery_udev.cpp INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV - LIBS += $$QMAKE_LIBS_LIBUDEV + LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV } else { SOURCES += $$PWD/qdevicediscovery_static.cpp } diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri index d1abf123aa8a403a46ff383672dc0c155c619ed9..f67f00672ae6b1f4b1a6fbeb9c685d297b40986d 100644 --- a/src/platformsupport/fontdatabases/mac/coretext.pri +++ b/src/platformsupport/fontdatabases/mac/coretext.pri @@ -3,8 +3,8 @@ OBJECTIVE_SOURCES += $$PWD/qfontengine_coretext.mm $$PWD/qcoretextfontdatabase.m ios: \ # On iOS CoreText and CoreGraphics are stand-alone frameworks - LIBS += -framework CoreText -framework CoreGraphics + LIBS_PRIVATE += -framework CoreText -framework CoreGraphics else: \ # On Mac OS they are part of the ApplicationServices umbrella framework, # even in 10.8 where they were also made available stand-alone. - LIBS += -framework ApplicationServices + LIBS_PRIVATE += -framework ApplicationServices diff --git a/src/platformsupport/glxconvenience/glxconvenience.pri b/src/platformsupport/glxconvenience/glxconvenience.pri index 3632f45b549da0ce7719c6c7c40ffa2a6e2b6b7c..d325f5adf90f714858c03c9d8f7add93d095fbfa 100644 --- a/src/platformsupport/glxconvenience/glxconvenience.pri +++ b/src/platformsupport/glxconvenience/glxconvenience.pri @@ -1,6 +1,6 @@ contains(QT_CONFIG,xlib):contains(QT_CONFIG,xrender) { contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2) { - LIBS += $$QMAKE_LIBS_X11 -lXrender + LIBS_PRIVATE += $$QMAKE_LIBS_X11 -lXrender HEADERS += $$PWD/qglxconvenience_p.h SOURCES += $$PWD/qglxconvenience.cpp } diff --git a/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri b/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri index 1797f48d04980c64022ccb9f2eb44d1046426704..c058498ba0fc8b8d2768524dd7eb9002887c0fb5 100644 --- a/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri +++ b/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri @@ -8,5 +8,5 @@ SOURCES += \ $$PWD/qevdevkeyboardmanager.cpp contains(QT_CONFIG, libudev) { - LIBS += $$QMAKE_LIBS_LIBUDEV + LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV } diff --git a/src/platformsupport/input/evdevmouse/evdevmouse.pri b/src/platformsupport/input/evdevmouse/evdevmouse.pri index 16b456683de64ddfa8cad19711031f4e87ac8e30..7e7a9e16296e38d5b5239eefc6b95b576d783ee4 100644 --- a/src/platformsupport/input/evdevmouse/evdevmouse.pri +++ b/src/platformsupport/input/evdevmouse/evdevmouse.pri @@ -7,6 +7,6 @@ SOURCES += \ $$PWD/qevdevmousemanager.cpp contains(QT_CONFIG, libudev) { - LIBS += $$QMAKE_LIBS_LIBUDEV + LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV } diff --git a/src/platformsupport/input/evdevtablet/evdevtablet.pri b/src/platformsupport/input/evdevtablet/evdevtablet.pri index 02b04d2e051872045b887ff7dd060c2d317ea108..5ace0df61de6984c10b4551916c650dbd6766eeb 100644 --- a/src/platformsupport/input/evdevtablet/evdevtablet.pri +++ b/src/platformsupport/input/evdevtablet/evdevtablet.pri @@ -5,5 +5,5 @@ SOURCES += \ $$PWD/qevdevtablet.cpp contains(QT_CONFIG, libudev) { - LIBS += $$QMAKE_LIBS_LIBUDEV + LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV } diff --git a/src/platformsupport/input/evdevtouch/evdevtouch.pri b/src/platformsupport/input/evdevtouch/evdevtouch.pri index 64c4b9afd99c5a3d2b7086fdd175d2ce1cb881ef..a6b90937f2e0a96c9725c3d570e6df44698c960e 100644 --- a/src/platformsupport/input/evdevtouch/evdevtouch.pri +++ b/src/platformsupport/input/evdevtouch/evdevtouch.pri @@ -5,7 +5,7 @@ SOURCES += \ $$PWD/qevdevtouch.cpp contains(QT_CONFIG, libudev) { - LIBS += $$QMAKE_LIBS_LIBUDEV + LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV } # DEFINES += USE_MTDEV diff --git a/src/platformsupport/linuxaccessibility/linuxaccessibility.pri b/src/platformsupport/linuxaccessibility/linuxaccessibility.pri index 2721002ea5cbeeed9191e8fd35addb5ef948d2f7..1b65fb1cad614663b207b5f3c6b4400e1b0ff7a3 100644 --- a/src/platformsupport/linuxaccessibility/linuxaccessibility.pri +++ b/src/platformsupport/linuxaccessibility/linuxaccessibility.pri @@ -1,6 +1,6 @@ contains(QT_CONFIG, accessibility-atspi-bridge) { - QT += dbus + QT_FOR_PRIVATE += dbus include(../../3rdparty/atspi2/atspi2.pri) INCLUDEPATH += $$PWD diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index c420b368b5527e3ad8bf5ad936eac96ede91c48f..4cb1f2c1bfa66e3f2568cb94bbd413b5f4f29910 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -2,7 +2,7 @@ TARGET = QtPlatformSupport QT = core-private gui-private CONFIG += static internal_module -mac:LIBS += -lz +mac:LIBS_PRIVATE += -lz DEFINES += QT_NO_CAST_FROM_ASCII PRECOMPILED_HEADER = ../corelib/global/qt_pch.h