diff options
| -rw-r--r-- | mkspecs/features/ctest_testcase_common.prf | 4 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemengine_win.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/accessible/itemviews.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/itemmodels/itemmodels.pro | 4 | ||||
| -rw-r--r-- | tests/auto/other/other.pro | 4 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/selftests.pri | 6 |
6 files changed, 14 insertions, 9 deletions
diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf index 0d5ff5f89c..63e31f5415 100644 --- a/mkspecs/features/ctest_testcase_common.prf +++ b/mkspecs/features/ctest_testcase_common.prf @@ -48,8 +48,8 @@ for (dep, dependentmodules): \ dependentmodules = $$join(mod_deps, ";") QT_FOR_CONFIG += gui-private -qtConfig(angle): CMAKE_GL_DEFINES = -DQT_WITH_ANGLE=True -!qtConfig(egl): CMAKE_GL_DEFINES += -DNO_EGL=True +qtHaveModule(gui):qtConfig(angle): CMAKE_GL_DEFINES = -DQT_WITH_ANGLE=True +qtHaveModule(gui):!qtConfig(egl): CMAKE_GL_DEFINES += -DNO_EGL=True CMAKE_MODULE_VERSIONS = CMAKE_MODULES_UNDER_TEST = diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index 74081b4ffa..a796fd005a 100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp @@ -204,10 +204,12 @@ GlobalSid::GlobalSid() ::GetTokenInformation(token, TokenUser, 0, 0, &retsize); if (retsize) { void *tokenBuffer = malloc(retsize); + Q_CHECK_PTR(tokenBuffer); if (::GetTokenInformation(token, TokenUser, tokenBuffer, retsize, &retsize)) { PSID tokenSid = reinterpret_cast<PTOKEN_USER>(tokenBuffer)->User.Sid; DWORD sidLen = ::GetLengthSid(tokenSid); currentUserSID = reinterpret_cast<PSID>(malloc(sidLen)); + Q_CHECK_PTR(currentUserSID); if (::CopySid(sidLen, currentUserSID, tokenSid)) BuildTrusteeWithSid(¤tUserTrusteeW, currentUserSID); } @@ -294,6 +296,7 @@ static QString readSymLink(const QFileSystemEntry &link) if (handle != INVALID_HANDLE_VALUE) { DWORD bufsize = MAXIMUM_REPARSE_DATA_BUFFER_SIZE; REPARSE_DATA_BUFFER *rdb = (REPARSE_DATA_BUFFER*)malloc(bufsize); + Q_CHECK_PTR(rdb); DWORD retsize = 0; if (::DeviceIoControl(handle, FSCTL_GET_REPARSE_POINT, 0, 0, rdb, bufsize, &retsize, 0)) { if (rdb->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT) { diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp index 159d61d683..51cfaa7f5e 100644 --- a/src/widgets/accessible/itemviews.cpp +++ b/src/widgets/accessible/itemviews.cpp @@ -973,7 +973,7 @@ void QAccessibleTableCell::unselectCell() { QAbstractItemView::SelectionMode selectionMode = view->selectionMode(); - if (!m_index.isValid() || (selectionMode & QAbstractItemView::NoSelection)) + if (!m_index.isValid() || (selectionMode == QAbstractItemView::NoSelection)) return; QAccessibleTableInterface *cellTable = table()->tableInterface(); diff --git a/tests/auto/corelib/itemmodels/itemmodels.pro b/tests/auto/corelib/itemmodels/itemmodels.pro index bcb6e604f8..cca350ad43 100644 --- a/tests/auto/corelib/itemmodels/itemmodels.pro +++ b/tests/auto/corelib/itemmodels/itemmodels.pro @@ -1,9 +1,9 @@ TEMPLATE=subdirs -SUBDIRS = qabstractitemmodel \ - qstringlistmodel \ +SUBDIRS = qstringlistmodel qtHaveModule(gui): SUBDIRS += \ + qabstractitemmodel \ qabstractproxymodel \ qidentityproxymodel \ qitemselectionmodel \ diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index 61a464356c..d70c895dec 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -48,9 +48,9 @@ cross_compile: SUBDIRS -= \ atwrapper \ compiler -winrt|!qtConfig(accessibility): SUBDIRS -= qaccessibility +winrt|!qtHaveModule(gui)|!qtConfig(accessibility): SUBDIRS -= qaccessibility -!qtConfig(accessibility-atspi-bridge): SUBDIRS -= qaccessibilitylinux +!qtHaveModule(gui)|!qtConfig(accessibility-atspi-bridge): SUBDIRS -= qaccessibilitylinux !qtConfig(process): SUBDIRS -= qprocess_and_guieventloop diff --git a/tests/auto/testlib/selftests/selftests.pri b/tests/auto/testlib/selftests/selftests.pri index 498d1653c0..05ed6d9905 100644 --- a/tests/auto/testlib/selftests/selftests.pri +++ b/tests/auto/testlib/selftests/selftests.pri @@ -27,10 +27,8 @@ SUBPROGRAMS = \ findtestdata \ float \ globaldata \ - keyboard \ longstring \ maxwarnings \ - mouse \ multiexec \ pairdiagnostics \ printdatatags \ @@ -52,5 +50,9 @@ SUBPROGRAMS = \ warnings \ xunit +qtHaveModule(gui): SUBPROGRAMS += \ + keyboard \ + mouse + INCLUDEPATH += ../../../../shared/ HEADERS += ../../../../shared/emulationdetector.h |