From ad2da2d27a590333fc89a56fc58700a09c3017b3 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 17 Dec 2020 14:55:57 +0100 Subject: Remove the qmake project files Remove the qmake project files for most of Qt. Leave the qmake project files for examples, because we still test those in the CI to ensure qmake does not regress. Also leave the qmake project files for utils and other minor parts that lack CMake project files. Task-number: QTBUG-88742 Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc Reviewed-by: Edward Welbourne Reviewed-by: Qt CI Bot Reviewed-by: Kai Koehne --- src/3rdparty/VulkanMemoryAllocator.pri | 1 - .../double-conversion/double-conversion.pri | 22 --- src/3rdparty/freetype/freetype.pro | 84 --------- src/3rdparty/gradle/gradle.pro | 32 ---- src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 187 --------------------- src/3rdparty/iaccessible2/iaccessible2.pri | 18 -- src/3rdparty/libjpeg.pri | 63 ------- src/3rdparty/libpng/libpng.pro | 34 ---- src/3rdparty/md4c.pri | 4 - src/3rdparty/pcre2/pcre2.pri | 46 ----- src/3rdparty/pcre2/pcre2.pro | 16 -- src/3rdparty/sqlite.pri | 17 -- src/3rdparty/tinycbor/tests/encoder/encoder.pro | 9 - src/3rdparty/tinycbor/tests/parser/parser.pro | 10 -- src/3rdparty/zlib.pri | 19 --- src/3rdparty/zlib_dependency.pri | 10 -- 16 files changed, 572 deletions(-) delete mode 100644 src/3rdparty/VulkanMemoryAllocator.pri delete mode 100644 src/3rdparty/double-conversion/double-conversion.pri delete mode 100644 src/3rdparty/freetype/freetype.pro delete mode 100644 src/3rdparty/gradle/gradle.pro delete mode 100644 src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro delete mode 100644 src/3rdparty/iaccessible2/iaccessible2.pri delete mode 100644 src/3rdparty/libjpeg.pri delete mode 100644 src/3rdparty/libpng/libpng.pro delete mode 100644 src/3rdparty/md4c.pri delete mode 100644 src/3rdparty/pcre2/pcre2.pri delete mode 100644 src/3rdparty/pcre2/pcre2.pro delete mode 100644 src/3rdparty/sqlite.pri delete mode 100644 src/3rdparty/tinycbor/tests/encoder/encoder.pro delete mode 100644 src/3rdparty/tinycbor/tests/parser/parser.pro delete mode 100644 src/3rdparty/zlib.pri delete mode 100644 src/3rdparty/zlib_dependency.pri (limited to 'src/3rdparty') diff --git a/src/3rdparty/VulkanMemoryAllocator.pri b/src/3rdparty/VulkanMemoryAllocator.pri deleted file mode 100644 index 7466200dfc..0000000000 --- a/src/3rdparty/VulkanMemoryAllocator.pri +++ /dev/null @@ -1 +0,0 @@ -INCLUDEPATH += $$PWD/VulkanMemoryAllocator diff --git a/src/3rdparty/double-conversion/double-conversion.pri b/src/3rdparty/double-conversion/double-conversion.pri deleted file mode 100644 index 395c4682f9..0000000000 --- a/src/3rdparty/double-conversion/double-conversion.pri +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDEPATH += $$PWD/.. $$PWD/include -SOURCES += \ - $$PWD/bignum.cc \ - $$PWD/bignum-dtoa.cc \ - $$PWD/cached-powers.cc \ - $$PWD/diy-fp.cc \ - $$PWD/double-conversion.cc \ - $$PWD/fast-dtoa.cc \ - $$PWD/fixed-dtoa.cc \ - $$PWD/strtod.cc - -HEADERS += \ - $$PWD/bignum-dtoa.h \ - $$PWD/bignum.h \ - $$PWD/cached-powers.h \ - $$PWD/diy-fp.h \ - $$PWD/include/double-conversion/double-conversion.h \ - $$PWD/fast-dtoa.h \ - $$PWD/fixed-dtoa.h \ - $$PWD/ieee.h \ - $$PWD/strtod.h \ - $$PWD/include/double-conversion/utils.h diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro deleted file mode 100644 index 7dce10a902..0000000000 --- a/src/3rdparty/freetype/freetype.pro +++ /dev/null @@ -1,84 +0,0 @@ -TARGET = qtfreetype - -CONFIG += \ - static \ - hide_symbols \ - exceptions_off rtti_off warn_off \ - installed - -MODULE_INCLUDEPATH += $$PWD/include -MODULE_EXT_HEADERS_DIR = $$PWD/include - -load(qt_helper_lib) - -SOURCES += \ - $$PWD/src/autofit/afdummy.c \ - $$PWD/src/autofit/afhints.c \ - $$PWD/src/autofit/aflatin.c \ - $$PWD/src/autofit/autofit.c \ - $$PWD/src/base/ftbase.c \ - $$PWD/src/base/ftbitmap.c \ - $$PWD/src/base/ftbbox.c \ - $$PWD/src/base/ftdebug.c \ - $$PWD/src/base/ftglyph.c \ - $$PWD/src/base/ftfntfmt.c \ - $$PWD/src/base/ftinit.c \ - $$PWD/src/base/ftlcdfil.c \ - $$PWD/src/base/ftmm.c \ - $$PWD/src/base/ftsynth.c \ - $$PWD/src/base/fttype1.c \ - $$PWD/src/bdf/bdf.c \ - $$PWD/src/cache/ftcache.c \ - $$PWD/src/cff/cff.c \ - $$PWD/src/cid/type1cid.c \ - $$PWD/src/gzip/ftgzip.c \ - $$PWD/src/lzw/ftlzw.c \ - $$PWD/src/otvalid/otvalid.c \ - $$PWD/src/otvalid/otvbase.c \ - $$PWD/src/otvalid/otvcommn.c \ - $$PWD/src/otvalid/otvgdef.c \ - $$PWD/src/otvalid/otvgpos.c \ - $$PWD/src/otvalid/otvgsub.c \ - $$PWD/src/otvalid/otvjstf.c \ - $$PWD/src/otvalid/otvmod.c \ - $$PWD/src/pcf/pcf.c \ - $$PWD/src/pfr/pfr.c \ - $$PWD/src/psaux/psaux.c \ - $$PWD/src/pshinter/pshinter.c \ - $$PWD/src/psnames/psmodule.c \ - $$PWD/src/raster/raster.c \ - $$PWD/src/sfnt/sfnt.c \ - $$PWD/src/smooth/smooth.c \ - $$PWD/src/truetype/truetype.c \ - $$PWD/src/type1/type1.c \ - $$PWD/src/type42/type42.c \ - $$PWD/src/winfonts/winfnt.c - -# These source files are included by one of the sources above -# which means they should not be compiled as separate object files. -OTHER_FILES += \ - $$PWD/src/autofit/afangles.c \ - $$PWD/src/autofit/afglobal.c \ - $$PWD/src/autofit/afloader.c \ - $$PWD/src/autofit/afmodule.c - -win32 { - SOURCES += $$PWD/src/base/ftsystem.c -} else { - SOURCES += $$PWD/builds/unix/ftsystem.c - INCLUDEPATH += $$PWD/builds/unix -} - -DEFINES += FT2_BUILD_LIBRARY - -DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB -include(../zlib_dependency.pri) - -include($$OUT_PWD/../../gui/qtgui-config.pri) -QT_FOR_CONFIG += gui-private -qtConfig(png) { - DEFINES += FT_CONFIG_OPTION_USE_PNG - QMAKE_USE_PRIVATE += libpng -} - -DEFINES += TT_CONFIG_OPTION_SUBPIXEL_HINTING diff --git a/src/3rdparty/gradle/gradle.pro b/src/3rdparty/gradle/gradle.pro deleted file mode 100644 index 5d8efdcfd3..0000000000 --- a/src/3rdparty/gradle/gradle.pro +++ /dev/null @@ -1,32 +0,0 @@ -TEMPLATE = aux -TARGET = dummy # Avoid a conflict with the existing gradle directory -CONFIG -= qt android_install - -gradle_files.files = \ - $$PWD/gradlew \ - $$PWD/gradlew.bat \ - $$PWD/gradle.properties -gradle_dirs.files = \ - $$PWD/gradle - -gradle_files.path = $$[QT_INSTALL_PREFIX]/src/3rdparty/gradle -gradle_dirs.path = $${gradle_files.path} - -INSTALLS += gradle_files gradle_dirs -!prefix_build:!equals(OUT_PWD, $$PWD) { - # For COPIES to work, files and directory entries need to be separate objects. - COPIES += gradle_files gradle_dirs -} - -!prefix_build:!equals(OUT_PWD, $$PWD) { - RETURN = $$escape_expand(\\n\\t) - equals(QMAKE_HOST.os, Windows) { - RETURN = $$escape_expand(\\r\\n\\t) - } - OUT_PATH = $$shell_path($$OUT_PWD) - - QMAKE_POST_LINK += \ - $${QMAKE_COPY} $$shell_path($$PWD/gradlew) $$OUT_PATH $$RETURN \ - $${QMAKE_COPY} $$shell_path($$PWD/gradlew.bat) $$OUT_PATH $$RETURN \ - $${QMAKE_COPY_DIR} $$shell_path($$PWD/gradle) $$OUT_PATH -} diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro deleted file mode 100644 index 8b53f3e990..0000000000 --- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro +++ /dev/null @@ -1,187 +0,0 @@ -TARGET = qtharfbuzz - -CONFIG += \ - static \ - hide_symbols \ - exceptions_off rtti_off warn_off - -MODULE_INCLUDEPATH += $$PWD/include/harfbuzz - - -# built-in shapers list configuration: -SHAPERS += opentype # HB's main shaper; enabling it should be enough most of the time - -# native shaper on Apple platforms; could be used alone to handle both OT and AAT fonts -darwin: SHAPERS += coretext - -# fallback shaper: not really useful with opentype or coretext shaper -#SHAPERS += fallback - -DEFINES += HAVE_CONFIG_H -DEFINES += HB_NO_UNICODE_FUNCS -DEFINES += HB_NDEBUG -DEFINES += HB_EXTERN= - -# platform/compiler specific definitions -DEFINES += HAVE_ATEXIT -unix: DEFINES += HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD -win32: DEFINES += HB_NO_WIN1256 - -# Harfbuzz-NG inside Qt uses the Qt atomics (inline code only) -INCLUDEPATH += $$QT.core.includes -DEFINES += QT_NO_VERSION_TAGGING - -SOURCES += \ - $$PWD/src/hb-aat-layout.cc \ - $$PWD/src/hb-aat-map.cc \ - $$PWD/src/hb-blob.cc \ - $$PWD/src/hb-buffer.cc \ - $$PWD/src/hb-buffer-serialize.cc \ - $$PWD/src/hb-face.cc \ - $$PWD/src/hb-fallback-shape.cc \ - $$PWD/src/hb-font.cc \ - $$PWD/src/hb-map.cc \ - $$PWD/src/hb-number.cc \ - $$PWD/src/hb-set.cc \ - $$PWD/src/hb-shape.cc \ - $$PWD/src/hb-shape-plan.cc \ - $$PWD/src/hb-shaper.cc \ - $$PWD/src/hb-subset.cc \ - $$PWD/src/hb-subset-cff-common.cc \ - $$PWD/src/hb-subset-cff1.cc \ - $$PWD/src/hb-subset-cff2.cc \ - $$PWD/src/hb-subset-input.cc \ - $$PWD/src/hb-subset-plan.cc \ - $$PWD/src/hb-unicode.cc \ - $$PWD/hb-dummy.cc - -OTHER_FILES += \ - $$PWD/src/harfbuzz.cc - -HEADERS += \ - $$PWD/src/hb-atomic.hh \ - $$PWD/src/hb-algs.hh \ - $$PWD/src/hb-buffer.hh \ - $$PWD/src/hb-buffer-deserialize-json.hh \ - $$PWD/src/hb-buffer-deserialize-text.hh \ - $$PWD/src/hb-cache.hh \ - $$PWD/src/hb-debug.hh \ - $$PWD/src/hb-face.hh \ - $$PWD/src/hb-font.hh \ - $$PWD/src/hb-mutex.hh \ - $$PWD/src/hb-object.hh \ - $$PWD/src/hb-open-file.hh \ - $$PWD/src/hb-open-type.hh \ - $$PWD/src/hb-set-digest.hh \ - $$PWD/src/hb-set.hh \ - $$PWD/src/hb-shape-plan.hh \ - $$PWD/src/hb-shaper-impl.hh \ - $$PWD/src/hb-shaper-list.hh \ - $$PWD/src/hb-shaper.hh \ - $$PWD/src/hb-string-array.hh \ - $$PWD/src/hb-unicode.hh \ - $$PWD/src/hb-utf.hh - -HEADERS += \ - $$PWD/src/hb.h \ - $$PWD/src/hb-blob.h \ - $$PWD/src/hb-buffer.h \ - $$PWD/src/hb-common.h \ - $$PWD/src/hb-deprecated.h \ - $$PWD/src/hb-face.h \ - $$PWD/src/hb-font.h \ - $$PWD/src/hb-set.h \ - $$PWD/src/hb-shape.h \ - $$PWD/src/hb-shape-plan.h \ - $$PWD/src/hb-unicode.h \ - $$PWD/src/hb-version.h - -contains(SHAPERS, opentype) { - DEFINES += HAVE_OT - - SOURCES += \ - $$PWD/src/hb-ot-cff1-table.cc \ - $$PWD/src/hb-ot-cff2-table.cc \ - $$PWD/src/hb-ot-color.cc \ - $$PWD/src/hb-ot-face.cc \ - $$PWD/src/hb-ot-font.cc \ - $$PWD/src/hb-ot-layout.cc \ - $$PWD/src/hb-ot-map.cc \ - $$PWD/src/hb-ot-math.cc \ - $$PWD/src/hb-ot-meta.cc \ - $$PWD/src/hb-ot-metrics.cc \ - $$PWD/src/hb-ot-name.cc \ - $$PWD/src/hb-ot-shape.cc \ - $$PWD/src/hb-ot-tag.cc \ - $$PWD/src/hb-ot-shape-complex-arabic.cc \ - $$PWD/src/hb-ot-shape-complex-default.cc \ - $$PWD/src/hb-ot-shape-complex-hangul.cc \ - $$PWD/src/hb-ot-shape-complex-hebrew.cc \ - $$PWD/src/hb-ot-shape-complex-indic.cc \ - $$PWD/src/hb-ot-shape-complex-indic-table.cc \ - $$PWD/src/hb-ot-shape-complex-khmer.cc \ - $$PWD/src/hb-ot-shape-complex-myanmar.cc \ - $$PWD/src/hb-ot-shape-complex-thai.cc \ - $$PWD/src/hb-ot-shape-complex-use.cc \ - $$PWD/src/hb-ot-shape-complex-use-table.cc \ - $$PWD/src/hb-ot-shape-complex-vowel-constraints.cc \ - $$PWD/src/hb-ot-shape-fallback.cc \ - $$PWD/src/hb-ot-shape-normalize.cc \ - $$PWD/src/hb-ot-var.cc - - HEADERS += \ - $$PWD/src/hb-ot-cmap-table.hh \ - $$PWD/src/hb-ot-color-cbdt-table.hh \ - $$PWD/src/hb-ot-glyf-table.hh \ - $$PWD/src/hb-ot-head-table.hh \ - $$PWD/src/hb-ot-hhea-table.hh \ - $$PWD/src/hb-ot-hmtx-table.hh \ - $$PWD/src/hb-ot-kern-table.hh \ - $$PWD/src/hb-ot-layout.hh \ - $$PWD/src/hb-ot-layout-gdef-table.hh \ - $$PWD/src/hb-ot-layout-gpos-table.hh \ - $$PWD/src/hb-ot-layout-gsub-table.hh \ - $$PWD/src/hb-ot-layout-jstf-table.hh \ - $$PWD/src/hb-ot-map.hh \ - $$PWD/src/hb-ot-math-table.hh \ - $$PWD/src/hb-ot-maxp-table.hh \ - $$PWD/src/hb-ot-name-table.hh \ - $$PWD/src/hb-ot-os2-table.hh \ - $$PWD/src/hb-ot-post-table.hh \ - $$PWD/src/hb-ot-post-macroman.hh \ - $$PWD/src/hb-ot-shape.hh \ - $$PWD/src/hb-ot-shape-complex-arabic.hh \ - $$PWD/src/hb-ot-shape-complex-arabic-fallback.hh \ - $$PWD/src/hb-ot-shape-complex-arabic-table.hh \ -# $$PWD/src/hb-ot-shape-complex-arabic-win1256.hh \ # disabled with HB_NO_WIN1256 - $$PWD/src/hb-ot-shape-complex-indic.hh \ - $$PWD/src/hb-ot-shape-complex-indic-machine.hh \ - $$PWD/src/hb-ot-shape-complex-myanmar-machine.hh \ - $$PWD/src/hb-ot-shape-complex-use.hh \ - $$PWD/src/hb-ot-shape-complex-use-machine.hh \ - $$PWD/src/hb-ot-shape-fallback.hh \ - $$PWD/src/hb-ot-shape-normalize.hh \ - $$PWD/src/hb-ot-var-avar-table.hh \ - $$PWD/src/hb-ot-var-fvar-table.hh \ - $$PWD/src/hb-ot-var-hvar-table.hh \ - $$PWD/src/hb-ot-var-mvar-table.hh - - HEADERS += \ - $$PWD/src/hb-ot.h \ - $$PWD/src/hb-ot-font.h \ - $$PWD/src/hb-ot-layout.h \ - $$PWD/src/hb-ot-math.h \ - $$PWD/src/hb-ot-shape.h \ - $$PWD/src/hb-ot-var.h -} - -MODULE_EXT_HEADERS = $$HEADERS - -contains(SHAPERS, fallback)|isEmpty(SHAPERS) { - DEFINES += HAVE_FALLBACK - - SOURCES += \ - $$PWD/src/hb-fallback-shape.cc -} - -load(qt_helper_lib) diff --git a/src/3rdparty/iaccessible2/iaccessible2.pri b/src/3rdparty/iaccessible2/iaccessible2.pri deleted file mode 100644 index f60e67681d..0000000000 --- a/src/3rdparty/iaccessible2/iaccessible2.pri +++ /dev/null @@ -1,18 +0,0 @@ - -ARCH_SUBDIR=x86 -contains(QT_ARCH, x86_64): ARCH_SUBDIR = amd64 - -MIDL_GENERATED = $$PWD/generated/$${ARCH_SUBDIR} - -INCLUDEPATH += $$MIDL_GENERATED - -SOURCES += $${MIDL_GENERATED}/ia2_api_all_i.c - -HEADERS += $${MIDL_GENERATED}/ia2_api_all.h - -OTHER_FILES = \ - $$PWD/idl/ia2_api_all.idl - -LIBS += -lrpcrt4 - -TR_EXCLUDE += $$PWD/* diff --git a/src/3rdparty/libjpeg.pri b/src/3rdparty/libjpeg.pri deleted file mode 100644 index 364dbb11a6..0000000000 --- a/src/3rdparty/libjpeg.pri +++ /dev/null @@ -1,63 +0,0 @@ -# Disable warnings in 3rdparty code due to unused arguments -gcc: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main - -# Do not warn about sprintf, getenv, sscanf ... use -msvc: DEFINES += _CRT_SECURE_NO_WARNINGS - -INCLUDEPATH += \ - $$PWD/libjpeg \ - $$PWD/libjpeg/src - -SOURCES += \ - $$PWD/libjpeg/src/jaricom.c \ - $$PWD/libjpeg/src/jcapimin.c \ - $$PWD/libjpeg/src/jcapistd.c \ - $$PWD/libjpeg/src/jcarith.c \ - $$PWD/libjpeg/src/jccoefct.c \ - $$PWD/libjpeg/src/jccolor.c \ - $$PWD/libjpeg/src/jcdctmgr.c \ - $$PWD/libjpeg/src/jchuff.c \ - $$PWD/libjpeg/src/jcinit.c \ - $$PWD/libjpeg/src/jcmainct.c \ - $$PWD/libjpeg/src/jcmarker.c \ - $$PWD/libjpeg/src/jcmaster.c \ - $$PWD/libjpeg/src/jcomapi.c \ - $$PWD/libjpeg/src/jcparam.c \ - $$PWD/libjpeg/src/jcprepct.c \ - $$PWD/libjpeg/src/jcsample.c \ - $$PWD/libjpeg/src/jctrans.c \ - $$PWD/libjpeg/src/jdapimin.c \ - $$PWD/libjpeg/src/jdapistd.c \ - $$PWD/libjpeg/src/jdarith.c \ - $$PWD/libjpeg/src/jdatadst.c \ - $$PWD/libjpeg/src/jdatasrc.c \ - $$PWD/libjpeg/src/jdcoefct.c \ - $$PWD/libjpeg/src/jdcolor.c \ - $$PWD/libjpeg/src/jddctmgr.c \ - $$PWD/libjpeg/src/jdhuff.c \ - $$PWD/libjpeg/src/jdinput.c \ - $$PWD/libjpeg/src/jdmainct.c \ - $$PWD/libjpeg/src/jdmarker.c \ - $$PWD/libjpeg/src/jdmaster.c \ - $$PWD/libjpeg/src/jdmerge.c \ - $$PWD/libjpeg/src/jdpostct.c \ - $$PWD/libjpeg/src/jdsample.c \ - $$PWD/libjpeg/src/jdtrans.c \ - $$PWD/libjpeg/src/jerror.c \ - $$PWD/libjpeg/src/jfdctflt.c \ - $$PWD/libjpeg/src/jfdctfst.c \ - $$PWD/libjpeg/src/jfdctint.c \ - $$PWD/libjpeg/src/jidctflt.c \ - $$PWD/libjpeg/src/jidctfst.c \ - $$PWD/libjpeg/src/jidctint.c \ - $$PWD/libjpeg/src/jquant1.c \ - $$PWD/libjpeg/src/jquant2.c \ - $$PWD/libjpeg/src/jutils.c \ - $$PWD/libjpeg/src/jmemmgr.c \ - $$PWD/libjpeg/src/jsimd_none.c \ - $$PWD/libjpeg/src/jcphuff.c \ - $$PWD/libjpeg/src/jidctred.c \ - $$PWD/libjpeg/src/jdphuff.c \ - $$PWD/libjpeg/src/jmemnobs.c - -TR_EXCLUDE += $$PWD/* diff --git a/src/3rdparty/libpng/libpng.pro b/src/3rdparty/libpng/libpng.pro deleted file mode 100644 index b71dfefd20..0000000000 --- a/src/3rdparty/libpng/libpng.pro +++ /dev/null @@ -1,34 +0,0 @@ -TARGET = qtlibpng - -CONFIG += \ - static \ - hide_symbols \ - exceptions_off rtti_off warn_off \ - installed - -MODULE_INCLUDEPATH = $$PWD -MODULE_EXT_HEADERS = png.h pngconf.h - -load(qt_helper_lib) - -DEFINES += PNG_ARM_NEON_OPT=0 PNG_POWERPC_VSX_OPT=0 -SOURCES += \ - png.c \ - pngerror.c \ - pngget.c \ - pngmem.c \ - pngpread.c \ - pngread.c \ - pngrio.c \ - pngrtran.c \ - pngrutil.c \ - pngset.c \ - pngtrans.c \ - pngwio.c \ - pngwrite.c \ - pngwtran.c \ - pngwutil.c - -TR_EXCLUDE += $$PWD/* - -include(../zlib_dependency.pri) diff --git a/src/3rdparty/md4c.pri b/src/3rdparty/md4c.pri deleted file mode 100644 index 8de2991ac2..0000000000 --- a/src/3rdparty/md4c.pri +++ /dev/null @@ -1,4 +0,0 @@ -INCLUDEPATH += $$PWD/md4c -HEADERS += $$PWD/md4c/md4c.h -SOURCES += $$PWD/md4c/md4c.c -DEFINES += MD4C_USE_UTF8 diff --git a/src/3rdparty/pcre2/pcre2.pri b/src/3rdparty/pcre2/pcre2.pri deleted file mode 100644 index ace72ec93e..0000000000 --- a/src/3rdparty/pcre2/pcre2.pri +++ /dev/null @@ -1,46 +0,0 @@ -MODULE_INCLUDEPATH += $$PWD/src - -MODULE_DEFINES += PCRE2_CODE_UNIT_WIDTH=16 -win32: MODULE_DEFINES += PCRE2_STATIC - -DEFINES += HAVE_CONFIG_H - -qtConfig(intelcet) { - QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHSTK - QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHSTK -} - -SOURCES += \ - $$PWD/src/pcre2_auto_possess.c \ - $$PWD/src/pcre2_chartables.c \ - $$PWD/src/pcre2_compile.c \ - $$PWD/src/pcre2_config.c \ - $$PWD/src/pcre2_context.c \ - $$PWD/src/pcre2_dfa_match.c \ - $$PWD/src/pcre2_error.c \ - $$PWD/src/pcre2_extuni.c \ - $$PWD/src/pcre2_find_bracket.c \ - $$PWD/src/pcre2_jit_compile.c \ - $$PWD/src/pcre2_maketables.c \ - $$PWD/src/pcre2_match.c \ - $$PWD/src/pcre2_match_data.c \ - $$PWD/src/pcre2_newline.c \ - $$PWD/src/pcre2_ord2utf.c \ - $$PWD/src/pcre2_pattern_info.c \ - $$PWD/src/pcre2_script_run.c \ - $$PWD/src/pcre2_serialize.c \ - $$PWD/src/pcre2_string_utils.c \ - $$PWD/src/pcre2_study.c \ - $$PWD/src/pcre2_substitute.c \ - $$PWD/src/pcre2_substring.c \ - $$PWD/src/pcre2_tables.c \ - $$PWD/src/pcre2_ucd.c \ - $$PWD/src/pcre2_valid_utf.c \ - $$PWD/src/pcre2_xclass.c - -HEADERS += \ - $$PWD/src/config.h \ - $$PWD/src/pcre2.h \ - $$PWD/src/pcre2_internal.h \ - $$PWD/src/pcre2_intmodedep.h \ - $$PWD/src/pcre2_ucp.h diff --git a/src/3rdparty/pcre2/pcre2.pro b/src/3rdparty/pcre2/pcre2.pro deleted file mode 100644 index 95f11f6f23..0000000000 --- a/src/3rdparty/pcre2/pcre2.pro +++ /dev/null @@ -1,16 +0,0 @@ -TARGET = qtpcre2 - -CONFIG += \ - static \ - hide_symbols \ - exceptions_off rtti_off warn_off - -include(pcre2.pri) - -# platform/compiler specific definitions -uikit|qnx: DEFINES += PCRE2_DISABLE_JIT -win32:contains(QT_ARCH, "arm"): DEFINES += PCRE2_DISABLE_JIT -win32:contains(QT_ARCH, "arm64"): DEFINES += PCRE2_DISABLE_JIT -macos:contains(QT_ARCH, "arm64"): DEFINES += PCRE2_DISABLE_JIT - -load(qt_helper_lib) diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri deleted file mode 100644 index f4c8062468..0000000000 --- a/src/3rdparty/sqlite.pri +++ /dev/null @@ -1,17 +0,0 @@ -CONFIG(release, debug|release):DEFINES *= NDEBUG -QT_FOR_CONFIG += core-private -DEFINES += SQLITE_ENABLE_COLUMN_METADATA SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_FTS5 SQLITE_ENABLE_RTREE SQLITE_ENABLE_JSON1 -!contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS -qtConfig(posix_fallocate): DEFINES += HAVE_POSIX_FALLOCATE=1 -qnx: DEFINES += _QNX_SOURCE -!win32: DEFINES += HAVE_USLEEP=1 -qtConfig(dlopen) { - QMAKE_USE += libdl -} else { - DEFINES += SQLITE_OMIT_LOAD_EXTENSION -} -integrity: QMAKE_CFLAGS += -include qplatformdefs.h -INCLUDEPATH += $$PWD/sqlite -SOURCES += $$PWD/sqlite/sqlite3.c - -TR_EXCLUDE += $$PWD/* diff --git a/src/3rdparty/tinycbor/tests/encoder/encoder.pro b/src/3rdparty/tinycbor/tests/encoder/encoder.pro deleted file mode 100644 index 62d9b7e409..0000000000 --- a/src/3rdparty/tinycbor/tests/encoder/encoder.pro +++ /dev/null @@ -1,9 +0,0 @@ -SOURCES += tst_encoder.cpp - -CONFIG += testcase parallel_test c++11 -QT = core testlib - -INCLUDEPATH += ../../src -msvc: POST_TARGETDEPS = ../../lib/tinycbor.lib -else: POST_TARGETDEPS += ../../lib/libtinycbor.a -LIBS += $$POST_TARGETDEPS diff --git a/src/3rdparty/tinycbor/tests/parser/parser.pro b/src/3rdparty/tinycbor/tests/parser/parser.pro deleted file mode 100644 index a61291a9e4..0000000000 --- a/src/3rdparty/tinycbor/tests/parser/parser.pro +++ /dev/null @@ -1,10 +0,0 @@ -SOURCES += tst_parser.cpp ../../src/cborparser.c - -CONFIG += testcase parallel_test c++11 -QT = core testlib -DEFINES += CBOR_PARSER_MAX_RECURSIONS=16 - -INCLUDEPATH += ../../src -msvc: POST_TARGETDEPS = ../../lib/tinycbor.lib -else: POST_TARGETDEPS += ../../lib/libtinycbor.a -LIBS += $$POST_TARGETDEPS diff --git a/src/3rdparty/zlib.pri b/src/3rdparty/zlib.pri deleted file mode 100644 index 4d8af3f0c6..0000000000 --- a/src/3rdparty/zlib.pri +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDEPATH = $$PWD/zlib/src $$INCLUDEPATH -SOURCES+= \ - $$PWD/zlib/src/adler32.c \ - $$PWD/zlib/src/compress.c \ - $$PWD/zlib/src/crc32.c \ - $$PWD/zlib/src/deflate.c \ - $$PWD/zlib/src/gzclose.c \ - $$PWD/zlib/src/gzlib.c \ - $$PWD/zlib/src/gzread.c \ - $$PWD/zlib/src/gzwrite.c \ - $$PWD/zlib/src/infback.c \ - $$PWD/zlib/src/inffast.c \ - $$PWD/zlib/src/inflate.c \ - $$PWD/zlib/src/inftrees.c \ - $$PWD/zlib/src/trees.c \ - $$PWD/zlib/src/uncompr.c \ - $$PWD/zlib/src/zutil.c - -TR_EXCLUDE += $$PWD/* diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri deleted file mode 100644 index f35f310c19..0000000000 --- a/src/3rdparty/zlib_dependency.pri +++ /dev/null @@ -1,10 +0,0 @@ -# zlib dependency satisfied by bundled 3rd party zlib or system zlib -qtConfig(system-zlib) { - QMAKE_USE_PRIVATE += zlib -} else { - INCLUDEPATH += $$PWD/zlib/src - !no_core_dep { - CONFIG += qt - QT_PRIVATE += core - } -} -- cgit v1.2.3