Skip to content

Commit 982ea71

Browse files
committed
[fix] global: update compilation script
1 parent 210925f commit 982ea71

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

run.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
if [ "$1" = "full" ]; then
44
set -e
5-
qmake CONFIG+=released src/FastTrack.pro
5+
qmake6 CONFIG+=released src/FastTrack.pro
66
make clean
77
make
88
cd build
@@ -13,7 +13,7 @@ fi
1313

1414
if [ "$1" = "no_web" ]; then
1515
set -e
16-
qmake CONFIG+="released NO_WEB" src/FastTrack.pro
16+
qmake6 CONFIG+="released NO_WEB" src/FastTrack.pro
1717
make clean
1818
make
1919
cd build
@@ -24,7 +24,7 @@ fi
2424

2525
if [ "$1" = "partial" ]; then
2626
set -e
27-
qmake CONFIG+=released src/FastTrack.pro
27+
qmake6 CONFIG+=released src/FastTrack.pro
2828
make
2929
cd build
3030
./fasttrack
@@ -33,7 +33,7 @@ fi
3333

3434
if [ "$1" = "debug" ]; then
3535
set -e
36-
qmake CONFIG+=debug src/FastTrack.pro
36+
qmake6 CONFIG+=debug src/FastTrack.pro
3737
make
3838
cd build
3939
./fasttrack
@@ -43,7 +43,7 @@ fi
4343

4444
if [ "$1" = "profile" ]; then
4545
set -e
46-
qmake QMAKE_CXXFLAGS+=-pg QMAKE_LFLAGS+=-pg CONFIG+=debug src/FastTrack.pro
46+
qmake6 QMAKE_CXXFLAGS+=-pg QMAKE_LFLAGS+=-pg CONFIG+=debug src/FastTrack.pro
4747
make
4848
cd build
4949
./fasttrack
@@ -53,7 +53,7 @@ fi
5353

5454
if [ "$1" = "ci" ]; then
5555
set -e
56-
qmake CONFIG+=released src/FastTrack.pro
56+
qmake6 CONFIG+=released src/FastTrack.pro
5757
make clean
5858
make
5959
make clean
@@ -62,7 +62,7 @@ fi
6262

6363
if [ "$1" = "cli" ]; then
6464
set -e
65-
qmake CONFIG+=released src/FastTrack-Cli.pro
65+
qmake6 CONFIG+=released src/FastTrack-Cli.pro
6666
make clean
6767
make
6868
make clean

src/FastTrack-Cli.pro

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
QT += core gui network webenginewidgets
2-
3-
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
1+
greaterThan(QT_MAJOR_VERSION, 6): QT += widgets core gui network webenginewidgets
42

53
TARGET = fasttrack-cli
64
TEMPLATE = app

src/FastTrack.pro

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
QT += core gui network webenginewidgets
2-
3-
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webenginewidgets
1+
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webenginewidgets core gui network webenginewidgets
42
NO_WEB {
53
QT -= webenginewidgets
64
DEFINES += NO_WEB

0 commit comments

Comments
 (0)