just kept the language file changes - the rest is like it was before... sorry
--HG-- branch : develop
This commit is contained in:
parent
de862c7b7f
commit
93e73e5041
|
@ -21,7 +21,7 @@ CONFIG += c++11
|
||||||
DESTDIR = bin
|
DESTDIR = bin
|
||||||
|
|
||||||
# files created moc
|
# files created moc
|
||||||
#MOC_DIR = moc
|
MOC_DIR = moc
|
||||||
|
|
||||||
# objecs files
|
# objecs files
|
||||||
OBJECTS_DIR = obj
|
OBJECTS_DIR = obj
|
||||||
|
@ -51,7 +51,6 @@ OTHER_FILES += share/resources/valentina.rc \
|
||||||
TRANSLATIONS += share/translations/valentina_ru.ts \
|
TRANSLATIONS += share/translations/valentina_ru.ts \
|
||||||
share/translations/valentina_uk.ts \
|
share/translations/valentina_uk.ts \
|
||||||
share/translations/valentina_de.ts
|
share/translations/valentina_de.ts
|
||||||
QMAKE_CXX = g++
|
|
||||||
unix {
|
unix {
|
||||||
QMAKE_CXX = ccache g++
|
QMAKE_CXX = ccache g++
|
||||||
}
|
}
|
||||||
|
@ -68,8 +67,7 @@ CONFIG(debug, debug|release){
|
||||||
*-g++{
|
*-g++{
|
||||||
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" -isystem "$${UI_DIR}" \
|
-isystem "/usr/include/qt5/QtCore" -isystem "$${UI_DIR}" -isystem "$${MOC_DIR}" \
|
||||||
# -isystem "$${MOC_DIR}" \
|
|
||||||
-isystem "$${RCC_DIR}" \
|
-isystem "$${RCC_DIR}" \
|
||||||
-Og -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \
|
-Og -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \
|
||||||
-Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self \
|
-Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self \
|
||||||
|
@ -109,7 +107,7 @@ win32:RC_FILE = share/resources/valentina.rc
|
||||||
QMAKE_DISTCLEAN += $${DESTDIR}/* \
|
QMAKE_DISTCLEAN += $${DESTDIR}/* \
|
||||||
$${OBJECTS_DIR}/* \
|
$${OBJECTS_DIR}/* \
|
||||||
$${UI_DIR}/* \
|
$${UI_DIR}/* \
|
||||||
# $${MOC_DIR}/* \
|
$${MOC_DIR}/* \
|
||||||
$${RCC_DIR}/*
|
$${RCC_DIR}/*
|
||||||
|
|
||||||
unix {
|
unix {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user