Add change to project file. Try to use precompiled headers.

This commit is contained in:
dismine 2013-08-29 16:12:30 +03:00
parent ebf803122e
commit 759afeedd7
6 changed files with 37 additions and 11 deletions

View File

@ -4,10 +4,13 @@
# #
#------------------------------------------------- #-------------------------------------------------
# Use out-of-source builds (shadow builds)
QT += core gui widgets xml svg printsupport QT += core gui widgets xml svg printsupport
TARGET = Valentina TARGET = Valentina
TEMPLATE = app TEMPLATE = app
CONFIG += precompile_header
SOURCES += main.cpp\ SOURCES += main.cpp\
mainwindow.cpp \ mainwindow.cpp \
@ -155,11 +158,32 @@ RESOURCES += \
icon.qrc \ icon.qrc \
cursor.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){ CONFIG(debug, debug|release){
# Debug # Debug
QMAKE_CXXFLAGS += -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \ 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/QtXml" -isystem "/usr/include/qt5/QtGui" \
-isystem "/usr/include/qt5/QtCore" -O0 -Wall -Wextra -pedantic -Weffc++ \ -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 \ -Woverloaded-virtual -Wctor-dtor-privacy -Wnon-virtual-dtor -Wold-style-cast \
-Wconversion -Wsign-conversion -Winit-self -Wunreachable-code -std=c++0x -Wconversion -Wsign-conversion -Winit-self -Wunreachable-code -std=c++0x
}else{ }else{

View File

@ -1,8 +1,5 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++"
#include "dialogalongline.h" #include "dialogalongline.h"
#include "ui_dialogalongline.h" #include "ui_dialogalongline.h"
#pragma GCC diagnostic pop
DialogAlongLine::DialogAlongLine(const VContainer *data, QWidget *parent) : DialogAlongLine::DialogAlongLine(const VContainer *data, QWidget *parent) :
DialogTool(data, parent), ui(new Ui::DialogAlongLine), number(0), pointName(QString()), DialogTool(data, parent), ui(new Ui::DialogAlongLine), number(0), pointName(QString()),

View File

@ -1,10 +1,7 @@
#ifndef DIALOGALONGLINE_H #ifndef DIALOGALONGLINE_H
#define DIALOGALONGLINE_H #define DIALOGALONGLINE_H
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++"
#include "dialogtool.h" #include "dialogtool.h"
#pragma GCC diagnostic pop
#include "../options.h" #include "../options.h"
#include "../container/vcontainer.h" #include "../container/vcontainer.h"
#include "../container/calculator.h" #include "../container/calculator.h"

View File

@ -176,10 +176,6 @@
</widget> </widget>
</item> </item>
</layout> </layout>
<zorder>buttonBox</zorder>
<zorder>layoutWidget_2</zorder>
<zorder></zorder>
<zorder>horizontalLayoutWidget</zorder>
</widget> </widget>
<resources/> <resources/>
<connections> <connections>

View File

@ -13,7 +13,6 @@
#include <QComboBox> #include <QComboBox>
#include <QSharedPointer> #include <QSharedPointer>
#include <QToolButton> #include <QToolButton>
#include <QSharedPointer>
#include "widgets/vmaingraphicsscene.h" #include "widgets/vmaingraphicsscene.h"
#include "widgets/vmaingraphicsview.h" #include "widgets/vmaingraphicsview.h"
#include "dialogs/dialogincrements.h" #include "dialogs/dialogincrements.h"

13
stable.h Normal file
View File

@ -0,0 +1,13 @@
/* Add C includes here */
#if defined __cplusplus
/* Add C++ includes here */
#include <QApplication>
#include <QtXml>
#include <QSharedPointer>
#include <QMainWindow>
#include "options.h"
#include <QMap>
#include <QString>
#include <QDialog>
#endif