diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 12:34:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 12:34:06 (GMT) |
| commit | 2735bc6759f881c786a1097580a8682e3d28f365 (patch) | |
| tree | d16cbc4e32c4f4a2f5e49083400f9ab85831b09a /src/gui/util/qdesktopservices_win.cpp | |
| parent | 234751504f2703d39e562966431a54c015fb990e (diff) | |
| parent | 688deeee6c8c2892becb4207f8c40dddba0e3769 (diff) | |
| download | Qt-2735bc6759f881c786a1097580a8682e3d28f365.zip Qt-2735bc6759f881c786a1097580a8682e3d28f365.tar.gz Qt-2735bc6759f881c786a1097580a8682e3d28f365.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add missing license header
Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.
Compile fix WinCE
Ensure that we load system libraries from the correct location.
Diffstat (limited to 'src/gui/util/qdesktopservices_win.cpp')
| -rw-r--r-- | src/gui/util/qdesktopservices_win.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp index 9f3b6e1..359710f 100644 --- a/src/gui/util/qdesktopservices_win.cpp +++ b/src/gui/util/qdesktopservices_win.cpp @@ -41,7 +41,7 @@ #include <qsettings.h> #include <qdir.h> -#include <qlibrary.h> +#include <private/qsystemlibrary_p.h> #include <qurl.h> #include <qstringlist.h> #include <qprocess.h> @@ -177,9 +177,9 @@ QString QDesktopServices::storageLocation(StandardLocation type) QString result; #ifndef Q_OS_WINCE - QLibrary library(QLatin1String("shell32")); + QSystemLibrary library(QLatin1String("shell32")); #else - QLibrary library(QLatin1String("coredll")); + QSystemLibrary library(QLatin1String("coredll")); #endif // Q_OS_WINCE typedef BOOL (WINAPI*GetSpecialFolderPath)(HWND, LPWSTR, int, BOOL); static GetSpecialFolderPath SHGetSpecialFolderPath = |