diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 182a60e3b7..c09eb1684d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -144,12 +144,12 @@ stages: strategy: matrix: macOSRelease: - imageName: 'macOS-11' - QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off" + imageName: 'macOS-12' + QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers" EXECUTOR: "time" macOSDebug: - imageName: 'macOS-11' - QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=silent CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address" + imageName: 'macOS-12' + QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address" CONFIG: debug TESTS: $ALL_TESTS EXECUTOR: "time" @@ -199,11 +199,11 @@ stages: strategy: matrix: MacOS release + tests: - imageName: 'macOS-11' + imageName: 'macOS-12' QMAKE_EXTRA: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off" EXECUTOR: "time" macOS debug + tests: - imageName: 'macOS-11' + imageName: 'macOS-12' QMAKE_EXTRA: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=silent CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address" CONFIG: debug TESTS: $ALL_TESTS @@ -249,7 +249,7 @@ stages: QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off" EXECUTOR: "time" pool: - vmImage: 'macOS-11' + vmImage: 'macOS-12' steps: - ${{ parameters.checkoutStep }} diff --git a/buildScripts/azure/build_internal.sh b/buildScripts/azure/build_internal.sh index 6a93a9f3d6..59a07c1c58 100755 --- a/buildScripts/azure/build_internal.sh +++ b/buildScripts/azure/build_internal.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -x + #This is a magic fix for macOS, but old Linux /usr/bin/env has no -S option, thus we cannot use shabang line #An obsolete bash (v3) does not support `exec {varname}<>`, thus we want to use zsh if ! ( eval 'exec {somevar}<>$(mktemp)' ) ; then @@ -25,7 +27,7 @@ ccache -sz export PKG_CONFIG_PATH=$(python3.${TRIK_PYTHON3_VERSION_MINOR}-config --prefix)/lib/pkgconfig rm -f .qmake.cache { echo -n 'Remove broken object files ' ; find . -name '*.o' -type f -print0 | xargs -0 file --mime-type | grep -v 'application/x-object' | cut -f 1 -d ':' | xargs -t rm -f _RM_REQUIRES_ARGUMENTS_BUT_BSD_XARGS_IS_MISSING_R_PARAMETER_ARGUMENT || : ; echo Done ; } -qmake -Wall PYTHON3_VERSION_MINOR=$TRIK_PYTHON3_VERSION_MINOR CONFIG+=$CONFIG $QMAKE_EXTRA $PROJECT.pro +qmake -d -Wall PYTHON3_VERSION_MINOR=$TRIK_PYTHON3_VERSION_MINOR CONFIG+=$CONFIG $QMAKE_EXTRA $PROJECT.pro make -j2 qmake_all 2>&1 | tee -a build.log ccache -s make -j2 all 2>&1 | tee -a build.log diff --git a/buildScripts/azure/install_Darwin.sh b/buildScripts/azure/install_Darwin.sh index f2f2c1b2c5..ebe45aaac4 100755 --- a/buildScripts/azure/install_Darwin.sh +++ b/buildScripts/azure/install_Darwin.sh @@ -15,6 +15,7 @@ "$TRIK_PYTHON" -m aqt install-qt -m qtscript -O "$HOME/Qt" mac desktop "${TRIK_QT_VERSION}" [ -d $HOME/qtifw ] || env TRIK_QT_INSTALL_DIR="$HOME/qtifw" "$(dirname $(realpath ${BASH_SOURCE[0]}))"/install_qtifw_mac.sh # Force SDK version compatible with Qt 5.12 - sudo xcode-select -s /Applications/Xcode_11.7.app/Contents/Developer + system_profiler -json SPDeveloperToolsDataType | jq '.SPDeveloperToolsDataType[].spdevtools_path' || : + sudo xcode-select -s /Applications/Xcode_13.1.app/Contents/Developer xcodebuild -showsdks xcrun -sdk macosx --show-sdk-path diff --git a/global.pri b/global.pri index 5f010bcdb8..888607de36 100644 --- a/global.pri +++ b/global.pri @@ -216,11 +216,27 @@ gcc:versionAtLeast(QT_VERSION, 5.15.0):QMAKE_CXXFLAGS *= -Wno-deprecated-declara clang { #treat git submodules as system path - SYSTEM_INCLUDE_PREFIX_OPTION += $$system(git submodule status 2>/dev/null | sed $$shell_quote('s/^.[0-9a-fA-F]* \\([^ ]*\\).*$/--system-header-prefix=\\1/g')) + SYSTEM_INCLUDE_PREFIX_OPTION += $$system(git submodule status 2>/dev/null | sed $$shell_quote('s/^.[0-9a-fA-F]* \\([^ ]*\\).*$/-isystem=\\1/g')) #treat Qt includes as system headers SYSTEM_INCLUDE_PREFIX_OPTION *= --system-header-prefix=$$[QT_INSTALL_HEADERS] - QMAKE_CXXFLAG += -Wno-nullability-completeness -Wno-error=nullability-extension + # QMAKE_CXXFLAG += -Wno-nullability-completeness -Wno-error=nullability-extension + + for(module, QT) { + equals(module, "testlib"): module = test + moduleList = $$split(module, ) + SYSTEM_INCLUDE_PREFIX_OPTION += --system-header-prefix=Qt$$upper($$take_first(moduleList))$$join(moduleList, ) + } + unset(moduleList) + + for(module, QT) { + equals(module, "testlib"): module = test + moduleList = $$split(module, ) + SYSTEM_INCLUDE_PREFIX_OPTION += \ + -isystem$$shell_quote($$[QT_INSTALL_LIBS]/Qt$$upper(\ + $$take_first(moduleList))$$join(moduleList, )).framework/Headers/ + } + unset(moduleList) } #gcc { @@ -228,6 +244,7 @@ clang { SYSTEM_INCLUDE_PREFIX_OPTION *= -isystem $$[QT_INSTALL_HEADERS] #} +# QMAKE_CXXFLAGS += -pedantic-errors -Wextra -Werror QMAKE_CXXFLAGS *= $$SYSTEM_INCLUDE_PREFIX_OPTION false:clang { diff --git a/plugins/robots/checker/patcher/patcher.pro b/plugins/robots/checker/patcher/patcher.pro index 08f1da1e07..d3c128483c 100644 --- a/plugins/robots/checker/patcher/patcher.pro +++ b/plugins/robots/checker/patcher/patcher.pro @@ -14,6 +14,9 @@ TARGET = patcher +QT -= gui +QT += xml + include(../../../../global.pri) links(qrrepo qrutils) @@ -22,9 +25,6 @@ includes(qrrepo) TEMPLATE = app -QT -= gui -QT += xml - CONFIG += cmdline SOURCES += \ diff --git a/plugins/robots/checker/twoDModelRunner/twoDModelRunner.pro b/plugins/robots/checker/twoDModelRunner/twoDModelRunner.pro index b6bd8a348e..d9f2ff6a84 100644 --- a/plugins/robots/checker/twoDModelRunner/twoDModelRunner.pro +++ b/plugins/robots/checker/twoDModelRunner/twoDModelRunner.pro @@ -15,10 +15,11 @@ TARGET = 2D-model TEMPLATE = app CONFIG += cmdline -include(../../../../global.pri) QT += widgets +include(../../../../global.pri) + includes(plugins/robots/interpreters/interpreterCore \ plugins/robots/common/kitBase \ plugins/robots/common/twoDModel \ diff --git a/plugins/robots/common/ev3Kit/ev3Kit.pri b/plugins/robots/common/ev3Kit/ev3Kit.pri index e66bbaa346..1ac5bd9e4a 100644 --- a/plugins/robots/common/ev3Kit/ev3Kit.pri +++ b/plugins/robots/common/ev3Kit/ev3Kit.pri @@ -14,6 +14,8 @@ QT += widgets +include(../../../../global.pri) + links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \ robots-utils robots-kit-base robots-2d-model qextserialport \ ) diff --git a/plugins/robots/common/kitBase/kitBase.pri b/plugins/robots/common/kitBase/kitBase.pri index af5d4998e4..659b3a1544 100644 --- a/plugins/robots/common/kitBase/kitBase.pri +++ b/plugins/robots/common/kitBase/kitBase.pri @@ -14,6 +14,8 @@ QT += widgets xml +include(../../../../global.pri) + links(qrkernel qrutils qrtext qrgui-preferences-dialog robots-utils) includes(qrtext plugins/robots/utils) diff --git a/plugins/robots/common/kitBase/kitBase.pro b/plugins/robots/common/kitBase/kitBase.pro index 66ae2ec8b7..3c105f1a12 100644 --- a/plugins/robots/common/kitBase/kitBase.pro +++ b/plugins/robots/common/kitBase/kitBase.pro @@ -15,6 +15,4 @@ TARGET = robots-kit-base TEMPLATE = lib -include(../../../../global.pri) - include(kitBase.pri) diff --git a/plugins/robots/common/nxtKit/nxtKit.pri b/plugins/robots/common/nxtKit/nxtKit.pri index 303c241f25..a65b7a9cbd 100644 --- a/plugins/robots/common/nxtKit/nxtKit.pri +++ b/plugins/robots/common/nxtKit/nxtKit.pri @@ -14,6 +14,8 @@ QT += widgets +include(../../../../global.pri) + includes(plugins/robots/common/nxtKit \ plugins/robots/common/kitBase \ plugins/robots/common/twoDModel \ diff --git a/plugins/robots/common/pioneerKit/pioneerKit.pri b/plugins/robots/common/pioneerKit/pioneerKit.pri index 25971878fe..16474ef3a0 100644 --- a/plugins/robots/common/pioneerKit/pioneerKit.pri +++ b/plugins/robots/common/pioneerKit/pioneerKit.pri @@ -14,6 +14,8 @@ QT += widgets +include(../../../../global.pri) + includes(plugins/robots/common/pioneerKit \ plugins/robots/common/kitBase \ plugins/robots/utils \ diff --git a/plugins/robots/common/pioneerKit/pioneerKit.pro b/plugins/robots/common/pioneerKit/pioneerKit.pro index c3bff06b38..0456cc38e5 100644 --- a/plugins/robots/common/pioneerKit/pioneerKit.pro +++ b/plugins/robots/common/pioneerKit/pioneerKit.pro @@ -16,6 +16,4 @@ TARGET = robots-pioneer-kit TEMPLATE = lib -include(../../../../global.pri) - include(pioneerKit.pri) diff --git a/plugins/robots/common/trikKit/trikKit.pri b/plugins/robots/common/trikKit/trikKit.pri index 5b6805ca8d..2f6c4105dd 100644 --- a/plugins/robots/common/trikKit/trikKit.pri +++ b/plugins/robots/common/trikKit/trikKit.pri @@ -14,6 +14,8 @@ QT += widgets +include(../../../../global.pri) + includes(plugins/robots/common/trikKit \ plugins/robots/common/kitBase \ plugins/robots/utils \ diff --git a/plugins/robots/common/twoDModel/twoDModel.pri b/plugins/robots/common/twoDModel/twoDModel.pri index f9766a76c3..898390095c 100644 --- a/plugins/robots/common/twoDModel/twoDModel.pri +++ b/plugins/robots/common/twoDModel/twoDModel.pri @@ -14,6 +14,8 @@ QT += widgets xml svg +include(../../../../global.pri) + DEFINES += TWO_D_MODEL_LIBRARY links(qrkernel qrutils qrgui-tool-plugin-interface qrgui-controller robots-utils robots-kit-base Box2D) diff --git a/plugins/robots/generators/ev3/ev3GeneratorBase/ev3GeneratorBase.pro b/plugins/robots/generators/ev3/ev3GeneratorBase/ev3GeneratorBase.pro index 549bfc1657..f547dc3c1f 100644 --- a/plugins/robots/generators/ev3/ev3GeneratorBase/ev3GeneratorBase.pro +++ b/plugins/robots/generators/ev3/ev3GeneratorBase/ev3GeneratorBase.pro @@ -16,10 +16,10 @@ TARGET = robots-ev3-generator-base TEMPLATE = lib -include(../../../../../global.pri) - QT += widgets +include(../../../../../global.pri) + CONFIG += trikqscintilla2 includes(plugins/robots/generators/ev3/ev3GeneratorBase \ diff --git a/plugins/robots/generators/ev3/ev3RbfGenerator/ev3RbfGenerator.pro b/plugins/robots/generators/ev3/ev3RbfGenerator/ev3RbfGenerator.pro index 9a3779440e..276d8e225b 100644 --- a/plugins/robots/generators/ev3/ev3RbfGenerator/ev3RbfGenerator.pro +++ b/plugins/robots/generators/ev3/ev3RbfGenerator/ev3RbfGenerator.pro @@ -16,10 +16,10 @@ TARGET = robots-ev3-rbf-generator TEMPLATE = lib -include(../../../../../global.pri) - QT += widgets +include(../../../../../global.pri) + CONFIG += plugin trikqscintilla2 DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ diff --git a/plugins/robots/generators/nxt/nxtGeneratorBase/nxtGeneratorBase.pro b/plugins/robots/generators/nxt/nxtGeneratorBase/nxtGeneratorBase.pro index d16fb4568c..d746c9f61b 100644 --- a/plugins/robots/generators/nxt/nxtGeneratorBase/nxtGeneratorBase.pro +++ b/plugins/robots/generators/nxt/nxtGeneratorBase/nxtGeneratorBase.pro @@ -16,10 +16,10 @@ TARGET = robots-nxt-generator-base TEMPLATE = lib -include(../../../../../global.pri) - QT += widgets +include(../../../../../global.pri) + CONFIG += trikqscintilla2 includes(plugins/robots/generators/nxt/nxtGeneratorBase \ diff --git a/plugins/robots/generators/nxt/nxtOsekCGenerator/nxtOsekCGenerator.pro b/plugins/robots/generators/nxt/nxtOsekCGenerator/nxtOsekCGenerator.pro index 2ff4a80520..01937203b4 100644 --- a/plugins/robots/generators/nxt/nxtOsekCGenerator/nxtOsekCGenerator.pro +++ b/plugins/robots/generators/nxt/nxtOsekCGenerator/nxtOsekCGenerator.pro @@ -17,10 +17,10 @@ TARGET = robots-nxt-osek-c-generator TEMPLATE = lib CONFIG += plugin trikqscintilla2 -include(../../../../../global.pri) - QT += widgets +include(../../../../../global.pri) + DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ includes(plugins/robots/generators/nxt/nxtGeneratorBase \ diff --git a/plugins/robots/generators/nxt/nxtRussianCGenerator/nxtRussianCGenerator.pro b/plugins/robots/generators/nxt/nxtRussianCGenerator/nxtRussianCGenerator.pro index f447f63d3b..5b222d2244 100644 --- a/plugins/robots/generators/nxt/nxtRussianCGenerator/nxtRussianCGenerator.pro +++ b/plugins/robots/generators/nxt/nxtRussianCGenerator/nxtRussianCGenerator.pro @@ -17,10 +17,10 @@ TARGET = robots-nxt-russian-c-generator TEMPLATE = lib CONFIG += plugin trikqscintilla2 -include(../../../../../global.pri) - QT += widgets +include(../../../../../global.pri) + DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ includes(plugins/robots/generators/nxt/nxtGeneratorBase \ diff --git a/plugins/robots/generators/pioneer/pioneerLuaGenerator/pioneerLuaGenerator.pro b/plugins/robots/generators/pioneer/pioneerLuaGenerator/pioneerLuaGenerator.pro index 16e370682c..9e46de4141 100644 --- a/plugins/robots/generators/pioneer/pioneerLuaGenerator/pioneerLuaGenerator.pro +++ b/plugins/robots/generators/pioneer/pioneerLuaGenerator/pioneerLuaGenerator.pro @@ -17,10 +17,10 @@ TARGET = robots-pioneer-lua-generator TEMPLATE = lib CONFIG += plugin trikqscintilla2 -include(../../../../../global.pri) - QT += widgets network +include(../../../../../global.pri) + DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ includes( \ diff --git a/plugins/robots/generators/trik/trikFSharpGeneratorLibrary/trikFSharpGeneratorLibrary.pro b/plugins/robots/generators/trik/trikFSharpGeneratorLibrary/trikFSharpGeneratorLibrary.pro index 7fae5580ce..7b17f5eff1 100644 --- a/plugins/robots/generators/trik/trikFSharpGeneratorLibrary/trikFSharpGeneratorLibrary.pro +++ b/plugins/robots/generators/trik/trikFSharpGeneratorLibrary/trikFSharpGeneratorLibrary.pro @@ -18,10 +18,10 @@ TEMPLATE = lib CONFIG += trikqscintilla2 -include(../../../../../global.pri) - QT += widgets network +include(../../../../../global.pri) + DEFINES += ROBOTS_TRIK_FSHARP_GENERATOR_LIBRARY includes( \ diff --git a/plugins/robots/generators/trik/trikGeneratorBase/trikGeneratorBase.pro b/plugins/robots/generators/trik/trikGeneratorBase/trikGeneratorBase.pro index 1a984d2858..cc2f7a0caf 100644 --- a/plugins/robots/generators/trik/trikGeneratorBase/trikGeneratorBase.pro +++ b/plugins/robots/generators/trik/trikGeneratorBase/trikGeneratorBase.pro @@ -16,10 +16,10 @@ TARGET = robots-trik-generator-base TEMPLATE = lib -include(../../../../../global.pri) - QT += widgets +include(../../../../../global.pri) + CONFIG += trikqscintilla2 includes(plugins/robots/generators/generatorBase \ diff --git a/plugins/robots/generators/trik/trikPascalABCGeneratorLibrary/trikPascalABCGeneratorLibrary.pro b/plugins/robots/generators/trik/trikPascalABCGeneratorLibrary/trikPascalABCGeneratorLibrary.pro index 1ccab50918..d3f06fba9f 100644 --- a/plugins/robots/generators/trik/trikPascalABCGeneratorLibrary/trikPascalABCGeneratorLibrary.pro +++ b/plugins/robots/generators/trik/trikPascalABCGeneratorLibrary/trikPascalABCGeneratorLibrary.pro @@ -16,10 +16,10 @@ TARGET = robots-trik-pascal-abc-generator-library TEMPLATE = lib -include(../../../../../global.pri) - QT += widgets network +include(../../../../../global.pri) + CONFIG += trikqscintilla2 includes(plugins/robots/generators/trik/trikGeneratorBase \ diff --git a/plugins/robots/generators/trik/trikPythonGeneratorLibrary/trikPythonGeneratorLibrary.pro b/plugins/robots/generators/trik/trikPythonGeneratorLibrary/trikPythonGeneratorLibrary.pro index 882b675613..545b710c65 100644 --- a/plugins/robots/generators/trik/trikPythonGeneratorLibrary/trikPythonGeneratorLibrary.pro +++ b/plugins/robots/generators/trik/trikPythonGeneratorLibrary/trikPythonGeneratorLibrary.pro @@ -16,12 +16,12 @@ TARGET = robots-trik-python-generator-library TEMPLATE = lib +QT += widgets network + include(../../../../../global.pri) CONFIG += trikqscintilla2 -QT += widgets network - includes(plugins/robots/generators/trik/trikGeneratorBase \ plugins/robots/generators/generatorBase \ plugins/robots/common/kitBase \ diff --git a/plugins/robots/generators/trik/trikQtsGeneratorLibrary/trikQtsGeneratorLibrary.pro b/plugins/robots/generators/trik/trikQtsGeneratorLibrary/trikQtsGeneratorLibrary.pro index ebd41dd611..acd62fe315 100644 --- a/plugins/robots/generators/trik/trikQtsGeneratorLibrary/trikQtsGeneratorLibrary.pro +++ b/plugins/robots/generators/trik/trikQtsGeneratorLibrary/trikQtsGeneratorLibrary.pro @@ -16,10 +16,10 @@ TARGET = robots-trik-qts-generator-library TEMPLATE = lib -include(../../../../../global.pri) - QT += widgets network +include(../../../../../global.pri) + CONFIG += trikqscintilla2 includes(plugins/robots/generators/trik/trikGeneratorBase \ diff --git a/plugins/robots/generators/trik/trikV62FSharpGenerator/trikV62FSharpGenerator.pro b/plugins/robots/generators/trik/trikV62FSharpGenerator/trikV62FSharpGenerator.pro index 67434625ce..81a3e3107b 100644 --- a/plugins/robots/generators/trik/trikV62FSharpGenerator/trikV62FSharpGenerator.pro +++ b/plugins/robots/generators/trik/trikV62FSharpGenerator/trikV62FSharpGenerator.pro @@ -18,10 +18,10 @@ TEMPLATE = lib CONFIG += plugin trikqscintilla2 -include(../../../../../global.pri) - QT += widgets network +include(../../../../../global.pri) + DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ includes(\ diff --git a/plugins/robots/generators/trik/trikV62PascalABCGenerator/trikV62PascalABCGenerator.pro b/plugins/robots/generators/trik/trikV62PascalABCGenerator/trikV62PascalABCGenerator.pro index b8e58f2a1e..8e4826a309 100644 --- a/plugins/robots/generators/trik/trikV62PascalABCGenerator/trikV62PascalABCGenerator.pro +++ b/plugins/robots/generators/trik/trikV62PascalABCGenerator/trikV62PascalABCGenerator.pro @@ -18,10 +18,10 @@ TEMPLATE = lib CONFIG += plugin trikqscintilla2 -include(../../../../../global.pri) - QT += widgets network +include(../../../../../global.pri) + DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ includes( \ diff --git a/plugins/robots/generators/trik/trikV62PythonGenerator/trikV62PythonGenerator.pri b/plugins/robots/generators/trik/trikV62PythonGenerator/trikV62PythonGenerator.pri index ed406003d4..a60122bb4a 100644 --- a/plugins/robots/generators/trik/trikV62PythonGenerator/trikV62PythonGenerator.pri +++ b/plugins/robots/generators/trik/trikV62PythonGenerator/trikV62PythonGenerator.pri @@ -14,6 +14,8 @@ QT += widgets network +include(../../../../../global.pri) + CONFIG += trikqscintilla2 includes( \ diff --git a/plugins/robots/generators/trik/trikV62PythonGenerator/trikV62PythonGenerator.pro b/plugins/robots/generators/trik/trikV62PythonGenerator/trikV62PythonGenerator.pro index dc3300c2ce..3c7c96e9b0 100644 --- a/plugins/robots/generators/trik/trikV62PythonGenerator/trikV62PythonGenerator.pro +++ b/plugins/robots/generators/trik/trikV62PythonGenerator/trikV62PythonGenerator.pro @@ -17,8 +17,6 @@ TARGET = robots-trik-v62-python-generator TEMPLATE = lib CONFIG += plugin -include(../../../../../global.pri) - DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ include(trikV62PythonGenerator.pri) diff --git a/plugins/robots/generators/trik/trikV62QtsGenerator/trikV62QtsGenerator.pri b/plugins/robots/generators/trik/trikV62QtsGenerator/trikV62QtsGenerator.pri index 1433372876..d930ab5085 100644 --- a/plugins/robots/generators/trik/trikV62QtsGenerator/trikV62QtsGenerator.pri +++ b/plugins/robots/generators/trik/trikV62QtsGenerator/trikV62QtsGenerator.pri @@ -14,6 +14,8 @@ QT += widgets network +include(../../../../../global.pri) + CONFIG += trikqscintilla2 includes( \ diff --git a/plugins/robots/generators/trik/trikV6FSharpGenerator/trikV6FSharpGenerator.pro b/plugins/robots/generators/trik/trikV6FSharpGenerator/trikV6FSharpGenerator.pro index 8bd394d92e..4377816cbc 100644 --- a/plugins/robots/generators/trik/trikV6FSharpGenerator/trikV6FSharpGenerator.pro +++ b/plugins/robots/generators/trik/trikV6FSharpGenerator/trikV6FSharpGenerator.pro @@ -18,10 +18,10 @@ TEMPLATE = lib CONFIG += plugin trikqscintilla2 -include(../../../../../global.pri) - QT += widgets network +include(../../../../../global.pri) + DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ includes(\ diff --git a/plugins/robots/generators/trik/trikV6PascalABCGenerator/trikV6PascalABCGenerator.pro b/plugins/robots/generators/trik/trikV6PascalABCGenerator/trikV6PascalABCGenerator.pro index dc09bc35d2..cd995583e6 100644 --- a/plugins/robots/generators/trik/trikV6PascalABCGenerator/trikV6PascalABCGenerator.pro +++ b/plugins/robots/generators/trik/trikV6PascalABCGenerator/trikV6PascalABCGenerator.pro @@ -18,10 +18,10 @@ TEMPLATE = lib CONFIG += plugin trikqscintilla2 -include(../../../../../global.pri) - QT += widgets network +include(../../../../../global.pri) + DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ includes( \ diff --git a/plugins/robots/generators/trik/trikV6QtsGenerator/trikV6QtsGenerator.pro b/plugins/robots/generators/trik/trikV6QtsGenerator/trikV6QtsGenerator.pro index f38a31cc18..9f9053ea47 100644 --- a/plugins/robots/generators/trik/trikV6QtsGenerator/trikV6QtsGenerator.pro +++ b/plugins/robots/generators/trik/trikV6QtsGenerator/trikV6QtsGenerator.pro @@ -18,10 +18,10 @@ TEMPLATE = lib CONFIG += plugin trikqscintilla2 -include(../../../../../global.pri) - QT += widgets network +include(../../../../../global.pri) + DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ includes( \ diff --git a/plugins/robots/interpreters/ev3KitInterpreter/ev3KitInterpreter.pro b/plugins/robots/interpreters/ev3KitInterpreter/ev3KitInterpreter.pro index 5165788f14..f172029cbc 100644 --- a/plugins/robots/interpreters/ev3KitInterpreter/ev3KitInterpreter.pro +++ b/plugins/robots/interpreters/ev3KitInterpreter/ev3KitInterpreter.pro @@ -17,6 +17,8 @@ TARGET = robots-ev3-interpreter TEMPLATE = lib CONFIG += plugin +QT += widgets + include(../../../../global.pri) copyToDestdir(images/ev3-robot.png, now, images/) diff --git a/plugins/robots/interpreters/interpreterCore/interpreterCore.pri b/plugins/robots/interpreters/interpreterCore/interpreterCore.pri index 78d3ac6aa7..330446ce26 100644 --- a/plugins/robots/interpreters/interpreterCore/interpreterCore.pri +++ b/plugins/robots/interpreters/interpreterCore/interpreterCore.pri @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -QT += svg xml widgets CONFIG += trikqscintilla2 includes(plugins/robots/interpreters/interpreterCore \ diff --git a/plugins/robots/interpreters/interpreterCore/interpreterCore.pro b/plugins/robots/interpreters/interpreterCore/interpreterCore.pro index c5e008b401..d26272b8f4 100644 --- a/plugins/robots/interpreters/interpreterCore/interpreterCore.pro +++ b/plugins/robots/interpreters/interpreterCore/interpreterCore.pro @@ -16,6 +16,8 @@ TARGET = robots-interpreter-core TEMPLATE = lib +QT += svg xml widgets + include(../../../../global.pri) copyToDestdir($$PWD/icons/splashscreen.png) diff --git a/plugins/robots/interpreters/nullKitInterpreter/nullKitInterpreter.pro b/plugins/robots/interpreters/nullKitInterpreter/nullKitInterpreter.pro index a7dd3cb0a9..1e71d86d85 100644 --- a/plugins/robots/interpreters/nullKitInterpreter/nullKitInterpreter.pro +++ b/plugins/robots/interpreters/nullKitInterpreter/nullKitInterpreter.pro @@ -17,6 +17,8 @@ TARGET = robots-null-interpreter TEMPLATE = lib CONFIG += plugin +QT += widgets + include(../../../../global.pri) DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ diff --git a/plugins/robots/interpreters/nxtKitInterpreter/nxtKitInterpreter.pro b/plugins/robots/interpreters/nxtKitInterpreter/nxtKitInterpreter.pro index c6526d3f15..4684ab0541 100644 --- a/plugins/robots/interpreters/nxtKitInterpreter/nxtKitInterpreter.pro +++ b/plugins/robots/interpreters/nxtKitInterpreter/nxtKitInterpreter.pro @@ -17,6 +17,8 @@ TARGET = robots-nxt-interpreter TEMPLATE = lib CONFIG += plugin +QT += widgets + include(../../../../global.pri) copyToDestdir(icons/nxt-robot.png, now, images/) diff --git a/plugins/robots/interpreters/robotsPlugin/robotsPlugin.pro b/plugins/robots/interpreters/robotsPlugin/robotsPlugin.pro index 36ffe99cd0..4338ed5234 100644 --- a/plugins/robots/interpreters/robotsPlugin/robotsPlugin.pro +++ b/plugins/robots/interpreters/robotsPlugin/robotsPlugin.pro @@ -17,12 +17,12 @@ TARGET = robots-plugin TEMPLATE = lib CONFIG += plugin +QT += widgets + include(../../../../global.pri) DESTDIR = $$DESTDIR/plugins/tools/ -QT += widgets - includes(plugins/robots/interpreters/interpreterCore \ plugins/robots/common/kitBase \ plugins/robots/utils \ diff --git a/plugins/robots/interpreters/trikKitInterpreterCommon/trikKitInterpreterCommon.pro b/plugins/robots/interpreters/trikKitInterpreterCommon/trikKitInterpreterCommon.pro index e1c21b8c9d..84d5edd496 100644 --- a/plugins/robots/interpreters/trikKitInterpreterCommon/trikKitInterpreterCommon.pro +++ b/plugins/robots/interpreters/trikKitInterpreterCommon/trikKitInterpreterCommon.pro @@ -15,6 +15,8 @@ TARGET = robots-trik-kit-interpreter-common TEMPLATE = lib +QT += widgets network script xml multimedia + include(../../../../global.pri) DEFINES += ROBOTS_TRIK_KIT_INTERPRETER_COMMON_LIBRARY diff --git a/plugins/robots/interpreters/trikV62KitInterpreter/trikV62KitInterpreter.pro b/plugins/robots/interpreters/trikV62KitInterpreter/trikV62KitInterpreter.pro index 7a58fb56ec..88b331aabf 100644 --- a/plugins/robots/interpreters/trikV62KitInterpreter/trikV62KitInterpreter.pro +++ b/plugins/robots/interpreters/trikV62KitInterpreter/trikV62KitInterpreter.pro @@ -17,6 +17,8 @@ TARGET = robots-trik-v62-interpreter TEMPLATE = lib CONFIG += plugin +QT += widgets network + include(../../../../global.pri) DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ diff --git a/plugins/robots/interpreters/trikV6KitInterpreter/trikV6KitInterpreter.pro b/plugins/robots/interpreters/trikV6KitInterpreter/trikV6KitInterpreter.pro index 4360362709..678a233cf4 100644 --- a/plugins/robots/interpreters/trikV6KitInterpreter/trikV6KitInterpreter.pro +++ b/plugins/robots/interpreters/trikV6KitInterpreter/trikV6KitInterpreter.pro @@ -17,6 +17,8 @@ TARGET = robots-trik-v6-interpreter TEMPLATE = lib CONFIG += plugin +QT += widgets network + include(../../../../global.pri) DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/ diff --git a/plugins/robots/thirdparty/qextserialport/qextserialport.pro b/plugins/robots/thirdparty/qextserialport/qextserialport.pro index 29c82141d7..4c832623a5 100644 --- a/plugins/robots/thirdparty/qextserialport/qextserialport.pro +++ b/plugins/robots/thirdparty/qextserialport/qextserialport.pro @@ -1,10 +1,10 @@ TEMPLATE = lib -include(../../../../global.pri) - unix:QT = core else:QT = core gui +include(../../../../global.pri) + include(qextserialport/src/qextserialport.pri) #include(qextserialport/doc/doc.pri) diff --git a/plugins/robots/thirdparty/trikRuntime/trikRuntime b/plugins/robots/thirdparty/trikRuntime/trikRuntime index 29b4ecd8fa..dc29531d97 160000 --- a/plugins/robots/thirdparty/trikRuntime/trikRuntime +++ b/plugins/robots/thirdparty/trikRuntime/trikRuntime @@ -1 +1 @@ -Subproject commit 29b4ecd8fa527fea8e3abbc719966f4e7a88b2fa +Subproject commit dc29531d97a1c122df6b6fe23e045e78c59cdb4e diff --git a/plugins/robots/utils/utils.pri b/plugins/robots/utils/utils.pri index 5486818c49..09fd59e246 100644 --- a/plugins/robots/utils/utils.pri +++ b/plugins/robots/utils/utils.pri @@ -14,6 +14,8 @@ QT += widgets network +include(../../../global.pri) + links(qrkernel qrutils qextserialport qrtext) includes(qrtext) diff --git a/plugins/robots/utils/utils.pro b/plugins/robots/utils/utils.pro index 35329236c1..1811c6432a 100644 --- a/plugins/robots/utils/utils.pro +++ b/plugins/robots/utils/utils.pro @@ -16,6 +16,4 @@ TARGET = robots-utils TEMPLATE = lib -include(../../../global.pri) - include(utils.pri) diff --git a/plugins/tools/subprogramsImporterExporter/subprogramsImporterExporter.pro b/plugins/tools/subprogramsImporterExporter/subprogramsImporterExporter.pro index c008193bd9..28b3453ae6 100644 --- a/plugins/tools/subprogramsImporterExporter/subprogramsImporterExporter.pro +++ b/plugins/tools/subprogramsImporterExporter/subprogramsImporterExporter.pro @@ -15,14 +15,14 @@ TEMPLATE = lib CONFIG += plugin +QT += widgets core + include(../../../global.pri) DESTDIR = $$DESTDIR/plugins/tools/ links(qrkernel qrrepo qrutils qrgui-tool-plugin-interface) -QT += widgets core - TRANSLATIONS = \ $$PWD/../../../qrtranslations/ru/plugins/subprogramsImporterExporter_ru.ts \ diff --git a/plugins/tools/updatesChecker/updatesChecker.pro b/plugins/tools/updatesChecker/updatesChecker.pro index 7fafa28501..fbc45563b4 100644 --- a/plugins/tools/updatesChecker/updatesChecker.pro +++ b/plugins/tools/updatesChecker/updatesChecker.pro @@ -15,6 +15,8 @@ TEMPLATE = lib CONFIG += plugin +QT += widgets xml + include(../../../global.pri) DESTDIR = $$DESTDIR/plugins/tools/ @@ -24,8 +26,6 @@ links(qrkernel qrgui-preferences-dialog) INCLUDEPATH += \ $$PWD/../../../qrgui/ \ -QT += widgets xml - TRANSLATIONS = \ $$PWD/../../../qrtranslations/ru/plugins/updatesChecker_ru.ts \ $$PWD/../../../qrtranslations/fr/plugins/updatesChecker_fr.ts \ diff --git a/qrgui/brandManager/brandManager.pro b/qrgui/brandManager/brandManager.pro index 2d45cc9ffe..73ec46337d 100644 --- a/qrgui/brandManager/brandManager.pro +++ b/qrgui/brandManager/brandManager.pro @@ -16,6 +16,8 @@ TARGET = qrgui-brand-manager TEMPLATE = lib +QT += widgets + include(../../global.pri) HEADERS += \ @@ -31,8 +33,6 @@ RESOURCES += \ $$PWD/fonts/fonts.qrc \ $$PWD/styles/styles.qrc \ -QT += widgets - DEFINES += QRGUI_BRAND_MANAGER_LIBRARY links(qrkernel qrutils qrgui-plugin-manager) diff --git a/qrgui/controller/controller.pro b/qrgui/controller/controller.pro index 1e2a445fad..9e7fed8f3b 100644 --- a/qrgui/controller/controller.pro +++ b/qrgui/controller/controller.pro @@ -16,12 +16,12 @@ TARGET = qrgui-controller TEMPLATE = lib +QT += widgets + include(../../global.pri) includes(qrgui) -QT += widgets - DEFINES += QRGUI_CONTROLLER_LIBRARY HEADERS += \ diff --git a/qrgui/dialogs/dialogs.pro b/qrgui/dialogs/dialogs.pro index bf07e623a4..f864b54ef8 100644 --- a/qrgui/dialogs/dialogs.pro +++ b/qrgui/dialogs/dialogs.pro @@ -16,10 +16,10 @@ TARGET = qrgui-dialogs TEMPLATE = lib -include(../../global.pri) - QT += xml widgets +include(../../global.pri) + links(qrkernel qrutils qrgui-models qrgui-plugin-manager qrgui-controller) includes(qrgui) diff --git a/qrgui/editor/editor.pro b/qrgui/editor/editor.pro index 7249be3fd2..7758bbc2fb 100644 --- a/qrgui/editor/editor.pro +++ b/qrgui/editor/editor.pro @@ -16,6 +16,8 @@ TARGET = qrgui-editor TEMPLATE = lib +QT += widgets xml + include(../../global.pri) links(qrkernel qrutils qrgraph \ @@ -26,8 +28,6 @@ links(qrkernel qrutils qrgraph \ includes(qrgraph qrgui qrgui/plugins/metaMetaModel) -QT += widgets xml - DEFINES += QRGUI_EDITOR_LIBRARY TRANSLATIONS = \ diff --git a/qrgui/hotKeyManager/hotKeyManager.pro b/qrgui/hotKeyManager/hotKeyManager.pro index f8745d8b04..311b3f4916 100644 --- a/qrgui/hotKeyManager/hotKeyManager.pro +++ b/qrgui/hotKeyManager/hotKeyManager.pro @@ -16,13 +16,13 @@ TARGET = qrgui-hotkey-manager TEMPLATE = lib +QT += widgets + include(../../global.pri) links(qrgui-preferences-dialog qrutils) includes(qrgui) -QT += widgets - DEFINES += QRGUI_HOTKEY_MANAGER_LIBRARY TRANSLATIONS = \ diff --git a/qrgui/mainWindow/mainWindow.pro b/qrgui/mainWindow/mainWindow.pro index e2995e158a..f4ebd35848 100644 --- a/qrgui/mainWindow/mainWindow.pro +++ b/qrgui/mainWindow/mainWindow.pro @@ -15,12 +15,12 @@ TARGET = trik-studio TEMPLATE = app +QT += widgets printsupport xml svg + include(../../global.pri) DEFINES += TRIK_STUDIO_VERSION='\\"$$TRIK_STUDIO_VERSION\\"' -QT += widgets printsupport xml svg - links(qrkernel qrutils qrtext qrrepo qrgui-models qrgui-editor qrgui-controller qrgui-dialogs qrgui-preferences-dialog \ qrgui-text-editor qrgui-mouse-gestures qrgui-hotkey-manager qrgui-brand-manager \ qrgui-facade qrgui-plugin-manager qrgui-tool-plugin-interface qrgui-thirdparty \ diff --git a/qrgui/models/models.pri b/qrgui/models/models.pri index 2288116482..2c6e0357ae 100644 --- a/qrgui/models/models.pri +++ b/qrgui/models/models.pri @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -QT += xml widgets - links(qrkernel qrutils qrrepo qrgraph qrgui-meta-meta-model qrgui-controller qrgui-plugin-manager) includes(qrgui qrgraph qrgui/plugins/metaMetaModel) diff --git a/qrgui/models/models.pro b/qrgui/models/models.pro index d6b7ffc2c9..536e48f274 100644 --- a/qrgui/models/models.pro +++ b/qrgui/models/models.pro @@ -16,6 +16,8 @@ TEMPLATE = lib TARGET = qrgui-models +QT += xml widgets + include(../../global.pri) TRANSLATIONS = \ diff --git a/qrgui/mouseGestures/mouseGestures.pro b/qrgui/mouseGestures/mouseGestures.pro index b4ab6db917..a0cffbcb44 100644 --- a/qrgui/mouseGestures/mouseGestures.pro +++ b/qrgui/mouseGestures/mouseGestures.pro @@ -16,13 +16,13 @@ TARGET = qrgui-mouse-gestures TEMPLATE = lib +QT += widgets + include(../../global.pri) links(qrkernel qrutils) includes(qrgui qrgraph) -QT += widgets - DEFINES += QRGUI_MOUSE_GESTURES_LIBRARY TRANSLATIONS = \ diff --git a/qrgui/plugins/metaMetaModel/metaMetaModel.pro b/qrgui/plugins/metaMetaModel/metaMetaModel.pro index 1ee7a15cff..80a9208c61 100644 --- a/qrgui/plugins/metaMetaModel/metaMetaModel.pro +++ b/qrgui/plugins/metaMetaModel/metaMetaModel.pro @@ -16,10 +16,10 @@ TARGET = qrgui-meta-meta-model TEMPLATE = lib -include(../../../global.pri) - QT += xml +include(../../../global.pri) + includes(qrgui qrgraph) links(qrkernel qrgraph) diff --git a/qrgui/plugins/pluginManager/pluginManager.pro b/qrgui/plugins/pluginManager/pluginManager.pro index 86ccb12f39..e455b44956 100644 --- a/qrgui/plugins/pluginManager/pluginManager.pro +++ b/qrgui/plugins/pluginManager/pluginManager.pro @@ -16,10 +16,10 @@ TARGET = qrgui-plugin-manager TEMPLATE = lib -include(../../../global.pri) - QT += xml svg +include(../../../global.pri) + links(qrkernel qrgraph qrutils qrrepo qrgui-tool-plugin-interface qrgui-meta-meta-model) includes(qrgui qrgraph qrgui/plugins/metaMetaModel) diff --git a/qrgui/preferencesDialog/preferencesDialog.pro b/qrgui/preferencesDialog/preferencesDialog.pro index 7adbf62f6c..d76b95b940 100644 --- a/qrgui/preferencesDialog/preferencesDialog.pro +++ b/qrgui/preferencesDialog/preferencesDialog.pro @@ -16,10 +16,10 @@ TARGET = qrgui-preferences-dialog TEMPLATE = lib -include(../../global.pri) - QT += widgets +include(../../global.pri) + links(qrkernel qrutils) DEFINES += QRGUI_PREFERENCES_DIALOG_LIBRARY diff --git a/qrgui/systemFacade/systemFacade.pro b/qrgui/systemFacade/systemFacade.pro index 0965be1b73..2a355606c0 100644 --- a/qrgui/systemFacade/systemFacade.pro +++ b/qrgui/systemFacade/systemFacade.pro @@ -16,10 +16,10 @@ TARGET = qrgui-facade TEMPLATE = lib -include(../../global.pri) - QT += widgets +include(../../global.pri) + links(qrkernel qrutils qrgui-models qrgui-plugin-manager qrgui-text-editor qrgui-tool-plugin-interface) includes(qrgui) diff --git a/qrgui/textEditor/textEditor.pro b/qrgui/textEditor/textEditor.pro index 76a2e9d44c..5a76fa784b 100644 --- a/qrgui/textEditor/textEditor.pro +++ b/qrgui/textEditor/textEditor.pro @@ -16,14 +16,14 @@ TARGET = qrgui-text-editor TEMPLATE = lib +QT += widgets + include(../../global.pri) links(qrkernel qrutils qrgui-tool-plugin-interface qrgui-brand-manager) CONFIG += trikqscintilla2 -QT += widgets - DEFINES += QRGUI_TEXT_EDITOR_LIBRARY TRANSLATIONS = \ diff --git a/qrgui/thirdparty/thirdparty.pro b/qrgui/thirdparty/thirdparty.pro index 04554e1891..cc7c8c7f9e 100644 --- a/qrgui/thirdparty/thirdparty.pro +++ b/qrgui/thirdparty/thirdparty.pro @@ -16,12 +16,12 @@ TARGET = qrgui-thirdparty TEMPLATE = lib +QT += widgets + include(../../global.pri) DEFINES += QRGUI_THIRDPARTY_LIBRARY -QT += widgets - TRANSLATIONS = \ $$PWD/../../qrtranslations/ru/qrgui_thirdparty_ru.ts \ $$PWD/../../qrtranslations/fr/qrgui_thirdparty_fr.ts \ diff --git a/qrmc/qrmc.pri b/qrmc/qrmc.pri index 9c91bb28ec..776fcf77ce 100644 --- a/qrmc/qrmc.pri +++ b/qrmc/qrmc.pri @@ -14,10 +14,10 @@ TARGET = qrmc -include(../global.pri) - QT += xml +include(../global.pri) + CONFIG += console DEPENDPATH += \ diff --git a/qrrepo/qrrepo.pri b/qrrepo/qrrepo.pri index a175777d0d..0be0633a86 100644 --- a/qrrepo/qrrepo.pri +++ b/qrrepo/qrrepo.pri @@ -14,6 +14,8 @@ QT += xml +include(../global.pri) + clang:QMAKE_CXXFLAGS += -Wno-error=c++17-extensions DEFINES += QRREPO_LIBRARY diff --git a/qrrepo/qrrepo.pro b/qrrepo/qrrepo.pro index 97b9aa8e1d..4d1c034055 100644 --- a/qrrepo/qrrepo.pro +++ b/qrrepo/qrrepo.pro @@ -14,8 +14,6 @@ TEMPLATE = lib -include(../global.pri) - win32: copyToDestdir($$system($$pkgConfigExecutable() zlib --variable=prefix)\bin\zlib1.dll, NOW) include(qrrepo.pri) diff --git a/qrtest/unitTests/common.pri b/qrtest/unitTests/common.pri index 92cc2a88fc..e19efd3b4e 100644 --- a/qrtest/unitTests/common.pri +++ b/qrtest/unitTests/common.pri @@ -14,6 +14,8 @@ isEmpty(TEMPLATE): TEMPLATE = app +QT += widgets + include(../../global.pri) # after global.pri sets DESTDIR @@ -25,8 +27,6 @@ equals(TEMPLATE, app) { CONFIG += testcase testcase_no_bundle no_testcase_installs } -QT += widgets - #clang complains about GTest headers, but error is produced for macro expansion and -isystem does not help #probably, this can be fixed if we stop using old-school obsolete MOCK_METHOD{0-9} instead of newer MOCK_METHOD clang:QMAKE_CXXFLAGS += -Wno-error=gnu-zero-variadic-macro-arguments diff --git a/qrtest/unitTests/pluginsTests/robotsTests/tcpRobotSimulator/tcpRobotSimulator.pro b/qrtest/unitTests/pluginsTests/robotsTests/tcpRobotSimulator/tcpRobotSimulator.pro index aade6ddd63..8b7872c13c 100644 --- a/qrtest/unitTests/pluginsTests/robotsTests/tcpRobotSimulator/tcpRobotSimulator.pro +++ b/qrtest/unitTests/pluginsTests/robotsTests/tcpRobotSimulator/tcpRobotSimulator.pro @@ -16,10 +16,10 @@ TARGET = tcp-robot-simulator TEMPLATE = lib -include($$PWD/../../../../../global.pri) - QT += network +include($$PWD/../../../../../global.pri) + DEFINES += TCP_ROBOT_SIMULATOR_LIBRARY HEADERS += \ diff --git a/qrutils/qrutils.pri b/qrutils/qrutils.pri index a284182066..eeaac63314 100644 --- a/qrutils/qrutils.pri +++ b/qrutils/qrutils.pri @@ -12,6 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +QT += xml widgets svg + +include(../global.pri) + HEADERS += \ $$PWD/outFile.h \ $$PWD/utilsDeclSpec.h \ @@ -63,8 +67,6 @@ TRANSLATIONS = \ $$PWD/../qrtranslations/ru/qrutils_ru.ts \ $$PWD/../qrtranslations/fr/qrutils_fr.ts \ -QT += xml widgets svg - includes(qrtext qrgraph) links(qrkernel qrtext) diff --git a/qrutils/qrutils.pro b/qrutils/qrutils.pro index 4759117590..2d3717b9b4 100644 --- a/qrutils/qrutils.pro +++ b/qrutils/qrutils.pro @@ -14,6 +14,4 @@ TEMPLATE = lib -include(../global.pri) - include(qrutils.pri) diff --git a/qrxc/qrxc.pro b/qrxc/qrxc.pro index 3a65f1fe52..b1d05ad7ef 100644 --- a/qrxc/qrxc.pro +++ b/qrxc/qrxc.pro @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +QT += xml gui + include(../global.pri) CONFIG *= cmdline @@ -66,7 +68,6 @@ SOURCES += \ roleType.cpp \ TEMPLATE = app -QT += xml gui CONFIG += console links(qrutils)