Skip to content

Commit

Permalink
cmake: remove qmake build system (except in examples/)
Browse files Browse the repository at this point in the history
Change-Id: I8d00047f8e03bb77863041eaa99f1bba13a15a32
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
  • Loading branch information
rgriebl committed Jun 30, 2021
1 parent 28db22b commit e38f7b9
Show file tree
Hide file tree
Showing 83 changed files with 19 additions and 2,044 deletions.
14 changes: 0 additions & 14 deletions .qmake.conf

This file was deleted.

19 changes: 19 additions & 0 deletions CMakeLists.txt
Expand Up @@ -43,6 +43,8 @@ if(NOT TARGET Qt::Gui OR NOT TARGET Qt::Quick)
return()
endif()

## COVERAGE ###########################################################

if(AM_COVERAGE)
if(NOT (LINUX AND (GCC OR CLANG)))
message(FATAL_ERROR "Coverage builds are only supported on Linux, using GCC or Clang.")
Expand Down Expand Up @@ -87,10 +89,27 @@ if(AM_COVERAGE)
)
endif()

## BUILD ##############################################################

qt_build_repo()

## DOCUMENTATION ######################################################

add_custom_target(QtApplicationManagerDoc)

qt_internal_add_docs(QtApplicationManagerDoc
doc/qtapplicationmanager.qdocconf
)

## QMAKE FEATURES #####################################################

if(NOT QT_BUILD_STANDALONE_TESTS)
# Copy mkspecs for users preferring qmake builds
set(mkspecs_install_dir "${INSTALL_MKSPECSDIR}")
qt_path_join(mkspecs_install_dir ${QT_INSTALL_DIR} ${mkspecs_install_dir})

qt_copy_or_install(DIRECTORY qmake-features/
DESTINATION "${mkspecs_install_dir}"
FILES_MATCHING PATTERN "*.pr[if]"
)
endif()
159 changes: 0 additions & 159 deletions application-manager.pro

This file was deleted.

24 changes: 0 additions & 24 deletions doc/doc.pro

This file was deleted.

4 changes: 0 additions & 4 deletions examples/applicationmanager/applicationmanager.pro
Expand Up @@ -3,10 +3,6 @@
# depend on appman_common-private
requires(false)

load(am-config)

requires(!disable-installer)

TEMPLATE = subdirs

SUBDIRS = \
Expand Down
2 changes: 0 additions & 2 deletions qmake-features/CMakeLists.txt

This file was deleted.

32 changes: 0 additions & 32 deletions qmake-features/add-static-library.prf

This file was deleted.

71 changes: 0 additions & 71 deletions qmake-features/am-config.prf

This file was deleted.

18 changes: 0 additions & 18 deletions qmake-features/am-coverage.prf

This file was deleted.

0 comments on commit e38f7b9

Please sign in to comment.