Since Q5.12 available support for C++17.
--HG-- branch : develop
This commit is contained in:
parent
bcc2eab0fb
commit
5c55778d66
|
@ -18,7 +18,12 @@ 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
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# The following define makes your compiler emit warnings if you use
|
# The following define makes your compiler emit warnings if you use
|
||||||
# any feature of Qt which has been marked as deprecated (the exact warnings
|
# any feature of Qt which has been marked as deprecated (the exact warnings
|
||||||
|
|
|
@ -31,7 +31,12 @@ 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
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# The following define makes your compiler emit warnings if you use
|
# The following define makes your compiler emit warnings if you use
|
||||||
# any feature of Qt which has been marked as deprecated (the exact warnings
|
# any feature of Qt which has been marked as deprecated (the exact warnings
|
||||||
|
|
|
@ -17,7 +17,12 @@ TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += staticlib # Making static library
|
CONFIG += staticlib # Making static library
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -21,7 +21,12 @@ TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += staticlib # Making static library
|
CONFIG += staticlib # Making static library
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -19,7 +19,12 @@ 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
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# The following define makes your compiler emit warnings if you use
|
# The following define makes your compiler emit warnings if you use
|
||||||
# any feature of Qt which has been marked as deprecated (the exact warnings
|
# any feature of Qt which has been marked as deprecated (the exact warnings
|
||||||
|
|
|
@ -17,7 +17,12 @@ TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += staticlib # Making static library
|
CONFIG += staticlib # Making static library
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -21,7 +21,12 @@ TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += staticlib # Making static library
|
CONFIG += staticlib # Making static library
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -17,7 +17,12 @@ TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += staticlib # Making static library
|
CONFIG += staticlib # Making static library
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -17,7 +17,12 @@ TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += staticlib # Making static library
|
CONFIG += staticlib # Making static library
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -17,7 +17,12 @@ TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += staticlib # Making static library
|
CONFIG += staticlib # Making static library
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -15,7 +15,12 @@ TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += staticlib # Making static library
|
CONFIG += staticlib # Making static library
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -17,7 +17,12 @@ TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += staticlib # Making static library
|
CONFIG += staticlib # Making static library
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -19,7 +19,12 @@ TARGET = vpropertyexplorer
|
||||||
# We want create library
|
# We want create library
|
||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# The following define makes your compiler emit warnings if you use
|
# The following define makes your compiler emit warnings if you use
|
||||||
# any feature of Qt which has been marked as deprecated (the exact warnings
|
# any feature of Qt which has been marked as deprecated (the exact warnings
|
||||||
|
|
|
@ -17,7 +17,12 @@ TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += staticlib # Making static library
|
CONFIG += staticlib # Making static library
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -17,7 +17,12 @@ TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += staticlib # Making static library
|
CONFIG += staticlib # Making static library
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -17,7 +17,12 @@ TEMPLATE = lib
|
||||||
|
|
||||||
CONFIG += staticlib # Making static library
|
CONFIG += staticlib # Making static library
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -31,7 +31,12 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
||||||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -21,7 +21,12 @@ TARGET = ParserTest
|
||||||
# Console application.
|
# Console application.
|
||||||
CONFIG += console
|
CONFIG += console
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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.
|
||||||
|
|
|
@ -29,7 +29,12 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
||||||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -27,7 +27,12 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
||||||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||||
|
|
||||||
CONFIG += c++14
|
# Since Q5.12 available support for C++17
|
||||||
|
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {
|
||||||
|
CONFIG += c++17
|
||||||
|
} else {
|
||||||
|
CONFIG += c++14
|
||||||
|
}
|
||||||
|
|
||||||
# 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