Since Q5.4 available support C++14.
--HG-- branch : develop
This commit is contained in:
parent
965d908663
commit
2dcfe1c84b
|
@ -18,8 +18,13 @@ TEMPLATE = app
|
||||||
# Use out-of-source builds (shadow builds)
|
# Use out-of-source builds (shadow builds)
|
||||||
CONFIG -= debug_and_release debug_and_release_target
|
CONFIG -= debug_and_release debug_and_release_target
|
||||||
|
|
||||||
|
# Since Q5.4 available support C++14
|
||||||
|
greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) {
|
||||||
|
CONFIG += c++14
|
||||||
|
} else {
|
||||||
# We use C++11 standard
|
# We use C++11 standard
|
||||||
CONFIG += c++11
|
CONFIG += c++11
|
||||||
|
}
|
||||||
|
|
||||||
# Since Qt 5.4.0 the source code location is recorded only in debug builds.
|
# Since Qt 5.4.0 the source code location is recorded only in debug builds.
|
||||||
# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT.
|
# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT.
|
||||||
|
|
|
@ -26,8 +26,13 @@ macx{
|
||||||
# Use out-of-source builds (shadow builds)
|
# Use out-of-source builds (shadow builds)
|
||||||
CONFIG -= debug_and_release debug_and_release_target
|
CONFIG -= debug_and_release debug_and_release_target
|
||||||
|
|
||||||
|
# Since Q5.4 available support C++14
|
||||||
|
greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) {
|
||||||
|
CONFIG += c++14
|
||||||
|
} else {
|
||||||
# We use C++11 standard
|
# We use C++11 standard
|
||||||
CONFIG += c++11
|
CONFIG += c++11
|
||||||
|
}
|
||||||
|
|
||||||
# Since Qt 5.4.0 the source code location is recorded only in debug builds.
|
# Since Qt 5.4.0 the source code location is recorded only in debug builds.
|
||||||
# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT.
|
# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT.
|
||||||
|
|
|
@ -19,8 +19,13 @@ TEMPLATE = lib
|
||||||
# Use out-of-source builds (shadow builds)
|
# Use out-of-source builds (shadow builds)
|
||||||
CONFIG -= debug_and_release debug_and_release_target
|
CONFIG -= debug_and_release debug_and_release_target
|
||||||
|
|
||||||
|
# Since Q5.4 available support C++14
|
||||||
|
greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) {
|
||||||
|
CONFIG += c++14
|
||||||
|
} else {
|
||||||
# We use C++11 standard
|
# We use C++11 standard
|
||||||
CONFIG += c++11
|
CONFIG += c++11
|
||||||
|
}
|
||||||
|
|
||||||
# Since Qt 5.4.0 the source code location is recorded only in debug builds.
|
# Since Qt 5.4.0 the source code location is recorded only in debug builds.
|
||||||
# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT.
|
# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT.
|
||||||
|
|
|
@ -19,8 +19,13 @@ TARGET = vpropertyexplorer
|
||||||
# We want create library
|
# We want create library
|
||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
|
|
||||||
|
# Since Q5.4 available support C++14
|
||||||
|
greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) {
|
||||||
|
CONFIG += c++14
|
||||||
|
} else {
|
||||||
# We use C++11 standard
|
# We use C++11 standard
|
||||||
CONFIG += c++11
|
CONFIG += c++11
|
||||||
|
}
|
||||||
|
|
||||||
# Since Qt 5.4.0 the source code location is recorded only in debug builds.
|
# Since Qt 5.4.0 the source code location is recorded only in debug builds.
|
||||||
# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT.
|
# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT.
|
||||||
|
|
|
@ -18,8 +18,15 @@ TEMPLATE = app
|
||||||
# CONFIG += testcase adds a 'make check' which is great. But by default it also
|
# CONFIG += testcase adds a 'make check' which is great. But by default it also
|
||||||
# adds a 'make install' that installs the test cases, which we do not want.
|
# adds a 'make install' that installs the test cases, which we do not want.
|
||||||
# Can configure it not to do that with 'no_testcase_installs'
|
# Can configure it not to do that with 'no_testcase_installs'
|
||||||
|
CONFIG += testcase no_testcase_installs
|
||||||
|
|
||||||
|
# Since Q5.4 available support C++14
|
||||||
|
greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) {
|
||||||
|
CONFIG += c++14
|
||||||
|
} else {
|
||||||
# We use C++11 standard
|
# We use C++11 standard
|
||||||
CONFIG += c++11 testcase no_testcase_installs
|
CONFIG += c++11
|
||||||
|
}
|
||||||
|
|
||||||
# Use out-of-source builds (shadow builds)
|
# Use out-of-source builds (shadow builds)
|
||||||
CONFIG -= app_bundle debug_and_release debug_and_release_target
|
CONFIG -= app_bundle debug_and_release debug_and_release_target
|
||||||
|
|
|
@ -16,8 +16,15 @@ include(../../../common.pri)
|
||||||
# CONFIG += testcase adds a 'make check' which is great. But by default it also
|
# CONFIG += testcase adds a 'make check' which is great. But by default it also
|
||||||
# adds a 'make install' that installs the test cases, which we do not want.
|
# adds a 'make install' that installs the test cases, which we do not want.
|
||||||
# Can configure it not to do that with 'no_testcase_installs'
|
# Can configure it not to do that with 'no_testcase_installs'
|
||||||
|
CONFIG += testcase no_testcase_installs
|
||||||
|
|
||||||
|
# Since Q5.4 available support C++14
|
||||||
|
greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) {
|
||||||
|
CONFIG += c++14
|
||||||
|
} else {
|
||||||
# We use C++11 standard
|
# We use C++11 standard
|
||||||
CONFIG += c++11 testcase no_testcase_installs
|
CONFIG += c++11
|
||||||
|
}
|
||||||
|
|
||||||
# Use out-of-source builds (shadow builds)
|
# Use out-of-source builds (shadow builds)
|
||||||
CONFIG -= app_bundle debug_and_release debug_and_release_target
|
CONFIG -= app_bundle debug_and_release debug_and_release_target
|
||||||
|
|
|
@ -14,8 +14,15 @@ include(../../../common.pri)
|
||||||
# CONFIG += testcase adds a 'make check' which is great. But by default it also
|
# CONFIG += testcase adds a 'make check' which is great. But by default it also
|
||||||
# adds a 'make install' that installs the test cases, which we do not want.
|
# adds a 'make install' that installs the test cases, which we do not want.
|
||||||
# Can configure it not to do that with 'no_testcase_installs'
|
# Can configure it not to do that with 'no_testcase_installs'
|
||||||
|
CONFIG += testcase no_testcase_installs
|
||||||
|
|
||||||
|
# Since Q5.4 available support C++14
|
||||||
|
greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) {
|
||||||
|
CONFIG += c++14
|
||||||
|
} else {
|
||||||
# We use C++11 standard
|
# We use C++11 standard
|
||||||
CONFIG += c++11 testcase no_testcase_installs
|
CONFIG += c++11
|
||||||
|
}
|
||||||
|
|
||||||
# Use out-of-source builds (shadow builds)
|
# Use out-of-source builds (shadow builds)
|
||||||
CONFIG -= app_bundle debug_and_release debug_and_release_target
|
CONFIG -= app_bundle debug_and_release debug_and_release_target
|
||||||
|
|
Loading…
Reference in New Issue
Block a user