walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #2685 from firewave/qmake 

qmake improvements
This commit is contained in:
Daniel Marjamäki 2020-09-14 11:03:26 +02:00 committed by GitHub
parent 94850fec3f 57201cf8d5
commit 6a833b5769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -113,4 +113,7 @@ cmake-*
# clang tooling temporary files
.clangd/
compile_commands.json
compile_commands.json
# qmake
/gui/.qmake.stash

17
gui/gui.pro
View File

@ -103,6 +103,19 @@ contains(LINKCORE, [yY][eE][sS]) {
include($$PWD/../lib/lib.pri)
}
win32-msvc* {
MSVC_VER = $$(VisualStudioVersion)
message($$MSVC_VER)
MSVC_VER_SPLIT = $$split(MSVC_VER, .)
MSVC_VER_MAJOR = $$first(MSVC_VER_SPLIT)
# doesn't compile with older VS versions - assume VS2019 (16.x) is the first working for now
!lessThan(MSVC_VER_MAJOR, 16) {
message("using precompiled header")
CONFIG += precompile_header
PRECOMPILED_HEADER = precompiled_qmake.h
}
}
HEADERS += aboutdialog.h \
application.h \
applicationdialog.h \
@ -198,11 +211,11 @@ win32 {
}
contains(QMAKE_CC, gcc) {
QMAKE_CXXFLAGS += -std=c++11 -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-deprecated-declarations
QMAKE_CXXFLAGS += -std=c++0x -pedantic -Wall -Wextra -Wcast-qual -Wno-deprecated-declarations -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-shadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar
}
contains(QMAKE_CXX, clang++) {
QMAKE_CXXFLAGS += -std=c++11
QMAKE_CXXFLAGS += -std=c++0x -pedantic -Wall -Wextra -Wcast-qual -Wno-deprecated-declarations -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-shadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar
}
contains(HAVE_QCHART, [yY][eE][sS]) {

23
gui/precompiled_qmake.h Normal file
View File

@ -0,0 +1,23 @@
/*
* Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2020 Cppcheck team.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "precompiled.h"
#include <QDialog>
#include <QObject>
#include <QWidget>