diff --git a/3rdparty/qextserialport/qextserialport.pro b/3rdparty/qextserialport/qextserialport.pro index c9ca860c..06b7d572 100644 --- a/3rdparty/qextserialport/qextserialport.pro +++ b/3rdparty/qextserialport/qextserialport.pro @@ -70,6 +70,7 @@ greaterThan(QT_MAJOR_VERSION, 4) { QESP_LIB_BASENAME = qextserialport } TARGET = $$qextLibraryName($$QESP_LIB_BASENAME) + VERSION = 1.2.0 # generate feature file by qmake based on this *.in file. @@ -77,7 +78,7 @@ QMAKE_SUBSTITUTES += extserialport.prf.in OTHER_FILES += extserialport.prf.in # for make docs -include(doc/doc.pri) +#include(doc/doc.pri) # for make install win32:!qesp_static { diff --git a/3rdparty/quazip-0.5.1/quazip.pro b/3rdparty/quazip-0.5.1/quazip.pro deleted file mode 100644 index 28aa9ab6..00000000 --- a/3rdparty/quazip-0.5.1/quazip.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE=subdirs -SUBDIRS=quazip qztest diff --git a/3rdparty/quazip-0.5.1/CMakeLists.txt b/3rdparty/quazip/CMakeLists.txt similarity index 100% rename from 3rdparty/quazip-0.5.1/CMakeLists.txt rename to 3rdparty/quazip/CMakeLists.txt diff --git a/3rdparty/quazip-0.5.1/COPYING b/3rdparty/quazip/COPYING similarity index 100% rename from 3rdparty/quazip-0.5.1/COPYING rename to 3rdparty/quazip/COPYING diff --git a/3rdparty/quazip-0.5.1/Doxyfile b/3rdparty/quazip/Doxyfile similarity index 100% rename from 3rdparty/quazip-0.5.1/Doxyfile rename to 3rdparty/quazip/Doxyfile diff --git a/3rdparty/quazip-0.5.1/FindQuaZip.cmake b/3rdparty/quazip/FindQuaZip.cmake similarity index 100% rename from 3rdparty/quazip-0.5.1/FindQuaZip.cmake rename to 3rdparty/quazip/FindQuaZip.cmake diff --git a/3rdparty/quazip-0.5.1/NEWS.txt b/3rdparty/quazip/NEWS.txt similarity index 100% rename from 3rdparty/quazip-0.5.1/NEWS.txt rename to 3rdparty/quazip/NEWS.txt diff --git a/3rdparty/quazip-0.5.1/README.txt b/3rdparty/quazip/README.txt similarity index 100% rename from 3rdparty/quazip-0.5.1/README.txt rename to 3rdparty/quazip/README.txt diff --git a/3rdparty/quazip-0.5.1/doc/html/JlCompress_8h_source.html b/3rdparty/quazip/doc/html/JlCompress_8h_source.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/JlCompress_8h_source.html rename to 3rdparty/quazip/doc/html/JlCompress_8h_source.html diff --git a/3rdparty/quazip-0.5.1/doc/html/annotated.html b/3rdparty/quazip/doc/html/annotated.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/annotated.html rename to 3rdparty/quazip/doc/html/annotated.html diff --git a/3rdparty/quazip-0.5.1/doc/html/bc_s.png b/3rdparty/quazip/doc/html/bc_s.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/bc_s.png rename to 3rdparty/quazip/doc/html/bc_s.png diff --git a/3rdparty/quazip-0.5.1/doc/html/classJlCompress-members.html b/3rdparty/quazip/doc/html/classJlCompress-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classJlCompress-members.html rename to 3rdparty/quazip/doc/html/classJlCompress-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classJlCompress.html b/3rdparty/quazip/doc/html/classJlCompress.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classJlCompress.html rename to 3rdparty/quazip/doc/html/classJlCompress.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaAdler32-members.html b/3rdparty/quazip/doc/html/classQuaAdler32-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaAdler32-members.html rename to 3rdparty/quazip/doc/html/classQuaAdler32-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaAdler32.html b/3rdparty/quazip/doc/html/classQuaAdler32.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaAdler32.html rename to 3rdparty/quazip/doc/html/classQuaAdler32.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaAdler32__coll__graph.map b/3rdparty/quazip/doc/html/classQuaAdler32__coll__graph.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaAdler32__coll__graph.map rename to 3rdparty/quazip/doc/html/classQuaAdler32__coll__graph.map diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaAdler32__coll__graph.md5 b/3rdparty/quazip/doc/html/classQuaAdler32__coll__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaAdler32__coll__graph.md5 rename to 3rdparty/quazip/doc/html/classQuaAdler32__coll__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaAdler32__coll__graph.png b/3rdparty/quazip/doc/html/classQuaAdler32__coll__graph.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaAdler32__coll__graph.png rename to 3rdparty/quazip/doc/html/classQuaAdler32__coll__graph.png diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaAdler32__inherit__graph.map b/3rdparty/quazip/doc/html/classQuaAdler32__inherit__graph.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaAdler32__inherit__graph.map rename to 3rdparty/quazip/doc/html/classQuaAdler32__inherit__graph.map diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaAdler32__inherit__graph.md5 b/3rdparty/quazip/doc/html/classQuaAdler32__inherit__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaAdler32__inherit__graph.md5 rename to 3rdparty/quazip/doc/html/classQuaAdler32__inherit__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaAdler32__inherit__graph.png b/3rdparty/quazip/doc/html/classQuaAdler32__inherit__graph.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaAdler32__inherit__graph.png rename to 3rdparty/quazip/doc/html/classQuaAdler32__inherit__graph.png diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaChecksum32-members.html b/3rdparty/quazip/doc/html/classQuaChecksum32-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaChecksum32-members.html rename to 3rdparty/quazip/doc/html/classQuaChecksum32-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaChecksum32.html b/3rdparty/quazip/doc/html/classQuaChecksum32.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaChecksum32.html rename to 3rdparty/quazip/doc/html/classQuaChecksum32.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaChecksum32__inherit__graph.map b/3rdparty/quazip/doc/html/classQuaChecksum32__inherit__graph.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaChecksum32__inherit__graph.map rename to 3rdparty/quazip/doc/html/classQuaChecksum32__inherit__graph.map diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaChecksum32__inherit__graph.md5 b/3rdparty/quazip/doc/html/classQuaChecksum32__inherit__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaChecksum32__inherit__graph.md5 rename to 3rdparty/quazip/doc/html/classQuaChecksum32__inherit__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaChecksum32__inherit__graph.png b/3rdparty/quazip/doc/html/classQuaChecksum32__inherit__graph.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaChecksum32__inherit__graph.png rename to 3rdparty/quazip/doc/html/classQuaChecksum32__inherit__graph.png diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaCrc32-members.html b/3rdparty/quazip/doc/html/classQuaCrc32-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaCrc32-members.html rename to 3rdparty/quazip/doc/html/classQuaCrc32-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaCrc32.html b/3rdparty/quazip/doc/html/classQuaCrc32.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaCrc32.html rename to 3rdparty/quazip/doc/html/classQuaCrc32.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaCrc32__coll__graph.map b/3rdparty/quazip/doc/html/classQuaCrc32__coll__graph.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaCrc32__coll__graph.map rename to 3rdparty/quazip/doc/html/classQuaCrc32__coll__graph.map diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaCrc32__coll__graph.md5 b/3rdparty/quazip/doc/html/classQuaCrc32__coll__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaCrc32__coll__graph.md5 rename to 3rdparty/quazip/doc/html/classQuaCrc32__coll__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaCrc32__coll__graph.png b/3rdparty/quazip/doc/html/classQuaCrc32__coll__graph.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaCrc32__coll__graph.png rename to 3rdparty/quazip/doc/html/classQuaCrc32__coll__graph.png diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaCrc32__inherit__graph.map b/3rdparty/quazip/doc/html/classQuaCrc32__inherit__graph.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaCrc32__inherit__graph.map rename to 3rdparty/quazip/doc/html/classQuaCrc32__inherit__graph.map diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaCrc32__inherit__graph.md5 b/3rdparty/quazip/doc/html/classQuaCrc32__inherit__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaCrc32__inherit__graph.md5 rename to 3rdparty/quazip/doc/html/classQuaCrc32__inherit__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaCrc32__inherit__graph.png b/3rdparty/quazip/doc/html/classQuaCrc32__inherit__graph.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaCrc32__inherit__graph.png rename to 3rdparty/quazip/doc/html/classQuaCrc32__inherit__graph.png diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaGzipFile-members.html b/3rdparty/quazip/doc/html/classQuaGzipFile-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaGzipFile-members.html rename to 3rdparty/quazip/doc/html/classQuaGzipFile-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaGzipFile.html b/3rdparty/quazip/doc/html/classQuaGzipFile.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaGzipFile.html rename to 3rdparty/quazip/doc/html/classQuaGzipFile.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZIODevice-members.html b/3rdparty/quazip/doc/html/classQuaZIODevice-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZIODevice-members.html rename to 3rdparty/quazip/doc/html/classQuaZIODevice-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZIODevice.html b/3rdparty/quazip/doc/html/classQuaZIODevice.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZIODevice.html rename to 3rdparty/quazip/doc/html/classQuaZIODevice.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZip-members.html b/3rdparty/quazip/doc/html/classQuaZip-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZip-members.html rename to 3rdparty/quazip/doc/html/classQuaZip-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZip.html b/3rdparty/quazip/doc/html/classQuaZip.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZip.html rename to 3rdparty/quazip/doc/html/classQuaZip.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipDir-members.html b/3rdparty/quazip/doc/html/classQuaZipDir-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipDir-members.html rename to 3rdparty/quazip/doc/html/classQuaZipDir-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipDir.html b/3rdparty/quazip/doc/html/classQuaZipDir.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipDir.html rename to 3rdparty/quazip/doc/html/classQuaZipDir.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipFile-members.html b/3rdparty/quazip/doc/html/classQuaZipFile-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipFile-members.html rename to 3rdparty/quazip/doc/html/classQuaZipFile-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipFile.html b/3rdparty/quazip/doc/html/classQuaZipFile.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipFile.html rename to 3rdparty/quazip/doc/html/classQuaZipFile.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipFilePrivate-members.html b/3rdparty/quazip/doc/html/classQuaZipFilePrivate-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipFilePrivate-members.html rename to 3rdparty/quazip/doc/html/classQuaZipFilePrivate-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipFilePrivate.html b/3rdparty/quazip/doc/html/classQuaZipFilePrivate.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipFilePrivate.html rename to 3rdparty/quazip/doc/html/classQuaZipFilePrivate.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipFilePrivate__coll__graph.map b/3rdparty/quazip/doc/html/classQuaZipFilePrivate__coll__graph.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipFilePrivate__coll__graph.map rename to 3rdparty/quazip/doc/html/classQuaZipFilePrivate__coll__graph.map diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipFilePrivate__coll__graph.md5 b/3rdparty/quazip/doc/html/classQuaZipFilePrivate__coll__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipFilePrivate__coll__graph.md5 rename to 3rdparty/quazip/doc/html/classQuaZipFilePrivate__coll__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipFilePrivate__coll__graph.png b/3rdparty/quazip/doc/html/classQuaZipFilePrivate__coll__graph.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipFilePrivate__coll__graph.png rename to 3rdparty/quazip/doc/html/classQuaZipFilePrivate__coll__graph.png diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipFile__coll__graph.map b/3rdparty/quazip/doc/html/classQuaZipFile__coll__graph.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipFile__coll__graph.map rename to 3rdparty/quazip/doc/html/classQuaZipFile__coll__graph.map diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipFile__coll__graph.md5 b/3rdparty/quazip/doc/html/classQuaZipFile__coll__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipFile__coll__graph.md5 rename to 3rdparty/quazip/doc/html/classQuaZipFile__coll__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipFile__coll__graph.png b/3rdparty/quazip/doc/html/classQuaZipFile__coll__graph.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipFile__coll__graph.png rename to 3rdparty/quazip/doc/html/classQuaZipFile__coll__graph.png diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipPrivate-members.html b/3rdparty/quazip/doc/html/classQuaZipPrivate-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipPrivate-members.html rename to 3rdparty/quazip/doc/html/classQuaZipPrivate-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipPrivate.html b/3rdparty/quazip/doc/html/classQuaZipPrivate.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipPrivate.html rename to 3rdparty/quazip/doc/html/classQuaZipPrivate.html diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipPrivate__coll__graph.map b/3rdparty/quazip/doc/html/classQuaZipPrivate__coll__graph.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipPrivate__coll__graph.map rename to 3rdparty/quazip/doc/html/classQuaZipPrivate__coll__graph.map diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipPrivate__coll__graph.md5 b/3rdparty/quazip/doc/html/classQuaZipPrivate__coll__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipPrivate__coll__graph.md5 rename to 3rdparty/quazip/doc/html/classQuaZipPrivate__coll__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZipPrivate__coll__graph.png b/3rdparty/quazip/doc/html/classQuaZipPrivate__coll__graph.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZipPrivate__coll__graph.png rename to 3rdparty/quazip/doc/html/classQuaZipPrivate__coll__graph.png diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZip__coll__graph.map b/3rdparty/quazip/doc/html/classQuaZip__coll__graph.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZip__coll__graph.map rename to 3rdparty/quazip/doc/html/classQuaZip__coll__graph.map diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZip__coll__graph.md5 b/3rdparty/quazip/doc/html/classQuaZip__coll__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZip__coll__graph.md5 rename to 3rdparty/quazip/doc/html/classQuaZip__coll__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/classQuaZip__coll__graph.png b/3rdparty/quazip/doc/html/classQuaZip__coll__graph.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classQuaZip__coll__graph.png rename to 3rdparty/quazip/doc/html/classQuaZip__coll__graph.png diff --git a/3rdparty/quazip-0.5.1/doc/html/classes.html b/3rdparty/quazip/doc/html/classes.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/classes.html rename to 3rdparty/quazip/doc/html/classes.html diff --git a/3rdparty/quazip-0.5.1/doc/html/closed.png b/3rdparty/quazip/doc/html/closed.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/closed.png rename to 3rdparty/quazip/doc/html/closed.png diff --git a/3rdparty/quazip-0.5.1/doc/html/dir_6b1d21316abab84c9bd8ed600604809a.html b/3rdparty/quazip/doc/html/dir_6b1d21316abab84c9bd8ed600604809a.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/dir_6b1d21316abab84c9bd8ed600604809a.html rename to 3rdparty/quazip/doc/html/dir_6b1d21316abab84c9bd8ed600604809a.html diff --git a/3rdparty/quazip-0.5.1/doc/html/dir_6b1d21316abab84c9bd8ed600604809a_dep.map b/3rdparty/quazip/doc/html/dir_6b1d21316abab84c9bd8ed600604809a_dep.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/dir_6b1d21316abab84c9bd8ed600604809a_dep.map rename to 3rdparty/quazip/doc/html/dir_6b1d21316abab84c9bd8ed600604809a_dep.map diff --git a/3rdparty/quazip-0.5.1/doc/html/dir_6b1d21316abab84c9bd8ed600604809a_dep.md5 b/3rdparty/quazip/doc/html/dir_6b1d21316abab84c9bd8ed600604809a_dep.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/dir_6b1d21316abab84c9bd8ed600604809a_dep.md5 rename to 3rdparty/quazip/doc/html/dir_6b1d21316abab84c9bd8ed600604809a_dep.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/dir_6b1d21316abab84c9bd8ed600604809a_dep.png b/3rdparty/quazip/doc/html/dir_6b1d21316abab84c9bd8ed600604809a_dep.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/dir_6b1d21316abab84c9bd8ed600604809a_dep.png rename to 3rdparty/quazip/doc/html/dir_6b1d21316abab84c9bd8ed600604809a_dep.png diff --git a/3rdparty/quazip-0.5.1/doc/html/dirs.html b/3rdparty/quazip/doc/html/dirs.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/dirs.html rename to 3rdparty/quazip/doc/html/dirs.html diff --git a/3rdparty/quazip-0.5.1/doc/html/doxygen.css b/3rdparty/quazip/doc/html/doxygen.css similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/doxygen.css rename to 3rdparty/quazip/doc/html/doxygen.css diff --git a/3rdparty/quazip-0.5.1/doc/html/doxygen.png b/3rdparty/quazip/doc/html/doxygen.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/doxygen.png rename to 3rdparty/quazip/doc/html/doxygen.png diff --git a/3rdparty/quazip-0.5.1/doc/html/faq.html b/3rdparty/quazip/doc/html/faq.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/faq.html rename to 3rdparty/quazip/doc/html/faq.html diff --git a/3rdparty/quazip-0.5.1/doc/html/files.html b/3rdparty/quazip/doc/html/files.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/files.html rename to 3rdparty/quazip/doc/html/files.html diff --git a/3rdparty/quazip-0.5.1/doc/html/functions.html b/3rdparty/quazip/doc/html/functions.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/functions.html rename to 3rdparty/quazip/doc/html/functions.html diff --git a/3rdparty/quazip-0.5.1/doc/html/functions_enum.html b/3rdparty/quazip/doc/html/functions_enum.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/functions_enum.html rename to 3rdparty/quazip/doc/html/functions_enum.html diff --git a/3rdparty/quazip-0.5.1/doc/html/functions_eval.html b/3rdparty/quazip/doc/html/functions_eval.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/functions_eval.html rename to 3rdparty/quazip/doc/html/functions_eval.html diff --git a/3rdparty/quazip-0.5.1/doc/html/functions_func.html b/3rdparty/quazip/doc/html/functions_func.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/functions_func.html rename to 3rdparty/quazip/doc/html/functions_func.html diff --git a/3rdparty/quazip-0.5.1/doc/html/functions_vars.html b/3rdparty/quazip/doc/html/functions_vars.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/functions_vars.html rename to 3rdparty/quazip/doc/html/functions_vars.html diff --git a/3rdparty/quazip-0.5.1/doc/html/graph_legend.html b/3rdparty/quazip/doc/html/graph_legend.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/graph_legend.html rename to 3rdparty/quazip/doc/html/graph_legend.html diff --git a/3rdparty/quazip-0.5.1/doc/html/graph_legend.md5 b/3rdparty/quazip/doc/html/graph_legend.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/graph_legend.md5 rename to 3rdparty/quazip/doc/html/graph_legend.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/graph_legend.png b/3rdparty/quazip/doc/html/graph_legend.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/graph_legend.png rename to 3rdparty/quazip/doc/html/graph_legend.png diff --git a/3rdparty/quazip-0.5.1/doc/html/hierarchy.html b/3rdparty/quazip/doc/html/hierarchy.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/hierarchy.html rename to 3rdparty/quazip/doc/html/hierarchy.html diff --git a/3rdparty/quazip-0.5.1/doc/html/index.html b/3rdparty/quazip/doc/html/index.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/index.html rename to 3rdparty/quazip/doc/html/index.html diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_0.map b/3rdparty/quazip/doc/html/inherit_graph_0.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_0.map rename to 3rdparty/quazip/doc/html/inherit_graph_0.map diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_0.md5 b/3rdparty/quazip/doc/html/inherit_graph_0.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_0.md5 rename to 3rdparty/quazip/doc/html/inherit_graph_0.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_0.png b/3rdparty/quazip/doc/html/inherit_graph_0.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_0.png rename to 3rdparty/quazip/doc/html/inherit_graph_0.png diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_1.map b/3rdparty/quazip/doc/html/inherit_graph_1.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_1.map rename to 3rdparty/quazip/doc/html/inherit_graph_1.map diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_1.md5 b/3rdparty/quazip/doc/html/inherit_graph_1.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_1.md5 rename to 3rdparty/quazip/doc/html/inherit_graph_1.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_1.png b/3rdparty/quazip/doc/html/inherit_graph_1.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_1.png rename to 3rdparty/quazip/doc/html/inherit_graph_1.png diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_10.map b/3rdparty/quazip/doc/html/inherit_graph_10.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_10.map rename to 3rdparty/quazip/doc/html/inherit_graph_10.map diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_10.md5 b/3rdparty/quazip/doc/html/inherit_graph_10.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_10.md5 rename to 3rdparty/quazip/doc/html/inherit_graph_10.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_10.png b/3rdparty/quazip/doc/html/inherit_graph_10.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_10.png rename to 3rdparty/quazip/doc/html/inherit_graph_10.png diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_2.map b/3rdparty/quazip/doc/html/inherit_graph_2.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_2.map rename to 3rdparty/quazip/doc/html/inherit_graph_2.map diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_2.md5 b/3rdparty/quazip/doc/html/inherit_graph_2.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_2.md5 rename to 3rdparty/quazip/doc/html/inherit_graph_2.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_2.png b/3rdparty/quazip/doc/html/inherit_graph_2.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_2.png rename to 3rdparty/quazip/doc/html/inherit_graph_2.png diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_3.map b/3rdparty/quazip/doc/html/inherit_graph_3.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_3.map rename to 3rdparty/quazip/doc/html/inherit_graph_3.map diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_3.md5 b/3rdparty/quazip/doc/html/inherit_graph_3.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_3.md5 rename to 3rdparty/quazip/doc/html/inherit_graph_3.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_3.png b/3rdparty/quazip/doc/html/inherit_graph_3.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_3.png rename to 3rdparty/quazip/doc/html/inherit_graph_3.png diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_4.map b/3rdparty/quazip/doc/html/inherit_graph_4.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_4.map rename to 3rdparty/quazip/doc/html/inherit_graph_4.map diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_4.md5 b/3rdparty/quazip/doc/html/inherit_graph_4.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_4.md5 rename to 3rdparty/quazip/doc/html/inherit_graph_4.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_4.png b/3rdparty/quazip/doc/html/inherit_graph_4.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_4.png rename to 3rdparty/quazip/doc/html/inherit_graph_4.png diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_5.map b/3rdparty/quazip/doc/html/inherit_graph_5.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_5.map rename to 3rdparty/quazip/doc/html/inherit_graph_5.map diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_5.md5 b/3rdparty/quazip/doc/html/inherit_graph_5.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_5.md5 rename to 3rdparty/quazip/doc/html/inherit_graph_5.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_5.png b/3rdparty/quazip/doc/html/inherit_graph_5.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_5.png rename to 3rdparty/quazip/doc/html/inherit_graph_5.png diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_6.map b/3rdparty/quazip/doc/html/inherit_graph_6.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_6.map rename to 3rdparty/quazip/doc/html/inherit_graph_6.map diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_6.md5 b/3rdparty/quazip/doc/html/inherit_graph_6.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_6.md5 rename to 3rdparty/quazip/doc/html/inherit_graph_6.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_6.png b/3rdparty/quazip/doc/html/inherit_graph_6.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_6.png rename to 3rdparty/quazip/doc/html/inherit_graph_6.png diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_7.map b/3rdparty/quazip/doc/html/inherit_graph_7.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_7.map rename to 3rdparty/quazip/doc/html/inherit_graph_7.map diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_7.md5 b/3rdparty/quazip/doc/html/inherit_graph_7.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_7.md5 rename to 3rdparty/quazip/doc/html/inherit_graph_7.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_7.png b/3rdparty/quazip/doc/html/inherit_graph_7.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_7.png rename to 3rdparty/quazip/doc/html/inherit_graph_7.png diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_8.map b/3rdparty/quazip/doc/html/inherit_graph_8.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_8.map rename to 3rdparty/quazip/doc/html/inherit_graph_8.map diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_8.md5 b/3rdparty/quazip/doc/html/inherit_graph_8.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_8.md5 rename to 3rdparty/quazip/doc/html/inherit_graph_8.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_8.png b/3rdparty/quazip/doc/html/inherit_graph_8.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_8.png rename to 3rdparty/quazip/doc/html/inherit_graph_8.png diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_9.map b/3rdparty/quazip/doc/html/inherit_graph_9.map similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_9.map rename to 3rdparty/quazip/doc/html/inherit_graph_9.map diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_9.md5 b/3rdparty/quazip/doc/html/inherit_graph_9.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_9.md5 rename to 3rdparty/quazip/doc/html/inherit_graph_9.md5 diff --git a/3rdparty/quazip-0.5.1/doc/html/inherit_graph_9.png b/3rdparty/quazip/doc/html/inherit_graph_9.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherit_graph_9.png rename to 3rdparty/quazip/doc/html/inherit_graph_9.png diff --git a/3rdparty/quazip-0.5.1/doc/html/inherits.html b/3rdparty/quazip/doc/html/inherits.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/inherits.html rename to 3rdparty/quazip/doc/html/inherits.html diff --git a/3rdparty/quazip-0.5.1/doc/html/jquery.js b/3rdparty/quazip/doc/html/jquery.js similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/jquery.js rename to 3rdparty/quazip/doc/html/jquery.js diff --git a/3rdparty/quazip-0.5.1/doc/html/nav_f.png b/3rdparty/quazip/doc/html/nav_f.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/nav_f.png rename to 3rdparty/quazip/doc/html/nav_f.png diff --git a/3rdparty/quazip-0.5.1/doc/html/nav_h.png b/3rdparty/quazip/doc/html/nav_h.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/nav_h.png rename to 3rdparty/quazip/doc/html/nav_h.png diff --git a/3rdparty/quazip-0.5.1/doc/html/open.png b/3rdparty/quazip/doc/html/open.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/open.png rename to 3rdparty/quazip/doc/html/open.png diff --git a/3rdparty/quazip-0.5.1/doc/html/pages.html b/3rdparty/quazip/doc/html/pages.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/pages.html rename to 3rdparty/quazip/doc/html/pages.html diff --git a/3rdparty/quazip-0.5.1/doc/html/quaadler32_8h_source.html b/3rdparty/quazip/doc/html/quaadler32_8h_source.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/quaadler32_8h_source.html rename to 3rdparty/quazip/doc/html/quaadler32_8h_source.html diff --git a/3rdparty/quazip-0.5.1/doc/html/quachecksum32_8h_source.html b/3rdparty/quazip/doc/html/quachecksum32_8h_source.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/quachecksum32_8h_source.html rename to 3rdparty/quazip/doc/html/quachecksum32_8h_source.html diff --git a/3rdparty/quazip-0.5.1/doc/html/quacrc32_8h_source.html b/3rdparty/quazip/doc/html/quacrc32_8h_source.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/quacrc32_8h_source.html rename to 3rdparty/quazip/doc/html/quacrc32_8h_source.html diff --git a/3rdparty/quazip-0.5.1/doc/html/quagzipfile_8h_source.html b/3rdparty/quazip/doc/html/quagzipfile_8h_source.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/quagzipfile_8h_source.html rename to 3rdparty/quazip/doc/html/quagzipfile_8h_source.html diff --git a/3rdparty/quazip-0.5.1/doc/html/quaziodevice_8h_source.html b/3rdparty/quazip/doc/html/quaziodevice_8h_source.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/quaziodevice_8h_source.html rename to 3rdparty/quazip/doc/html/quaziodevice_8h_source.html diff --git a/3rdparty/quazip-0.5.1/doc/html/quazip_8h_source.html b/3rdparty/quazip/doc/html/quazip_8h_source.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/quazip_8h_source.html rename to 3rdparty/quazip/doc/html/quazip_8h_source.html diff --git a/3rdparty/quazip-0.5.1/doc/html/quazip__global_8h_source.html b/3rdparty/quazip/doc/html/quazip__global_8h_source.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/quazip__global_8h_source.html rename to 3rdparty/quazip/doc/html/quazip__global_8h_source.html diff --git a/3rdparty/quazip-0.5.1/doc/html/quazipdir_8h_source.html b/3rdparty/quazip/doc/html/quazipdir_8h_source.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/quazipdir_8h_source.html rename to 3rdparty/quazip/doc/html/quazipdir_8h_source.html diff --git a/3rdparty/quazip-0.5.1/doc/html/quazipfile_8h_source.html b/3rdparty/quazip/doc/html/quazipfile_8h_source.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/quazipfile_8h_source.html rename to 3rdparty/quazip/doc/html/quazipfile_8h_source.html diff --git a/3rdparty/quazip-0.5.1/doc/html/quazipfileinfo_8h_source.html b/3rdparty/quazip/doc/html/quazipfileinfo_8h_source.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/quazipfileinfo_8h_source.html rename to 3rdparty/quazip/doc/html/quazipfileinfo_8h_source.html diff --git a/3rdparty/quazip-0.5.1/doc/html/quazipnewinfo_8h_source.html b/3rdparty/quazip/doc/html/quazipnewinfo_8h_source.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/quazipnewinfo_8h_source.html rename to 3rdparty/quazip/doc/html/quazipnewinfo_8h_source.html diff --git a/3rdparty/quazip-0.5.1/doc/html/structQuaZipFileInfo-members.html b/3rdparty/quazip/doc/html/structQuaZipFileInfo-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/structQuaZipFileInfo-members.html rename to 3rdparty/quazip/doc/html/structQuaZipFileInfo-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/structQuaZipFileInfo.html b/3rdparty/quazip/doc/html/structQuaZipFileInfo.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/structQuaZipFileInfo.html rename to 3rdparty/quazip/doc/html/structQuaZipFileInfo.html diff --git a/3rdparty/quazip-0.5.1/doc/html/structQuaZipNewInfo-members.html b/3rdparty/quazip/doc/html/structQuaZipNewInfo-members.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/structQuaZipNewInfo-members.html rename to 3rdparty/quazip/doc/html/structQuaZipNewInfo-members.html diff --git a/3rdparty/quazip-0.5.1/doc/html/structQuaZipNewInfo.html b/3rdparty/quazip/doc/html/structQuaZipNewInfo.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/structQuaZipNewInfo.html rename to 3rdparty/quazip/doc/html/structQuaZipNewInfo.html diff --git a/3rdparty/quazip-0.5.1/doc/html/tab_a.png b/3rdparty/quazip/doc/html/tab_a.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/tab_a.png rename to 3rdparty/quazip/doc/html/tab_a.png diff --git a/3rdparty/quazip-0.5.1/doc/html/tab_b.png b/3rdparty/quazip/doc/html/tab_b.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/tab_b.png rename to 3rdparty/quazip/doc/html/tab_b.png diff --git a/3rdparty/quazip-0.5.1/doc/html/tab_h.png b/3rdparty/quazip/doc/html/tab_h.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/tab_h.png rename to 3rdparty/quazip/doc/html/tab_h.png diff --git a/3rdparty/quazip-0.5.1/doc/html/tab_s.png b/3rdparty/quazip/doc/html/tab_s.png similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/tab_s.png rename to 3rdparty/quazip/doc/html/tab_s.png diff --git a/3rdparty/quazip-0.5.1/doc/html/tabs.css b/3rdparty/quazip/doc/html/tabs.css similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/tabs.css rename to 3rdparty/quazip/doc/html/tabs.css diff --git a/3rdparty/quazip-0.5.1/doc/html/usage.html b/3rdparty/quazip/doc/html/usage.html similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/html/usage.html rename to 3rdparty/quazip/doc/html/usage.html diff --git a/3rdparty/quazip-0.5.1/doc/latex/Makefile b/3rdparty/quazip/doc/latex/Makefile similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/Makefile rename to 3rdparty/quazip/doc/latex/Makefile diff --git a/3rdparty/quazip-0.5.1/doc/latex/annotated.tex b/3rdparty/quazip/doc/latex/annotated.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/annotated.tex rename to 3rdparty/quazip/doc/latex/annotated.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/classJlCompress.tex b/3rdparty/quazip/doc/latex/classJlCompress.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classJlCompress.tex rename to 3rdparty/quazip/doc/latex/classJlCompress.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaAdler32.tex b/3rdparty/quazip/doc/latex/classQuaAdler32.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaAdler32.tex rename to 3rdparty/quazip/doc/latex/classQuaAdler32.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaAdler32__coll__graph.eps b/3rdparty/quazip/doc/latex/classQuaAdler32__coll__graph.eps similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaAdler32__coll__graph.eps rename to 3rdparty/quazip/doc/latex/classQuaAdler32__coll__graph.eps diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaAdler32__coll__graph.md5 b/3rdparty/quazip/doc/latex/classQuaAdler32__coll__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaAdler32__coll__graph.md5 rename to 3rdparty/quazip/doc/latex/classQuaAdler32__coll__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaAdler32__inherit__graph.eps b/3rdparty/quazip/doc/latex/classQuaAdler32__inherit__graph.eps similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaAdler32__inherit__graph.eps rename to 3rdparty/quazip/doc/latex/classQuaAdler32__inherit__graph.eps diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaAdler32__inherit__graph.md5 b/3rdparty/quazip/doc/latex/classQuaAdler32__inherit__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaAdler32__inherit__graph.md5 rename to 3rdparty/quazip/doc/latex/classQuaAdler32__inherit__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaChecksum32.tex b/3rdparty/quazip/doc/latex/classQuaChecksum32.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaChecksum32.tex rename to 3rdparty/quazip/doc/latex/classQuaChecksum32.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaChecksum32__inherit__graph.eps b/3rdparty/quazip/doc/latex/classQuaChecksum32__inherit__graph.eps similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaChecksum32__inherit__graph.eps rename to 3rdparty/quazip/doc/latex/classQuaChecksum32__inherit__graph.eps diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaChecksum32__inherit__graph.md5 b/3rdparty/quazip/doc/latex/classQuaChecksum32__inherit__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaChecksum32__inherit__graph.md5 rename to 3rdparty/quazip/doc/latex/classQuaChecksum32__inherit__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaCrc32.tex b/3rdparty/quazip/doc/latex/classQuaCrc32.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaCrc32.tex rename to 3rdparty/quazip/doc/latex/classQuaCrc32.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaCrc32__coll__graph.eps b/3rdparty/quazip/doc/latex/classQuaCrc32__coll__graph.eps similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaCrc32__coll__graph.eps rename to 3rdparty/quazip/doc/latex/classQuaCrc32__coll__graph.eps diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaCrc32__coll__graph.md5 b/3rdparty/quazip/doc/latex/classQuaCrc32__coll__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaCrc32__coll__graph.md5 rename to 3rdparty/quazip/doc/latex/classQuaCrc32__coll__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaCrc32__inherit__graph.eps b/3rdparty/quazip/doc/latex/classQuaCrc32__inherit__graph.eps similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaCrc32__inherit__graph.eps rename to 3rdparty/quazip/doc/latex/classQuaCrc32__inherit__graph.eps diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaCrc32__inherit__graph.md5 b/3rdparty/quazip/doc/latex/classQuaCrc32__inherit__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaCrc32__inherit__graph.md5 rename to 3rdparty/quazip/doc/latex/classQuaCrc32__inherit__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaGzipFile.tex b/3rdparty/quazip/doc/latex/classQuaGzipFile.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaGzipFile.tex rename to 3rdparty/quazip/doc/latex/classQuaGzipFile.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZIODevice.tex b/3rdparty/quazip/doc/latex/classQuaZIODevice.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZIODevice.tex rename to 3rdparty/quazip/doc/latex/classQuaZIODevice.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZip.tex b/3rdparty/quazip/doc/latex/classQuaZip.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZip.tex rename to 3rdparty/quazip/doc/latex/classQuaZip.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZipDir.tex b/3rdparty/quazip/doc/latex/classQuaZipDir.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZipDir.tex rename to 3rdparty/quazip/doc/latex/classQuaZipDir.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZipFile.tex b/3rdparty/quazip/doc/latex/classQuaZipFile.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZipFile.tex rename to 3rdparty/quazip/doc/latex/classQuaZipFile.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZipFilePrivate.tex b/3rdparty/quazip/doc/latex/classQuaZipFilePrivate.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZipFilePrivate.tex rename to 3rdparty/quazip/doc/latex/classQuaZipFilePrivate.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZipFilePrivate__coll__graph.eps b/3rdparty/quazip/doc/latex/classQuaZipFilePrivate__coll__graph.eps similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZipFilePrivate__coll__graph.eps rename to 3rdparty/quazip/doc/latex/classQuaZipFilePrivate__coll__graph.eps diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZipFilePrivate__coll__graph.md5 b/3rdparty/quazip/doc/latex/classQuaZipFilePrivate__coll__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZipFilePrivate__coll__graph.md5 rename to 3rdparty/quazip/doc/latex/classQuaZipFilePrivate__coll__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZipFile__coll__graph.eps b/3rdparty/quazip/doc/latex/classQuaZipFile__coll__graph.eps similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZipFile__coll__graph.eps rename to 3rdparty/quazip/doc/latex/classQuaZipFile__coll__graph.eps diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZipFile__coll__graph.md5 b/3rdparty/quazip/doc/latex/classQuaZipFile__coll__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZipFile__coll__graph.md5 rename to 3rdparty/quazip/doc/latex/classQuaZipFile__coll__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZipPrivate.tex b/3rdparty/quazip/doc/latex/classQuaZipPrivate.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZipPrivate.tex rename to 3rdparty/quazip/doc/latex/classQuaZipPrivate.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZipPrivate__coll__graph.eps b/3rdparty/quazip/doc/latex/classQuaZipPrivate__coll__graph.eps similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZipPrivate__coll__graph.eps rename to 3rdparty/quazip/doc/latex/classQuaZipPrivate__coll__graph.eps diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZipPrivate__coll__graph.md5 b/3rdparty/quazip/doc/latex/classQuaZipPrivate__coll__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZipPrivate__coll__graph.md5 rename to 3rdparty/quazip/doc/latex/classQuaZipPrivate__coll__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZip__coll__graph.eps b/3rdparty/quazip/doc/latex/classQuaZip__coll__graph.eps similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZip__coll__graph.eps rename to 3rdparty/quazip/doc/latex/classQuaZip__coll__graph.eps diff --git a/3rdparty/quazip-0.5.1/doc/latex/classQuaZip__coll__graph.md5 b/3rdparty/quazip/doc/latex/classQuaZip__coll__graph.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/classQuaZip__coll__graph.md5 rename to 3rdparty/quazip/doc/latex/classQuaZip__coll__graph.md5 diff --git a/3rdparty/quazip-0.5.1/doc/latex/dir_6b1d21316abab84c9bd8ed600604809a.tex b/3rdparty/quazip/doc/latex/dir_6b1d21316abab84c9bd8ed600604809a.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/dir_6b1d21316abab84c9bd8ed600604809a.tex rename to 3rdparty/quazip/doc/latex/dir_6b1d21316abab84c9bd8ed600604809a.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/dir_6b1d21316abab84c9bd8ed600604809a_dep.eps b/3rdparty/quazip/doc/latex/dir_6b1d21316abab84c9bd8ed600604809a_dep.eps similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/dir_6b1d21316abab84c9bd8ed600604809a_dep.eps rename to 3rdparty/quazip/doc/latex/dir_6b1d21316abab84c9bd8ed600604809a_dep.eps diff --git a/3rdparty/quazip-0.5.1/doc/latex/dir_6b1d21316abab84c9bd8ed600604809a_dep.md5 b/3rdparty/quazip/doc/latex/dir_6b1d21316abab84c9bd8ed600604809a_dep.md5 similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/dir_6b1d21316abab84c9bd8ed600604809a_dep.md5 rename to 3rdparty/quazip/doc/latex/dir_6b1d21316abab84c9bd8ed600604809a_dep.md5 diff --git a/3rdparty/quazip-0.5.1/doc/latex/dirs.tex b/3rdparty/quazip/doc/latex/dirs.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/dirs.tex rename to 3rdparty/quazip/doc/latex/dirs.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/doxygen.sty b/3rdparty/quazip/doc/latex/doxygen.sty similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/doxygen.sty rename to 3rdparty/quazip/doc/latex/doxygen.sty diff --git a/3rdparty/quazip-0.5.1/doc/latex/faq.tex b/3rdparty/quazip/doc/latex/faq.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/faq.tex rename to 3rdparty/quazip/doc/latex/faq.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/hierarchy.tex b/3rdparty/quazip/doc/latex/hierarchy.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/hierarchy.tex rename to 3rdparty/quazip/doc/latex/hierarchy.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/index.tex b/3rdparty/quazip/doc/latex/index.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/index.tex rename to 3rdparty/quazip/doc/latex/index.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/refman.tex b/3rdparty/quazip/doc/latex/refman.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/refman.tex rename to 3rdparty/quazip/doc/latex/refman.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/structQuaZipFileInfo.tex b/3rdparty/quazip/doc/latex/structQuaZipFileInfo.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/structQuaZipFileInfo.tex rename to 3rdparty/quazip/doc/latex/structQuaZipFileInfo.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/structQuaZipNewInfo.tex b/3rdparty/quazip/doc/latex/structQuaZipNewInfo.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/structQuaZipNewInfo.tex rename to 3rdparty/quazip/doc/latex/structQuaZipNewInfo.tex diff --git a/3rdparty/quazip-0.5.1/doc/latex/usage.tex b/3rdparty/quazip/doc/latex/usage.tex similarity index 100% rename from 3rdparty/quazip-0.5.1/doc/latex/usage.tex rename to 3rdparty/quazip/doc/latex/usage.tex diff --git a/3rdparty/quazip-0.5.1/includes.pri b/3rdparty/quazip/includes.pri similarity index 100% rename from 3rdparty/quazip-0.5.1/includes.pri rename to 3rdparty/quazip/includes.pri diff --git a/3rdparty/quazip-0.5.1/quazip.pri b/3rdparty/quazip/quazip.pri similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip.pri rename to 3rdparty/quazip/quazip.pri diff --git a/3rdparty/quazip/quazip.pro b/3rdparty/quazip/quazip.pro new file mode 100644 index 00000000..1be0df8a --- /dev/null +++ b/3rdparty/quazip/quazip.pro @@ -0,0 +1,3 @@ +TEMPLATE=subdirs +SUBDIRS=quazip +#SUBDIRS += qztest diff --git a/3rdparty/quazip-0.5.1/quazip.sln b/3rdparty/quazip/quazip.sln similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip.sln rename to 3rdparty/quazip/quazip.sln diff --git a/3rdparty/quazip-0.5.1/quazip/CMakeLists.txt b/3rdparty/quazip/quazip/CMakeLists.txt similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/CMakeLists.txt rename to 3rdparty/quazip/quazip/CMakeLists.txt diff --git a/3rdparty/quazip-0.5.1/quazip/JlCompress.cpp b/3rdparty/quazip/quazip/JlCompress.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/JlCompress.cpp rename to 3rdparty/quazip/quazip/JlCompress.cpp diff --git a/3rdparty/quazip-0.5.1/quazip/JlCompress.h b/3rdparty/quazip/quazip/JlCompress.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/JlCompress.h rename to 3rdparty/quazip/quazip/JlCompress.h diff --git a/3rdparty/quazip-0.5.1/quazip/crypt.h b/3rdparty/quazip/quazip/crypt.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/crypt.h rename to 3rdparty/quazip/quazip/crypt.h diff --git a/3rdparty/quazip-0.5.1/quazip/debian/libquazip0.symbols b/3rdparty/quazip/quazip/debian/libquazip0.symbols similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/debian/libquazip0.symbols rename to 3rdparty/quazip/quazip/debian/libquazip0.symbols diff --git a/3rdparty/quazip-0.5.1/quazip/doc/faq.dox b/3rdparty/quazip/quazip/doc/faq.dox similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/doc/faq.dox rename to 3rdparty/quazip/quazip/doc/faq.dox diff --git a/3rdparty/quazip-0.5.1/quazip/doc/index.dox b/3rdparty/quazip/quazip/doc/index.dox similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/doc/index.dox rename to 3rdparty/quazip/quazip/doc/index.dox diff --git a/3rdparty/quazip-0.5.1/quazip/doc/usage.dox b/3rdparty/quazip/quazip/doc/usage.dox similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/doc/usage.dox rename to 3rdparty/quazip/quazip/doc/usage.dox diff --git a/3rdparty/quazip-0.5.1/quazip/ioapi.h b/3rdparty/quazip/quazip/ioapi.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/ioapi.h rename to 3rdparty/quazip/quazip/ioapi.h diff --git a/3rdparty/quazip-0.5.1/quazip/qioapi.cpp b/3rdparty/quazip/quazip/qioapi.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/qioapi.cpp rename to 3rdparty/quazip/quazip/qioapi.cpp diff --git a/3rdparty/quazip-0.5.1/quazip/quaadler32.cpp b/3rdparty/quazip/quazip/quaadler32.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quaadler32.cpp rename to 3rdparty/quazip/quazip/quaadler32.cpp diff --git a/3rdparty/quazip-0.5.1/quazip/quaadler32.h b/3rdparty/quazip/quazip/quaadler32.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quaadler32.h rename to 3rdparty/quazip/quazip/quaadler32.h diff --git a/3rdparty/quazip-0.5.1/quazip/quachecksum32.h b/3rdparty/quazip/quazip/quachecksum32.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quachecksum32.h rename to 3rdparty/quazip/quazip/quachecksum32.h diff --git a/3rdparty/quazip-0.5.1/quazip/quacrc32.cpp b/3rdparty/quazip/quazip/quacrc32.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quacrc32.cpp rename to 3rdparty/quazip/quazip/quacrc32.cpp diff --git a/3rdparty/quazip-0.5.1/quazip/quacrc32.h b/3rdparty/quazip/quazip/quacrc32.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quacrc32.h rename to 3rdparty/quazip/quazip/quacrc32.h diff --git a/3rdparty/quazip-0.5.1/quazip/quagzipfile.cpp b/3rdparty/quazip/quazip/quagzipfile.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quagzipfile.cpp rename to 3rdparty/quazip/quazip/quagzipfile.cpp diff --git a/3rdparty/quazip-0.5.1/quazip/quagzipfile.h b/3rdparty/quazip/quazip/quagzipfile.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quagzipfile.h rename to 3rdparty/quazip/quazip/quagzipfile.h diff --git a/3rdparty/quazip-0.5.1/quazip/quaziodevice.cpp b/3rdparty/quazip/quazip/quaziodevice.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quaziodevice.cpp rename to 3rdparty/quazip/quazip/quaziodevice.cpp diff --git a/3rdparty/quazip-0.5.1/quazip/quaziodevice.h b/3rdparty/quazip/quazip/quaziodevice.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quaziodevice.h rename to 3rdparty/quazip/quazip/quaziodevice.h diff --git a/3rdparty/quazip-0.5.1/quazip/quazip.cpp b/3rdparty/quazip/quazip/quazip.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazip.cpp rename to 3rdparty/quazip/quazip/quazip.cpp diff --git a/3rdparty/quazip-0.5.1/quazip/quazip.h b/3rdparty/quazip/quazip/quazip.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazip.h rename to 3rdparty/quazip/quazip/quazip.h diff --git a/3rdparty/quazip-0.5.1/quazip/quazip.pri b/3rdparty/quazip/quazip/quazip.pri similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazip.pri rename to 3rdparty/quazip/quazip/quazip.pri diff --git a/3rdparty/quazip-0.5.1/quazip/quazip.pro b/3rdparty/quazip/quazip/quazip.pro similarity index 96% rename from 3rdparty/quazip-0.5.1/quazip/quazip.pro rename to 3rdparty/quazip/quazip/quazip.pro index 6b8456ff..aeb0963b 100644 --- a/3rdparty/quazip-0.5.1/quazip/quazip.pro +++ b/3rdparty/quazip/quazip/quazip.pro @@ -5,6 +5,8 @@ DEPENDPATH += . INCLUDEPATH += . !win32:VERSION = 1.0.0 +INCLUDEPATH += $$[QT_INSTALL_PREFIX]/../src/qtbase/src/3rdparty/zlib + DEFINES += QUAZIP_BUILD CONFIG(staticlib): DEFINES += QUAZIP_STATIC diff --git a/3rdparty/quazip-0.5.1/quazip/quazip.sln b/3rdparty/quazip/quazip/quazip.sln similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazip.sln rename to 3rdparty/quazip/quazip/quazip.sln diff --git a/3rdparty/quazip-0.5.1/quazip/quazip.vcproj b/3rdparty/quazip/quazip/quazip.vcproj similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazip.vcproj rename to 3rdparty/quazip/quazip/quazip.vcproj diff --git a/3rdparty/quazip-0.5.1/quazip/quazip.vcxproj b/3rdparty/quazip/quazip/quazip.vcxproj similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazip.vcxproj rename to 3rdparty/quazip/quazip/quazip.vcxproj diff --git a/3rdparty/quazip-0.5.1/quazip/quazip.vcxproj.filters b/3rdparty/quazip/quazip/quazip.vcxproj.filters similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazip.vcxproj.filters rename to 3rdparty/quazip/quazip/quazip.vcxproj.filters diff --git a/3rdparty/quazip-0.5.1/quazip/quazip_global.h b/3rdparty/quazip/quazip/quazip_global.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazip_global.h rename to 3rdparty/quazip/quazip/quazip_global.h diff --git a/3rdparty/quazip-0.5.1/quazip/quazipdir.cpp b/3rdparty/quazip/quazip/quazipdir.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazipdir.cpp rename to 3rdparty/quazip/quazip/quazipdir.cpp diff --git a/3rdparty/quazip-0.5.1/quazip/quazipdir.h b/3rdparty/quazip/quazip/quazipdir.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazipdir.h rename to 3rdparty/quazip/quazip/quazipdir.h diff --git a/3rdparty/quazip-0.5.1/quazip/quazipfile.cpp b/3rdparty/quazip/quazip/quazipfile.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazipfile.cpp rename to 3rdparty/quazip/quazip/quazipfile.cpp diff --git a/3rdparty/quazip-0.5.1/quazip/quazipfile.h b/3rdparty/quazip/quazip/quazipfile.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazipfile.h rename to 3rdparty/quazip/quazip/quazipfile.h diff --git a/3rdparty/quazip-0.5.1/quazip/quazipfileinfo.cpp b/3rdparty/quazip/quazip/quazipfileinfo.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazipfileinfo.cpp rename to 3rdparty/quazip/quazip/quazipfileinfo.cpp diff --git a/3rdparty/quazip-0.5.1/quazip/quazipfileinfo.h b/3rdparty/quazip/quazip/quazipfileinfo.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazipfileinfo.h rename to 3rdparty/quazip/quazip/quazipfileinfo.h diff --git a/3rdparty/quazip-0.5.1/quazip/quazipnewinfo.cpp b/3rdparty/quazip/quazip/quazipnewinfo.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazipnewinfo.cpp rename to 3rdparty/quazip/quazip/quazipnewinfo.cpp diff --git a/3rdparty/quazip-0.5.1/quazip/quazipnewinfo.h b/3rdparty/quazip/quazip/quazipnewinfo.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/quazipnewinfo.h rename to 3rdparty/quazip/quazip/quazipnewinfo.h diff --git a/3rdparty/quazip-0.5.1/quazip/run_moc.bat b/3rdparty/quazip/quazip/run_moc.bat similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/run_moc.bat rename to 3rdparty/quazip/quazip/run_moc.bat diff --git a/3rdparty/quazip-0.5.1/quazip/unzip.c b/3rdparty/quazip/quazip/unzip.c similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/unzip.c rename to 3rdparty/quazip/quazip/unzip.c diff --git a/3rdparty/quazip-0.5.1/quazip/unzip.h b/3rdparty/quazip/quazip/unzip.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/unzip.h rename to 3rdparty/quazip/quazip/unzip.h diff --git a/3rdparty/quazip-0.5.1/quazip/zip.c b/3rdparty/quazip/quazip/zip.c similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/zip.c rename to 3rdparty/quazip/quazip/zip.c diff --git a/3rdparty/quazip-0.5.1/quazip/zip.h b/3rdparty/quazip/quazip/zip.h similarity index 100% rename from 3rdparty/quazip-0.5.1/quazip/zip.h rename to 3rdparty/quazip/quazip/zip.h diff --git a/3rdparty/quazip-0.5.1/qztest/qztest.cpp b/3rdparty/quazip/qztest/qztest.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/qztest.cpp rename to 3rdparty/quazip/qztest/qztest.cpp diff --git a/3rdparty/quazip-0.5.1/qztest/qztest.h b/3rdparty/quazip/qztest/qztest.h similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/qztest.h rename to 3rdparty/quazip/qztest/qztest.h diff --git a/3rdparty/quazip-0.5.1/qztest/qztest.pro b/3rdparty/quazip/qztest/qztest.pro similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/qztest.pro rename to 3rdparty/quazip/qztest/qztest.pro diff --git a/3rdparty/quazip-0.5.1/qztest/qztest.sln b/3rdparty/quazip/qztest/qztest.sln similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/qztest.sln rename to 3rdparty/quazip/qztest/qztest.sln diff --git a/3rdparty/quazip-0.5.1/qztest/qztest.vcproj b/3rdparty/quazip/qztest/qztest.vcproj similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/qztest.vcproj rename to 3rdparty/quazip/qztest/qztest.vcproj diff --git a/3rdparty/quazip-0.5.1/qztest/qztest.vcxproj b/3rdparty/quazip/qztest/qztest.vcxproj similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/qztest.vcxproj rename to 3rdparty/quazip/qztest/qztest.vcxproj diff --git a/3rdparty/quazip-0.5.1/qztest/qztest.vcxproj.filters b/3rdparty/quazip/qztest/qztest.vcxproj.filters similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/qztest.vcxproj.filters rename to 3rdparty/quazip/qztest/qztest.vcxproj.filters diff --git a/3rdparty/quazip-0.5.1/qztest/run_moc.bat b/3rdparty/quazip/qztest/run_moc.bat similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/run_moc.bat rename to 3rdparty/quazip/qztest/run_moc.bat diff --git a/3rdparty/quazip-0.5.1/qztest/testjlcompress.cpp b/3rdparty/quazip/qztest/testjlcompress.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testjlcompress.cpp rename to 3rdparty/quazip/qztest/testjlcompress.cpp diff --git a/3rdparty/quazip-0.5.1/qztest/testjlcompress.h b/3rdparty/quazip/qztest/testjlcompress.h similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testjlcompress.h rename to 3rdparty/quazip/qztest/testjlcompress.h diff --git a/3rdparty/quazip-0.5.1/qztest/testquachecksum32.cpp b/3rdparty/quazip/qztest/testquachecksum32.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testquachecksum32.cpp rename to 3rdparty/quazip/qztest/testquachecksum32.cpp diff --git a/3rdparty/quazip-0.5.1/qztest/testquachecksum32.h b/3rdparty/quazip/qztest/testquachecksum32.h similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testquachecksum32.h rename to 3rdparty/quazip/qztest/testquachecksum32.h diff --git a/3rdparty/quazip-0.5.1/qztest/testquagzipfile.cpp b/3rdparty/quazip/qztest/testquagzipfile.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testquagzipfile.cpp rename to 3rdparty/quazip/qztest/testquagzipfile.cpp diff --git a/3rdparty/quazip-0.5.1/qztest/testquagzipfile.h b/3rdparty/quazip/qztest/testquagzipfile.h similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testquagzipfile.h rename to 3rdparty/quazip/qztest/testquagzipfile.h diff --git a/3rdparty/quazip-0.5.1/qztest/testquaziodevice.cpp b/3rdparty/quazip/qztest/testquaziodevice.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testquaziodevice.cpp rename to 3rdparty/quazip/qztest/testquaziodevice.cpp diff --git a/3rdparty/quazip-0.5.1/qztest/testquaziodevice.h b/3rdparty/quazip/qztest/testquaziodevice.h similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testquaziodevice.h rename to 3rdparty/quazip/qztest/testquaziodevice.h diff --git a/3rdparty/quazip-0.5.1/qztest/testquazip.cpp b/3rdparty/quazip/qztest/testquazip.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testquazip.cpp rename to 3rdparty/quazip/qztest/testquazip.cpp diff --git a/3rdparty/quazip-0.5.1/qztest/testquazip.h b/3rdparty/quazip/qztest/testquazip.h similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testquazip.h rename to 3rdparty/quazip/qztest/testquazip.h diff --git a/3rdparty/quazip-0.5.1/qztest/testquazipdir.cpp b/3rdparty/quazip/qztest/testquazipdir.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testquazipdir.cpp rename to 3rdparty/quazip/qztest/testquazipdir.cpp diff --git a/3rdparty/quazip-0.5.1/qztest/testquazipdir.h b/3rdparty/quazip/qztest/testquazipdir.h similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testquazipdir.h rename to 3rdparty/quazip/qztest/testquazipdir.h diff --git a/3rdparty/quazip-0.5.1/qztest/testquazipfile.cpp b/3rdparty/quazip/qztest/testquazipfile.cpp similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testquazipfile.cpp rename to 3rdparty/quazip/qztest/testquazipfile.cpp diff --git a/3rdparty/quazip-0.5.1/qztest/testquazipfile.h b/3rdparty/quazip/qztest/testquazipfile.h similarity index 100% rename from 3rdparty/quazip-0.5.1/qztest/testquazipfile.h rename to 3rdparty/quazip/qztest/testquazipfile.h diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index 056b9471..95b5b9a2 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -1,212 +1,8 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2011-06-20T22:05:30 -# -#------------------------------------------------- +TEMPLATE = subdirs -QT += core gui opengl network xml +SUBDIRS = 3rdparty src -greaterThan(QT_MAJOR_VERSION,4): QT += widgets webkitwidgets -lessThan(QT_MAJOR_VERSION,5): QT += webkit +CONFIG += ordered -CONFIG += rtti +src.depends = 3rdparty -#static { -# CONFIG += static -# QTPLUGIN += qsvg qgif - -# DEFINES += STATIC // Equivalent to "#define STATIC" in source code -# message("Static build.") -#} - -TARGET = SleepyHead -unix:!macx { -TARGET.path=/usr/bin -} - -TEMPLATE = app - -# GIT_VERSION = $$system(git describe --tags --long --abbrev=6 --dirty="*") - -exists(.git):DEFINES += GIT_BRANCH=\\\"$$system(git rev-parse --abbrev-ref HEAD)\\\" -else:DEFINES += GIT_BRANCH=\\\"UNKNOWN\\\" - -exists(.git):DEFINES += GIT_REVISION=\\\"$$system(git rev-parse HEAD)\\\" -else:DEFINES += GIT_REVISION=\\\"UNKNOWN\\\" - -unix:!macx:LIBS += -lX11 -lz -lGLU - -macx { - SOURCES += - LIBS += -framework IOKit -framework CoreFoundation -lz - ICON = icons/iconfile.icns -} - -win32 { - DEFINES += WINVER=0x0501 # needed for mingw to pull in appropriate dbt business...probably a better way to do this - LIBS += -lsetupapi -lz -} -if (win32-msvc2008|win32-msvc2010|win32-msvc2012):!equals(TEMPLATE_PREFIX, "vc") { - LIBS += -ladvapi32 - DEFINES += BUILD_WITH_MSVC=1 -} - -include(3rdparty/qextserialport/src/qextserialport.pri) -include(3rdparty/quazip-0.5.1/quazip/quazip.pri) - -#include(SleepLib2/sleeplib.pri) - -SOURCES += main.cpp\ - SleepLib/machine.cpp \ - SleepLib/machine_loader.cpp \ - SleepLib/preferences.cpp \ - SleepLib/profiles.cpp \ - SleepLib/loader_plugins/cms50_loader.cpp \ - SleepLib/loader_plugins/prs1_loader.cpp \ - SleepLib/loader_plugins/zeo_loader.cpp \ - SleepLib/loader_plugins/resmed_loader.cpp \ - daily.cpp \ - oximetry.cpp \ - overview.cpp \ - mainwindow.cpp \ - SleepLib/event.cpp \ - SleepLib/session.cpp \ - SleepLib/day.cpp \ - Graphs/gLineChart.cpp \ - Graphs/gLineOverlay.cpp \ - Graphs/gFooBar.cpp \ - Graphs/gXAxis.cpp \ - Graphs/gYAxis.cpp \ - Graphs/gFlagsLine.cpp \ - Graphs/glcommon.cpp \ - Graphs/gSegmentChart.cpp \ - preferencesdialog.cpp \ - Graphs/gGraphView.cpp \ - Graphs/gStatsLine.cpp \ - Graphs/gSummaryChart.cpp \ - SleepLib/schema.cpp \ - profileselect.cpp \ - newprofile.cpp \ - exportcsv.cpp \ - common_gui.cpp \ - SleepLib/loader_plugins/intellipap_loader.cpp \ - SleepLib/calcs.cpp \ - updateparser.cpp \ - UpdaterWindow.cpp \ - SleepLib/common.cpp \ - SleepLib/loader_plugins/icon_loader.cpp \ - SleepLib/loader_plugins/mseries_loader.cpp \ - reports.cpp \ - summary.cpp - -HEADERS += \ - SleepLib/machine.h \ - SleepLib/machine_loader.h \ - SleepLib/preferences.h \ - SleepLib/profiles.h \ - SleepLib/loader_plugins/cms50_loader.h \ - SleepLib/loader_plugins/prs1_loader.h \ - SleepLib/loader_plugins/zeo_loader.h \ - oximetry.h \ - daily.h \ - overview.h \ - mainwindow.h \ - SleepLib/event.h \ - SleepLib/machine_common.h \ - SleepLib/session.h \ - SleepLib/day.h \ - Graphs/gLineChart.h \ - Graphs/gLineOverlay.h \ - Graphs/gFooBar.h \ - Graphs/gXAxis.h \ - Graphs/gYAxis.h \ - Graphs/gFlagsLine.h \ - Graphs/glcommon.h \ - Graphs/gSegmentChart.h\ - SleepLib/loader_plugins/resmed_loader.h \ - preferencesdialog.h \ - Graphs/gGraphView.h \ - Graphs/gStatsLine.h \ - Graphs/gSummaryChart.h \ - SleepLib/schema.h \ - profileselect.h \ - newprofile.h \ - exportcsv.h \ - common_gui.h \ - SleepLib/loader_plugins/intellipap_loader.h \ - SleepLib/calcs.h \ - version.h \ - updateparser.h \ - UpdaterWindow.h \ - SleepLib/common.h \ - SleepLib/loader_plugins/icon_loader.h \ - SleepLib/loader_plugins/mseries_loader.h \ - reports.h \ - summary.h - - -FORMS += \ - daily.ui \ - overview.ui \ - mainwindow.ui \ - oximetry.ui \ - preferencesdialog.ui \ - report.ui \ - profileselect.ui \ - newprofile.ui \ - exportcsv.ui \ - UpdaterWindow.ui - -RESOURCES += \ - Resources.qrc - -OTHER_FILES += \ - docs/index.html \ - docs/usage.html \ - docs/schema.xml \ - docs/graphs.xml \ - docs/channels.xml \ - docs/release_notes.html \ - docs/startup_tips.txt \ - docs/countries.txt \ - docs/tz.txt \ - LICENSE.txt \ - docs/tooltips.css \ - docs/script.js \ - update.xml \ - docs/changelog.txt \ - docs/update_notes.html \ - qextserialport/qextserialport.pri - -TRANSLATIONS += \ - Translations/Nederlands.nl_NL.ts \ - Translations/Francais.fr.ts \ - Translations/Svenska.se.ts \ - Translations/Deutsch.de_DE.ts \ - Translations/Espaniol.es.ts - -win32 { - CONFIG(debug, debug|release) { - DDIR = $$OUT_PWD/debug/Translations - } - CONFIG(release, debug|release) { - DDIR = $$OUT_PWD/release/Translations - } - DDIR ~= s,/,\\,g - - TRANS_FILES += $$PWD/Translations/*.qm - TRANS_FILES_WIN = $${TRANS_FILES} - TRANS_FILES_WIN ~= s,/,\\,g - - system(mkdir $$quote($$DDIR)) - - for(FILE,TRANS_FILES_WIN){ - system(xcopy /y $$quote($$FILE) $$quote($$DDIR)) - } -} - -mac { - TransFiles.files = Translations - TransFiles.path = Contents/MacOS - QMAKE_BUNDLE_DATA += TransFiles -} diff --git a/Graphs/gFlagsLine.cpp b/src/Graphs/gFlagsLine.cpp similarity index 100% rename from Graphs/gFlagsLine.cpp rename to src/Graphs/gFlagsLine.cpp diff --git a/Graphs/gFlagsLine.h b/src/Graphs/gFlagsLine.h similarity index 100% rename from Graphs/gFlagsLine.h rename to src/Graphs/gFlagsLine.h diff --git a/Graphs/gFooBar.cpp b/src/Graphs/gFooBar.cpp similarity index 100% rename from Graphs/gFooBar.cpp rename to src/Graphs/gFooBar.cpp diff --git a/Graphs/gFooBar.h b/src/Graphs/gFooBar.h similarity index 100% rename from Graphs/gFooBar.h rename to src/Graphs/gFooBar.h diff --git a/Graphs/gGraphView.cpp b/src/Graphs/gGraphView.cpp similarity index 100% rename from Graphs/gGraphView.cpp rename to src/Graphs/gGraphView.cpp diff --git a/Graphs/gGraphView.h b/src/Graphs/gGraphView.h similarity index 100% rename from Graphs/gGraphView.h rename to src/Graphs/gGraphView.h diff --git a/Graphs/gLineChart.cpp b/src/Graphs/gLineChart.cpp similarity index 100% rename from Graphs/gLineChart.cpp rename to src/Graphs/gLineChart.cpp diff --git a/Graphs/gLineChart.h b/src/Graphs/gLineChart.h similarity index 100% rename from Graphs/gLineChart.h rename to src/Graphs/gLineChart.h diff --git a/Graphs/gLineOverlay.cpp b/src/Graphs/gLineOverlay.cpp similarity index 100% rename from Graphs/gLineOverlay.cpp rename to src/Graphs/gLineOverlay.cpp diff --git a/Graphs/gLineOverlay.h b/src/Graphs/gLineOverlay.h similarity index 100% rename from Graphs/gLineOverlay.h rename to src/Graphs/gLineOverlay.h diff --git a/Graphs/gSegmentChart.cpp b/src/Graphs/gSegmentChart.cpp similarity index 100% rename from Graphs/gSegmentChart.cpp rename to src/Graphs/gSegmentChart.cpp diff --git a/Graphs/gSegmentChart.h b/src/Graphs/gSegmentChart.h similarity index 100% rename from Graphs/gSegmentChart.h rename to src/Graphs/gSegmentChart.h diff --git a/Graphs/gStatsLine.cpp b/src/Graphs/gStatsLine.cpp similarity index 100% rename from Graphs/gStatsLine.cpp rename to src/Graphs/gStatsLine.cpp diff --git a/Graphs/gStatsLine.h b/src/Graphs/gStatsLine.h similarity index 100% rename from Graphs/gStatsLine.h rename to src/Graphs/gStatsLine.h diff --git a/Graphs/gSummaryChart.cpp b/src/Graphs/gSummaryChart.cpp similarity index 100% rename from Graphs/gSummaryChart.cpp rename to src/Graphs/gSummaryChart.cpp diff --git a/Graphs/gSummaryChart.h b/src/Graphs/gSummaryChart.h similarity index 100% rename from Graphs/gSummaryChart.h rename to src/Graphs/gSummaryChart.h diff --git a/Graphs/gXAxis.cpp b/src/Graphs/gXAxis.cpp similarity index 100% rename from Graphs/gXAxis.cpp rename to src/Graphs/gXAxis.cpp diff --git a/Graphs/gXAxis.h b/src/Graphs/gXAxis.h similarity index 100% rename from Graphs/gXAxis.h rename to src/Graphs/gXAxis.h diff --git a/Graphs/gYAxis.cpp b/src/Graphs/gYAxis.cpp similarity index 100% rename from Graphs/gYAxis.cpp rename to src/Graphs/gYAxis.cpp diff --git a/Graphs/gYAxis.h b/src/Graphs/gYAxis.h similarity index 100% rename from Graphs/gYAxis.h rename to src/Graphs/gYAxis.h diff --git a/Graphs/glcommon.cpp b/src/Graphs/glcommon.cpp similarity index 100% rename from Graphs/glcommon.cpp rename to src/Graphs/glcommon.cpp diff --git a/Graphs/glcommon.h b/src/Graphs/glcommon.h similarity index 100% rename from Graphs/glcommon.h rename to src/Graphs/glcommon.h diff --git a/Graphs/graphdata.h b/src/Graphs/graphdata.h similarity index 100% rename from Graphs/graphdata.h rename to src/Graphs/graphdata.h diff --git a/Graphs/graphdata_custom.h b/src/Graphs/graphdata_custom.h similarity index 100% rename from Graphs/graphdata_custom.h rename to src/Graphs/graphdata_custom.h diff --git a/SleepLib/calcs.cpp b/src/SleepLib/calcs.cpp similarity index 100% rename from SleepLib/calcs.cpp rename to src/SleepLib/calcs.cpp diff --git a/SleepLib/calcs.h b/src/SleepLib/calcs.h similarity index 100% rename from SleepLib/calcs.h rename to src/SleepLib/calcs.h diff --git a/SleepLib/common.cpp b/src/SleepLib/common.cpp similarity index 100% rename from SleepLib/common.cpp rename to src/SleepLib/common.cpp diff --git a/SleepLib/common.h b/src/SleepLib/common.h similarity index 100% rename from SleepLib/common.h rename to src/SleepLib/common.h diff --git a/SleepLib/day.cpp b/src/SleepLib/day.cpp similarity index 100% rename from SleepLib/day.cpp rename to src/SleepLib/day.cpp diff --git a/SleepLib/day.h b/src/SleepLib/day.h similarity index 100% rename from SleepLib/day.h rename to src/SleepLib/day.h diff --git a/SleepLib/event.cpp b/src/SleepLib/event.cpp similarity index 100% rename from SleepLib/event.cpp rename to src/SleepLib/event.cpp diff --git a/SleepLib/event.h b/src/SleepLib/event.h similarity index 100% rename from SleepLib/event.h rename to src/SleepLib/event.h diff --git a/SleepLib/loader_plugins/cms50_loader.cpp b/src/SleepLib/loader_plugins/cms50_loader.cpp similarity index 100% rename from SleepLib/loader_plugins/cms50_loader.cpp rename to src/SleepLib/loader_plugins/cms50_loader.cpp diff --git a/SleepLib/loader_plugins/cms50_loader.h b/src/SleepLib/loader_plugins/cms50_loader.h similarity index 100% rename from SleepLib/loader_plugins/cms50_loader.h rename to src/SleepLib/loader_plugins/cms50_loader.h diff --git a/SleepLib/loader_plugins/icon_loader.cpp b/src/SleepLib/loader_plugins/icon_loader.cpp similarity index 100% rename from SleepLib/loader_plugins/icon_loader.cpp rename to src/SleepLib/loader_plugins/icon_loader.cpp diff --git a/SleepLib/loader_plugins/icon_loader.h b/src/SleepLib/loader_plugins/icon_loader.h similarity index 100% rename from SleepLib/loader_plugins/icon_loader.h rename to src/SleepLib/loader_plugins/icon_loader.h diff --git a/SleepLib/loader_plugins/intellipap_loader.cpp b/src/SleepLib/loader_plugins/intellipap_loader.cpp similarity index 100% rename from SleepLib/loader_plugins/intellipap_loader.cpp rename to src/SleepLib/loader_plugins/intellipap_loader.cpp diff --git a/SleepLib/loader_plugins/intellipap_loader.h b/src/SleepLib/loader_plugins/intellipap_loader.h similarity index 100% rename from SleepLib/loader_plugins/intellipap_loader.h rename to src/SleepLib/loader_plugins/intellipap_loader.h diff --git a/SleepLib/loader_plugins/mseries_loader.cpp b/src/SleepLib/loader_plugins/mseries_loader.cpp similarity index 100% rename from SleepLib/loader_plugins/mseries_loader.cpp rename to src/SleepLib/loader_plugins/mseries_loader.cpp diff --git a/SleepLib/loader_plugins/mseries_loader.h b/src/SleepLib/loader_plugins/mseries_loader.h similarity index 100% rename from SleepLib/loader_plugins/mseries_loader.h rename to src/SleepLib/loader_plugins/mseries_loader.h diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/src/SleepLib/loader_plugins/prs1_loader.cpp similarity index 100% rename from SleepLib/loader_plugins/prs1_loader.cpp rename to src/SleepLib/loader_plugins/prs1_loader.cpp diff --git a/SleepLib/loader_plugins/prs1_loader.h b/src/SleepLib/loader_plugins/prs1_loader.h similarity index 100% rename from SleepLib/loader_plugins/prs1_loader.h rename to src/SleepLib/loader_plugins/prs1_loader.h diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/src/SleepLib/loader_plugins/resmed_loader.cpp similarity index 100% rename from SleepLib/loader_plugins/resmed_loader.cpp rename to src/SleepLib/loader_plugins/resmed_loader.cpp diff --git a/SleepLib/loader_plugins/resmed_loader.h b/src/SleepLib/loader_plugins/resmed_loader.h similarity index 100% rename from SleepLib/loader_plugins/resmed_loader.h rename to src/SleepLib/loader_plugins/resmed_loader.h diff --git a/SleepLib/loader_plugins/zeo_loader.cpp b/src/SleepLib/loader_plugins/zeo_loader.cpp similarity index 100% rename from SleepLib/loader_plugins/zeo_loader.cpp rename to src/SleepLib/loader_plugins/zeo_loader.cpp diff --git a/SleepLib/loader_plugins/zeo_loader.h b/src/SleepLib/loader_plugins/zeo_loader.h similarity index 100% rename from SleepLib/loader_plugins/zeo_loader.h rename to src/SleepLib/loader_plugins/zeo_loader.h diff --git a/SleepLib/machine.cpp b/src/SleepLib/machine.cpp similarity index 100% rename from SleepLib/machine.cpp rename to src/SleepLib/machine.cpp diff --git a/SleepLib/machine.h b/src/SleepLib/machine.h similarity index 99% rename from SleepLib/machine.h rename to src/SleepLib/machine.h index ea01a37c..885e2652 100644 --- a/SleepLib/machine.h +++ b/src/SleepLib/machine.h @@ -20,7 +20,6 @@ #include #include "SleepLib/preferences.h" - #include "SleepLib/machine_common.h" #include "SleepLib/event.h" #include "SleepLib/session.h" diff --git a/SleepLib/machine_common.h b/src/SleepLib/machine_common.h similarity index 100% rename from SleepLib/machine_common.h rename to src/SleepLib/machine_common.h diff --git a/SleepLib/machine_loader.cpp b/src/SleepLib/machine_loader.cpp similarity index 100% rename from SleepLib/machine_loader.cpp rename to src/SleepLib/machine_loader.cpp diff --git a/SleepLib/machine_loader.h b/src/SleepLib/machine_loader.h similarity index 94% rename from SleepLib/machine_loader.h rename to src/SleepLib/machine_loader.h index 96c1de4d..9a6cd8ab 100644 --- a/SleepLib/machine_loader.h +++ b/src/SleepLib/machine_loader.h @@ -12,13 +12,7 @@ License: GPL #include "profiles.h" #include "machine.h" -#ifdef Q_OS_WIN -// Windows just needs the headers -#include "../quazip/zlib.h" -#else -// use the system one #include "zlib.h" -#endif /*! \class MachineLoader \brief Base class to derive a new Machine importer from diff --git a/SleepLib/preferences.cpp b/src/SleepLib/preferences.cpp similarity index 100% rename from SleepLib/preferences.cpp rename to src/SleepLib/preferences.cpp diff --git a/SleepLib/preferences.h b/src/SleepLib/preferences.h similarity index 100% rename from SleepLib/preferences.h rename to src/SleepLib/preferences.h diff --git a/SleepLib/profiles.cpp b/src/SleepLib/profiles.cpp similarity index 100% rename from SleepLib/profiles.cpp rename to src/SleepLib/profiles.cpp diff --git a/SleepLib/profiles.h b/src/SleepLib/profiles.h similarity index 100% rename from SleepLib/profiles.h rename to src/SleepLib/profiles.h diff --git a/SleepLib/schema.cpp b/src/SleepLib/schema.cpp similarity index 100% rename from SleepLib/schema.cpp rename to src/SleepLib/schema.cpp diff --git a/SleepLib/schema.h b/src/SleepLib/schema.h similarity index 100% rename from SleepLib/schema.h rename to src/SleepLib/schema.h diff --git a/SleepLib/session.cpp b/src/SleepLib/session.cpp similarity index 100% rename from SleepLib/session.cpp rename to src/SleepLib/session.cpp diff --git a/SleepLib/session.h b/src/SleepLib/session.h similarity index 100% rename from SleepLib/session.h rename to src/SleepLib/session.h diff --git a/src/SleepyHeadQT.pro.user b/src/SleepyHeadQT.pro.user new file mode 100644 index 00000000..ab1fad0d --- /dev/null +++ b/src/SleepyHeadQT.pro.user @@ -0,0 +1,244 @@ + + + + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + true + 1 + true + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.1.0 MinGW 32bit + Desktop Qt 5.1.0 MinGW 32bit + qt.510.win32_mingw48.essentials_kit + 0 + 0 + 0 + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + -j4 + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + C:/Users/Mark/Documents/src/build-SleepyHeadQT-Desktop_Qt_5_1_0_MinGW_32bit-Debug + true + + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + C:/Users/Mark/Documents/src/build-SleepyHeadQT-Desktop_Qt_5_1_0_MinGW_32bit-Release + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + true + + false + false + false + false + true + 0.01 + 10 + true + 25 + + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + SleepyHeadQT + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Mark/Documents/src/sleepyhead-code/SleepyHeadQT.pro + 2 + + SleepyHeadQT.pro + false + false + + + 3768 + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.EnvironmentId + {c26fa218-b995-4591-9f60-dce266d9d16a} + + + ProjectExplorer.Project.Updater.FileVersion + 12 + + diff --git a/UpdaterWindow.cpp b/src/UpdaterWindow.cpp similarity index 99% rename from UpdaterWindow.cpp rename to src/UpdaterWindow.cpp index 99ad78d7..cd251560 100644 --- a/UpdaterWindow.cpp +++ b/src/UpdaterWindow.cpp @@ -13,8 +13,8 @@ #include #include "SleepLib/profiles.h" -#include "3rdparty/quazip-0.5.1/quazip/quazip.h" -#include "3rdparty/quazip-0.5.1/quazip/quazipfile.h" +#include "quazip/quazip.h" +#include "quazip/quazipfile.h" #include "UpdaterWindow.h" #include "ui_UpdaterWindow.h" #include "version.h" diff --git a/UpdaterWindow.h b/src/UpdaterWindow.h similarity index 100% rename from UpdaterWindow.h rename to src/UpdaterWindow.h diff --git a/UpdaterWindow.ui b/src/UpdaterWindow.ui similarity index 100% rename from UpdaterWindow.ui rename to src/UpdaterWindow.ui diff --git a/common_gui.cpp b/src/common_gui.cpp similarity index 100% rename from common_gui.cpp rename to src/common_gui.cpp diff --git a/common_gui.h b/src/common_gui.h similarity index 100% rename from common_gui.h rename to src/common_gui.h diff --git a/daily.cpp b/src/daily.cpp similarity index 100% rename from daily.cpp rename to src/daily.cpp diff --git a/daily.h b/src/daily.h similarity index 100% rename from daily.h rename to src/daily.h diff --git a/daily.ui b/src/daily.ui similarity index 100% rename from daily.ui rename to src/daily.ui diff --git a/exportcsv.cpp b/src/exportcsv.cpp similarity index 100% rename from exportcsv.cpp rename to src/exportcsv.cpp diff --git a/exportcsv.h b/src/exportcsv.h similarity index 100% rename from exportcsv.h rename to src/exportcsv.h diff --git a/exportcsv.ui b/src/exportcsv.ui similarity index 100% rename from exportcsv.ui rename to src/exportcsv.ui diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/mainwindow.cpp b/src/mainwindow.cpp similarity index 100% rename from mainwindow.cpp rename to src/mainwindow.cpp diff --git a/mainwindow.h b/src/mainwindow.h similarity index 100% rename from mainwindow.h rename to src/mainwindow.h diff --git a/mainwindow.ui b/src/mainwindow.ui similarity index 100% rename from mainwindow.ui rename to src/mainwindow.ui diff --git a/newprofile.cpp b/src/newprofile.cpp similarity index 100% rename from newprofile.cpp rename to src/newprofile.cpp diff --git a/newprofile.h b/src/newprofile.h similarity index 100% rename from newprofile.h rename to src/newprofile.h diff --git a/newprofile.ui b/src/newprofile.ui similarity index 100% rename from newprofile.ui rename to src/newprofile.ui diff --git a/overview.cpp b/src/overview.cpp similarity index 100% rename from overview.cpp rename to src/overview.cpp diff --git a/overview.h b/src/overview.h similarity index 100% rename from overview.h rename to src/overview.h diff --git a/overview.ui b/src/overview.ui similarity index 100% rename from overview.ui rename to src/overview.ui diff --git a/oximetry.cpp b/src/oximetry.cpp similarity index 99% rename from oximetry.cpp rename to src/oximetry.cpp index f67c59b8..991ead14 100644 --- a/oximetry.cpp +++ b/src/oximetry.cpp @@ -9,10 +9,11 @@ #include #include +#include "qextserialport/src/qextserialenumerator.h" + #include "oximetry.h" #include "ui_oximetry.h" #include "common_gui.h" -#include "3rdparty/qextserialport/src/qextserialenumerator.h" #include "SleepLib/loader_plugins/cms50_loader.h" #include "SleepLib/event.h" #include "SleepLib/calcs.h" diff --git a/oximetry.h b/src/oximetry.h similarity index 99% rename from oximetry.h rename to src/oximetry.h index 311c0e2d..03a36583 100644 --- a/oximetry.h +++ b/src/oximetry.h @@ -13,7 +13,8 @@ #include #include #include -#include <3rdparty/qextserialport/src/qextserialport.h> + +#include "qextserialport/src/qextserialport.h" #include "SleepLib/profiles.h" #include "SleepLib/day.h" diff --git a/oximetry.ui b/src/oximetry.ui similarity index 100% rename from oximetry.ui rename to src/oximetry.ui diff --git a/preferencesdialog.cpp b/src/preferencesdialog.cpp similarity index 100% rename from preferencesdialog.cpp rename to src/preferencesdialog.cpp diff --git a/preferencesdialog.h b/src/preferencesdialog.h similarity index 100% rename from preferencesdialog.h rename to src/preferencesdialog.h diff --git a/preferencesdialog.ui b/src/preferencesdialog.ui similarity index 100% rename from preferencesdialog.ui rename to src/preferencesdialog.ui diff --git a/profileselect.cpp b/src/profileselect.cpp similarity index 100% rename from profileselect.cpp rename to src/profileselect.cpp diff --git a/profileselect.h b/src/profileselect.h similarity index 100% rename from profileselect.h rename to src/profileselect.h diff --git a/profileselect.ui b/src/profileselect.ui similarity index 100% rename from profileselect.ui rename to src/profileselect.ui diff --git a/report.ui b/src/report.ui similarity index 100% rename from report.ui rename to src/report.ui diff --git a/reports.cpp b/src/reports.cpp similarity index 100% rename from reports.cpp rename to src/reports.cpp diff --git a/reports.h b/src/reports.h similarity index 100% rename from reports.h rename to src/reports.h diff --git a/src/src.pro b/src/src.pro new file mode 100644 index 00000000..bb7f6011 --- /dev/null +++ b/src/src.pro @@ -0,0 +1,239 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2011-06-20T22:05:30 +# +#------------------------------------------------- + +QT += core gui opengl network xml + +greaterThan(QT_MAJOR_VERSION,4) { + QT += widgets webkitwidgets +} else { + QT += webkit +} + +CONFIG += rtti + +#static { +# CONFIG += static +# QTPLUGIN += qsvg qgif qpng + +# DEFINES += STATIC // Equivalent to "#define STATIC" in source code +# message("Static build.") +#} + +TARGET = SleepyHead +unix:!macx { + TARGET.path=/usr/bin +} + +TEMPLATE = app + +# GIT_VERSION = $$system(git describe --tags --long --abbrev=6 --dirty="*") + +exists(.git):DEFINES += GIT_BRANCH=\\\"$$system(git rev-parse --abbrev-ref HEAD)\\\" +else:DEFINES += GIT_BRANCH=\\\"UNKNOWN\\\" + +exists(.git):DEFINES += GIT_REVISION=\\\"$$system(git rev-parse HEAD)\\\" +else:DEFINES += GIT_REVISION=\\\"UNKNOWN\\\" + +unix:!macx:LIBS += -lX11 -lz -lGLU + +macx { + SOURCES += + LIBS += -framework IOKit -framework CoreFoundation -lz + ICON = icons/iconfile.icns +} + +win32 { + DEFINES += WINVER=0x0501 # needed for mingw to pull in appropriate dbt business...probably a better way to do this + LIBS += -lsetupapi -lz +} +if (win32-msvc2008|win32-msvc2010|win32-msvc2012):!equals(TEMPLATE_PREFIX, "vc") { + LIBS += -ladvapi32 + DEFINES += BUILD_WITH_MSVC=1 +} + + +#include(..3rdparty/qextserialport/src/qextserialport.pri) +#include(3rdparty/quazip-0.5.1/quazip/quazip.pri) + +#include(SleepLib2/sleeplib.pri) + +SOURCES += main.cpp\ + SleepLib/machine.cpp \ + SleepLib/machine_loader.cpp \ + SleepLib/preferences.cpp \ + SleepLib/profiles.cpp \ + SleepLib/loader_plugins/cms50_loader.cpp \ + SleepLib/loader_plugins/prs1_loader.cpp \ + SleepLib/loader_plugins/zeo_loader.cpp \ + SleepLib/loader_plugins/resmed_loader.cpp \ + daily.cpp \ + oximetry.cpp \ + overview.cpp \ + mainwindow.cpp \ + SleepLib/event.cpp \ + SleepLib/session.cpp \ + SleepLib/day.cpp \ + Graphs/gLineChart.cpp \ + Graphs/gLineOverlay.cpp \ + Graphs/gFooBar.cpp \ + Graphs/gXAxis.cpp \ + Graphs/gYAxis.cpp \ + Graphs/gFlagsLine.cpp \ + Graphs/glcommon.cpp \ + Graphs/gSegmentChart.cpp \ + preferencesdialog.cpp \ + Graphs/gGraphView.cpp \ + Graphs/gStatsLine.cpp \ + Graphs/gSummaryChart.cpp \ + SleepLib/schema.cpp \ + profileselect.cpp \ + newprofile.cpp \ + exportcsv.cpp \ + common_gui.cpp \ + SleepLib/loader_plugins/intellipap_loader.cpp \ + SleepLib/calcs.cpp \ + updateparser.cpp \ + UpdaterWindow.cpp \ + SleepLib/common.cpp \ + SleepLib/loader_plugins/icon_loader.cpp \ + SleepLib/loader_plugins/mseries_loader.cpp \ + reports.cpp \ + summary.cpp + +HEADERS += \ + SleepLib/machine.h \ + SleepLib/machine_loader.h \ + SleepLib/preferences.h \ + SleepLib/profiles.h \ + SleepLib/loader_plugins/cms50_loader.h \ + SleepLib/loader_plugins/prs1_loader.h \ + SleepLib/loader_plugins/zeo_loader.h \ + oximetry.h \ + daily.h \ + overview.h \ + mainwindow.h \ + SleepLib/event.h \ + SleepLib/machine_common.h \ + SleepLib/session.h \ + SleepLib/day.h \ + Graphs/gLineChart.h \ + Graphs/gLineOverlay.h \ + Graphs/gFooBar.h \ + Graphs/gXAxis.h \ + Graphs/gYAxis.h \ + Graphs/gFlagsLine.h \ + Graphs/glcommon.h \ + Graphs/gSegmentChart.h\ + SleepLib/loader_plugins/resmed_loader.h \ + preferencesdialog.h \ + Graphs/gGraphView.h \ + Graphs/gStatsLine.h \ + Graphs/gSummaryChart.h \ + SleepLib/schema.h \ + profileselect.h \ + newprofile.h \ + exportcsv.h \ + common_gui.h \ + SleepLib/loader_plugins/intellipap_loader.h \ + SleepLib/calcs.h \ + version.h \ + updateparser.h \ + UpdaterWindow.h \ + SleepLib/common.h \ + SleepLib/loader_plugins/icon_loader.h \ + SleepLib/loader_plugins/mseries_loader.h \ + reports.h \ + summary.h + + +FORMS += \ + daily.ui \ + overview.ui \ + mainwindow.ui \ + oximetry.ui \ + preferencesdialog.ui \ + report.ui \ + profileselect.ui \ + newprofile.ui \ + exportcsv.ui \ + UpdaterWindow.ui + +RESOURCES += \ + ../Resources.qrc + +OTHER_FILES += \ + docs/index.html \ + docs/usage.html \ + docs/schema.xml \ + docs/graphs.xml \ + docs/channels.xml \ + docs/release_notes.html \ + docs/startup_tips.txt \ + docs/countries.txt \ + docs/tz.txt \ + LICENSE.txt \ + docs/tooltips.css \ + docs/script.js \ + update.xml \ + docs/changelog.txt \ + docs/update_notes.html \ + qextserialport/qextserialport.pri + +TRANSLATIONS += \ + ../Translations/Nederlands.nl_NL.ts \ + ../Translations/Francais.fr.ts \ + ../Translations/Svenska.se.ts \ + ../Translations/Deutsch.de_DE.ts \ + ../Translations/Espaniol.es.ts + +win32 { + CONFIG(debug, debug|release) { + DDIR = $$OUT_PWD/debug/Translations + } + CONFIG(release, debug|release) { + DDIR = $$OUT_PWD/release/Translations + } + DDIR ~= s,/,\\,g + + TRANS_FILES += $$PWD/../Translations/*.qm + TRANS_FILES_WIN = $${TRANS_FILES} + TRANS_FILES_WIN ~= s,/,\\,g + + system(mkdir $$quote($$DDIR)) + + for(FILE,TRANS_FILES_WIN){ + system(xcopy /y $$quote($$FILE) $$quote($$DDIR)) + } +} + +mac { + TransFiles.files = ../Translations + TransFiles.path = Contents/MacOS + QMAKE_BUNDLE_DATA += TransFiles +} + + +INCLUDEPATH += src \ +../3rdparty \ +../3rdparty/quazip + +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/release/ -lquazip +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/debug/ -lquazip +else:unix: LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/ -lquazip + +DEPENDPATH += $$PWD/../3rdparty/quazip/quazip + +greaterThan(QT_MAJOR_VERSION,4) { + win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lQt5ExtSerialPortd + else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lQt5ExtSerialPortd + else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lQt5ExtSerialPortd +} else { + win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialportd + else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialportd + else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lqextserialportd +} +INCLUDEPATH += $$PWD/../3rdparty/qextserialport +DEPENDPATH += $$PWD/../3rdparty/qextserialport diff --git a/summary.cpp b/src/summary.cpp similarity index 100% rename from summary.cpp rename to src/summary.cpp diff --git a/summary.h b/src/summary.h similarity index 100% rename from summary.h rename to src/summary.h diff --git a/updateparser.cpp b/src/updateparser.cpp similarity index 100% rename from updateparser.cpp rename to src/updateparser.cpp diff --git a/updateparser.h b/src/updateparser.h similarity index 100% rename from updateparser.h rename to src/updateparser.h diff --git a/version.h b/src/version.h similarity index 100% rename from version.h rename to src/version.h