diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 13:41:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 13:41:11 +0100 |
| commit | e3de1d31fe05455f1f22085bb3607047d8ba718d (patch) | |
| tree | ef7ea9ac0cdab88d953af7796e52c22a0e49b4c5 /tests/auto/cmake/test_modules/CMakeLists.txt | |
| parent | 5809a8b0ec112ced99d34c9670d097f1f0dc3171 (diff) | |
| parent | 97cf3d27e6e9771690b1ea29e09f06d4376ffcab (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/sensors/generic/generictiltsensor.cpp
src/sensors/qtapsensor.h
sync.profile
Change-Id: I017a5fa8dffb69b41727495175c0fca9b76962e1
Diffstat (limited to 'tests/auto/cmake/test_modules/CMakeLists.txt')
| -rw-r--r-- | tests/auto/cmake/test_modules/CMakeLists.txt | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/tests/auto/cmake/test_modules/CMakeLists.txt b/tests/auto/cmake/test_modules/CMakeLists.txt deleted file mode 100644 index 6452e942..00000000 --- a/tests/auto/cmake/test_modules/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(test_modules) - -find_package(Qt5Core REQUIRED) - -find_package(Qt5Sensors REQUIRED) - -include_directories( - ${Qt5Sensors_INCLUDE_DIRS} -) - -add_definitions( - ${Qt5Sensors_DEFINITIONS} -) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - -add_executable(mainapp main.cpp) -target_link_libraries(mainapp - ${Qt5Sensors_LIBRARIES} -) |