whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: Fix autotests with -qtnamespace 

Change-Id: If367429dafc283b3b2d57dab593060055f65659d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
bb10
Kai Koehne 2012-01-30 12:12:38 +01:00 committed by Qt by Nokia
parent 9464458098
commit 0fdb881987
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
View File

@ -1647,6 +1647,12 @@ BOOL IsUserAdmin()
}
#endif
#if defined(Q_OS_WIN)
QT_BEGIN_NAMESPACE
extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
QT_END_NAMESPACE
#endif
void tst_QFileInfo::owner()
{
QString userName;
@ -1687,7 +1693,6 @@ void tst_QFileInfo::owner()
NetApiBufferFree(pBuf);
}
}
extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
qt_ntfs_permission_lookup = 1;
#endif
if (userName.isEmpty())

2
tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
View File

@ -859,12 +859,14 @@ void tst_QPixmap::convertFromImageDetach()
#if defined(Q_OS_WIN)
QT_BEGIN_NAMESPACE
Q_GUI_EXPORT HBITMAP qt_createIconMask(const QBitmap &bitmap);
Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat = 0);
Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0);
Q_GUI_EXPORT HICON qt_pixmapToWinHICON(const QPixmap &p);
Q_GUI_EXPORT QImage qt_imageFromWinHBITMAP(HDC hdc, HBITMAP bitmap, int w, int h);
Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon);
QT_END_NAMESPACE
void tst_QPixmap::toWinHBITMAP_data()
{