summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2012-07-19 10:22:57 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-07-27 16:07:01 (GMT)
commitfc5174ccce1906c787b7a5ab2f389a1ef439bc2b (patch)
tree793040877e2c5a0ee303bc2b891360f64ad0707b
parent6b5dc82f32eba3fd6f54061095bbf218d9076a75 (diff)
downloadQt-fc5174ccce1906c787b7a5ab2f389a1ef439bc2b.zip
Qt-fc5174ccce1906c787b7a5ab2f389a1ef439bc2b.tar.gz
Qt-fc5174ccce1906c787b7a5ab2f389a1ef439bc2b.tar.bz2
Use improved QLibrary search heuristics for loading libdbus
Change-Id: I0a8ddb61e573f1e87dbdd0b29f4418beb2d7b494 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/dbus/qdbus_symbols.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp
index 97d809d..24a56e9 100644
--- a/src/dbus/qdbus_symbols.cpp
+++ b/src/dbus/qdbus_symbols.cpp
@@ -76,6 +76,7 @@ bool qdbus_loadLibDBus()
static int majorversions[] = { 3, 2, -1 };
lib->unload();
lib->setFileName(QLatin1String("dbus-1"));
+ lib->setLoadHints(QLibrary::ImprovedSearchHeuristics);
for (uint i = 0; i < sizeof(majorversions) / sizeof(majorversions[0]); ++i) {
lib->setFileNameAndVersion(lib->fileName(), majorversions[i]);
if (lib->load() && lib->resolve("dbus_connection_open_private"))