From f60105ed2698b7e51fac3e3631a1f1742f91bbad Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 9 Feb 2021 17:06:13 +0100 Subject: Remove QMake project files This includes removal of the corresponding .prev_CMakeLists.txt files. Pick-to: 6.1 Task-number: QTBUG-88742 Change-Id: I43bd344cd515aa2f671d012c64f281e8fc4793c9 Reviewed-by: Qt CI Bot Reviewed-by: Oliver Wolff --- .prev_CMakeLists.txt | 20 --- qtimageformats.pro | 3 - src/imageformats/.prev_CMakeLists.txt | 2 - src/imageformats/imageformats.pro | 3 - src/plugins/imageformats/.prev_CMakeLists.txt | 25 --- src/plugins/imageformats/dds/dds.pro | 16 -- src/plugins/imageformats/icns/.prev_CMakeLists.txt | 22 --- src/plugins/imageformats/icns/icns.pro | 16 -- src/plugins/imageformats/imageformats.pro | 23 --- src/plugins/imageformats/jp2/.prev_CMakeLists.txt | 22 --- src/plugins/imageformats/jp2/jp2.pro | 15 -- .../imageformats/macheif/.prev_CMakeLists.txt | 27 ---- src/plugins/imageformats/macheif/macheif.pro | 20 --- src/plugins/imageformats/macjp2/macjp2.pro | 20 --- src/plugins/imageformats/mng/mng.pro | 15 -- src/plugins/imageformats/tga/.prev_CMakeLists.txt | 20 --- src/plugins/imageformats/tga/tga.pro | 13 -- src/plugins/imageformats/tiff/.prev_CMakeLists.txt | 93 ----------- src/plugins/imageformats/tiff/tiff.pro | 18 --- src/plugins/imageformats/wbmp/.prev_CMakeLists.txt | 19 --- src/plugins/imageformats/wbmp/wbmp.pro | 11 -- src/plugins/imageformats/webp/.prev_CMakeLists.txt | 173 --------------------- src/plugins/imageformats/webp/webp.pro | 18 --- src/plugins/plugins.pro | 2 - src/src.pro | 4 - tests/.prev_CMakeLists.txt | 7 - tests/auto/auto.pro | 11 -- tests/auto/dds/dds.pro | 8 - tests/auto/heif/heif.pro | 8 - tests/auto/icns/icns.pro | 8 - tests/auto/jp2/jp2.pro | 8 - tests/auto/mng/mng.pro | 8 - tests/auto/tga/tga.pro | 8 - tests/auto/tiff/tiff.pro | 8 - tests/auto/wbmp/wbmp.pro | 8 - tests/auto/webp/webp.pro | 8 - tests/tests.pro | 2 - 37 files changed, 712 deletions(-) delete mode 100644 .prev_CMakeLists.txt delete mode 100644 qtimageformats.pro delete mode 100644 src/imageformats/.prev_CMakeLists.txt delete mode 100644 src/imageformats/imageformats.pro delete mode 100644 src/plugins/imageformats/.prev_CMakeLists.txt delete mode 100644 src/plugins/imageformats/dds/dds.pro delete mode 100644 src/plugins/imageformats/icns/.prev_CMakeLists.txt delete mode 100644 src/plugins/imageformats/icns/icns.pro delete mode 100644 src/plugins/imageformats/imageformats.pro delete mode 100644 src/plugins/imageformats/jp2/.prev_CMakeLists.txt delete mode 100644 src/plugins/imageformats/jp2/jp2.pro delete mode 100644 src/plugins/imageformats/macheif/.prev_CMakeLists.txt delete mode 100644 src/plugins/imageformats/macheif/macheif.pro delete mode 100644 src/plugins/imageformats/macjp2/macjp2.pro delete mode 100644 src/plugins/imageformats/mng/mng.pro delete mode 100644 src/plugins/imageformats/tga/.prev_CMakeLists.txt delete mode 100644 src/plugins/imageformats/tga/tga.pro delete mode 100644 src/plugins/imageformats/tiff/.prev_CMakeLists.txt delete mode 100644 src/plugins/imageformats/tiff/tiff.pro delete mode 100644 src/plugins/imageformats/wbmp/.prev_CMakeLists.txt delete mode 100644 src/plugins/imageformats/wbmp/wbmp.pro delete mode 100644 src/plugins/imageformats/webp/.prev_CMakeLists.txt delete mode 100644 src/plugins/imageformats/webp/webp.pro delete mode 100644 src/plugins/plugins.pro delete mode 100644 src/src.pro delete mode 100644 tests/.prev_CMakeLists.txt delete mode 100644 tests/auto/auto.pro delete mode 100644 tests/auto/dds/dds.pro delete mode 100644 tests/auto/heif/heif.pro delete mode 100644 tests/auto/icns/icns.pro delete mode 100644 tests/auto/jp2/jp2.pro delete mode 100644 tests/auto/mng/mng.pro delete mode 100644 tests/auto/tga/tga.pro delete mode 100644 tests/auto/tiff/tiff.pro delete mode 100644 tests/auto/wbmp/wbmp.pro delete mode 100644 tests/auto/webp/webp.pro delete mode 100644 tests/tests.pro diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt deleted file mode 100644 index 298c008..0000000 --- a/.prev_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Generated from qtimageformats.pro. - -cmake_minimum_required(VERSION 3.15.0) - -include(.cmake.conf) -project(imageformats_FIXME - VERSION "${QT_REPO_MODULE_VERSION}" - DESCRIPTION "Qt imageformats_FIXME Libraries" - HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C -) - -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) -find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) - -if(NOT TARGET Qt::Gui) - message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.") - return() -endif() -qt_build_repo() diff --git a/qtimageformats.pro b/qtimageformats.pro deleted file mode 100644 index fe127be..0000000 --- a/qtimageformats.pro +++ /dev/null @@ -1,3 +0,0 @@ -requires(qtHaveModule(gui)) - -load(qt_parts) diff --git a/src/imageformats/.prev_CMakeLists.txt b/src/imageformats/.prev_CMakeLists.txt deleted file mode 100644 index 989075a..0000000 --- a/src/imageformats/.prev_CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Generated from imageformats.pro. - diff --git a/src/imageformats/imageformats.pro b/src/imageformats/imageformats.pro deleted file mode 100644 index 95ff5bc..0000000 --- a/src/imageformats/imageformats.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = aux -CONFIG += prepare_docs qt_docs_targets -QMAKE_DOCS = $$PWD/doc/qtimageformats.qdocconf diff --git a/src/plugins/imageformats/.prev_CMakeLists.txt b/src/plugins/imageformats/.prev_CMakeLists.txt deleted file mode 100644 index da2ff9f..0000000 --- a/src/plugins/imageformats/.prev_CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -# Generated from imageformats.pro. - -add_subdirectory(tga) -add_subdirectory(wbmp) -if(QT_FEATURE_tiff) - add_subdirectory(tiff) -endif() -if(QT_FEATURE_webp) - add_subdirectory(webp) -endif() -if(APPLE) - add_subdirectory(macheif) -endif() -if(QT_FEATURE_regularexpression) - add_subdirectory(icns) -endif() -if(QT_FEATURE_mng) - add_subdirectory(mng) -endif() -if(QT_FEATURE_jasper) - add_subdirectory(jp2) -endif() -if(APPLE AND NOT QT_FEATURE_jasper) - add_subdirectory(macjp2) -endif() diff --git a/src/plugins/imageformats/dds/dds.pro b/src/plugins/imageformats/dds/dds.pro deleted file mode 100644 index 00e64cb..0000000 --- a/src/plugins/imageformats/dds/dds.pro +++ /dev/null @@ -1,16 +0,0 @@ -TARGET = qdds - -HEADERS += \ - ddsheader.h \ - qddshandler.h - -SOURCES += \ - ddsheader.cpp \ - main.cpp \ - qddshandler.cpp - -OTHER_FILES += dds.json - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QDDSPlugin -load(qt_plugin) diff --git a/src/plugins/imageformats/icns/.prev_CMakeLists.txt b/src/plugins/imageformats/icns/.prev_CMakeLists.txt deleted file mode 100644 index 715e544..0000000 --- a/src/plugins/imageformats/icns/.prev_CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Generated from icns.pro. - -##################################################################### -## QICNSPlugin Plugin: -##################################################################### - -qt_add_plugin(QICNSPlugin - OUTPUT_NAME qicns - TYPE imageformats - SOURCES - main.cpp - qicnshandler.cpp qicnshandler_p.h - DEFINES - QT_NO_CAST_FROM_ASCII - QT_NO_CAST_TO_ASCII - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:icns.pro:: -# OTHER_FILES = "icns.json" diff --git a/src/plugins/imageformats/icns/icns.pro b/src/plugins/imageformats/icns/icns.pro deleted file mode 100644 index 57da844..0000000 --- a/src/plugins/imageformats/icns/icns.pro +++ /dev/null @@ -1,16 +0,0 @@ -TARGET = qicns - -DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - -HEADERS += \ - qicnshandler_p.h - -SOURCES += \ - main.cpp \ - qicnshandler.cpp - -OTHER_FILES += icns.json - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QICNSPlugin -load(qt_plugin) diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro deleted file mode 100644 index 4116591..0000000 --- a/src/plugins/imageformats/imageformats.pro +++ /dev/null @@ -1,23 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ -# dds \ - tga \ - wbmp - -include($$OUT_PWD/../../imageformats/qtimageformats-config.pri) -QT_FOR_CONFIG += imageformats-private - -qtConfig(tiff): SUBDIRS += tiff -qtConfig(webp): SUBDIRS += webp - -darwin: SUBDIRS += macheif - -qtConfig(regularexpression): \ - SUBDIRS += icns - -qtConfig(mng): SUBDIRS += mng -qtConfig(jasper) { - SUBDIRS += jp2 -} else:darwin: { - SUBDIRS += macjp2 -} diff --git a/src/plugins/imageformats/jp2/.prev_CMakeLists.txt b/src/plugins/imageformats/jp2/.prev_CMakeLists.txt deleted file mode 100644 index 7afc730..0000000 --- a/src/plugins/imageformats/jp2/.prev_CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Generated from jp2.pro. - -##################################################################### -## QJp2Plugin Plugin: -##################################################################### - -qt_add_plugin(QJp2Plugin - OUTPUT_NAME qjp2 - TYPE imageformats - SOURCES - main.cpp - qjp2handler.cpp qjp2handler_p.h - LIBRARIES - WrapJasper::WrapJasper - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:jp2.pro:: -# OTHER_FILES = "jp2.json" -# QT_FOR_CONFIG = "imageformats-private" diff --git a/src/plugins/imageformats/jp2/jp2.pro b/src/plugins/imageformats/jp2/jp2.pro deleted file mode 100644 index d9fb4fa..0000000 --- a/src/plugins/imageformats/jp2/jp2.pro +++ /dev/null @@ -1,15 +0,0 @@ -TARGET = qjp2 - -HEADERS += qjp2handler_p.h -SOURCES += main.cpp \ - qjp2handler.cpp -OTHER_FILES += jp2.json - -include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) -QT_FOR_CONFIG += imageformats-private - -QMAKE_USE_PRIVATE += jasper - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QJp2Plugin -load(qt_plugin) diff --git a/src/plugins/imageformats/macheif/.prev_CMakeLists.txt b/src/plugins/imageformats/macheif/.prev_CMakeLists.txt deleted file mode 100644 index 6c624b2..0000000 --- a/src/plugins/imageformats/macheif/.prev_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# Generated from macheif.pro. - -##################################################################### -## QMacHeifPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QMacHeifPlugin - OUTPUT_NAME qmacheif - TYPE imageformats - SOURCES - ../shared/qiiofhelpers.cpp ../shared/qiiofhelpers_p.h - main.cpp - qmacheifhandler.cpp qmacheifhandler.h - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - ${FWCoreFoundation} - ${FWCoreGraphics} - ${FWImageIO} - Qt::Core - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate -) - -#### Keys ignored in scope 1:.:.:macheif.pro:: -# OTHER_FILES = "macheif.json" diff --git a/src/plugins/imageformats/macheif/macheif.pro b/src/plugins/imageformats/macheif/macheif.pro deleted file mode 100644 index 38e8087..0000000 --- a/src/plugins/imageformats/macheif/macheif.pro +++ /dev/null @@ -1,20 +0,0 @@ -TARGET = qmacheif -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QMacHeifPlugin - -LIBS += -framework CoreFoundation -framework CoreGraphics -framework ImageIO - -QT += core-private gui-private - -SOURCES += \ - qmacheifhandler.cpp \ - main.cpp - -HEADERS += \ - qmacheifhandler.h - -include (../shared/qiiofhelpers.pri) - -OTHER_FILES += macheif.json - -load(qt_plugin) diff --git a/src/plugins/imageformats/macjp2/macjp2.pro b/src/plugins/imageformats/macjp2/macjp2.pro deleted file mode 100644 index 9a44b69..0000000 --- a/src/plugins/imageformats/macjp2/macjp2.pro +++ /dev/null @@ -1,20 +0,0 @@ -TARGET = qmacjp2 -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QMacJp2Plugin - -LIBS += -framework CoreFoundation -framework CoreGraphics -framework ImageIO - -QT += core-private gui-private - -SOURCES += \ - qmacjp2handler.cpp \ - main.cpp - -HEADERS += \ - qmacjp2handler.h - -include (../shared/qiiofhelpers.pri) - -OTHER_FILES += macjp2.json - -load(qt_plugin) diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro deleted file mode 100644 index f509fa8..0000000 --- a/src/plugins/imageformats/mng/mng.pro +++ /dev/null @@ -1,15 +0,0 @@ -TARGET = qmng - -HEADERS += qmnghandler_p.h -SOURCES += main.cpp \ - qmnghandler.cpp -OTHER_FILES += mng.json - -include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) -QT_FOR_CONFIG += imageformats-private - -QMAKE_USE_PRIVATE += mng - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QMngPlugin -load(qt_plugin) diff --git a/src/plugins/imageformats/tga/.prev_CMakeLists.txt b/src/plugins/imageformats/tga/.prev_CMakeLists.txt deleted file mode 100644 index db1def3..0000000 --- a/src/plugins/imageformats/tga/.prev_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Generated from tga.pro. - -##################################################################### -## QTgaPlugin Plugin: -##################################################################### - -qt_add_plugin(QTgaPlugin - OUTPUT_NAME qtga - TYPE imageformats - SOURCES - main.cpp - qtgafile.cpp qtgafile.h - qtgahandler.cpp qtgahandler.h - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:tga.pro:: -# OTHER_FILES = "tga.json" diff --git a/src/plugins/imageformats/tga/tga.pro b/src/plugins/imageformats/tga/tga.pro deleted file mode 100644 index 7a04c20..0000000 --- a/src/plugins/imageformats/tga/tga.pro +++ /dev/null @@ -1,13 +0,0 @@ -TARGET = qtga - -HEADERS += qtgahandler.h \ - qtgafile.h -SOURCES += qtgahandler.cpp \ - qtgafile.cpp -OTHER_FILES += tga.json - -SOURCES += main.cpp - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QTgaPlugin -load(qt_plugin) diff --git a/src/plugins/imageformats/tiff/.prev_CMakeLists.txt b/src/plugins/imageformats/tiff/.prev_CMakeLists.txt deleted file mode 100644 index 3fe4a88..0000000 --- a/src/plugins/imageformats/tiff/.prev_CMakeLists.txt +++ /dev/null @@ -1,93 +0,0 @@ -# Generated from tiff.pro. - -##################################################################### -## QTiffPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QTiffPlugin - OUTPUT_NAME qtiff - TYPE imageformats - SOURCES - main.cpp - qtiffhandler.cpp qtiffhandler_p.h - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:tiff.pro:: -# OTHER_FILES = "tiff.json" -# QT_FOR_CONFIG = "imageformats-private" - -## Scopes: -##################################################################### - -qt_internal_extend_target(QTiffPlugin CONDITION QT_FEATURE_system_tiff - LIBRARIES - TIFF::TIFF -) - -qt_internal_extend_target(QTiffPlugin CONDITION NOT QT_FEATURE_system_tiff - SOURCES - ../../../3rdparty/libtiff/libtiff/tif_aux.c - ../../../3rdparty/libtiff/libtiff/tif_close.c - ../../../3rdparty/libtiff/libtiff/tif_codec.c - ../../../3rdparty/libtiff/libtiff/tif_color.c - ../../../3rdparty/libtiff/libtiff/tif_compress.c - ../../../3rdparty/libtiff/libtiff/tif_dir.c - ../../../3rdparty/libtiff/libtiff/tif_dirinfo.c - ../../../3rdparty/libtiff/libtiff/tif_dirread.c - ../../../3rdparty/libtiff/libtiff/tif_dirwrite.c - ../../../3rdparty/libtiff/libtiff/tif_dumpmode.c - ../../../3rdparty/libtiff/libtiff/tif_error.c - ../../../3rdparty/libtiff/libtiff/tif_extension.c - ../../../3rdparty/libtiff/libtiff/tif_fax3.c - ../../../3rdparty/libtiff/libtiff/tif_fax3sm.c - ../../../3rdparty/libtiff/libtiff/tif_flush.c - ../../../3rdparty/libtiff/libtiff/tif_getimage.c - ../../../3rdparty/libtiff/libtiff/tif_luv.c - ../../../3rdparty/libtiff/libtiff/tif_lzw.c - ../../../3rdparty/libtiff/libtiff/tif_next.c - ../../../3rdparty/libtiff/libtiff/tif_open.c - ../../../3rdparty/libtiff/libtiff/tif_packbits.c - ../../../3rdparty/libtiff/libtiff/tif_pixarlog.c - ../../../3rdparty/libtiff/libtiff/tif_predict.c - ../../../3rdparty/libtiff/libtiff/tif_print.c - ../../../3rdparty/libtiff/libtiff/tif_read.c - ../../../3rdparty/libtiff/libtiff/tif_strip.c - ../../../3rdparty/libtiff/libtiff/tif_swab.c - ../../../3rdparty/libtiff/libtiff/tif_thunder.c - ../../../3rdparty/libtiff/libtiff/tif_tile.c - ../../../3rdparty/libtiff/libtiff/tif_version.c - ../../../3rdparty/libtiff/libtiff/tif_warning.c - ../../../3rdparty/libtiff/libtiff/tif_write.c - ../../../3rdparty/libtiff/libtiff/tif_zip.c - ../../../3rdparty/libtiff/port/snprintf.c - INCLUDE_DIRECTORIES - ../../../3rdparty/libtiff/libtiff -) - -qt_internal_extend_target(QTiffPlugin CONDITION WIN32 AND NOT QT_FEATURE_system_tiff - SOURCES - ../../../3rdparty/libtiff/libtiff/tif_win32.c -) - -qt_internal_extend_target(QTiffPlugin CONDITION UNIX AND NOT QT_FEATURE_system_tiff - SOURCES - ../../../3rdparty/libtiff/libtiff/tif_unix.c -) - -qt_internal_extend_target(QTiffPlugin CONDITION ANDROID AND NOT QT_FEATURE_system_tiff - SOURCES - ../../../3rdparty/libtiff/port/lfind.c -) - -qt_internal_extend_target(QTiffPlugin CONDITION QT_FEATURE_system_zlib AND NOT QT_FEATURE_system_tiff - LIBRARIES - ZLIB::ZLIB -) - -qt_internal_extend_target(QTiffPlugin CONDITION NOT QT_FEATURE_system_tiff AND NOT QT_FEATURE_system_zlib - LIBRARIES - Qt::ZlibPrivate -) diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro deleted file mode 100644 index 0c42749..0000000 --- a/src/plugins/imageformats/tiff/tiff.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = qtiff - -HEADERS += qtiffhandler_p.h -SOURCES += main.cpp qtiffhandler.cpp -OTHER_FILES += tiff.json - -include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) -QT_FOR_CONFIG += imageformats-private - -qtConfig(system-tiff) { - QMAKE_USE_PRIVATE += tiff -} else { - include($$PWD/../../../3rdparty/libtiff.pri) -} - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QTiffPlugin -load(qt_plugin) diff --git a/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt b/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt deleted file mode 100644 index 2d6484a..0000000 --- a/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Generated from wbmp.pro. - -##################################################################### -## QWbmpPlugin Plugin: -##################################################################### - -qt_add_plugin(QWbmpPlugin - OUTPUT_NAME qwbmp - TYPE imageformats - SOURCES - main.cpp - qwbmphandler.cpp qwbmphandler_p.h - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:wbmp.pro:: -# OTHER_FILES = "wbmp.json" diff --git a/src/plugins/imageformats/wbmp/wbmp.pro b/src/plugins/imageformats/wbmp/wbmp.pro deleted file mode 100644 index f25c23c..0000000 --- a/src/plugins/imageformats/wbmp/wbmp.pro +++ /dev/null @@ -1,11 +0,0 @@ -TARGET = qwbmp - -HEADERS += qwbmphandler_p.h -SOURCES += qwbmphandler.cpp -OTHER_FILES += wbmp.json - -SOURCES += main.cpp - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QWbmpPlugin -load(qt_plugin) diff --git a/src/plugins/imageformats/webp/.prev_CMakeLists.txt b/src/plugins/imageformats/webp/.prev_CMakeLists.txt deleted file mode 100644 index b2a1564..0000000 --- a/src/plugins/imageformats/webp/.prev_CMakeLists.txt +++ /dev/null @@ -1,173 +0,0 @@ -# Generated from webp.pro. - -##################################################################### -## QWebpPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWebpPlugin - OUTPUT_NAME qwebp - TYPE imageformats - SOURCES - main.cpp - qwebphandler.cpp qwebphandler_p.h - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:webp.pro:: -# OTHER_FILES = "webp.json" -# QT_FOR_CONFIG = "imageformats-private" - -## Scopes: -##################################################################### - -qt_internal_extend_target(QWebpPlugin CONDITION QT_FEATURE_system_webp - PUBLIC_LIBRARIES - WrapWebP::WrapWebP -) - -qt_internal_extend_target(QWebpPlugin CONDITION NOT QT_FEATURE_system_webp - SOURCES - ../../../3rdparty/libwebp/src/dec/alpha_dec.c - ../../../3rdparty/libwebp/src/dec/buffer_dec.c - ../../../3rdparty/libwebp/src/dec/frame_dec.c - ../../../3rdparty/libwebp/src/dec/idec_dec.c - ../../../3rdparty/libwebp/src/dec/io_dec.c - ../../../3rdparty/libwebp/src/dec/quant_dec.c - ../../../3rdparty/libwebp/src/dec/tree_dec.c - ../../../3rdparty/libwebp/src/dec/vp8_dec.c - ../../../3rdparty/libwebp/src/dec/vp8l_dec.c - ../../../3rdparty/libwebp/src/dec/webp_dec.c - ../../../3rdparty/libwebp/src/demux/anim_decode.c - ../../../3rdparty/libwebp/src/demux/demux.c - ../../../3rdparty/libwebp/src/dsp/alpha_processing.c - ../../../3rdparty/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/alpha_processing_sse2.c - ../../../3rdparty/libwebp/src/dsp/alpha_processing_sse41.c - ../../../3rdparty/libwebp/src/dsp/cost.c - ../../../3rdparty/libwebp/src/dsp/cost_mips32.c - ../../../3rdparty/libwebp/src/dsp/cost_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/cost_neon.c - ../../../3rdparty/libwebp/src/dsp/cost_sse2.c - ../../../3rdparty/libwebp/src/dsp/cpu.c - ../../../3rdparty/libwebp/src/dsp/dec.c - ../../../3rdparty/libwebp/src/dsp/dec_clip_tables.c - ../../../3rdparty/libwebp/src/dsp/dec_mips32.c - ../../../3rdparty/libwebp/src/dsp/dec_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/dec_msa.c - ../../../3rdparty/libwebp/src/dsp/dec_sse2.c - ../../../3rdparty/libwebp/src/dsp/dec_sse41.c - ../../../3rdparty/libwebp/src/dsp/enc.c - ../../../3rdparty/libwebp/src/dsp/enc_mips32.c - ../../../3rdparty/libwebp/src/dsp/enc_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/enc_msa.c - ../../../3rdparty/libwebp/src/dsp/enc_sse2.c - ../../../3rdparty/libwebp/src/dsp/enc_sse41.c - ../../../3rdparty/libwebp/src/dsp/filters.c - ../../../3rdparty/libwebp/src/dsp/filters_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/filters_msa.c - ../../../3rdparty/libwebp/src/dsp/filters_sse2.c - ../../../3rdparty/libwebp/src/dsp/lossless.c - ../../../3rdparty/libwebp/src/dsp/lossless_enc.c - ../../../3rdparty/libwebp/src/dsp/lossless_enc_mips32.c - ../../../3rdparty/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/lossless_enc_msa.c - ../../../3rdparty/libwebp/src/dsp/lossless_enc_sse2.c - ../../../3rdparty/libwebp/src/dsp/lossless_enc_sse41.c - ../../../3rdparty/libwebp/src/dsp/lossless_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/lossless_sse2.c - ../../../3rdparty/libwebp/src/dsp/rescaler.c - ../../../3rdparty/libwebp/src/dsp/rescaler_mips32.c - ../../../3rdparty/libwebp/src/dsp/rescaler_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/rescaler_msa.c - ../../../3rdparty/libwebp/src/dsp/rescaler_sse2.c - ../../../3rdparty/libwebp/src/dsp/ssim.c - ../../../3rdparty/libwebp/src/dsp/ssim_sse2.c - ../../../3rdparty/libwebp/src/dsp/upsampling.c - ../../../3rdparty/libwebp/src/dsp/upsampling_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/upsampling_msa.c - ../../../3rdparty/libwebp/src/dsp/upsampling_sse2.c - ../../../3rdparty/libwebp/src/dsp/upsampling_sse41.c - ../../../3rdparty/libwebp/src/dsp/yuv.c - ../../../3rdparty/libwebp/src/dsp/yuv_mips32.c - ../../../3rdparty/libwebp/src/dsp/yuv_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/yuv_sse2.c - ../../../3rdparty/libwebp/src/dsp/yuv_sse41.c - ../../../3rdparty/libwebp/src/enc/alpha_enc.c - ../../../3rdparty/libwebp/src/enc/analysis_enc.c - ../../../3rdparty/libwebp/src/enc/backward_references_cost_enc.c - ../../../3rdparty/libwebp/src/enc/backward_references_enc.c - ../../../3rdparty/libwebp/src/enc/config_enc.c - ../../../3rdparty/libwebp/src/enc/cost_enc.c - ../../../3rdparty/libwebp/src/enc/filter_enc.c - ../../../3rdparty/libwebp/src/enc/frame_enc.c - ../../../3rdparty/libwebp/src/enc/histogram_enc.c - ../../../3rdparty/libwebp/src/enc/iterator_enc.c - ../../../3rdparty/libwebp/src/enc/near_lossless_enc.c - ../../../3rdparty/libwebp/src/enc/picture_csp_enc.c - ../../../3rdparty/libwebp/src/enc/picture_enc.c - ../../../3rdparty/libwebp/src/enc/picture_psnr_enc.c - ../../../3rdparty/libwebp/src/enc/picture_rescale_enc.c - ../../../3rdparty/libwebp/src/enc/picture_tools_enc.c - ../../../3rdparty/libwebp/src/enc/predictor_enc.c - ../../../3rdparty/libwebp/src/enc/quant_enc.c - ../../../3rdparty/libwebp/src/enc/syntax_enc.c - ../../../3rdparty/libwebp/src/enc/token_enc.c - ../../../3rdparty/libwebp/src/enc/tree_enc.c - ../../../3rdparty/libwebp/src/enc/vp8l_enc.c - ../../../3rdparty/libwebp/src/enc/webp_enc.c - ../../../3rdparty/libwebp/src/mux/anim_encode.c - ../../../3rdparty/libwebp/src/mux/muxedit.c - ../../../3rdparty/libwebp/src/mux/muxinternal.c - ../../../3rdparty/libwebp/src/mux/muxread.c - ../../../3rdparty/libwebp/src/utils/bit_reader_utils.c - ../../../3rdparty/libwebp/src/utils/bit_writer_utils.c - ../../../3rdparty/libwebp/src/utils/color_cache_utils.c - ../../../3rdparty/libwebp/src/utils/filters_utils.c - ../../../3rdparty/libwebp/src/utils/huffman_encode_utils.c - ../../../3rdparty/libwebp/src/utils/huffman_utils.c - ../../../3rdparty/libwebp/src/utils/quant_levels_dec_utils.c - ../../../3rdparty/libwebp/src/utils/quant_levels_utils.c - ../../../3rdparty/libwebp/src/utils/random_utils.c - ../../../3rdparty/libwebp/src/utils/rescaler_utils.c - ../../../3rdparty/libwebp/src/utils/thread_utils.c - ../../../3rdparty/libwebp/src/utils/utils.c - INCLUDE_DIRECTORIES - ../../../3rdparty/libwebp - ../../../3rdparty/libwebp/src - ../../../3rdparty/libwebp/src/dec - ../../../3rdparty/libwebp/src/dsp - ../../../3rdparty/libwebp/src/enc - ../../../3rdparty/libwebp/src/mux - ../../../3rdparty/libwebp/src/utils - ../../../3rdparty/libwebp/src/webp -) - -qt_internal_extend_target(QWebpPlugin CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FEATURE_system_webp - SOURCES - /sources/android/cpufeatures/cpu-features.c - INCLUDE_DIRECTORIES - /sources/android/cpufeatures -) - -#### Keys ignored in scope 6:.:../../../3rdparty:../../../3rdparty/libwebp.pri:INTEGRITY: -# QMAKE_CFLAGS = "-c99" - -#### Keys ignored in scope 12:.:../../../3rdparty:../../../3rdparty/libwebp.pri:else: -# QMAKE_EXTRA_COMPILERS = "neon_comp" -# neon_comp.commands = "$$QMAKE_CC" "-c" "$(CFLAGS)" "$$QMAKE_CFLAGS_NEON" "$(INCPATH)" "${QMAKE_FILE_IN}" -# neon_comp.dependency_type = "TYPE_C" -# neon_comp.input = "SOURCES_FOR_NEON" -# neon_comp.name = "compiling[neon]" "${QMAKE_FILE_IN}" -# neon_comp.output = "${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}" -# neon_comp.variable_out = "OBJECTS" - -#### Keys ignored in scope 13:.:../../../3rdparty:../../../3rdparty/libwebp.pri:MSVC: -# neon_comp.commands = "-Fo${QMAKE_FILE_OUT}" - -#### Keys ignored in scope 14:.:../../../3rdparty:../../../3rdparty/libwebp.pri:else: -# neon_comp.commands = "-o" "${QMAKE_FILE_OUT}" - -#### Keys ignored in scope 15:.:../../../3rdparty:../../../3rdparty/libwebp.pri:silent: -# neon_comp.commands = "@echo" "compiling[neon]" "${QMAKE_FILE_IN}" "&&" diff --git a/src/plugins/imageformats/webp/webp.pro b/src/plugins/imageformats/webp/webp.pro deleted file mode 100644 index cea7c78..0000000 --- a/src/plugins/imageformats/webp/webp.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = qwebp - -HEADERS += qwebphandler_p.h -SOURCES += main.cpp qwebphandler.cpp -OTHER_FILES += webp.json - -include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) -QT_FOR_CONFIG += imageformats-private - -qtConfig(system-webp) { - QMAKE_USE += webp -} else { - include($$PWD/../../../3rdparty/libwebp.pri) -} - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QWebpPlugin -load(qt_plugin) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro deleted file mode 100644 index e9abe7d..0000000 --- a/src/plugins/plugins.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = imageformats diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index 4f9cee1..0000000 --- a/src/src.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = imageformats plugins - -plugins.depends = imageformats diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt deleted file mode 100644 index 2214137..0000000 --- a/tests/.prev_CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Generated from tests.pro. - -if(QT_BUILD_STANDALONE_TESTS) - # Add qt_find_package calls for extra dependencies that need to be found when building - # the standalone tests here. -endif() -qt_build_tests() diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro deleted file mode 100644 index daa1dfb..0000000 --- a/tests/auto/auto.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ - tga \ - wbmp \ - dds \ - icns \ - jp2 \ - webp \ - heif \ - mng \ - tiff diff --git a/tests/auto/dds/dds.pro b/tests/auto/dds/dds.pro deleted file mode 100644 index da63b84..0000000 --- a/tests/auto/dds/dds.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qdds - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qdds.cpp -RESOURCES += $$PWD/../../shared/images/dds.qrc diff --git a/tests/auto/heif/heif.pro b/tests/auto/heif/heif.pro deleted file mode 100644 index 9ef1085..0000000 --- a/tests/auto/heif/heif.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qheif - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qheif.cpp -RESOURCES += $$PWD/../../shared/images/heif.qrc diff --git a/tests/auto/icns/icns.pro b/tests/auto/icns/icns.pro deleted file mode 100644 index ef891b7..0000000 --- a/tests/auto/icns/icns.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qicns - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qicns.cpp -RESOURCES += $$PWD/../../shared/images/icns.qrc diff --git a/tests/auto/jp2/jp2.pro b/tests/auto/jp2/jp2.pro deleted file mode 100644 index 26c2f83..0000000 --- a/tests/auto/jp2/jp2.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qjp2 - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qjp2.cpp -RESOURCES += $$PWD/../../shared/images/jp2.qrc diff --git a/tests/auto/mng/mng.pro b/tests/auto/mng/mng.pro deleted file mode 100644 index 64545a0..0000000 --- a/tests/auto/mng/mng.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qmng - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qmng.cpp -RESOURCES += $$PWD/../../shared/images/mng.qrc diff --git a/tests/auto/tga/tga.pro b/tests/auto/tga/tga.pro deleted file mode 100644 index 14d51c6..0000000 --- a/tests/auto/tga/tga.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qtga - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qtga.cpp -RESOURCES += $$PWD/../../shared/images/tga.qrc diff --git a/tests/auto/tiff/tiff.pro b/tests/auto/tiff/tiff.pro deleted file mode 100644 index 29ed9eb..0000000 --- a/tests/auto/tiff/tiff.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qtiff - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qtiff.cpp -RESOURCES += $$PWD/../../shared/images/tiff.qrc diff --git a/tests/auto/wbmp/wbmp.pro b/tests/auto/wbmp/wbmp.pro deleted file mode 100644 index f8b0bdd..0000000 --- a/tests/auto/wbmp/wbmp.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qwbmp - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qwbmp.cpp -RESOURCES += $$PWD/../../shared/images/wbmp.qrc diff --git a/tests/auto/webp/webp.pro b/tests/auto/webp/webp.pro deleted file mode 100644 index 666ab51..0000000 --- a/tests/auto/webp/webp.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qwebp - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qwebp.cpp -RESOURCES += $$PWD/webp.qrc diff --git a/tests/tests.pro b/tests/tests.pro deleted file mode 100644 index 6b6bdac..0000000 --- a/tests/tests.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = auto benchmarks -- cgit v1.2.3