Skip to content

Commit 87e9c6a

Browse files
188080501188080501
committed
更改工程目录结构
1 parent 9e00838 commit 87e9c6a

File tree

540 files changed

+180
-455
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

540 files changed

+180
-455
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
### JQNetworkLib ###
2-
lib/JQNetwork/bin
2+
library/JQNetwork/bin
33

44
### JQQRCode bin ###
5-
lib/JQLibrary/bin/JQQRCode*
5+
library/JQLibrary/bin/JQQRCode*
66

77
### C++ ###
88
# Prerequisites

‎JQLibraryImport.pri‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
# GitHub: https://github.com/188080501/
1111
#
1212

13-
include( $$PWD/lib/JQLibrary/JQLibrary.pri )
13+
include( $$PWD/library/JQLibrary/JQLibrary.pri )
14+
include( $$PWD/library/JQLibrary/JQQmlLib.pri )
15+
include( $$PWD/library/JQLibrary/JQQRCodeReader.pri )
16+
include( $$PWD/library/JQLibrary/JQQRCodeWriter.pri )
17+
include( $$PWD/library/JQLibrary/JQZopfli.pri )
1418

1519
mac {
16-
include( $$PWD/lib/JQLibrary/JQGuetzli.pri )
20+
include( $$PWD/library/JQLibrary/JQGuetzli.pri )
1721
}
18-
19-
include( $$PWD/lib/JQLibrary/JQQmlLib.pri )
20-
include( $$PWD/lib/JQLibrary/JQQRCodeReader.pri )
21-
include( $$PWD/lib/JQLibrary/JQQRCodeWriter.pri )
22-
include( $$PWD/lib/JQLibrary/JQZopfli.pri )

‎JQTools.pro‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ CONFIG += c++11
1818
CONFIG += c++14
1919

2020
include( $$PWD/JQLibraryImport.pri )
21-
include( $$PWD/lib/MaterialUI/MaterialUI.pri )
22-
include( $$PWD/lib/JQToolsLibrary/JQToolsLibrary.pri )
23-
include( $$PWD/lib/JQNetwork/JQNetwork.pri )
21+
include( $$PWD/library/JQToolsLibrary/JQToolsLibrary.pri )
22+
include( $$PWD/library/JQNetwork/JQNetwork.pri )
23+
include( $$PWD/library/MaterialUI/MaterialUI.pri )
2424
include( $$PWD/components/components.pri )
2525

26-
INCLUDEPATH += \
26+
INCLUDEPATH *= \
2727
$$PWD/cpp/
2828

29-
HEADERS += \
29+
HEADERS *= \
3030
$$PWD/cpp/jqtools_manage.hpp
3131

32-
SOURCES += \
32+
SOURCES *= \
3333
$$PWD/cpp/main.cpp
3434

35-
RESOURCES += \
35+
RESOURCES *= \
3636
$$PWD/qml/qml.qrc
3737

3838
macx {
39-
ICON = $$PWD/resources/Icon/Icon.icns
39+
ICON = $$PWD/icon/icon.icns
4040
}
4141

4242
win32 {
43-
RC_FILE = $$PWD/resources/Icon/Icon.rc
43+
RC_FILE = $$PWD/icon/icon.rc
4444
}

‎components/CalculateGroup/CalculateGroup.pri‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
include( $$PWD/HashCalculate/HashCalculate.pri )
1414
include( $$PWD/TimestampTransform/TimestampTransform.pri )
1515

16-
INCLUDEPATH += \
16+
INCLUDEPATH *= \
1717
$$PWD/
1818

19-
HEADERS += \
19+
HEADERS *= \
2020
$$PWD/calculategroup.h

‎components/CalculateGroup/HashCalculate/HashCalculate.pri‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
# GitHub: https://github.com/188080501/
1111
#
1212

13-
INCLUDEPATH += \
13+
INCLUDEPATH *= \
1414
$$PWD/cpp/
1515

16-
HEADERS += \
16+
HEADERS *= \
1717
$$PWD/cpp/hashcalculate.h
1818

19-
SOURCES += \
19+
SOURCES *= \
2020
$$PWD/cpp/hashcalculate.cpp
2121

22-
RESOURCES += \
22+
RESOURCES *= \
2323
$$PWD/qml/HashCalculate.qrc

‎components/CalculateGroup/HashCalculate/cpp/hashcalculate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#define GROUP_CALCULATEGROUP_HASHCALCULATE_CPP_HASHCALCULATE_H_
1515

1616
// JQToolsLibrary import
17-
#include "JQToolsLibrary.h"
17+
#include <JQToolsLibrary>
1818

1919
#define HASHCALCULATE_INITIALIZA \
2020
{ \

‎components/CalculateGroup/TimestampTransform/TimestampTransform.pri‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
# GitHub: https://github.com/188080501/
1111
#
1212

13-
INCLUDEPATH += \
13+
INCLUDEPATH *= \
1414
$$PWD/cpp/
1515

16-
HEADERS += \
16+
HEADERS *= \
1717
$$PWD/cpp/timestamptransform.h
1818

19-
SOURCES += \
19+
SOURCES *= \
2020
$$PWD/cpp/timestamptransform.cpp
2121

22-
RESOURCES += \
22+
RESOURCES *= \
2323
$$PWD/qml/TimestampTransform.qrc

‎components/CalculateGroup/TimestampTransform/cpp/timestamptransform.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#define GROUP_CALCULATEGROUP_TIMESTAMPTRANSFORM_CPP_TIMESTAMPTRANSFORM_H_
1515

1616
// JQToolsLibrary import
17-
#include "JQToolsLibrary.h"
17+
#include <JQToolsLibrary>
1818

1919
#define TTIMESTAMPTRANSFORM_INITIALIZA \
2020
{ \

‎components/MakeGroup/BarcodeMaker/BarcodeMaker.pri‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
# GitHub: https://github.com/188080501/
1111
#
1212

13-
INCLUDEPATH += \
13+
INCLUDEPATH *= \
1414
$$PWD/cpp/
1515

16-
HEADERS += \
16+
HEADERS *= \
1717
$$PWD/cpp/barcodemaker.h
1818

19-
SOURCES += \
19+
SOURCES *= \
2020
$$PWD/cpp/barcodemaker.cpp
2121

22-
RESOURCES += \
22+
RESOURCES *= \
2323
$$PWD/qml/BarcodeMakerQml.qrc

‎components/MakeGroup/BarcodeMaker/cpp/barcodemaker.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <QQuickImageProvider>
1919

2020
// JQToolsLibrary import
21-
#include "JQToolsLibrary.h"
21+
#include <JQToolsLibrary>
2222

2323
#define BARCODEMAKER_INITIALIZA \
2424
{ \

0 commit comments

Comments
 (0)