AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Never attempt to run the dbus tests on APPLE.

Browse Source 
The Qt buildsystem is creating the config files for it even
when it is not building QtDBus, so Qt5DBus_FOUND = True.

Re-enable the CI testing on mac with this change.

Task-number: QTBUG-25522

Change-Id: I5d2690d17fde6c5aabcbdd3e2eef9f0846edd97d
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Stephen Kelly 2012-04-27 14:30:46 +02:00 committed by Qt by Nokia
parent 31b0a37306
commit aa17350eb6
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/cmake/CMakeLists.txt
View File

@ -95,6 +95,6 @@ expect_pass(pass8)
# If QtDBus has been installed then run the tests for its macros.
find_package(Qt5DBus QUIET)
if (Qt5DBus_FOUND)
if (Qt5DBus_FOUND AND NOT APPLE)
expect_pass(pass9)
endif()

2
tests/auto/cmake/cmake.pro
View File

@ -4,8 +4,6 @@ CMAKE_VERSION = $$system(cmake --version)
# Cause make to do nothing.
TEMPLATE = subdirs
mac:CONFIG+=insignificant_test
check.commands =
isEmpty(CMAKE_VERSION) {
message("cmake executable not found. Not running CMake unit tests")