diff options
| -rw-r--r-- | src/3rdparty/masm/stubs/wtf/Optional.h | 11 | ||||
| -rw-r--r-- | src/qml/.prev_configure.cmake | 19 | ||||
| -rw-r--r-- | src/qml/configure.cmake | 21 | ||||
| -rw-r--r-- | src/qml/configure.json | 16 |
4 files changed, 0 insertions, 67 deletions
diff --git a/src/3rdparty/masm/stubs/wtf/Optional.h b/src/3rdparty/masm/stubs/wtf/Optional.h index e0fd4421a9..c4064476c7 100644 --- a/src/3rdparty/masm/stubs/wtf/Optional.h +++ b/src/3rdparty/masm/stubs/wtf/Optional.h @@ -83,14 +83,3 @@ private: } #endif - -#if __cplusplus < 201402L && !QT_CONFIG(cxx14_make_unique)\ -&& !defined(__cpp_lib_make_unique) - -namespace std { - template<typename T, class ...Args> - unique_ptr<T> make_unique(Args &&...args) - { return unique_ptr<T>(new T(std::forward<Args>(args)...)); } -} - -#endif diff --git a/src/qml/.prev_configure.cmake b/src/qml/.prev_configure.cmake index 07dafd5d6f..b4fb15038c 100644 --- a/src/qml/.prev_configure.cmake +++ b/src/qml/.prev_configure.cmake @@ -10,21 +10,6 @@ #### Tests -# cxx14_make_unique -qt_config_compile_test(cxx14_make_unique - LABEL "C++14 make_unique()" - CODE -"#include <memory> - -int main(void) -{ - /* BEGIN TEST: */ -std::unique_ptr<int> ptr = std::make_unique<int>(); - /* END TEST: */ - return 0; -} -") - # pointer_32bit qt_config_compile_test(pointer_32bit LABEL "32bit pointers" @@ -95,10 +80,6 @@ qt_config_compile_test(arm_fp #### Features -qt_feature("cxx14_make_unique" PRIVATE - LABEL "C++14 make_unique" - CONDITION QT_FEATURE_cxx14 OR TEST_cxx14_make_unique -) qt_feature("qml-network" PUBLIC SECTION "QML" LABEL "QML network support" diff --git a/src/qml/configure.cmake b/src/qml/configure.cmake index 60e9c00517..11c29620d6 100644 --- a/src/qml/configure.cmake +++ b/src/qml/configure.cmake @@ -13,23 +13,6 @@ qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST MODULE_NAME qml QMAKE_LIB l #### Tests -# cxx14_make_unique -qt_config_compile_test(cxx14_make_unique - LABEL "C++14 make_unique()" - CODE -" -#include <memory> - -int main(int argc, char **argv) -{ - (void)argc; (void)argv; - /* BEGIN TEST: */ -std::unique_ptr<int> ptr = std::make_unique<int>(); - /* END TEST: */ - return 0; -} -") - # pointer_32bit qt_config_compile_test(pointer_32bit LABEL "32bit pointers" @@ -116,10 +99,6 @@ int main(int argc, char **argv) #### Features -qt_feature("cxx14_make_unique" PRIVATE - LABEL "C++14 make_unique" - CONDITION QT_FEATURE_cxx14 OR TEST_cxx14_make_unique -) qt_feature("qml-network" PUBLIC SECTION "QML" LABEL "QML network support" diff --git a/src/qml/configure.json b/src/qml/configure.json index 5a6a459b76..0bc16d31b8 100644 --- a/src/qml/configure.json +++ b/src/qml/configure.json @@ -13,17 +13,6 @@ }, "tests": { - "cxx14_make_unique": { - "label": "C++14 make_unique()", - "type": "compile", - "test": { - "include": "memory", - "main": [ - "std::unique_ptr<int> ptr = std::make_unique<int>();" - ], - "qmake": "CONFIG += c++11" - } - }, "pointer_32bit": { "label": "32bit pointers", "type": "compile", @@ -78,11 +67,6 @@ }, "features": { - "cxx14_make_unique": { - "label": "C++14 make_unique", - "condition": "features.c++14 || tests.cxx14_make_unique", - "output": [ "privateFeature" ] - }, "qml-network": { "label": "QML network support", "purpose": "Provides network transparency.", |