mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 10:00:56 +00:00
101 lines
4.9 KiB
Diff
101 lines
4.9 KiB
Diff
diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/tools/qlocale_icu.cpp
|
|
index c3e2907..2fac4e1 100644
|
|
--- a/src/corelib/tools/qlocale_icu.cpp
|
|
+++ b/src/corelib/tools/qlocale_icu.cpp
|
|
@@ -81,7 +81,7 @@ bool qt_initIcu(const QString &localeString)
|
|
if (status == NotLoaded) {
|
|
|
|
// resolve libicui18n
|
|
- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
|
|
+ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT));
|
|
lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
|
|
if (!lib.load()) {
|
|
qWarning() << "Unable to load library icui18n" << lib.errorString();
|
|
@@ -111,7 +111,7 @@ bool qt_initIcu(const QString &localeString)
|
|
}
|
|
|
|
// resolve libicuuc
|
|
- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
|
|
+ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT));
|
|
ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
|
|
if (!ucLib.load()) {
|
|
qWarning() << "Unable to load library icuuc" << ucLib.errorString();
|
|
diff --git a/src/gui/painting/qcups.cpp b/src/gui/painting/qcups.cpp
|
|
index 99ea43f..acdf9c9 100644
|
|
--- a/src/gui/painting/qcups.cpp
|
|
+++ b/src/gui/painting/qcups.cpp
|
|
@@ -87,7 +87,7 @@ static CupsPrintFile _cupsPrintFile = 0;
|
|
|
|
static void resolveCups()
|
|
{
|
|
- QLibrary cupsLib(QLatin1String("cups"), 2);
|
|
+ QLibrary cupsLib(QLatin1String("@cups@/lib/libcups"), 2);
|
|
if(cupsLib.load()) {
|
|
_cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests");
|
|
_cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests");
|
|
diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp
|
|
index 3d15538..f0f5351 100644
|
|
--- a/src/gui/painting/qprinterinfo_unix.cpp
|
|
+++ b/src/gui/painting/qprinterinfo_unix.cpp
|
|
@@ -454,7 +454,7 @@ int qt_retrieveNisPrinters(QList<QPrinterDescription> *printers)
|
|
char *domain;
|
|
int err;
|
|
|
|
- QLibrary lib(QLatin1String("nsl"));
|
|
+ QLibrary lib(QLatin1String("@glibc@/lib/libnsl"));
|
|
typedef int (*ypGetDefaultDomain)(char **);
|
|
ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain");
|
|
typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *);
|
|
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
|
|
index 6b42d1e..f88b628 100644
|
|
--- a/src/network/kernel/qhostinfo_unix.cpp
|
|
+++ b/src/network/kernel/qhostinfo_unix.cpp
|
|
@@ -95,7 +95,7 @@ static res_state_ptr local_res = 0;
|
|
static void resolveLibrary()
|
|
{
|
|
#if !defined(QT_NO_LIBRARY) && !defined(Q_OS_QNX)
|
|
- QLibrary lib(QLatin1String("resolv"));
|
|
+ QLibrary lib(QLatin1String("@glibc@/lib/libresolv"));
|
|
lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
|
|
if (!lib.load())
|
|
return;
|
|
diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp
|
|
index 229d6f9..c122bf3 100644
|
|
--- a/src/plugins/platforms/xcb/qglxintegration.cpp
|
|
+++ b/src/plugins/platforms/xcb/qglxintegration.cpp
|
|
@@ -136,7 +136,7 @@ void* QGLXContext::getProcAddress(const QString& procName)
|
|
{
|
|
extern const QString qt_gl_library_name();
|
|
// QLibrary lib(qt_gl_library_name());
|
|
- QLibrary lib(QLatin1String("GL"));
|
|
+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL"));
|
|
glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
|
|
}
|
|
}
|
|
diff --git a/src/plugins/platforms/xlib/qglxintegration.cpp b/src/plugins/platforms/xlib/qglxintegration.cpp
|
|
index 2467247..a2441d4 100644
|
|
--- a/src/plugins/platforms/xlib/qglxintegration.cpp
|
|
+++ b/src/plugins/platforms/xlib/qglxintegration.cpp
|
|
@@ -137,7 +137,7 @@ void* QGLXContext::getProcAddress(const QString& procName)
|
|
{
|
|
extern const QString qt_gl_library_name();
|
|
// QLibrary lib(qt_gl_library_name());
|
|
- QLibrary lib(QLatin1String("GL"));
|
|
+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL"));
|
|
glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
|
|
}
|
|
}
|
|
diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp
|
|
index f8f3d69..d63c5bc 100644
|
|
--- a/src/plugins/platforms/xlib/qxlibstatic.cpp
|
|
+++ b/src/plugins/platforms/xlib/qxlibstatic.cpp
|
|
@@ -242,7 +242,7 @@ static void* qt_load_library_runtime(const char *library, int vernum,
|
|
}
|
|
|
|
# define XFIXES_LOAD_RUNTIME(vernum, symbol, symbol_type) \
|
|
- (symbol_type)qt_load_library_runtime("libXfixes", vernum, 4, #symbol);
|
|
+ (symbol_type)qt_load_library_runtime("@libXfixes@/lib/libXfixes", vernum, 4, #symbol);
|
|
# define XFIXES_LOAD_V1(symbol) \
|
|
XFIXES_LOAD_RUNTIME(1, symbol, Ptr##symbol)
|
|
# define XFIXES_LOAD_V2(symbol) \
|