diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2016-07-04 19:29:30 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2016-07-05 14:40:29 +0000 |
| commit | 6583720aa4503fce16b44cce7b8d939058abf000 (patch) | |
| tree | 971b1f6f13dfee814a4984d9b7b8f6eb5e283353 /src/corelib/Qt5CoreConfigExtras.cmake.in | |
| parent | 840729a931a7d3fefbc4b4a8e01f8b1bd69a427e (diff) | |
Revert "CMake: Add imported target for qdoc."
This reverts commit dc0ae02ebc8e221f952829230c0301a718a6f10b.
qdoc is a binary built inside the qttools repository, thus it should be added
to the respective ConfigExtras.cmake.in there instead.
Task-number: QTBUG-54446
Change-Id: I182e5889af164a89c68226a91abc4d9962a508ea
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib/Qt5CoreConfigExtras.cmake.in')
| -rw-r--r-- | src/corelib/Qt5CoreConfigExtras.cmake.in | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in index f492148a50..a5ed8b2ea3 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -46,21 +46,6 @@ if (NOT TARGET Qt5::rcc) ) endif() -if (NOT TARGET Qt5::qdoc) - add_executable(Qt5::qdoc IMPORTED) - -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qdoc$$CMAKE_BIN_SUFFIX\") -!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qdoc$$CMAKE_BIN_SUFFIX\") -!!ENDIF - _qt5_Core_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdoc PROPERTIES - IMPORTED_LOCATION ${imported_location} - ) -endif() - set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake) set(Qt5Core_MOC_EXECUTABLE Qt5::moc) set(Qt5Core_RCC_EXECUTABLE Qt5::rcc) |