diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-28 10:58:46 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-28 11:45:59 (GMT) |
| commit | 7eba68adc4a7862d9474179592e5c8393a7acdbb (patch) | |
| tree | 73014cabc8b10f46203844aeb40de574d97032dc /tests/auto/qsettings | |
| parent | a20f8dcbeafa34b50ef69d1c5db0f17b09731d2a (diff) | |
| parent | 3bf3981c7026de9017887d08312391b54fe8afc6 (diff) | |
| download | Qt-7eba68adc4a7862d9474179592e5c8393a7acdbb.zip Qt-7eba68adc4a7862d9474179592e5c8393a7acdbb.tar.gz Qt-7eba68adc4a7862d9474179592e5c8393a7acdbb.tar.bz2 | |
Merge commit 'qt/master-stable'
Conflicts:
configure.exe
src/corelib/io/io.pri
src/corelib/io/qfilesystemwatcher.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/configure/configureapp.cpp
Diffstat (limited to 'tests/auto/qsettings')
| -rw-r--r-- | tests/auto/qsettings/tst_qsettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp index 7965ce9..ddf9724 100644 --- a/tests/auto/qsettings/tst_qsettings.cpp +++ b/tests/auto/qsettings/tst_qsettings.cpp @@ -343,7 +343,7 @@ void tst_QSettings::init() #if defined(Q_OS_WINCE) removePath(settingsPath()); #else - if (qWinVersion() & Qt::WV_NT_based) + if (QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) system(QString("rmdir /Q /S %1").arg(settingsPath()).toLatin1()); else system(QString("deltree /Y %1").arg(settingsPath()).toLatin1()); |