diff --git a/languages/qmljs/libs/CMakeLists.txt b/languages/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt similarity index 81% rename from languages/qmljs/libs/CMakeLists.txt rename to languages/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt index 39723e566f..bbd80cec6c 100644 --- a/languages/qmljs/libs/CMakeLists.txt +++ b/languages/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt @@ -1,63 +1,65 @@ -string(REPLACE "-Wdocumentation" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - qt5_wrap_ui(uifiles_SRCS utils/projectintropage.ui utils/filewizardpage.ui utils/newclasswidget.ui ) add_library(kdevqtc-qmlsupport STATIC ${uifiles_SRCS} languageutils/componentversion.cpp languageutils/fakemetaobject.cpp qmljs/parser/qmldirparser.cpp qmljs/parser/qmlerror.cpp qmljs/parser/qmljsast.cpp qmljs/parser/qmljsastvisitor.cpp qmljs/parser/qmljsengine_p.cpp qmljs/parser/qmljsgrammar.cpp qmljs/parser/qmljslexer.cpp qmljs/parser/qmljsparser.cpp qmljs/qmljsdocument.cpp qmljs/qmljsutils.cpp utils/changeset.cpp utils/fileutils.cpp utils/qtcassert.cpp utils/savefile.cpp utils/json.cpp utils/filesystemwatcher.cpp utils/environment.cpp utils/hostosinfo.cpp qmljs/persistenttrie.cpp qmljs/qmljsbind.cpp qmljs/qmljsbundle.cpp qmljs/qmljscontext.cpp qmljs/qmljsdialect.cpp qmljs/qmljsevaluate.cpp qmljs/qmljsimportdependencies.cpp qmljs/qmljsinterpreter.cpp qmljs/qmljsmodelmanagerinterface.cpp qmljs/qmljsplugindumper.cpp qmljs/qmljsqrcparser.cpp qmljs/qmljsscopeastpath.cpp qmljs/qmljsscopebuilder.cpp qmljs/qmljsscopechain.cpp qmljs/qmljstypedescriptionreader.cpp qmljs/qmljsvalueowner.cpp qmljs/qmljsviewercontext.cpp ) if (APPLE) target_sources(kdevqtc-qmlsupport PRIVATE utils/fileutils_mac.mm) target_link_libraries(kdevqtc-qmlsupport LINK_PRIVATE "-framework Foundation" ) endif() -set_target_properties(kdevqtc-qmlsupport PROPERTIES COMPILE_FLAGS "-DLANGUAGEUTILS_BUILD_DIR\ -DQTCREATOR_UTILS_LIB") +if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + target_compile_options(kdevqtc-qmlsupport PRIVATE "-Wno-documentation") +endif() +target_compile_definitions(kdevqtc-qmlsupport PUBLIC "-DLANGUAGEUTILS_BUILD_DIR\ -DQTCREATOR_UTILS_LIB -DQT_CREATOR -DQML_BUILD_STATIC_LIB") +target_include_directories(kdevqtc-qmlsupport PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(kdevqtc-qmlsupport LINK_PRIVATE Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Xml ) diff --git a/languages/qmljs/libs/LGPL_EXCEPTION.TXT b/languages/qmljs/3rdparty/qtcreator-libs/LGPL_EXCEPTION.TXT similarity index 100% rename from languages/qmljs/libs/LGPL_EXCEPTION.TXT rename to languages/qmljs/3rdparty/qtcreator-libs/LGPL_EXCEPTION.TXT diff --git a/languages/qmljs/libs/LICENSE.LGPL b/languages/qmljs/3rdparty/qtcreator-libs/LICENSE.LGPL similarity index 100% rename from languages/qmljs/libs/LICENSE.LGPL rename to languages/qmljs/3rdparty/qtcreator-libs/LICENSE.LGPL diff --git a/languages/qmljs/libs/README b/languages/qmljs/3rdparty/qtcreator-libs/README similarity index 100% rename from languages/qmljs/libs/README rename to languages/qmljs/3rdparty/qtcreator-libs/README diff --git a/languages/qmljs/libs/languageutils/componentversion.cpp b/languages/qmljs/3rdparty/qtcreator-libs/languageutils/componentversion.cpp similarity index 100% rename from languages/qmljs/libs/languageutils/componentversion.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/languageutils/componentversion.cpp diff --git a/languages/qmljs/libs/languageutils/componentversion.h b/languages/qmljs/3rdparty/qtcreator-libs/languageutils/componentversion.h similarity index 100% rename from languages/qmljs/libs/languageutils/componentversion.h rename to languages/qmljs/3rdparty/qtcreator-libs/languageutils/componentversion.h diff --git a/languages/qmljs/libs/languageutils/fakemetaobject.cpp b/languages/qmljs/3rdparty/qtcreator-libs/languageutils/fakemetaobject.cpp similarity index 100% rename from languages/qmljs/libs/languageutils/fakemetaobject.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/languageutils/fakemetaobject.cpp diff --git a/languages/qmljs/libs/languageutils/fakemetaobject.h b/languages/qmljs/3rdparty/qtcreator-libs/languageutils/fakemetaobject.h similarity index 100% rename from languages/qmljs/libs/languageutils/fakemetaobject.h rename to languages/qmljs/3rdparty/qtcreator-libs/languageutils/fakemetaobject.h diff --git a/languages/qmljs/libs/languageutils/languageutils_global.h b/languages/qmljs/3rdparty/qtcreator-libs/languageutils/languageutils_global.h similarity index 100% rename from languages/qmljs/libs/languageutils/languageutils_global.h rename to languages/qmljs/3rdparty/qtcreator-libs/languageutils/languageutils_global.h diff --git a/languages/qmljs/libs/qmljs/parser/changeLicense.py b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/changeLicense.py similarity index 100% rename from languages/qmljs/libs/qmljs/parser/changeLicense.py rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/changeLicense.py diff --git a/languages/qmljs/libs/qmljs/parser/cmd.sed b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/cmd.sed similarity index 100% rename from languages/qmljs/libs/qmljs/parser/cmd.sed rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/cmd.sed diff --git a/languages/qmljs/libs/qmljs/parser/gen-parser.sh b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/gen-parser.sh similarity index 100% rename from languages/qmljs/libs/qmljs/parser/gen-parser.sh rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/gen-parser.sh diff --git a/languages/qmljs/libs/qmljs/parser/parser.patch b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/parser.patch similarity index 100% rename from languages/qmljs/libs/qmljs/parser/parser.patch rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/parser.patch diff --git a/languages/qmljs/libs/qmljs/parser/parser.pri b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/parser.pri similarity index 100% rename from languages/qmljs/libs/qmljs/parser/parser.pri rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/parser.pri diff --git a/languages/qmljs/libs/qmljs/parser/qmldirparser.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmldirparser.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmldirparser.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmldirparser.cpp diff --git a/languages/qmljs/libs/qmljs/parser/qmldirparser_p.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmldirparser_p.h similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmldirparser_p.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmldirparser_p.h diff --git a/languages/qmljs/libs/qmljs/parser/qmlerror.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmlerror.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmlerror.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmlerror.cpp diff --git a/languages/qmljs/libs/qmljs/parser/qmlerror.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmlerror.h similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmlerror.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmlerror.h diff --git a/languages/qmljs/libs/qmljs/parser/qmljs.g b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljs.g similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljs.g rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljs.g diff --git a/languages/qmljs/libs/qmljs/parser/qmljsast.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsast.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsast.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsast.cpp diff --git a/languages/qmljs/libs/qmljs/parser/qmljsast_p.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsast_p.h similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsast_p.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsast_p.h diff --git a/languages/qmljs/libs/qmljs/parser/qmljsastfwd_p.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsastfwd_p.h similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsastfwd_p.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsastfwd_p.h diff --git a/languages/qmljs/libs/qmljs/parser/qmljsastvisitor.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsastvisitor.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsastvisitor.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsastvisitor.cpp diff --git a/languages/qmljs/libs/qmljs/parser/qmljsastvisitor_p.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsastvisitor_p.h similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsastvisitor_p.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsastvisitor_p.h diff --git a/languages/qmljs/libs/qmljs/parser/qmljsengine_p.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsengine_p.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsengine_p.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsengine_p.cpp diff --git a/languages/qmljs/libs/qmljs/parser/qmljsengine_p.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsengine_p.h similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsengine_p.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsengine_p.h diff --git a/languages/qmljs/libs/qmljs/parser/qmljsglobal_p.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsglobal_p.h similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsglobal_p.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsglobal_p.h diff --git a/languages/qmljs/libs/qmljs/parser/qmljsgrammar.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsgrammar.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsgrammar.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsgrammar.cpp diff --git a/languages/qmljs/libs/qmljs/parser/qmljsgrammar_p.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsgrammar_p.h similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsgrammar_p.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsgrammar_p.h diff --git a/languages/qmljs/libs/qmljs/parser/qmljskeywords_p.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljskeywords_p.h similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljskeywords_p.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljskeywords_p.h diff --git a/languages/qmljs/libs/qmljs/parser/qmljslexer.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljslexer.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljslexer.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljslexer.cpp diff --git a/languages/qmljs/libs/qmljs/parser/qmljslexer_p.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljslexer_p.h similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljslexer_p.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljslexer_p.h diff --git a/languages/qmljs/libs/qmljs/parser/qmljsmemorypool_p.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsmemorypool_p.h similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsmemorypool_p.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsmemorypool_p.h diff --git a/languages/qmljs/libs/qmljs/parser/qmljsparser.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsparser.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsparser.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsparser.cpp diff --git a/languages/qmljs/libs/qmljs/parser/qmljsparser_p.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsparser_p.h similarity index 100% rename from languages/qmljs/libs/qmljs/parser/qmljsparser_p.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsparser_p.h diff --git a/languages/qmljs/libs/qmljs/persistenttrie.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/persistenttrie.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/persistenttrie.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/persistenttrie.cpp diff --git a/languages/qmljs/libs/qmljs/persistenttrie.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/persistenttrie.h similarity index 100% rename from languages/qmljs/libs/qmljs/persistenttrie.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/persistenttrie.h diff --git a/languages/qmljs/libs/qmljs/qmljs_global.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljs_global.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljs_global.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljs_global.h diff --git a/languages/qmljs/libs/qmljs/qmljsbind.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsbind.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsbind.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsbind.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsbind.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsbind.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsbind.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsbind.h diff --git a/languages/qmljs/libs/qmljs/qmljsbundle.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsbundle.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsbundle.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsbundle.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsbundle.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsbundle.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsbundle.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsbundle.h diff --git a/languages/qmljs/libs/qmljs/qmljsconstants.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsconstants.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsconstants.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsconstants.h diff --git a/languages/qmljs/libs/qmljs/qmljscontext.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljscontext.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljscontext.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljscontext.cpp diff --git a/languages/qmljs/libs/qmljs/qmljscontext.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljscontext.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljscontext.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljscontext.h diff --git a/languages/qmljs/libs/qmljs/qmljsdialect.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsdialect.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsdialect.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsdialect.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsdialect.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsdialect.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsdialect.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsdialect.h diff --git a/languages/qmljs/libs/qmljs/qmljsdocument.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsdocument.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsdocument.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsdocument.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsdocument.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsdocument.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsdocument.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsdocument.h diff --git a/languages/qmljs/libs/qmljs/qmljsevaluate.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsevaluate.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsevaluate.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsevaluate.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsevaluate.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsevaluate.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsevaluate.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsevaluate.h diff --git a/languages/qmljs/libs/qmljs/qmljsimportdependencies.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsimportdependencies.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsimportdependencies.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsimportdependencies.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsimportdependencies.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsimportdependencies.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsimportdependencies.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsimportdependencies.h diff --git a/languages/qmljs/libs/qmljs/qmljsinterpreter.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsinterpreter.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsinterpreter.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsinterpreter.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsinterpreter.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsinterpreter.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsinterpreter.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsinterpreter.h diff --git a/languages/qmljs/libs/qmljs/qmljsmodelmanagerinterface.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsmodelmanagerinterface.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsmodelmanagerinterface.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsmodelmanagerinterface.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsmodelmanagerinterface.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsmodelmanagerinterface.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsmodelmanagerinterface.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsmodelmanagerinterface.h diff --git a/languages/qmljs/libs/qmljs/qmljsplugindumper.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsplugindumper.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsplugindumper.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsplugindumper.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsplugindumper.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsplugindumper.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsplugindumper.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsplugindumper.h diff --git a/languages/qmljs/libs/qmljs/qmljsqrcparser.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsqrcparser.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsqrcparser.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsqrcparser.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsqrcparser.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsqrcparser.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsqrcparser.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsqrcparser.h diff --git a/languages/qmljs/libs/qmljs/qmljsscopeastpath.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopeastpath.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsscopeastpath.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopeastpath.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsscopeastpath.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopeastpath.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsscopeastpath.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopeastpath.h diff --git a/languages/qmljs/libs/qmljs/qmljsscopebuilder.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopebuilder.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsscopebuilder.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopebuilder.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsscopebuilder.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopebuilder.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsscopebuilder.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopebuilder.h diff --git a/languages/qmljs/libs/qmljs/qmljsscopechain.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopechain.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsscopechain.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopechain.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsscopechain.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopechain.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsscopechain.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopechain.h diff --git a/languages/qmljs/libs/qmljs/qmljstypedescriptionreader.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljstypedescriptionreader.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljstypedescriptionreader.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljstypedescriptionreader.cpp diff --git a/languages/qmljs/libs/qmljs/qmljstypedescriptionreader.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljstypedescriptionreader.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljstypedescriptionreader.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljstypedescriptionreader.h diff --git a/languages/qmljs/libs/qmljs/qmljsutils.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsutils.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsutils.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsutils.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsutils.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsutils.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsutils.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsutils.h diff --git a/languages/qmljs/libs/qmljs/qmljsvalueowner.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsvalueowner.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsvalueowner.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsvalueowner.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsvalueowner.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsvalueowner.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsvalueowner.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsvalueowner.h diff --git a/languages/qmljs/libs/qmljs/qmljsviewercontext.cpp b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsviewercontext.cpp similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsviewercontext.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsviewercontext.cpp diff --git a/languages/qmljs/libs/qmljs/qmljsviewercontext.h b/languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsviewercontext.h similarity index 100% rename from languages/qmljs/libs/qmljs/qmljsviewercontext.h rename to languages/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsviewercontext.h diff --git a/languages/qmljs/libs/sync_qtc.sh b/languages/qmljs/3rdparty/qtcreator-libs/sync_qtc.sh similarity index 100% rename from languages/qmljs/libs/sync_qtc.sh rename to languages/qmljs/3rdparty/qtcreator-libs/sync_qtc.sh diff --git a/languages/qmljs/libs/utils/algorithm.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/algorithm.h similarity index 100% rename from languages/qmljs/libs/utils/algorithm.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/algorithm.h diff --git a/languages/qmljs/libs/utils/changeset.cpp b/languages/qmljs/3rdparty/qtcreator-libs/utils/changeset.cpp similarity index 100% rename from languages/qmljs/libs/utils/changeset.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/utils/changeset.cpp diff --git a/languages/qmljs/libs/utils/changeset.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/changeset.h similarity index 100% rename from languages/qmljs/libs/utils/changeset.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/changeset.h diff --git a/languages/qmljs/libs/utils/environment.cpp b/languages/qmljs/3rdparty/qtcreator-libs/utils/environment.cpp similarity index 100% rename from languages/qmljs/libs/utils/environment.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/utils/environment.cpp diff --git a/languages/qmljs/libs/utils/environment.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/environment.h similarity index 100% rename from languages/qmljs/libs/utils/environment.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/environment.h diff --git a/languages/qmljs/libs/utils/filesystemwatcher.cpp b/languages/qmljs/3rdparty/qtcreator-libs/utils/filesystemwatcher.cpp similarity index 100% rename from languages/qmljs/libs/utils/filesystemwatcher.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/utils/filesystemwatcher.cpp diff --git a/languages/qmljs/libs/utils/filesystemwatcher.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/filesystemwatcher.h similarity index 100% rename from languages/qmljs/libs/utils/filesystemwatcher.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/filesystemwatcher.h diff --git a/languages/qmljs/libs/utils/fileutils.cpp b/languages/qmljs/3rdparty/qtcreator-libs/utils/fileutils.cpp similarity index 100% rename from languages/qmljs/libs/utils/fileutils.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/utils/fileutils.cpp diff --git a/languages/qmljs/libs/utils/fileutils.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/fileutils.h similarity index 100% rename from languages/qmljs/libs/utils/fileutils.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/fileutils.h diff --git a/languages/qmljs/libs/utils/fileutils_mac.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/fileutils_mac.h similarity index 100% rename from languages/qmljs/libs/utils/fileutils_mac.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/fileutils_mac.h diff --git a/languages/qmljs/libs/utils/fileutils_mac.mm b/languages/qmljs/3rdparty/qtcreator-libs/utils/fileutils_mac.mm similarity index 100% rename from languages/qmljs/libs/utils/fileutils_mac.mm rename to languages/qmljs/3rdparty/qtcreator-libs/utils/fileutils_mac.mm diff --git a/languages/qmljs/libs/utils/filewizardpage.ui b/languages/qmljs/3rdparty/qtcreator-libs/utils/filewizardpage.ui similarity index 100% rename from languages/qmljs/libs/utils/filewizardpage.ui rename to languages/qmljs/3rdparty/qtcreator-libs/utils/filewizardpage.ui diff --git a/languages/qmljs/libs/utils/hostosinfo.cpp b/languages/qmljs/3rdparty/qtcreator-libs/utils/hostosinfo.cpp similarity index 100% rename from languages/qmljs/libs/utils/hostosinfo.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/utils/hostosinfo.cpp diff --git a/languages/qmljs/libs/utils/hostosinfo.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/hostosinfo.h similarity index 100% rename from languages/qmljs/libs/utils/hostosinfo.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/hostosinfo.h diff --git a/languages/qmljs/libs/utils/json.cpp b/languages/qmljs/3rdparty/qtcreator-libs/utils/json.cpp similarity index 100% rename from languages/qmljs/libs/utils/json.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/utils/json.cpp diff --git a/languages/qmljs/libs/utils/json.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/json.h similarity index 100% rename from languages/qmljs/libs/utils/json.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/json.h diff --git a/languages/qmljs/libs/utils/newclasswidget.ui b/languages/qmljs/3rdparty/qtcreator-libs/utils/newclasswidget.ui similarity index 100% rename from languages/qmljs/libs/utils/newclasswidget.ui rename to languages/qmljs/3rdparty/qtcreator-libs/utils/newclasswidget.ui diff --git a/languages/qmljs/libs/utils/osspecificaspects.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/osspecificaspects.h similarity index 100% rename from languages/qmljs/libs/utils/osspecificaspects.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/osspecificaspects.h diff --git a/languages/qmljs/libs/utils/projectintropage.ui b/languages/qmljs/3rdparty/qtcreator-libs/utils/projectintropage.ui similarity index 100% rename from languages/qmljs/libs/utils/projectintropage.ui rename to languages/qmljs/3rdparty/qtcreator-libs/utils/projectintropage.ui diff --git a/languages/qmljs/libs/utils/qtcassert.cpp b/languages/qmljs/3rdparty/qtcreator-libs/utils/qtcassert.cpp similarity index 100% rename from languages/qmljs/libs/utils/qtcassert.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/utils/qtcassert.cpp diff --git a/languages/qmljs/libs/utils/qtcassert.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/qtcassert.h similarity index 100% rename from languages/qmljs/libs/utils/qtcassert.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/qtcassert.h diff --git a/languages/qmljs/libs/utils/runextensions.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/runextensions.h similarity index 100% rename from languages/qmljs/libs/utils/runextensions.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/runextensions.h diff --git a/languages/qmljs/libs/utils/savefile.cpp b/languages/qmljs/3rdparty/qtcreator-libs/utils/savefile.cpp similarity index 100% rename from languages/qmljs/libs/utils/savefile.cpp rename to languages/qmljs/3rdparty/qtcreator-libs/utils/savefile.cpp diff --git a/languages/qmljs/libs/utils/savefile.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/savefile.h similarity index 100% rename from languages/qmljs/libs/utils/savefile.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/savefile.h diff --git a/languages/qmljs/libs/utils/utils_global.h b/languages/qmljs/3rdparty/qtcreator-libs/utils/utils_global.h similarity index 100% rename from languages/qmljs/libs/utils/utils_global.h rename to languages/qmljs/3rdparty/qtcreator-libs/utils/utils_global.h diff --git a/languages/qmljs/CMakeLists.txt b/languages/qmljs/CMakeLists.txt index bc0ac68897..95f0fe0123 100644 --- a/languages/qmljs/CMakeLists.txt +++ b/languages/qmljs/CMakeLists.txt @@ -1,37 +1,33 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/libs ${KDevelop_SOURCE_DIR}/languages/plugins ) -add_definitions(-DQT_CREATOR) # :D -add_definitions(-DQML_BUILD_STATIC_LIB=1) - -add_subdirectory(libs) +add_subdirectory(3rdparty/qtcreator-libs) add_subdirectory(duchain) add_subdirectory(nodejsmodules) if(BUILD_TESTING) add_subdirectory(tests) endif() add_subdirectory(codecompletion) ecm_qt_declare_logging_category(kdevqmljslanguagesupport_LOG_SRCS HEADER debug.h IDENTIFIER KDEV_QMLJS CATEGORY_NAME "kdevelop.languages.qmljs" ) kdevplatform_add_plugin(kdevqmljslanguagesupport JSON kdevqmljs.json SOURCES qmljsparsejob.cpp qmljshighlighting.cpp kdevqmljsplugin.cpp navigation/propertypreviewwidget.cpp ${kdevqmljslanguagesupport_LOG_SRCS} ) target_link_libraries(kdevqmljslanguagesupport kdevqmljsduchain kdevqmljscompletion Qt5::Widgets Qt5::QuickWidgets KF5::Declarative ) install(DIRECTORY navigation/propertywidgets DESTINATION ${KDE_INSTALL_DATADIR}/kdevqmljssupport) diff --git a/languages/qmljs/codecompletion/CMakeLists.txt b/languages/qmljs/codecompletion/CMakeLists.txt index 41eaa64e4c..693532550c 100644 --- a/languages/qmljs/codecompletion/CMakeLists.txt +++ b/languages/qmljs/codecompletion/CMakeLists.txt @@ -1,27 +1,27 @@ set(completion_SRCS items/completionitem.cpp items/modulecompletionitem.cpp items/functioncalltipcompletionitem.cpp context.cpp model.cpp worker.cpp - ../libs/qmljs/parser/qmljsgrammar.cpp + #../libs/qmljs/parser/qmljsgrammar.cpp ) add_library(kdevqmljscompletion STATIC ${completion_SRCS}) generate_export_header(kdevqmljscompletion EXPORT_MACRO_NAME KDEVQMLJSCOMPLETION_EXPORT EXPORT_FILE_NAME codecompletionexport.h) target_link_libraries(kdevqmljscompletion LINK_PRIVATE KDev::Language KDev::Interfaces KDev::Project kdevqmljsduchain kdevqtc-qmlsupport ) if(BUILD_TESTING) add_subdirectory(tests) endif()