diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-08-04 09:14:17 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-04 09:14:17 +0200 |
commit | 673160b9fd7b9a75336ba293dda7e64f3d732a80 (patch) | |
tree | b37e0216a090fbc9ac19dd55ca5e2ba1af1ef7cb /src/plugins/platforms/xlib/qxlibstatic.cpp | |
parent | 9a652ed802d5ec1114ba97ad86eca8d2f25c53d9 (diff) | |
parent | 92c998afb66a2ec900d50cab57929c0a97ad46ac (diff) |
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
Diffstat (limited to 'src/plugins/platforms/xlib/qxlibstatic.cpp')
-rw-r--r-- | src/plugins/platforms/xlib/qxlibstatic.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp index ee4c463b94..3ba0eb4c32 100644 --- a/src/plugins/platforms/xlib/qxlibstatic.cpp +++ b/src/plugins/platforms/xlib/qxlibstatic.cpp @@ -218,8 +218,8 @@ static const char * x11_atomnames = { \c XFIXES_MAJOR - it is a part of soname and may differ from the Xfixes version. */ -static void* qt_load_library_runtime(const char *library, int vernum, - int highestVernum, const char *symbol) +static QFunctionPointer qt_load_library_runtime(const char *library, int vernum, + int highestVernum, const char *symbol) { QList<int> versions; // we try to load in the following order: @@ -234,7 +234,7 @@ static void* qt_load_library_runtime(const char *library, int vernum, Q_FOREACH(int version, versions) { QLatin1String libName(library); QLibrary xfixesLib(libName, version); - void *ptr = xfixesLib.resolve(symbol); + QFunctionPointer ptr = xfixesLib.resolve(symbol); if (ptr) return ptr; } |