summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmake/FindWrapLibClang.cmake15
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/global/CMakeLists.txt13
-rw-r--r--src/global/configure.cmake31
-rw-r--r--src/linguist/lconvert/.prev_CMakeLists.txt31
-rw-r--r--src/linguist/lrelease/.prev_CMakeLists.txt36
-rw-r--r--src/linguist/lupdate/.prev_CMakeLists.txt80
-rw-r--r--src/linguist/lupdate/CMakeLists.txt30
-rw-r--r--src/qdoc/.prev_CMakeLists.txt5
-rw-r--r--src/qdoc/CMakeLists.txt3
10 files changed, 240 insertions, 5 deletions
diff --git a/cmake/FindWrapLibClang.cmake b/cmake/FindWrapLibClang.cmake
index 9ad0202b2..0155f0cdb 100644
--- a/cmake/FindWrapLibClang.cmake
+++ b/cmake/FindWrapLibClang.cmake
@@ -18,6 +18,11 @@ function(qt_tools_find_llvm_version_from_lib_dir lib_dir out_var)
endfunction()
function(qt_tools_find_lib_clang)
+ if(TARGET WrapLibClang::WrapLibClang)
+ set(WrapLibClang_FOUND TRUE PARENT_SCOPE)
+ return()
+ endif()
+
if(NOT QDOC_USE_STATIC_LIBCLANG AND DEFINED ENV{QDOC_USE_STATIC_LIBCLANG})
set(QDOC_USE_STATIC_LIBCLANG "$ENV{QDOC_USE_STATIC_LIBCLANG}")
endif()
@@ -206,6 +211,16 @@ function(qt_tools_find_lib_clang)
endif() # QDOC_USE_STATIC_LIBCLANG
qt_tools_create_lib_clang_target()
+
+ # Break apart version string
+ string(REPLACE "." ";" version_list ${QT_LIB_CLANG_VERSION})
+ list(GET version_list 0 QT_LIB_CLANG_VERSION_MAJOR)
+ list(GET version_list 1 QT_LIB_CLANG_VERSION_MINOR)
+ list(GET version_list 2 QT_LIB_CLANG_VERSION_PATCH)
+
+ set(QT_LIB_CLANG_VERSION_MAJOR ${QT_LIB_CLANG_VERSION_MAJOR} CACHE STRING "" FORCE)
+ set(QT_LIB_CLANG_VERSION_MINOR ${QT_LIB_CLANG_VERSION_MINOR} CACHE STRING "" FORCE)
+ set(QT_LIB_CLANG_VERSION_PATCH ${QT_LIB_CLANG_VERSION_PATCH} CACHE STRING "" FORCE)
set(QT_LIB_CLANG_LIBS "${QT_LIB_CLANG_LIBS}" CACHE STRING "" FORCE)
set(QT_LIB_CLANG_LIBDIR "${QT_LIB_CLANG_LIBDIR}" CACHE STRING "" FORCE)
set(QT_LIB_CLANG_INCLUDEPATH "${QT_LIB_CLANG_INCLUDEPATH}" CACHE STRING "" FORCE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7729f8551..156f055fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,6 @@
# Generated from src.pro.
+add_subdirectory(global)
add_subdirectory(linguist)
add_subdirectory(qtattributionsscanner)
if(QT_FEATURE_png AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets)
diff --git a/src/global/CMakeLists.txt b/src/global/CMakeLists.txt
new file mode 100644
index 000000000..d97f5a202
--- /dev/null
+++ b/src/global/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from global.pro.
+
+#####################################################################
+## Tools Module:
+#####################################################################
+
+qt_add_module(Tools
+ INTERNAL_MODULE
+ HEADER_MODULE
+)
+
+#### Keys ignored in scope 1:.:.:global.pro:<TRUE>:
+# MODULE = "tools"
diff --git a/src/global/configure.cmake b/src/global/configure.cmake
new file mode 100644
index 000000000..9f03fd463
--- /dev/null
+++ b/src/global/configure.cmake
@@ -0,0 +1,31 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+
+
+#### Tests
+
+# libclang
+qt_find_package(WrapLibClang PROVIDED_TARGETS WrapLibClang::WrapLibClang)
+
+if(TARGET WrapLibClang::WrapLibClang)
+ set(TEST_libclang "ON" CACHE BOOL "Required libclang version found." FORCE)
+endif()
+
+
+
+#### Features
+
+qt_feature("clang" PRIVATE
+ LABEL "QDoc"
+ CONDITION TEST_libclang
+)
+qt_feature("clangcpp" PRIVATE
+ LABEL "Clang-based lupdate parser"
+ CONDITION QT_FEATURE_clang AND TEST_libclang
+)
diff --git a/src/linguist/lconvert/.prev_CMakeLists.txt b/src/linguist/lconvert/.prev_CMakeLists.txt
new file mode 100644
index 000000000..6a47b65fb
--- /dev/null
+++ b/src/linguist/lconvert/.prev_CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from lconvert.pro.
+
+#####################################################################
+## lconvert Tool:
+#####################################################################
+
+qt_add_tool(lconvert
+ SOURCES
+ ../shared/numerus.cpp
+ ../shared/po.cpp
+ ../shared/qm.cpp
+ ../shared/qph.cpp
+ ../shared/translator.cpp ../shared/translator.h
+ ../shared/translatormessage.cpp ../shared/translatormessage.h
+ ../shared/ts.cpp
+ ../shared/xliff.cpp
+ main.cpp
+ DEFINES
+ QT_NO_CAST_FROM_ASCII
+ QT_NO_CAST_TO_ASCII
+ INCLUDE_DIRECTORIES
+ ../shared
+ LIBRARIES
+ Qt::CorePrivate
+ PUBLIC_LIBRARIES
+ Qt::Xml
+)
+
+#### Keys ignored in scope 1:.:.:lconvert.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Converter"
+# _OPTION = "host_build"
diff --git a/src/linguist/lrelease/.prev_CMakeLists.txt b/src/linguist/lrelease/.prev_CMakeLists.txt
new file mode 100644
index 000000000..307cef82d
--- /dev/null
+++ b/src/linguist/lrelease/.prev_CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from lrelease.pro.
+
+#####################################################################
+## lrelease Tool:
+#####################################################################
+
+qt_add_tool(lrelease
+ SOURCES
+ ../shared/numerus.cpp
+ ../shared/po.cpp
+ ../shared/projectdescriptionreader.cpp ../shared/projectdescriptionreader.h
+ ../shared/qm.cpp
+ ../shared/qph.cpp
+ ../shared/runqttool.cpp ../shared/runqttool.h
+ ../shared/translator.cpp ../shared/translator.h
+ ../shared/translatormessage.cpp ../shared/translatormessage.h
+ ../shared/ts.cpp
+ ../shared/xliff.cpp
+ main.cpp
+ DEFINES
+ QT_NO_CAST_FROM_ASCII
+ QT_NO_CAST_TO_ASCII
+ INCLUDE_DIRECTORIES
+ ../shared
+ LIBRARIES
+ Qt::CorePrivate
+ PUBLIC_LIBRARIES
+ Qt::Xml
+)
+
+#### Keys ignored in scope 1:.:.:lrelease.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Compiler"
+# QT_TOOL_ENV = "qmake"
+# _OPTION = "host_build"
+# qmake.name = "QMAKE"
+# qmake.value = "$$shell_path($$QMAKE_QMAKE)"
diff --git a/src/linguist/lupdate/.prev_CMakeLists.txt b/src/linguist/lupdate/.prev_CMakeLists.txt
new file mode 100644
index 000000000..f14ce2f77
--- /dev/null
+++ b/src/linguist/lupdate/.prev_CMakeLists.txt
@@ -0,0 +1,80 @@
+# Generated from lupdate.pro.
+
+#####################################################################
+## lupdate Tool:
+#####################################################################
+
+qt_add_tool(lupdate
+ SOURCES
+ ../shared/numerus.cpp
+ ../shared/po.cpp
+ ../shared/projectdescriptionreader.cpp ../shared/projectdescriptionreader.h
+ ../shared/qm.cpp
+ ../shared/qph.cpp
+ ../shared/qrcreader.cpp ../shared/qrcreader.h
+ ../shared/runqttool.cpp ../shared/runqttool.h
+ ../shared/simtexth.cpp ../shared/simtexth.h
+ ../shared/translator.cpp ../shared/translator.h
+ ../shared/translatormessage.cpp ../shared/translatormessage.h
+ ../shared/ts.cpp
+ ../shared/xliff.cpp
+ cpp.cpp cpp.h
+ java.cpp
+ lupdate.h
+ main.cpp
+ merge.cpp
+ ui.cpp
+ DEFINES
+ QT_NO_CAST_FROM_ASCII
+ QT_NO_CAST_TO_ASCII
+ INCLUDE_DIRECTORIES
+ ../shared
+ LIBRARIES
+ Qt::CorePrivate
+ Qt::ToolsPrivate
+ PUBLIC_LIBRARIES
+ Qt::Tools
+ Qt::Xml
+)
+
+#### Keys ignored in scope 1:.:.:lupdate.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Update Tool"
+# QT_TOOL_ENV = "qmake"
+# _OPTION = "host_build"
+# qmake.name = "QMAKE"
+# qmake.value = "$$shell_path($$QMAKE_QMAKE)"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(lupdate CONDITION TARGET Qt::QmlDevToolsPrivate
+ SOURCES
+ qdeclarative.cpp
+ LIBRARIES
+ Qt::QmlDevToolsPrivate
+ PUBLIC_LIBRARIES
+ Qt::QmlDevTools
+)
+
+qt_extend_target(lupdate CONDITION NOT TARGET Qt::QmlDevToolsPrivate
+ DEFINES
+ QT_NO_QML
+)
+
+qt_extend_target(lupdate CONDITION QT_FEATURE_clangcpp
+ SOURCES
+ clangtoolastreader.cpp clangtoolastreader.h
+ cpp_clang.cpp cpp_clang.h
+ DEFINES
+ (CLANG_RESOURCE_DIR=\"/clang//include\")
+ (LUPDATE_CLANG_VERSION_STR=\"\")
+ LUPDATE_CLANG_VERSION_MAJOR=
+ LUPDATE_CLANG_VERSION_MINOR=
+ LUPDATE_CLANG_VERSION_PATCH=
+)
+
+#### Keys ignored in scope 6:.:.:lupdate.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath:
+# QMAKE_RPATHDIR = "$$CLANG_LIBDIR"
+
+#### Keys ignored in scope 9:.:.:lupdate.pro:mingw:
+# RC_FILE = "lupdate.rc"
diff --git a/src/linguist/lupdate/CMakeLists.txt b/src/linguist/lupdate/CMakeLists.txt
index 5d77e697d..46d9575eb 100644
--- a/src/linguist/lupdate/CMakeLists.txt
+++ b/src/linguist/lupdate/CMakeLists.txt
@@ -19,7 +19,7 @@ qt_add_tool(lupdate
../shared/translatormessage.cpp ../shared/translatormessage.h
../shared/ts.cpp
../shared/xliff.cpp
- cpp.cpp
+ cpp.cpp cpp.h
java.cpp
lupdate.h
main.cpp
@@ -32,7 +32,9 @@ qt_add_tool(lupdate
../shared
LIBRARIES
Qt::CorePrivate
+ Qt::ToolsPrivate
PUBLIC_LIBRARIES
+ Qt::Tools
Qt::Xml
)
@@ -60,5 +62,29 @@ qt_extend_target(lupdate CONDITION NOT TARGET Qt::QmlDevToolsPrivate
QT_NO_QML
)
-#### Keys ignored in scope 5:.:.:lupdate.pro:mingw:
+qt_extend_target(lupdate CONDITION QT_FEATURE_clangcpp
+ SOURCES
+ clangtoolastreader.cpp clangtoolastreader.h
+ cpp_clang.cpp cpp_clang.h
+ DEFINES
+ # special case begin
+ # remove these
+ #(CLANG_RESOURCE_DIR=\"/clang//include\")
+ #(LUPDATE_CLANG_VERSION_STR=\"\")
+ #LUPDATE_CLANG_VERSION_MAJOR=
+ #LUPDATE_CLANG_VERSION_MINOR=
+ #LUPDATE_CLANG_VERSION_PATCH=
+ # in favor of these
+ CLANG_RESOURCE_DIR="\"${QT_LIB_CLANG_LIBDIR}/clang/${QT_LIB_CLANG_VERSION}\""
+ LUPDATE_CLANG_VERSION_STR="\"${QT_LIB_CLANG_VERSION}\""
+ LUPDATE_CLANG_VERSION_MAJOR="${QT_LIB_CLANG_VERSION_MAJOR}"
+ LUPDATE_CLANG_VERSION_MINOR="${QT_LIB_CLANG_VERSION_MINOR}"
+ LUPDATE_CLANG_VERSION_PATCH="${QT_LIB_CLANG_VERSION_PATCH}"
+ # special case end
+)
+
+#### Keys ignored in scope 6:.:.:lupdate.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath:
+# QMAKE_RPATHDIR = "$$CLANG_LIBDIR"
+
+#### Keys ignored in scope 9:.:.:lupdate.pro:mingw:
# RC_FILE = "lupdate.rc"
diff --git a/src/qdoc/.prev_CMakeLists.txt b/src/qdoc/.prev_CMakeLists.txt
index b04e6af4b..b56fe5b08 100644
--- a/src/qdoc/.prev_CMakeLists.txt
+++ b/src/qdoc/.prev_CMakeLists.txt
@@ -29,7 +29,6 @@ qt_add_tool(qdoc
puredocparser.cpp puredocparser.h
qdoccommandlineparser.cpp qdoccommandlineparser.h
qdocdatabase.cpp qdocdatabase.h
- qdocglobals.cpp qdocglobals.h
qdocindexfiles.cpp qdocindexfiles.h
qdoctagfiles.cpp qdoctagfiles.h
qmlcodemarker.cpp qmlcodemarker.h
@@ -42,11 +41,13 @@ qt_add_tool(qdoc
text.cpp text.h
tokenizer.cpp tokenizer.h
tree.cpp tree.h
+ utilities.cpp utilities.h
webxmlgenerator.cpp webxmlgenerator.h
+ xmlgenerator.cpp xmlgenerator.h
yyindent.cpp
DEFINES
(CLANG_RESOURCE_DIR=\"/clang//include\")
- QDOC2_COMPAT
+ QT_NO_FOREACH
INCLUDE_DIRECTORIES
${QT_SOURCE_TREE}/src/tools/qdoc
${QT_SOURCE_TREE}/src/tools/qdoc/qmlparser
diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt
index 7323f4cd7..d9d262620 100644
--- a/src/qdoc/CMakeLists.txt
+++ b/src/qdoc/CMakeLists.txt
@@ -29,7 +29,6 @@ qt_add_tool(qdoc
puredocparser.cpp puredocparser.h
qdoccommandlineparser.cpp qdoccommandlineparser.h
qdocdatabase.cpp qdocdatabase.h
- qdocglobals.cpp qdocglobals.h
qdocindexfiles.cpp qdocindexfiles.h
qdoctagfiles.cpp qdoctagfiles.h
qmlcodemarker.cpp qmlcodemarker.h
@@ -42,7 +41,9 @@ qt_add_tool(qdoc
text.cpp text.h
tokenizer.cpp tokenizer.h
tree.cpp tree.h
+ utilities.cpp utilities.h
webxmlgenerator.cpp webxmlgenerator.h
+ xmlgenerator.cpp xmlgenerator.h
yyindent.cpp
LIBRARIES # special case
WrapLibClang::WrapLibClang # special case
View Lorry Controller Status