diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-06 18:28:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-06 18:28:42 (GMT) |
| commit | 55ea900361418aed0c23c0f0023a88b022c2b55d (patch) | |
| tree | 9ac915b17e36a591e6bdca39f74e391a155dbb0f /src/gui/dialogs/qfiledialog_win.cpp | |
| parent | 109ece623d8a973a2d97263309aa32bceab7e210 (diff) | |
| parent | 1ef309e964753105e14a8c223a1b59c0cbd9369b (diff) | |
| download | Qt-55ea900361418aed0c23c0f0023a88b022c2b55d.zip Qt-55ea900361418aed0c23c0f0023a88b022c2b55d.tar.gz Qt-55ea900361418aed0c23c0f0023a88b022c2b55d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
QHostInfo: fix a race condition under CE
Diffstat (limited to 'src/gui/dialogs/qfiledialog_win.cpp')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp index de8e33d..6691ff1 100644 --- a/src/gui/dialogs/qfiledialog_win.cpp +++ b/src/gui/dialogs/qfiledialog_win.cpp @@ -670,7 +670,7 @@ QStringList qt_win_get_open_file_names(const QFileDialogArgs &args, // GetOpenFileName() will return only one folder name for all the files. To retrieve // the correct path for all selected files, we have to use Common Item Dialog interfaces. #ifndef Q_WS_WINCE - if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based) + if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)) return qt_win_CID_get_open_file_names(args, initialDirectory, filterLst, selectedFilter, idx); #endif @@ -757,7 +757,7 @@ static int __stdcall winGetExistDirCallbackProc(HWND hwnd, QString qt_win_get_existing_directory(const QFileDialogArgs &args) { #ifndef Q_WS_WINCE - if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based) + if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)) return qt_win_CID_get_existing_directory(args); #endif |