GUI: Simple first hack to allow bughunting in the GUI
This commit is contained in:
parent
ca3095746c
commit
25b5304efc
|
@ -16,6 +16,10 @@ contains(LINKCORE, [yY][eE][sS]) {
|
||||||
}
|
}
|
||||||
LIBS += -L$$PWD/../externals
|
LIBS += -L$$PWD/../externals
|
||||||
|
|
||||||
|
# z3
|
||||||
|
LIBS += -lz3
|
||||||
|
QMAKE_CXXFLAGS += -DUSE_Z3
|
||||||
|
|
||||||
DESTDIR = .
|
DESTDIR = .
|
||||||
RCC_DIR = temp
|
RCC_DIR = temp
|
||||||
MOC_DIR = temp
|
MOC_DIR = temp
|
||||||
|
|
|
@ -28,5 +28,6 @@
|
||||||
<file>images/applications-development.png</file>
|
<file>images/applications-development.png</file>
|
||||||
<file>images/applications-system.png</file>
|
<file>images/applications-system.png</file>
|
||||||
<file>images/llvm-dragon.png</file>
|
<file>images/llvm-dragon.png</file>
|
||||||
|
<file>images/verify.svg</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|
|
@ -0,0 +1,74 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="297"
|
||||||
|
height="210"
|
||||||
|
viewBox="0 0 78.581252 55.562501"
|
||||||
|
version="1.1"
|
||||||
|
id="svg8"
|
||||||
|
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
|
||||||
|
sodipodi:docname="verify.svg"
|
||||||
|
inkscape:export-filename="/home/danielm/verify.svg.png"
|
||||||
|
inkscape:export-xdpi="96"
|
||||||
|
inkscape:export-ydpi="96">
|
||||||
|
<defs
|
||||||
|
id="defs2" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="1.3764247"
|
||||||
|
inkscape:cx="231.16151"
|
||||||
|
inkscape:cy="218.89725"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="981"
|
||||||
|
inkscape:window-x="0"
|
||||||
|
inkscape:window-y="28"
|
||||||
|
inkscape:window-maximized="1"
|
||||||
|
units="px" />
|
||||||
|
<metadata
|
||||||
|
id="metadata5">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title></dc:title>
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Layer 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(0,-241.4375)">
|
||||||
|
<ellipse
|
||||||
|
id="path3715"
|
||||||
|
cx="38.99736"
|
||||||
|
cy="269.44327"
|
||||||
|
style="fill:#4d4d4d;stroke-width:0.1327479"
|
||||||
|
rx="21.936352"
|
||||||
|
ry="21.681561" />
|
||||||
|
<path
|
||||||
|
style="fill:#ffffff;stroke:#000000;stroke-width:0.1327479px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
d="m 25.288891,266.30976 11.703894,15.45035 17.71617,-21.78895 -4.248675,-3.6447 -13.467495,16.16344 -7.294892,-9.34944 z"
|
||||||
|
id="path4522"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="ccccccc" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 2.3 KiB |
|
@ -840,6 +840,7 @@ Settings MainWindow::getCppcheckSettings()
|
||||||
}
|
}
|
||||||
|
|
||||||
result.clang = mProjectFile->clangParser;
|
result.clang = mProjectFile->clangParser;
|
||||||
|
result.bugHunting = mProjectFile->bugHunting;
|
||||||
|
|
||||||
const QStringList undefines = mProjectFile->getUndefines();
|
const QStringList undefines = mProjectFile->getUndefines();
|
||||||
foreach (QString undefine, undefines)
|
foreach (QString undefine, undefines)
|
||||||
|
|
|
@ -46,6 +46,7 @@ ProjectFile::ProjectFile(const QString &filename, QObject *parent) :
|
||||||
void ProjectFile::clear()
|
void ProjectFile::clear()
|
||||||
{
|
{
|
||||||
clangParser = false;
|
clangParser = false;
|
||||||
|
bugHunting = false;
|
||||||
mRootPath.clear();
|
mRootPath.clear();
|
||||||
mBuildDir.clear();
|
mBuildDir.clear();
|
||||||
mImportProject.clear();
|
mImportProject.clear();
|
||||||
|
@ -115,6 +116,9 @@ bool ProjectFile::read(const QString &filename)
|
||||||
if (xmlReader.name() == CppcheckXml::Parser)
|
if (xmlReader.name() == CppcheckXml::Parser)
|
||||||
clangParser = true;
|
clangParser = true;
|
||||||
|
|
||||||
|
if (xmlReader.name() == CppcheckXml::BugHunting)
|
||||||
|
bugHunting = true;
|
||||||
|
|
||||||
if (xmlReader.name() == CppcheckXml::CheckHeadersElementName)
|
if (xmlReader.name() == CppcheckXml::CheckHeadersElementName)
|
||||||
mCheckHeaders = readBool(xmlReader);
|
mCheckHeaders = readBool(xmlReader);
|
||||||
|
|
||||||
|
@ -719,6 +723,11 @@ bool ProjectFile::write(const QString &filename)
|
||||||
xmlWriter.writeEndElement();
|
xmlWriter.writeEndElement();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (bugHunting) {
|
||||||
|
xmlWriter.writeStartElement(CppcheckXml::BugHunting);
|
||||||
|
xmlWriter.writeEndElement();
|
||||||
|
}
|
||||||
|
|
||||||
xmlWriter.writeStartElement(CppcheckXml::CheckHeadersElementName);
|
xmlWriter.writeStartElement(CppcheckXml::CheckHeadersElementName);
|
||||||
xmlWriter.writeCharacters(mCheckHeaders ? "true" : "false");
|
xmlWriter.writeCharacters(mCheckHeaders ? "true" : "false");
|
||||||
xmlWriter.writeEndElement();
|
xmlWriter.writeEndElement();
|
||||||
|
|
|
@ -366,6 +366,8 @@ public:
|
||||||
/** Use Clang parser */
|
/** Use Clang parser */
|
||||||
bool clangParser;
|
bool clangParser;
|
||||||
|
|
||||||
|
/** Bug hunting */
|
||||||
|
bool bugHunting;
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -264,6 +264,7 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
|
||||||
mUI.mBtnClangParser->setChecked(true);
|
mUI.mBtnClangParser->setChecked(true);
|
||||||
else
|
else
|
||||||
mUI.mBtnCppcheckParser->setChecked(true);
|
mUI.mBtnCppcheckParser->setChecked(true);
|
||||||
|
mUI.mBugHunting->setChecked(projectFile->bugHunting);
|
||||||
setExcludedPaths(projectFile->getExcludedPaths());
|
setExcludedPaths(projectFile->getExcludedPaths());
|
||||||
setLibraries(projectFile->getLibraries());
|
setLibraries(projectFile->getLibraries());
|
||||||
const QString platform = projectFile->getPlatform();
|
const QString platform = projectFile->getPlatform();
|
||||||
|
@ -366,6 +367,7 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
|
||||||
projectFile->setExcludedPaths(getExcludedPaths());
|
projectFile->setExcludedPaths(getExcludedPaths());
|
||||||
projectFile->setLibraries(getLibraries());
|
projectFile->setLibraries(getLibraries());
|
||||||
projectFile->clangParser = mUI.mBtnClangParser->isChecked();
|
projectFile->clangParser = mUI.mBtnClangParser->isChecked();
|
||||||
|
projectFile->bugHunting = mUI.mBugHunting->isChecked();
|
||||||
if (mUI.mComboBoxPlatform->currentText().endsWith(".xml"))
|
if (mUI.mComboBoxPlatform->currentText().endsWith(".xml"))
|
||||||
projectFile->setPlatform(mUI.mComboBoxPlatform->currentText());
|
projectFile->setPlatform(mUI.mComboBoxPlatform->currentText());
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>888</width>
|
<width>888</width>
|
||||||
<height>546</height>
|
<height>600</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -388,6 +388,13 @@
|
||||||
<string>Analysis</string>
|
<string>Analysis</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_9">
|
<layout class="QVBoxLayout" name="verticalLayout_9">
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="mBugHunting">
|
||||||
|
<property name="text">
|
||||||
|
<string>Bug hunting</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="mCheckHeaders">
|
<widget class="QCheckBox" name="mCheckHeaders">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
|
|
@ -123,6 +123,7 @@ namespace CppcheckXml {
|
||||||
const char ImportProjectElementName[] = "importproject";
|
const char ImportProjectElementName[] = "importproject";
|
||||||
const char AnalyzeAllVsConfigsElementName[] = "analyze-all-vs-configs";
|
const char AnalyzeAllVsConfigsElementName[] = "analyze-all-vs-configs";
|
||||||
const char Parser[] = "parser";
|
const char Parser[] = "parser";
|
||||||
|
const char BugHunting[] = "bug-hunting";
|
||||||
const char IncludeDirElementName[] = "includedir";
|
const char IncludeDirElementName[] = "includedir";
|
||||||
const char DirElementName[] = "dir";
|
const char DirElementName[] = "dir";
|
||||||
const char DirNameAttrib[] = "name";
|
const char DirNameAttrib[] = "name";
|
||||||
|
|
Loading…
Reference in New Issue