Skip to content

Commit 4015e12

Browse files
committed
gui.pro: remove old qt5 code and make it compilable
1 parent b94e609 commit 4015e12

File tree

2 files changed

+25
-220
lines changed

2 files changed

+25
-220
lines changed

gui/gui.pro

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,10 @@ QT += help
1313
QT += network
1414

1515
# Build online help
16-
onlinehelp.target = online-help.qhc
17-
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12) {
18-
# qcollectiongenerator is used in case of QT version < 5.12
19-
onlinehelp.commands = qcollectiongenerator $$PWD/help/online-help.qhcp -o $$PWD/help/online-help.qhc
20-
} else {
21-
onlinehelp.commands = qhelpgenerator $$PWD/help/online-help.qhcp -o $$PWD/help/online-help.qhc
22-
}
23-
QMAKE_EXTRA_TARGETS += onlinehelp
24-
PRE_TARGETDEPS += online-help.qhc
16+
#onlinehelp.target = online-help.qhc
17+
#onlinehelp.commands = qhelpgenerator $$PWD/help/online-help.qhcp -o $$PWD/help/online-help.qhc
18+
#QMAKE_EXTRA_TARGETS += onlinehelp
19+
#PRE_TARGETDEPS += online-help.qhc
2520

2621
contains(LINKCORE, [yY][eE][sS]) {
2722
LIBS += -l../bin/cppcheck-core
@@ -97,8 +92,25 @@ CONFIG += embed_manifest_exe
9792

9893
contains(LINKCORE, [yY][eE][sS]) {
9994
} else {
100-
BASEPATH = ../lib/
101-
include($$PWD/../lib/lib.pri)
95+
INCLUDEPATH += $$PWD/../lib
96+
HEADERS += $$PWD/../lib/*.h
97+
SOURCES += $$PWD/../lib/*.cpp
98+
99+
INCLUDEPATH += $$PWD/../frontend
100+
HEADERS += $$PWD/../frontend/*.h
101+
SOURCES += $$PWD/../frontend/*.cpp
102+
103+
INCLUDEPATH += $$PWD/../externals/picojson
104+
HEADERS += $$PWD/../externals/picojson/picojson.h
105+
106+
INCLUDEPATH += $$PWD/../externals/simplecpp
107+
HEADERS += $$PWD/../externals/simplecpp/simplecpp.h
108+
SOURCES += $$PWD/../externals/simplecpp/simplecpp.cpp
109+
DEFINES += SIMPLECPP_TOKENLIST_ALLOW_PTR
110+
111+
INCLUDEPATH += $$PWD/../externals/tinyxml2
112+
HEADERS += $$PWD/../externals/tinyxml2/tinyxml2.h
113+
SOURCES += $$PWD/../externals/tinyxml2/tinyxml2.cpp
102114
}
103115

104116
win32-msvc* {
@@ -137,6 +149,7 @@ HEADERS += aboutdialog.h \
137149
projectfile.h \
138150
projectfiledialog.h \
139151
report.h \
152+
resultitem.h \
140153
resultstree.h \
141154
resultsview.h \
142155
scratchpad.h \
@@ -179,6 +192,7 @@ SOURCES += aboutdialog.cpp \
179192
projectfile.cpp \
180193
projectfiledialog.cpp \
181194
report.cpp \
195+
resultitem.cpp \
182196
resultstree.cpp \
183197
resultsview.cpp \
184198
scratchpad.cpp \

lib/lib.pri

Lines changed: 0 additions & 209 deletions
This file was deleted.

0 commit comments

Comments
 (0)