diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-16 08:33:12 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-16 08:33:12 (GMT) |
| commit | 7248ba672f47501bf94dfc3e18ec03c4c6d27750 (patch) | |
| tree | dc4f1d50af98bbd21ba14482dd8adf3edff77787 /src/gui/styles/qwindowsstyle.cpp | |
| parent | 7eb53c4b8d9745f998694f3dbe88dab6791d0e81 (diff) | |
| parent | f9a6a8bc03cefe8ea90f695efd9d1e7c8d96321a (diff) | |
| download | Qt-7248ba672f47501bf94dfc3e18ec03c4c6d27750.zip Qt-7248ba672f47501bf94dfc3e18ec03c4c6d27750.tar.gz Qt-7248ba672f47501bf94dfc3e18ec03c4c6d27750.tar.bz2 | |
Merge branch '4.7' into 13092010doc
Diffstat (limited to 'src/gui/styles/qwindowsstyle.cpp')
| -rw-r--r-- | src/gui/styles/qwindowsstyle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index 579dd0b..720dd6d 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -44,7 +44,7 @@ #if !defined(QT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN) -#include "qlibrary.h" +#include <private/qsystemlibrary_p.h> #include "qapplication.h" #include "qbitmap.h" #include "qdrawutil.h" // for now @@ -126,7 +126,7 @@ QWindowsStylePrivate::QWindowsStylePrivate() #if defined(Q_WS_WIN) && !defined(Q_OS_WINCE) if ((QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)) { - QLibrary shellLib(QLatin1String("shell32")); + QSystemLibrary shellLib(QLatin1String("shell32")); pSHGetStockIconInfo = (PtrSHGetStockIconInfo)shellLib.resolve("SHGetStockIconInfo"); } #endif @@ -921,9 +921,9 @@ static const char *const question_xpm[] = { static QPixmap loadIconFromShell32( int resourceId, int size ) { #ifdef Q_OS_WINCE - HMODULE hmod = LoadLibrary(L"ceshell.dll"); + HMODULE hmod = LoadLibrary(L"ceshell"); #else - HMODULE hmod = LoadLibrary(L"shell32.dll"); + HMODULE hmod = QSystemLibrary::load(L"shell32"); #endif if( hmod ) { HICON iconHandle = (HICON)LoadImage(hmod, MAKEINTRESOURCE(resourceId), IMAGE_ICON, size, size, 0); |