From e1515252f1fc895448a124fe9d8f43c81a36b1ba Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sun, 21 Feb 2021 13:23:20 -0500 Subject: [PATCH] Allow compiling with Qt5 again (Qt6 is preferred) Small fix to Quazip, removes extraneous files --- hecl-gui/CMakeLists.txt | 49 ++- hecl-gui/EscapeSequenceParser.cpp | 11 + hecl-gui/quazip/.editorconfig | 6 + hecl-gui/quazip/CMakeLists.txt | 2 +- hecl-gui/quazip/NEWS.txt | 2 +- hecl-gui/quazip/quazip/CMakeLists.txt | 2 +- .../quazip/quazip/debian/libquazip0.symbols | 163 --------- hecl-gui/quazip/quazip/quazip.pri | 33 -- hecl-gui/quazip/quazip/quazip.pro | 113 ------- hecl-gui/quazip/quazip/quazip.sln | 20 -- hecl-gui/quazip/quazip/quazip.vcproj | 314 ------------------ hecl-gui/quazip/quazip/quazip.vcxproj | 183 ---------- hecl-gui/quazip/quazip/quazip.vcxproj.filters | 117 ------- hecl-gui/quazip/quazip/run_moc.bat | 3 - hecl-gui/quazip/qztest/coverage.sh | 3 - hecl-gui/quazip/qztest/qztest.pro | 54 --- hecl-gui/quazip/qztest/qztest.sln | 26 -- hecl-gui/quazip/qztest/qztest.vcproj | 293 ---------------- hecl-gui/quazip/qztest/qztest.vcxproj | 205 ------------ hecl-gui/quazip/qztest/qztest.vcxproj.filters | 108 ------ hecl-gui/quazip/qztest/run_moc.bat | 9 - 21 files changed, 51 insertions(+), 1665 deletions(-) create mode 100644 hecl-gui/quazip/.editorconfig delete mode 100644 hecl-gui/quazip/quazip/debian/libquazip0.symbols delete mode 100644 hecl-gui/quazip/quazip/quazip.pri delete mode 100644 hecl-gui/quazip/quazip/quazip.pro delete mode 100644 hecl-gui/quazip/quazip/quazip.sln delete mode 100644 hecl-gui/quazip/quazip/quazip.vcproj delete mode 100644 hecl-gui/quazip/quazip/quazip.vcxproj delete mode 100644 hecl-gui/quazip/quazip/quazip.vcxproj.filters delete mode 100644 hecl-gui/quazip/quazip/run_moc.bat delete mode 100644 hecl-gui/quazip/qztest/coverage.sh delete mode 100644 hecl-gui/quazip/qztest/qztest.pro delete mode 100644 hecl-gui/quazip/qztest/qztest.sln delete mode 100644 hecl-gui/quazip/qztest/qztest.vcproj delete mode 100644 hecl-gui/quazip/qztest/qztest.vcxproj delete mode 100644 hecl-gui/quazip/qztest/qztest.vcxproj.filters delete mode 100644 hecl-gui/quazip/qztest/run_moc.bat diff --git a/hecl-gui/CMakeLists.txt b/hecl-gui/CMakeLists.txt index 7348ec0df..fbd800025 100644 --- a/hecl-gui/CMakeLists.txt +++ b/hecl-gui/CMakeLists.txt @@ -4,22 +4,25 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core5Compat Network Widgets Xml Gui REQUIRED PATHS /usr/local/opt/qt) - -file(GLOB QUAZIP_SRCS quazip/quazip/*.c quazip/quazip/*.cpp quazip/quazip/*.h) -list(REMOVE_ITEM QUAZIP_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip/quagzipfile.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip/quagzipfile.h - ${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip/quaadler32.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip/quaadler32.h - ${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip/quacrc32.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip/quacrc32.h -) -if (NOT MSVC) - set_source_files_properties(${QUAZIP_SRCS} PROPERTIES COMPILE_OPTIONS -Wno-deprecated-declarations) +if(APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64) + set(QT_HOMEBREW_PATH /usr/local/opt/qt) +elseif(APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL arm64) + set(QT_HOMEBREW_PATH /opt/homebrew/opt/qt) +else() + set(QT_HOMEBREW_PATH "") endif() -set(QUAZIP_LIBS ${ZLIB_LIBRARIES}) +find_package(Qt6Widgets QUIET PATHS ${QT_HOMEBREW_PATH}) +if(Qt6Widgets_FOUND) + find_package(Qt6 COMPONENTS Core5Compat Network Widgets Xml Gui REQUIRED PATHS ${QT_HOMEBREW_PATH}) +else() + find_package(Qt5Widgets REQUIRED PATHS ${QT_HOMEBREW_PATH}) + find_package(Qt5 COMPONENTS Network Widgets Xml Gui REQUIRED PATHS ${QT_HOMEBREW_PATH}) +endif() + +set(BUILD_SHARED_LIBS OFF CACHE BOOL "") +set(QUAZIP_INSTALL OFF CACHE BOOL "") +add_subdirectory(quazip) add_executable(hecl-gui WIN32 MACOSX_BUNDLE ArgumentEditor.cpp @@ -76,17 +79,27 @@ target_compile_definitions(hecl-gui PRIVATE -DQT_USE_QSTRINGBUILDER ) -target_link_libraries(hecl-gui PRIVATE +if(Qt6Widgets_FOUND) + set(Qt_LIBS Qt6::Core Qt6::Core5Compat Qt6::Gui Qt6::Network Qt6::Widgets - Qt6::Xml - + Qt6::Xml) +else() + set(Qt_LIBS + Qt5::Core + Qt5::Gui + Qt5::Network + Qt5::Widgets + Qt5::Xml) +endif() +target_link_libraries(hecl-gui PRIVATE + ${Qt_LIBS} hecl-light zeus - ${QUAZIP_LIBS} + QuaZip::QuaZip ) target_include_directories(hecl-gui PRIVATE quazip/quazip) diff --git a/hecl-gui/EscapeSequenceParser.cpp b/hecl-gui/EscapeSequenceParser.cpp index 828087142..b61c41707 100644 --- a/hecl-gui/EscapeSequenceParser.cpp +++ b/hecl-gui/EscapeSequenceParser.cpp @@ -64,6 +64,7 @@ void ParseEscapeSequence(int attribute, QListIterator& i, QTextCharForm case 17: case 18: case 19: { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QString fontFamily = textCharFormat.fontFamily(); QStringList fontStyles = QFontDatabase::styles(fontFamily); int fontStyleIndex = attribute - 11; @@ -71,6 +72,16 @@ void ParseEscapeSequence(int attribute, QListIterator& i, QTextCharForm textCharFormat.setFont( QFontDatabase::font(fontFamily, fontStyles.at(fontStyleIndex), textCharFormat.font().pointSize())); } +#else + QFontDatabase fontDatabase; + QString fontFamily = textCharFormat.fontFamily(); + QStringList fontStyles = fontDatabase.styles(fontFamily); + int fontStyleIndex = attribute - 11; + if (fontStyleIndex < fontStyles.length()) { + textCharFormat.setFont( + fontDatabase.font(fontFamily, fontStyles.at(fontStyleIndex), textCharFormat.font().pointSize())); + } +#endif break; } case 20: { // Fraktur (unsupported) diff --git a/hecl-gui/quazip/.editorconfig b/hecl-gui/quazip/.editorconfig new file mode 100644 index 000000000..bae99d9c7 --- /dev/null +++ b/hecl-gui/quazip/.editorconfig @@ -0,0 +1,6 @@ +root = true + +[*] +end_of_line = lf +indent_style = space +indent_size = 4 diff --git a/hecl-gui/quazip/CMakeLists.txt b/hecl-gui/quazip/CMakeLists.txt index c314fe189..26be2c2e0 100644 --- a/hecl-gui/quazip/CMakeLists.txt +++ b/hecl-gui/quazip/CMakeLists.txt @@ -59,7 +59,7 @@ else() message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported") endif() -find_package(Qt${QUAZIP_QT_MAJOR_VERSION} OPTIONAL_COMPONENTS Zlib) +find_package(Qt${QUAZIP_QT_MAJOR_VERSION} QUIET OPTIONAL_COMPONENTS Zlib) if (Qt${QUAZIP_QT_MAJOR_VERSION}Zlib_FOUND) set(QUAZIP_LIB_LIBRARIES ${QUAZIP_LIB_LIBRARIES} Qt${QUAZIP_QT_MAJOR_VERSION}::Zlib) else() diff --git a/hecl-gui/quazip/NEWS.txt b/hecl-gui/quazip/NEWS.txt index 1ff5da636..74a0c8321 100644 --- a/hecl-gui/quazip/NEWS.txt +++ b/hecl-gui/quazip/NEWS.txt @@ -64,7 +64,7 @@ QuaZip changes * 2014-02-09 0.6.2 * QuaZipNewInfo / QuaZipFileInfo64 now provide API to access/set - NTFS time stamps - useful even on non-NTFS systems if you + NTFS time stamps - useful even on non-NTFS systems if you need more precise dates and times than default ones. * QuaZipNewInfo may now be initialized from QuaZipFileInfo64. * No more crashes when using QSaveFile as QIODevice for ZIP. diff --git a/hecl-gui/quazip/quazip/CMakeLists.txt b/hecl-gui/quazip/quazip/CMakeLists.txt index 030f7dd34..56408b1f0 100644 --- a/hecl-gui/quazip/quazip/CMakeLists.txt +++ b/hecl-gui/quazip/quazip/CMakeLists.txt @@ -53,7 +53,7 @@ set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES OUTPUT_NAME ${QUAZIP_LIB_FILE_NAME} PUBLIC_HEADER "${QUAZIP_HEADERS}" ) -target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC +target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC $ $ $ diff --git a/hecl-gui/quazip/quazip/debian/libquazip0.symbols b/hecl-gui/quazip/quazip/debian/libquazip0.symbols deleted file mode 100644 index ed3c09b6f..000000000 --- a/hecl-gui/quazip/quazip/debian/libquazip0.symbols +++ /dev/null @@ -1,163 +0,0 @@ -libquazip.so.0 libquazip0 #MINVER# - _Z24qiodevice_open_file_funcPvS_i@Base 0.4.4 - _Z24qiodevice_read_file_funcPvS_S_m@Base 0.4.4 - _Z24qiodevice_seek_file_funcPvS_mi@Base 0.4.4 - _Z24qiodevice_tell_file_funcPvS_@Base 0.4.4 - _Z25qiodevice_close_file_funcPvS_@Base 0.4.4 - _Z25qiodevice_error_file_funcPvS_@Base 0.4.4 - _Z25qiodevice_write_file_funcPvS_PKvm@Base 0.4.4 - _ZN10JlCompress10extractDirE7QStringS0_@Base 0.4.4 - _ZN10JlCompress11compressDirE7QStringS0_b@Base 0.4.4 - _ZN10JlCompress11extractFileE7QStringS0_S0_@Base 0.4.4 - _ZN10JlCompress11getFileListE7QString@Base 0.4.4 - _ZN10JlCompress12compressFileE7QStringS0_@Base 0.4.4 - _ZN10JlCompress12extractFilesE7QString11QStringListS0_@Base 0.4.4 - _ZN10JlCompress13compressFilesE7QString11QStringList@Base 0.4.4 - _ZN10QuaAdler325resetEv@Base 0.4.4 - _ZN10QuaAdler325valueEv@Base 0.4.4 - _ZN10QuaAdler326updateERK10QByteArray@Base 0.4.4 - _ZN10QuaAdler329calculateERK10QByteArray@Base 0.4.4 - _ZN10QuaAdler32C1Ev@Base 0.4.4 - _ZN10QuaAdler32C2Ev@Base 0.4.4 - _ZN10QuaZipFile10setZipNameERK7QString@Base 0.4.4 - _ZN10QuaZipFile11getFileInfoEP14QuaZipFileInfo@Base 0.4.4 - _ZN10QuaZipFile11setFileNameERK7QStringN6QuaZip15CaseSensitivityE@Base 0.4.4 - _ZN10QuaZipFile4openE6QFlagsIN9QIODevice12OpenModeFlagEE@Base 0.4.4 - _ZN10QuaZipFile4openE6QFlagsIN9QIODevice12OpenModeFlagEEPiS4_bPKc@Base 0.4.4 - _ZN10QuaZipFile4openE6QFlagsIN9QIODevice12OpenModeFlagEERK13QuaZipNewInfoPKcjiibiii@Base 0.4.4 - _ZN10QuaZipFile5closeEv@Base 0.4.4 - _ZN10QuaZipFile6setZipEP6QuaZip@Base 0.4.4 - _ZN10QuaZipFile8readDataEPcx@Base 0.4.4 - _ZN10QuaZipFile9writeDataEPKcx@Base 0.4.4 - _ZN10QuaZipFileC1EP6QuaZipP7QObject@Base 0.4.4 - _ZN10QuaZipFileC1EP7QObject@Base 0.4.4 - _ZN10QuaZipFileC1ERK7QStringP7QObject@Base 0.4.4 - _ZN10QuaZipFileC1ERK7QStringS2_N6QuaZip15CaseSensitivityEP7QObject@Base 0.4.4 - _ZN10QuaZipFileC1Ev@Base 0.4.4 - _ZN10QuaZipFileC2EP6QuaZipP7QObject@Base 0.4.4 - _ZN10QuaZipFileC2EP7QObject@Base 0.4.4 - _ZN10QuaZipFileC2ERK7QStringP7QObject@Base 0.4.4 - _ZN10QuaZipFileC2ERK7QStringS2_N6QuaZip15CaseSensitivityEP7QObject@Base 0.4.4 - _ZN10QuaZipFileC2Ev@Base 0.4.4 - _ZN10QuaZipFileD0Ev@Base 0.4.4 - _ZN10QuaZipFileD1Ev@Base 0.4.4 - _ZN10QuaZipFileD2Ev@Base 0.4.4 - _ZN13QuaZipNewInfo15setFileDateTimeERK7QString@Base 0.4.4 - _ZN13QuaZipNewInfoC1ERK7QString@Base 0.4.4 - _ZN13QuaZipNewInfoC1ERK7QStringS2_@Base 0.4.4 - _ZN13QuaZipNewInfoC2ERK7QString@Base 0.4.4 - _ZN13QuaZipNewInfoC2ERK7QStringS2_@Base 0.4.4 - _ZN13QuaZipNewInfoD1Ev@Base 0.4.4 - _ZN13QuaZipNewInfoD2Ev@Base 0.4.4 - _ZN14QuaZipFileInfoD1Ev@Base 0.4.4 - _ZN14QuaZipFileInfoD2Ev@Base 0.4.4 - _ZN6QuaZip10getUnzFileEv@Base 0.4.4 - _ZN6QuaZip10getZipFileEv@Base 0.4.4 - _ZN6QuaZip10setCommentERK7QString@Base 0.4.4 - _ZN6QuaZip10setZipNameERK7QString@Base 0.4.4 - _ZN6QuaZip11setIoDeviceEP9QIODevice@Base 0.4.4 - _ZN6QuaZip12goToNextFileEv@Base 0.4.4 - _ZN6QuaZip13goToFirstFileEv@Base 0.4.4 - _ZN6QuaZip14setCurrentFileERK7QStringNS_15CaseSensitivityE@Base 0.4.4 - _ZN6QuaZip15setCommentCodecEP10QTextCodec@Base 0.4.4 - _ZN6QuaZip15setCommentCodecEPKc@Base 0.4.4 - _ZN6QuaZip16setFileNameCodecEP10QTextCodec@Base 0.4.4 - _ZN6QuaZip16setFileNameCodecEPKc@Base 0.4.4 - _ZN6QuaZip31setDataDescriptorWritingEnabledEb@Base 0.4.4 - _ZN6QuaZip4openENS_4ModeEP19zlib_filefunc_def_s@Base 0.4.4 - _ZN6QuaZip5closeEv@Base 0.4.4 - _ZN6QuaZipC1EP9QIODevice@Base 0.4.4 - _ZN6QuaZipC1ERK7QString@Base 0.4.4 - _ZN6QuaZipC1Ev@Base 0.4.4 - _ZN6QuaZipC2EP9QIODevice@Base 0.4.4 - _ZN6QuaZipC2ERK7QString@Base 0.4.4 - _ZN6QuaZipC2Ev@Base 0.4.4 - _ZN6QuaZipD1Ev@Base 0.4.4 - _ZN6QuaZipD2Ev@Base 0.4.4 - _ZN7QStringD1Ev@Base 0.4.4 - _ZN7QStringD2Ev@Base 0.4.4 - _ZN8QuaCrc325resetEv@Base 0.4.4 - _ZN8QuaCrc325valueEv@Base 0.4.4 - _ZN8QuaCrc326updateERK10QByteArray@Base 0.4.4 - _ZN8QuaCrc329calculateERK10QByteArray@Base 0.4.4 - _ZN8QuaCrc32C1Ev@Base 0.4.4 - _ZN8QuaCrc32C2Ev@Base 0.4.4 - _ZNK10QuaZipFile10getZipNameEv@Base 0.4.4 - _ZNK10QuaZipFile10metaObjectEv@Base 0.4.4 - _ZNK10QuaZipFile11getFileNameEv@Base 0.4.4 - _ZNK10QuaZipFile11getZipErrorEv@Base 0.4.4 - _ZNK10QuaZipFile12isSequentialEv@Base 0.4.4 - _ZNK10QuaZipFile14bytesAvailableEv@Base 0.4.4 - _ZNK10QuaZipFile17getActualFileNameEv@Base 0.4.4 - _ZNK10QuaZipFile18getCaseSensitivityEv@Base 0.4.4 - _ZNK10QuaZipFile3posEv@Base 0.4.4 - _ZNK10QuaZipFile4sizeEv@Base 0.4.4 - _ZNK10QuaZipFile5atEndEv@Base 0.4.4 - _ZNK10QuaZipFile5csizeEv@Base 0.4.4 - _ZNK10QuaZipFile5isRawEv@Base 0.4.4 - _ZNK10QuaZipFile5usizeEv@Base 0.4.4 - _ZNK10QuaZipFile6getZipEv@Base 0.4.4 - _ZNK6QuaZip10getCommentEv@Base 0.4.4 - _ZNK6QuaZip10getZipNameEv@Base 0.4.4 - _ZNK6QuaZip11getIoDeviceEv@Base 0.4.4 - _ZNK6QuaZip11getZipErrorEv@Base 0.4.4 - _ZNK6QuaZip14hasCurrentFileEv@Base 0.4.4 - _ZNK6QuaZip15getCommentCodecEv@Base 0.4.4 - _ZNK6QuaZip15getEntriesCountEv@Base 0.4.4 - _ZNK6QuaZip15getFileInfoListEv@Base 0.4.4 - _ZNK6QuaZip15getFileNameListEv@Base 0.4.4 - _ZNK6QuaZip16getFileNameCodecEv@Base 0.4.4 - _ZNK6QuaZip18getCurrentFileInfoEP14QuaZipFileInfo@Base 0.4.4 - _ZNK6QuaZip18getCurrentFileNameEv@Base 0.4.4 - _ZNK6QuaZip30isDataDescriptorWritingEnabledEv@Base 0.4.4 - _ZNK6QuaZip6isOpenEv@Base 0.4.4 - _ZNK6QuaZip7getModeEv@Base 0.4.4 - _ZTI10QuaAdler32@Base 0.4.4 - _ZTI10QuaZipFile@Base 0.4.4 - _ZTI13QuaChecksum32@Base 0.4.4 - _ZTI8QuaCrc32@Base 0.4.4 - _ZTS10QuaAdler32@Base 0.4.4 - _ZTS10QuaZipFile@Base 0.4.4 - _ZTS13QuaChecksum32@Base 0.4.4 - _ZTS8QuaCrc32@Base 0.4.4 - _ZTV10QuaAdler32@Base 0.4.4 - _ZTV10QuaZipFile@Base 0.4.4 - _ZTV13QuaChecksum32@Base 0.4.4 - _ZTV8QuaCrc32@Base 0.4.4 - fill_qiodevice_filefunc@Base 0.4.4 - unzClose@Base 0.4.4 - unzCloseCurrentFile@Base 0.4.4 - unzGetCurrentFileInfo@Base 0.4.4 - unzGetFilePos@Base 0.4.4 - unzGetGlobalComment@Base 0.4.4 - unzGetGlobalInfo@Base 0.4.4 - unzGetLocalExtrafield@Base 0.4.4 - unzGetOffset@Base 0.4.4 - unzGoToFilePos@Base 0.4.4 - unzGoToFirstFile@Base 0.4.4 - unzGoToNextFile@Base 0.4.4 - unzLocateFile@Base 0.4.4 - unzOpen2@Base 0.4.4 - unzOpen@Base 0.4.4 - unzOpenCurrentFile2@Base 0.4.4 - unzOpenCurrentFile3@Base 0.4.4 - unzOpenCurrentFile@Base 0.4.4 - unzOpenCurrentFilePassword@Base 0.4.4 - unzReadCurrentFile@Base 0.4.4 - unzSetOffset@Base 0.4.4 - unzStringFileNameCompare@Base 0.4.4 - unz_copyright@Base 0.4.4 - unzeof@Base 0.4.4 - unztell@Base 0.4.4 - zipClearFlags@Base 0.4.4 - zipClose@Base 0.4.4 - zipCloseFileInZip@Base 0.4.4 - zipCloseFileInZipRaw@Base 0.4.4 - zipOpen2@Base 0.4.4 - zipOpen@Base 0.4.4 - zipOpenNewFileInZip2@Base 0.4.4 - zipOpenNewFileInZip3@Base 0.4.4 - zipOpenNewFileInZip@Base 0.4.4 - zipSetFlags@Base 0.4.4 - zipWriteInFileInZip@Base 0.4.4 - zip_copyright@Base 0.4.4 diff --git a/hecl-gui/quazip/quazip/quazip.pri b/hecl-gui/quazip/quazip/quazip.pri deleted file mode 100644 index bd0637a80..000000000 --- a/hecl-gui/quazip/quazip/quazip.pri +++ /dev/null @@ -1,33 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD -HEADERS += \ - $$PWD/minizip_crypt.h \ - $$PWD/ioapi.h \ - $$PWD/JlCompress.h \ - $$PWD/quaadler32.h \ - $$PWD/quachecksum32.h \ - $$PWD/quacrc32.h \ - $$PWD/quagzipfile.h \ - $$PWD/quaziodevice.h \ - $$PWD/quazipdir.h \ - $$PWD/quazipfile.h \ - $$PWD/quazipfileinfo.h \ - $$PWD/quazip_global.h \ - $$PWD/quazip.h \ - $$PWD/quazipnewinfo.h \ - $$PWD/unzip.h \ - $$PWD/zip.h - -SOURCES += $$PWD/qioapi.cpp \ - $$PWD/JlCompress.cpp \ - $$PWD/quaadler32.cpp \ - $$PWD/quacrc32.cpp \ - $$PWD/quagzipfile.cpp \ - $$PWD/quaziodevice.cpp \ - $$PWD/quazip.cpp \ - $$PWD/quazipdir.cpp \ - $$PWD/quazipfile.cpp \ - $$PWD/quazipfileinfo.cpp \ - $$PWD/quazipnewinfo.cpp \ - $$PWD/unzip.c \ - $$PWD/zip.c diff --git a/hecl-gui/quazip/quazip/quazip.pro b/hecl-gui/quazip/quazip/quazip.pro deleted file mode 100644 index ca1ec7d62..000000000 --- a/hecl-gui/quazip/quazip/quazip.pro +++ /dev/null @@ -1,113 +0,0 @@ -TEMPLATE = lib -CONFIG += qt warn_on -QT -= gui - -# Creating pkgconfig .pc file -CONFIG += create_prl no_install_prl create_pc - -QMAKE_PKGCONFIG_PREFIX = $$PREFIX -QMAKE_PKGCONFIG_INCDIR = $$headers.path -QMAKE_PKGCONFIG_REQUIRES = Qt5Core - -# The ABI version. - -!win32:VERSION = 1.0.0 - -# 1.0.0 is the first stable ABI. -# The next binary incompatible change will be 2.0.0 and so on. -# The existing QuaZIP policy on changing ABI requires to bump the -# major version of QuaZIP itself as well. Note that there may be -# other reasons for chaging the major version of QuaZIP, so -# in case where there is a QuaZIP major version bump but no ABI change, -# the VERSION variable will stay the same. - -# For example: - -# QuaZIP 1.0 is released after some 0.x, keeping binary compatibility. -# VERSION stays 1.0.0. -# Then some binary incompatible change is introduced. QuaZIP goes up to -# 2.0, VERSION to 2.0.0. -# And so on. - -greaterThan(QT_MAJOR_VERSION, 4) { - # disable all the Qt APIs deprecated before Qt 6.0.0 - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 -} - -# This one handles dllimport/dllexport directives. -DEFINES += QUAZIP_BUILD -DEFINES += QT_NO_CAST_FROM_ASCII -DEFINES += QT_NO_CAST_TO_ASCII -# You'll need to define this one manually if using a build system other -# than qmake or using QuaZIP sources directly in your project. -CONFIG(staticlib): DEFINES += QUAZIP_STATIC - -# Input -include(quazip.pri) - - -CONFIG(debug, debug|release) { - mac: TARGET = $$join(TARGET,,,_debug) - win32: TARGET = $$join(TARGET,,,d) -} - -unix:!symbian { - headers.path=$$PREFIX/include/quazip - headers.files=$$HEADERS - target.path=$$PREFIX/lib/$${LIB_ARCH} - QMAKE_PKGCONFIG_DESTDIR = pkgconfig - INSTALLS += headers target - - OBJECTS_DIR=.obj - MOC_DIR=.moc - -} - -win32 { - headers.path=$$PREFIX/include/quazip - headers.files=$$HEADERS - INSTALLS += headers target - CONFIG(staticlib){ - target.path=$$PREFIX/lib - QMAKE_PKGCONFIG_LIBDIR = $$PREFIX/lib/ - } else { - target.path=$$PREFIX/bin - QMAKE_PKGCONFIG_LIBDIR = $$PREFIX/bin/ - } - - ## odd, this path seems to be relative to the - ## target.path, so if we install the .dll into - ## the 'bin' dir, the .pc will go there as well, - ## unless have hack the needed path... - ## TODO any nicer solution? - QMAKE_PKGCONFIG_DESTDIR = ../lib/pkgconfig - # workaround for qdatetime.h macro bug - DEFINES += NOMINMAX -} - - -symbian { - - # Note, on Symbian you may run into troubles with LGPL. - # The point is, if your application uses some version of QuaZip, - # and a newer binary compatible version of QuaZip is released, then - # the users of your application must be able to relink it with the - # new QuaZip version. For example, to take advantage of some QuaZip - # bug fixes. - - # This is probably best achieved by building QuaZip as a static - # library and providing linkable object files of your application, - # so users can relink it. - - CONFIG += staticlib - CONFIG += debug_and_release - - LIBS += -lezip - - #Export headers to SDK Epoc32/include directory - exportheaders.sources = $$HEADERS - exportheaders.path = quazip - for(header, exportheaders.sources) { - BLD_INF_RULES.prj_exports += "$$header $$exportheaders.path/$$basename(header)" - } -} diff --git a/hecl-gui/quazip/quazip/quazip.sln b/hecl-gui/quazip/quazip/quazip.sln deleted file mode 100644 index 549f3a453..000000000 --- a/hecl-gui/quazip/quazip/quazip.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quazip", "quazip.vcproj", "{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|Win32.ActiveCfg = Debug|Win32 - {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|Win32.Build.0 = Debug|Win32 - {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|Win32.ActiveCfg = Release|Win32 - {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/hecl-gui/quazip/quazip/quazip.vcproj b/hecl-gui/quazip/quazip/quazip.vcproj deleted file mode 100644 index a23980723..000000000 --- a/hecl-gui/quazip/quazip/quazip.vcproj +++ /dev/null @@ -1,314 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hecl-gui/quazip/quazip/quazip.vcxproj b/hecl-gui/quazip/quazip/quazip.vcxproj deleted file mode 100644 index 6390b6569..000000000 --- a/hecl-gui/quazip/quazip/quazip.vcxproj +++ /dev/null @@ -1,183 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD} - Win32Proj - - - - DynamicLibrary - v120 - - - DynamicLibrary - v120 - - - DynamicLibrary - v120 - - - DynamicLibrary - v120 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - Debug\ - Debug\ - true - true - Release\ - Release\ - true - true - - - - Disabled - WIN32;_DEBUG;_WINDOWS;QUAZIP_BUILD;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - QtCored4.lib;%(AdditionalDependencies) - true - Windows - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;QUAZIP_BUILD;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - QtCored4.lib;%(AdditionalDependencies) - true - Windows - - - - - WIN32;NDEBUG;_WINDOWS;QUAZIP_BUILD;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - Qt5Core.lib;%(AdditionalDependencies) - true - Windows - true - true - MachineX86 - - - - - WIN32;NDEBUG;_WINDOWS;QUAZIP_BUILD;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - Qt5Core.lib;zlibwapi.lib;%(AdditionalDependencies) - true - Windows - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hecl-gui/quazip/quazip/quazip.vcxproj.filters b/hecl-gui/quazip/quazip/quazip.vcxproj.filters deleted file mode 100644 index 26cade116..000000000 --- a/hecl-gui/quazip/quazip/quazip.vcxproj.filters +++ /dev/null @@ -1,117 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - diff --git a/hecl-gui/quazip/quazip/run_moc.bat b/hecl-gui/quazip/quazip/run_moc.bat deleted file mode 100644 index f9aa4d982..000000000 --- a/hecl-gui/quazip/quazip/run_moc.bat +++ /dev/null @@ -1,3 +0,0 @@ -moc -o moc\moc_quazipfile.cpp quazipfile.h -moc -o moc\moc_quagzipfile.cpp quagzipfile.h -moc -o moc\moc_quaziodevice.cpp quaziodevice.h diff --git a/hecl-gui/quazip/qztest/coverage.sh b/hecl-gui/quazip/qztest/coverage.sh deleted file mode 100644 index 6890810f7..000000000 --- a/hecl-gui/quazip/qztest/coverage.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -lcov --capture -b ../quazip -d ../quazip/.obj --output-file cov.info -genhtml --demangle-cpp cov.info --output-directory cov diff --git a/hecl-gui/quazip/qztest/qztest.pro b/hecl-gui/quazip/qztest/qztest.pro deleted file mode 100644 index e16209501..000000000 --- a/hecl-gui/quazip/qztest/qztest.pro +++ /dev/null @@ -1,54 +0,0 @@ -TEMPLATE = app -QT -= gui -QT += network -CONFIG += qtestlib -CONFIG += console -CONFIG -= app_bundle -DEPENDPATH += . -INCLUDEPATH += . -!win32: LIBS += -lz -win32 { - # workaround for qdatetime.h macro bug - DEFINES += NOMINMAX -} - -greaterThan(QT_MAJOR_VERSION, 4) { - # disable all the Qt APIs deprecated before Qt 6.0.0 - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 -} - -CONFIG(staticlib): DEFINES += QUAZIP_STATIC - -# Input -HEADERS += qztest.h \ -testjlcompress.h \ -testquachecksum32.h \ -testquagzipfile.h \ -testquaziodevice.h \ -testquazipdir.h \ -testquazipfile.h \ -testquazip.h \ - testquazipnewinfo.h \ - testquazipfileinfo.h - -SOURCES += qztest.cpp \ -testjlcompress.cpp \ -testquachecksum32.cpp \ -testquagzipfile.cpp \ -testquaziodevice.cpp \ -testquazip.cpp \ -testquazipdir.cpp \ -testquazipfile.cpp \ - testquazipnewinfo.cpp \ - testquazipfileinfo.cpp - -OBJECTS_DIR = .obj -MOC_DIR = .moc - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../quazip/release/ -lquazip -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/ -lquazipd -else:mac:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/ -lquazip_debug -else:unix: LIBS += -L$$OUT_PWD/../quazip/ -lquazip - -INCLUDEPATH += $$PWD/.. -DEPENDPATH += $$PWD/../quazip diff --git a/hecl-gui/quazip/qztest/qztest.sln b/hecl-gui/quazip/qztest/qztest.sln deleted file mode 100644 index e993a0b58..000000000 --- a/hecl-gui/quazip/qztest/qztest.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qztest", "qztest.vcproj", "{7632B767-D089-4F15-8B1E-C4B3F9EBF592}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quazip", "..\quazip\quazip.vcproj", "{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Debug|Win32.ActiveCfg = Debug|Win32 - {7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Debug|Win32.Build.0 = Debug|Win32 - {7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Release|Win32.ActiveCfg = Release|Win32 - {7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Release|Win32.Build.0 = Release|Win32 - {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|Win32.ActiveCfg = Debug|Win32 - {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|Win32.Build.0 = Debug|Win32 - {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|Win32.ActiveCfg = Release|Win32 - {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/hecl-gui/quazip/qztest/qztest.vcproj b/hecl-gui/quazip/qztest/qztest.vcproj deleted file mode 100644 index 8dc703317..000000000 --- a/hecl-gui/quazip/qztest/qztest.vcproj +++ /dev/null @@ -1,293 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hecl-gui/quazip/qztest/qztest.vcxproj b/hecl-gui/quazip/qztest/qztest.vcxproj deleted file mode 100644 index 31d0c944c..000000000 --- a/hecl-gui/quazip/qztest/qztest.vcxproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7632B767-D089-4F15-8B1E-C4B3F9EBF592} - qztest - Win32Proj - - - - Application - v120 - - - Application - v120 - - - Application - v120 - - - Application - v120 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - Debug\ - Debug\ - true - true - Release\ - Release\ - true - true - - - - Disabled - ..;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - QtCored4.lib;QtTestd4.lib;%(AdditionalDependencies) - true - Console - MachineX86 - - - copy /y $(SolutionDir)\quazip\Debug\quazip.dll $(OutDir)\ - - - - - Disabled - ..;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - QtCored4.lib;QtTestd4.lib;%(AdditionalDependencies) - true - Console - - - copy /y $(SolutionDir)\quazip\Debug\quazip.dll $(OutDir)\ - - - - - ..;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - QtCore4.lib;QtTest4.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - copy /y $(SolutionDir)\quazip\Release\quazip.dll $(OutDir)\ - - - - - ..;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - Qt5Core.lib;Qt5Test.lib;Qt5Network.lib;zlibwapi.lib;%(AdditionalDependencies) - true - Console - true - true - - - - - - - - - {e4ac5f56-b711-4f0e-bc83-cde8b6cd53ad} - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hecl-gui/quazip/qztest/qztest.vcxproj.filters b/hecl-gui/quazip/qztest/qztest.vcxproj.filters deleted file mode 100644 index 7c88d3dc7..000000000 --- a/hecl-gui/quazip/qztest/qztest.vcxproj.filters +++ /dev/null @@ -1,108 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/hecl-gui/quazip/qztest/run_moc.bat b/hecl-gui/quazip/qztest/run_moc.bat deleted file mode 100644 index 75f43b473..000000000 --- a/hecl-gui/quazip/qztest/run_moc.bat +++ /dev/null @@ -1,9 +0,0 @@ -moc -o moc\moc_testjlcompress.cpp testjlcompress.h -moc -o moc\moc_testquachecksum32.cpp testquachecksum32.h -moc -o moc\moc_testquazip.cpp testquazip.h -moc -o moc\moc_testquazipfile.cpp testquazipfile.h -moc -o moc\moc_testquazipdir.cpp testquazipdir.h -moc -o moc\moc_testquagzipfile.cpp testquagzipfile.h -moc -o moc\moc_testquaziodevice.cpp testquaziodevice.h -moc -o moc\moc_testquazipfileinfo.cpp testquazipfileinfo.h -moc -o moc\moc_testquazipnewinfo.cpp testquazipnewinfo.h