diff options
| author | Davide Beatrici <davidebeatrici@gmail.com> | 2019-10-10 03:17:51 +0300 |
|---|---|---|
| committer | Davide Beatrici <davidebeatrici@gmail.com> | 2019-10-10 03:17:51 +0300 |
| commit | 2f967b7ea49eb1a36a05dd4c007bd2edcc77d0b9 (patch) | |
| tree | 384ee467238d77b4dd064145ac0f2ed9b7d7a60e /qmake/cplusplus.pri | |
| parent | 91f16f17f19a44b5444143e305561a54500bf742 (diff) | |
qmake: remove Qt 4 logic
Diffstat (limited to 'qmake/cplusplus.pri')
| -rw-r--r-- | qmake/cplusplus.pri | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/qmake/cplusplus.pri b/qmake/cplusplus.pri index dbbe008ad..4e0ff3b4b 100644 --- a/qmake/cplusplus.pri +++ b/qmake/cplusplus.pri @@ -18,17 +18,13 @@ # adds c++11, c++14 or c++1z to CONFIG. If none of # these are available, it adds c++03 to CONFIG. # -# In Qt 5, qmake understands the c++11, c++14, and c++1z +# qmake understands the c++11, c++14, and c++1z # CONFIG options, and will automatically populate # QMAKE_CXXFLAGS and QMAKE_LFLAGS with the appropriate # -std=c++XX values for the chosen C++ standard. -# For Qt 4, this .pri files will add the proper flags, -# because Qt 4's qmake doesn't know of the c++XX CONFIG -# options. # -# The c++03 option is unknown for both Qt 4 and Qt 5. -# We handle setting up the proper CXXFLAGS and LFLAGS for -# both versions of Qt when c++03 is in CONFIG. +# The c++03 option is unknown for Qt. +# We handle setting up the proper CXXFLAGS and LFLAGS when c++03 is in CONFIG. # First, auto-populate CONFIG with the latest C++ standard # that Qt has detected support for. @@ -78,26 +74,9 @@ CONFIG(c++14) { # Unix-specific handling of modern C++ features. unix { - # Qt 4, as opposed to Qt 5, doesn't automatically - # populate QMAKE_CXXFLAGS and QMAKE_LFLAGS with the - # appropriate -std=c++XX flags. So, for Qt 4, we'll - # have to set them up manually. - lessThan(QT_MAJOR_VERSION, 5) { - CONFIG(c++1z) { - QMAKE_CXXFLAGS += -std=c++1z - QMAKE_LFLAGS += -std=c++1z - } else:CONFIG(c++14) { - QMAKE_CXXFLAGS += -std=c++14 - QMAKE_LFLAGS += -std=c++14 - } else:CONFIG(c++11) { - QMAKE_CXXFLAGS += -std=c++11 - QMAKE_LFLAGS += -std=c++11 - } - } # No Qt versions know about CONFIG(c++03), since # its our own internal hint -- so for CONFIG(c++03) - # we set QMAKE_CXXFLAGS and QMAKE_LFLAGS for both Qt 4 - # and Qt 5. + # we set QMAKE_CXXFLAGS and QMAKE_LFLAGS. CONFIG(c++03):!CONFIG(c++11):!CONFIG(c++14):!CONFIG(c++1z) { # Note: we use -std=c++98 to support # older compilers. In GCC, the following |