diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-28 09:43:13 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-28 09:43:13 (GMT) |
| commit | 84294f47e55073914bcbcdbaf85df1a0e2e2d845 (patch) | |
| tree | 1166be97fcfcc6a71b9603443ef6360d33aef276 /tests/auto/qfileinfo | |
| parent | 80e13f5bd418395bd64396e359a288b748ae1dfb (diff) | |
| parent | 7b10151cb6550fe8060217fad8549950eadd5fca (diff) | |
| download | Qt-84294f47e55073914bcbcdbaf85df1a0e2e2d845.zip Qt-84294f47e55073914bcbcdbaf85df1a0e2e2d845.tar.gz Qt-84294f47e55073914bcbcdbaf85df1a0e2e2d845.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/kernel/qapplication.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'tests/auto/qfileinfo')
| -rw-r--r-- | tests/auto/qfileinfo/tst_qfileinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 4387553..a074f4b 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -1120,7 +1120,7 @@ void tst_QFileInfo::isHidden_data() #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) QVERIFY(QDir("./hidden-directory").exists() || QDir().mkdir("./hidden-directory")); - QVERIFY(SetFileAttributesW((wchar_t*)QString("./hidden-directory").utf16(),FILE_ATTRIBUTE_HIDDEN)); + QVERIFY(SetFileAttributesW(reinterpret_cast<LPCWSTR>(QString("./hidden-directory").utf16()),FILE_ATTRIBUTE_HIDDEN)); QTest::newRow("C:/path/to/hidden-directory") << QDir::currentPath() + QString::fromLatin1("/hidden-directory") << true; QTest::newRow("C:/path/to/hidden-directory/.") << QDir::currentPath() + QString::fromLatin1("/hidden-directory/.") << true; #endif |