From 759afeedd7226e9728bafdf2d5bad1aa78a8b022 Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 29 Aug 2013 16:12:30 +0300 Subject: [PATCH] Add change to project file. Try to use precompiled headers. --- Valentina.pro | 24 ++++++++++++++++++++++++ dialogs/dialogalongline.cpp | 3 --- dialogs/dialogalongline.h | 3 --- dialogs/dialogsplinepath.ui | 4 ---- mainwindow.h | 1 - stable.h | 13 +++++++++++++ 6 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 stable.h diff --git a/Valentina.pro b/Valentina.pro index d15f58aec..699a49bc1 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -4,10 +4,13 @@ # #------------------------------------------------- +# Use out-of-source builds (shadow builds) + QT += core gui widgets xml svg printsupport TARGET = Valentina TEMPLATE = app +CONFIG += precompile_header SOURCES += main.cpp\ mainwindow.cpp \ @@ -155,11 +158,32 @@ RESOURCES += \ icon.qrc \ cursor.qrc +CONFIG -= debug_and_release debug_and_release_target + +# directory for executable file +DESTDIR = bin + +# files created moc +MOC_DIR = moc + +# objecs files +OBJECTS_DIR = obj + +# files created rcc +RCC_DIR = rcc + +# files created uic +UI_DIR = uic + +# Use Precompiled headers (PCH) +PRECOMPILED_HEADER = stable.h + CONFIG(debug, debug|release){ # Debug QMAKE_CXXFLAGS += -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \ -isystem "/usr/include/qt5/QtXml" -isystem "/usr/include/qt5/QtGui" \ -isystem "/usr/include/qt5/QtCore" -O0 -Wall -Wextra -pedantic -Weffc++ \ + -isystem "$$OUT_PWD/uic" \ -Woverloaded-virtual -Wctor-dtor-privacy -Wnon-virtual-dtor -Wold-style-cast \ -Wconversion -Wsign-conversion -Winit-self -Wunreachable-code -std=c++0x }else{ diff --git a/dialogs/dialogalongline.cpp b/dialogs/dialogalongline.cpp index 7d2e4b003..6e7841255 100644 --- a/dialogs/dialogalongline.cpp +++ b/dialogs/dialogalongline.cpp @@ -1,8 +1,5 @@ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include "dialogalongline.h" #include "ui_dialogalongline.h" -#pragma GCC diagnostic pop DialogAlongLine::DialogAlongLine(const VContainer *data, QWidget *parent) : DialogTool(data, parent), ui(new Ui::DialogAlongLine), number(0), pointName(QString()), diff --git a/dialogs/dialogalongline.h b/dialogs/dialogalongline.h index cf030da8e..25fed1471 100644 --- a/dialogs/dialogalongline.h +++ b/dialogs/dialogalongline.h @@ -1,10 +1,7 @@ #ifndef DIALOGALONGLINE_H #define DIALOGALONGLINE_H -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include "dialogtool.h" -#pragma GCC diagnostic pop #include "../options.h" #include "../container/vcontainer.h" #include "../container/calculator.h" diff --git a/dialogs/dialogsplinepath.ui b/dialogs/dialogsplinepath.ui index 4fb4a1af0..c6c50ea08 100644 --- a/dialogs/dialogsplinepath.ui +++ b/dialogs/dialogsplinepath.ui @@ -176,10 +176,6 @@ - buttonBox - layoutWidget_2 - - horizontalLayoutWidget diff --git a/mainwindow.h b/mainwindow.h index 28253430c..4267329ce 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -13,7 +13,6 @@ #include #include #include -#include #include "widgets/vmaingraphicsscene.h" #include "widgets/vmaingraphicsview.h" #include "dialogs/dialogincrements.h" diff --git a/stable.h b/stable.h new file mode 100644 index 000000000..43303a198 --- /dev/null +++ b/stable.h @@ -0,0 +1,13 @@ +/* Add C includes here */ + + #if defined __cplusplus + /* Add C++ includes here */ + #include + #include + #include + #include + #include "options.h" + #include + #include + #include + #endif