From 2bf76918ab399d7cfc9ecf15a4b67fe412ee6815 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 15 May 2013 14:59:33 +0200 Subject: mark private dependencies as such Change-Id: Ic93c8dc5aaad3973e4d4fc6bb3b70ad7c0a632b0 Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- src/platformsupport/cglconvenience/cglconvenience.pri | 2 +- src/platformsupport/devicediscovery/devicediscovery.pri | 2 +- src/platformsupport/fontdatabases/mac/coretext.pri | 4 ++-- src/platformsupport/glxconvenience/glxconvenience.pri | 2 +- src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri | 2 +- src/platformsupport/input/evdevmouse/evdevmouse.pri | 2 +- src/platformsupport/input/evdevtablet/evdevtablet.pri | 2 +- src/platformsupport/input/evdevtouch/evdevtouch.pri | 2 +- src/platformsupport/linuxaccessibility/linuxaccessibility.pri | 2 +- src/platformsupport/platformsupport.pro | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/platformsupport/cglconvenience/cglconvenience.pri b/src/platformsupport/cglconvenience/cglconvenience.pri index f5e3d543ec..0e86ddb208 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 9faf6f24dd..9a58eeedfe 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 d1abf123aa..f67f00672a 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 3632f45b54..d325f5adf9 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 1797f48d04..c058498ba0 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 16b456683d..7e7a9e1629 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 02b04d2e05..5ace0df61d 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 64c4b9afd9..a6b90937f2 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 2721002ea5..1b65fb1cad 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 c420b368b5..4cb1f2c1bf 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 -- cgit v1.2.3