use private linkage where possible

Change-Id: Ie8eaa71bee87654c21218a23efd7e9d65b71f022
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen 2013-10-31 13:34:10 +01:00 committed by The Qt Project
parent e469e667e3
commit 43684a20d0
12 changed files with 18 additions and 18 deletions

View File

@ -4,7 +4,7 @@ INCLUDEPATH += \
$$ANGLE_DIR/src \
$$ANGLE_DIR/include
LIBS = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_GUI
LIBS_PRIVATE = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_GUI
# DirectX is included in the Windows 8 Kit, but everything else requires the DX SDK.
win32-msvc2012|win32-msvc2013 {
@ -36,7 +36,7 @@ win32-msvc2012|win32-msvc2013 {
# Similarly we want the MinGW linker to use the import libraries shipped with the compiler
# instead of those from the SDK which cause a crash on startup.
LIBS += -L\"$$DXLIB_DIR\"
LIBS_PRIVATE += -L\"$$DXLIB_DIR\"
}
}

View File

@ -4,11 +4,11 @@ TARGET = $$qtLibraryTarget(libEGL)
include(../common/common.pri)
angle_d3d11 {
LIBS += -ld3d11
LIBS_PRIVATE += -ld3d11
} else {
LIBS += -ld3d9
LIBS_PRIVATE += -ld3d9
}
LIBS += -ldxguid -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget(libGLESv2)
LIBS_PRIVATE += -ldxguid -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget(libGLESv2)
HEADERS += \
$$ANGLE_DIR/src/libEGL/Config.h \

View File

@ -8,18 +8,18 @@ INCLUDEPATH += $$OUT_PWD/.. $$ANGLE_DIR/src/libGLESv2
# Remember to adapt tools/configure/configureapp.cpp if the Direct X version changes.
angle_d3d11 {
LIBS += -ldxgi -ld3d11
LIBS_PRIVATE += -ldxgi -ld3d11
} else {
LIBS += -ld3d9
LIBS_PRIVATE += -ld3d9
}
LIBS += -ldxguid
LIBS_PRIVATE += -ldxguid
STATICLIBS = translator_common translator_hlsl preprocessor
for(libname, STATICLIBS) {
# Appends 'd' to the library for debug builds and builds up the fully
# qualified path to pass to the linker.
staticlib = $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}$$qtLibraryTarget($$libname).$${QMAKE_EXTENSION_STATICLIB}
LIBS += $$staticlib
LIBS_PRIVATE += $$staticlib
PRE_TARGETDEPS += $$staticlib
}

View File

@ -39,5 +39,5 @@ HEADERS += \
HEADERS += \
contains(QT_CONFIG, clock-gettime) {
linux-*|hpux-*|solaris-*:LIBS *= -lrt
linux-*|hpux-*|solaris-*: LIBS_PRIVATE *= -lrt
}

View File

@ -48,7 +48,7 @@ mac|darwin {
LIBS_PRIVATE += -framework CoreServices
}
LIBS_PRIVATE += -framework CoreFoundation
LIBS += -framework Foundation
LIBS_PRIVATE += -framework Foundation
}
win32:DEFINES-=QT_NO_CAST_TO_ASCII
DEFINES += $$MODULE_DEFINES

View File

@ -35,7 +35,7 @@ android {
win32: {
HEADERS += kernel/qnetworkinterface_win_p.h
SOURCES += kernel/qdnslookup_win.cpp kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp
LIBS += -ldnsapi
LIBS_PRIVATE += -ldnsapi
}
integrity:SOURCES += kernel/qdnslookup_unix.cpp kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp

View File

@ -40,7 +40,7 @@ win32:SOURCES += socket/qnativesocketengine_win.cpp \
socket/qlocalsocket_win.cpp \
socket/qlocalserver_win.cpp
win32:!wince*:LIBS += -ladvapi32
win32:!wince*: LIBS_PRIVATE += -ladvapi32
wince*: {
SOURCES -= socket/qlocalsocket_win.cpp \

View File

@ -45,5 +45,5 @@ android:!android-no-sdk: SOURCES += ssl/qsslsocket_openssl_android.cpp
QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS
LIBS_PRIVATE += $$OPENSSL_LIBS
win32: LIBS += -lcrypt32
win32: LIBS_PRIVATE += -lcrypt32
}

View File

@ -10,4 +10,4 @@ contains(QT_CONFIG, libudev) {
# DEFINES += USE_MTDEV
contains(DEFINES, USE_MTDEV): LIBS += -lmtdev
contains(DEFINES, USE_MTDEV): LIBS_PRIVATE += -lmtdev

View File

@ -11,7 +11,7 @@ HEADERS += \
mac:!ios {
OBJECTIVE_SOURCES += dialogs/qpagesetupdialog_mac.mm \
dialogs/qprintdialog_mac.mm
LIBS += -framework Cocoa
LIBS_PRIVATE += -framework Cocoa
}
win32 {

View File

@ -24,7 +24,7 @@ win32 {
$$PWD/qprintengine_win_p.h
SOURCES += \
$$PWD/qprintengine_win.cpp
LIBS += -lwinspool -lcomdlg32 -lgdi32 -luser32
LIBS_PRIVATE += -lwinspool -lcomdlg32 -lgdi32 -luser32
}
unix:!mac:contains(QT_CONFIG, cups): {

View File

@ -3,5 +3,5 @@
INCLUDEPATH += ../3rdparty/wintab
!wince* {
LIBS *= -lshell32
LIBS_PRIVATE *= -lshell32
}