更改工程目录结构

188080501 · Nov 24, 2017 · 87e9c6a · 87e9c6a
1 parent 9e00838
commit 87e9c6a
Show file tree

Hide file tree

Showing 540 changed files with 180 additions and 455 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
 ### JQNetworkLib ###
-lib/JQNetwork/bin
+library/JQNetwork/bin
 
 ### JQQRCode bin ###
-lib/JQLibrary/bin/JQQRCode*
+library/JQLibrary/bin/JQQRCode*
 
 ### C++ ###
 # Prerequisites

diff --git a/JQLibraryImport.pri b/JQLibraryImport.pri
@@ -10,13 +10,12 @@
 #   GitHub: https://github.com/188080501/
 #
 
-include( $$PWD/lib/JQLibrary/JQLibrary.pri )
+include( $$PWD/library/JQLibrary/JQLibrary.pri )
+include( $$PWD/library/JQLibrary/JQQmlLib.pri )
+include( $$PWD/library/JQLibrary/JQQRCodeReader.pri )
+include( $$PWD/library/JQLibrary/JQQRCodeWriter.pri )
+include( $$PWD/library/JQLibrary/JQZopfli.pri )
 
 mac {
-    include( $$PWD/lib/JQLibrary/JQGuetzli.pri )
+    include( $$PWD/library/JQLibrary/JQGuetzli.pri )
 }
-
-include( $$PWD/lib/JQLibrary/JQQmlLib.pri )
-include( $$PWD/lib/JQLibrary/JQQRCodeReader.pri )
-include( $$PWD/lib/JQLibrary/JQQRCodeWriter.pri )
-include( $$PWD/lib/JQLibrary/JQZopfli.pri )
diff --git a/JQTools.pro b/JQTools.pro
@@ -18,27 +18,27 @@ CONFIG += c++11
 CONFIG += c++14
 
 include( $$PWD/JQLibraryImport.pri )
-include( $$PWD/lib/MaterialUI/MaterialUI.pri )
-include( $$PWD/lib/JQToolsLibrary/JQToolsLibrary.pri )
-include( $$PWD/lib/JQNetwork/JQNetwork.pri )
+include( $$PWD/library/JQToolsLibrary/JQToolsLibrary.pri )
+include( $$PWD/library/JQNetwork/JQNetwork.pri )
+include( $$PWD/library/MaterialUI/MaterialUI.pri )
 include( $$PWD/components/components.pri )
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/cpp/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/cpp/jqtools_manage.hpp
 
-SOURCES += \
+SOURCES *= \
     $$PWD/cpp/main.cpp
 
-RESOURCES += \
+RESOURCES *= \
     $$PWD/qml/qml.qrc
 
 macx {
-    ICON = $$PWD/resources/Icon/Icon.icns
+    ICON = $$PWD/icon/icon.icns
 }
 
 win32 {
-    RC_FILE = $$PWD/resources/Icon/Icon.rc
+    RC_FILE = $$PWD/icon/icon.rc
 }
diff --git a/components/CalculateGroup/CalculateGroup.pri b/components/CalculateGroup/CalculateGroup.pri
@@ -13,8 +13,8 @@
 include( $$PWD/HashCalculate/HashCalculate.pri )
 include( $$PWD/TimestampTransform/TimestampTransform.pri )
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/calculategroup.h
diff --git a/components/CalculateGroup/HashCalculate/HashCalculate.pri b/components/CalculateGroup/HashCalculate/HashCalculate.pri
@@ -10,14 +10,14 @@
 #   GitHub: https://github.com/188080501/
 #
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/cpp/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/cpp/hashcalculate.h
 
-SOURCES += \
+SOURCES *= \
     $$PWD/cpp/hashcalculate.cpp
 
-RESOURCES += \
+RESOURCES *= \
     $$PWD/qml/HashCalculate.qrc
diff --git a/components/CalculateGroup/HashCalculate/cpp/hashcalculate.h b/components/CalculateGroup/HashCalculate/cpp/hashcalculate.h
@@ -14,7 +14,7 @@
 #define GROUP_CALCULATEGROUP_HASHCALCULATE_CPP_HASHCALCULATE_H_
 
 // JQToolsLibrary import
-#include "JQToolsLibrary.h"
+#include <JQToolsLibrary>
 
 #define HASHCALCULATE_INITIALIZA                                                            \
 {                                                                                           \

diff --git a/components/CalculateGroup/TimestampTransform/TimestampTransform.pri b/components/CalculateGroup/TimestampTransform/TimestampTransform.pri
@@ -10,14 +10,14 @@
 #   GitHub: https://github.com/188080501/
 #
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/cpp/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/cpp/timestamptransform.h
 
-SOURCES += \
+SOURCES *= \
     $$PWD/cpp/timestamptransform.cpp
 
-RESOURCES += \
+RESOURCES *= \
     $$PWD/qml/TimestampTransform.qrc
diff --git a/components/CalculateGroup/TimestampTransform/cpp/timestamptransform.h b/components/CalculateGroup/TimestampTransform/cpp/timestamptransform.h
@@ -14,7 +14,7 @@
 #define GROUP_CALCULATEGROUP_TIMESTAMPTRANSFORM_CPP_TIMESTAMPTRANSFORM_H_
 
 // JQToolsLibrary import
-#include "JQToolsLibrary.h"
+#include <JQToolsLibrary>
 
 #define TTIMESTAMPTRANSFORM_INITIALIZA                                                                       \
 {                                                                                                           \

diff --git a/components/MakeGroup/BarcodeMaker/BarcodeMaker.pri b/components/MakeGroup/BarcodeMaker/BarcodeMaker.pri
@@ -10,14 +10,14 @@
 #   GitHub: https://github.com/188080501/
 #
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/cpp/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/cpp/barcodemaker.h
 
-SOURCES += \
+SOURCES *= \
     $$PWD/cpp/barcodemaker.cpp
 
-RESOURCES += \
+RESOURCES *= \
     $$PWD/qml/BarcodeMakerQml.qrc
diff --git a/components/MakeGroup/BarcodeMaker/cpp/barcodemaker.h b/components/MakeGroup/BarcodeMaker/cpp/barcodemaker.h
@@ -18,7 +18,7 @@
 #include <QQuickImageProvider>
 
 // JQToolsLibrary import
-#include "JQToolsLibrary.h"
+#include <JQToolsLibrary>
 
 #define BARCODEMAKER_INITIALIZA                                                          \
 {                                                                                       \

diff --git a/components/MakeGroup/FontToPng/FontToPng.pri b/components/MakeGroup/FontToPng/FontToPng.pri
@@ -10,15 +10,15 @@
 #   GitHub: https://github.com/188080501/
 #
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/cpp/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/cpp/fonttopng.h
 
-SOURCES += \
+SOURCES *= \
     $$PWD/cpp/fonttopng.cpp
 
-RESOURCES += \
+RESOURCES *= \
     $$PWD/qml/FontToPng.qrc \
     $$PWD/Resource/Font/FontToPngFont.qrc
diff --git a/components/MakeGroup/FontToPng/cpp/fonttopng.h b/components/MakeGroup/FontToPng/cpp/fonttopng.h
@@ -25,7 +25,7 @@
 #include <QMutex>
 
 // JQToolsLibrary import
-#include "JQToolsLibrary.h"
+#include <JQToolsLibrary>
 
 #define FONTTOPNG_INITIALIZA                                                        \
 {                                                                                   \

diff --git a/components/MakeGroup/IconMaker/IconMaker.pri b/components/MakeGroup/IconMaker/IconMaker.pri
@@ -10,15 +10,15 @@
 #   GitHub: https://github.com/188080501/
 #
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/cpp/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/cpp/iconmaker.h
 
-SOURCES += \
+SOURCES *= \
     $$PWD/cpp/iconmaker.cpp
 
-RESOURCES += \
+RESOURCES *= \
     $$PWD/qml/IconMaker.qrc \
     $$PWD/Image/IconMakerImage.qrc
diff --git a/components/MakeGroup/IconMaker/cpp/iconmaker.h b/components/MakeGroup/IconMaker/cpp/iconmaker.h
@@ -17,7 +17,7 @@
 #include <QImage>
 
 // JQToolsLibrary import
-#include "JQToolsLibrary.h"
+#include <JQToolsLibrary>
 
 #define ICONMAKER_INITIALIZA                                                     \
 {                                                                               \

diff --git a/components/MakeGroup/MakeGroup.pri b/components/MakeGroup/MakeGroup.pri
@@ -15,8 +15,8 @@ include( $$PWD/FontToPng/FontToPng.pri )
 include( $$PWD/QRCodeMaker/QRCodeMaker.pri )
 include( $$PWD/BarcodeMaker/BarcodeMaker.pri )
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/makegroup.h
diff --git a/components/MakeGroup/QRCodeMaker/QRCodeMaker.pri b/components/MakeGroup/QRCodeMaker/QRCodeMaker.pri
@@ -10,14 +10,14 @@
 #   GitHub: https://github.com/188080501/
 #
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/cpp/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/cpp/qrcodemaker.h
 
-SOURCES += \
+SOURCES *= \
     $$PWD/cpp/qrcodemaker.cpp
 
-RESOURCES += \
+RESOURCES *= \
     $$PWD/qml/QRCodeMakerQml.qrc
diff --git a/components/MakeGroup/QRCodeMaker/cpp/qrcodemaker.h b/components/MakeGroup/QRCodeMaker/cpp/qrcodemaker.h
@@ -18,7 +18,7 @@
 #include <QQuickImageProvider>
 
 // JQToolsLibrary import
-#include "JQToolsLibrary.h"
+#include <JQToolsLibrary>
 
 #define QRCODEMAKER_INITIALIZA                                                          \
 {                                                                                       \

diff --git a/components/QtGroup/CppFileMaker/CppFileMaker.pri b/components/QtGroup/CppFileMaker/CppFileMaker.pri
@@ -10,15 +10,15 @@
 #   GitHub: https://github.com/188080501/
 #
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/cpp/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/cpp/cppfilemaker.h
 
-SOURCES += \
+SOURCES *= \
     $$PWD/cpp/cppfilemaker.cpp
 
-RESOURCES += \
+RESOURCES *= \
     $$PWD/qml/CppFileMaker.qrc \
     $$PWD/resources/files/CppFileMakerFiles.qrc
diff --git a/components/QtGroup/CppFileMaker/cpp/cppfilemaker.h b/components/QtGroup/CppFileMaker/cpp/cppfilemaker.h
@@ -20,7 +20,7 @@
 #include <QMap>
 
 // JQToolsLibrary import
-#include "JQToolsLibrary.h"
+#include <JQToolsLibrary>
 
 #define CPPFILEMAKER_INITIALIZA                                                         \
 {                                                                                       \

diff --git a/components/QtGroup/PngWarningRemover/PngWarningRemover.pri b/components/QtGroup/PngWarningRemover/PngWarningRemover.pri
@@ -10,14 +10,14 @@
 #   GitHub: https://github.com/188080501/
 #
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/cpp/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/cpp/pngwarningremover.h
 
-SOURCES += \
+SOURCES *= \
     $$PWD/cpp/pngwarningremover.cpp
 
-RESOURCES += \
+RESOURCES *= \
     $$PWD/qml/PngWarningRemover.qrc
diff --git a/components/QtGroup/PngWarningRemover/cpp/pngwarningremover.h b/components/QtGroup/PngWarningRemover/cpp/pngwarningremover.h
@@ -14,7 +14,7 @@
 #define GROUP_QTGROUP_PNGWARNINGREMOVER_CPP_PNGWARNINGREMOVER_H_
 
 // JQToolsLibrary import
-#include "JQToolsLibrary.h"
+#include <JQToolsLibrary>
 
 #define PNGWARNINGREMOVER_INITIALIZA                                                                     \
 {                                                                                                       \

diff --git a/components/QtGroup/PropertyMaker/PropertyMaker.pri b/components/QtGroup/PropertyMaker/PropertyMaker.pri
@@ -10,14 +10,14 @@
 #   GitHub: https://github.com/188080501/
 #
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/cpp/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/cpp/propertymaker.h
 
-SOURCES += \
+SOURCES *= \
     $$PWD/cpp/propertymaker.cpp
 
-RESOURCES += \
+RESOURCES *= \
     $$PWD/qml/PropertyMaker.qrc
diff --git a/components/QtGroup/PropertyMaker/cpp/propertymaker.h b/components/QtGroup/PropertyMaker/cpp/propertymaker.h
@@ -20,7 +20,7 @@
 #include <QMap>
 
 // JQToolsLibrary import
-#include "JQToolsLibrary.h"
+#include <JQToolsLibrary>
 
 #define PROPERTYMAKER_INITIALIZA                                                            \
 {                                                                                           \

diff --git a/components/QtGroup/QtGroup.pri b/components/QtGroup/QtGroup.pri
@@ -14,8 +14,8 @@ include( $$PWD/PngWarningRemover/PngWarningRemover.pri )
 include( $$PWD/PropertyMaker/PropertyMaker.pri )
 include( $$PWD/CppFileMaker/CppFileMaker.pri )
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/qtgroup.h
diff --git a/components/TextGroup/CaseTransform/CaseTransform.pri b/components/TextGroup/CaseTransform/CaseTransform.pri
@@ -10,14 +10,14 @@
 #   GitHub: https://github.com/188080501/
 #
 
-INCLUDEPATH += \
+INCLUDEPATH *= \
     $$PWD/cpp/
 
-HEADERS += \
+HEADERS *= \
     $$PWD/cpp/casetransform.h
 
-SOURCES += \
+SOURCES *= \
     $$PWD/cpp/casetransform.cpp
 
-RESOURCES += \
+RESOURCES *= \
     $$PWD/qml/CaseTransform.qrc
diff --git a/components/TextGroup/CaseTransform/cpp/casetransform.h b/components/TextGroup/CaseTransform/cpp/casetransform.h
@@ -14,7 +14,7 @@
 #define GROUP_TEXTGROUP_CASETRANSFORM_CPP_CASETRANSFORM_H_
 
 // JQToolsLibrary import
-#include "JQToolsLibrary.h"
+#include <JQToolsLibrary>
 
 #define CASETRANSFORM_INITIALIZA                                                             \
 {                                                                                           \