From 38088c451d3264eeb95ef697a79904d2461dcdd9 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 17 Nov 2020 13:41:35 +0100 Subject: Replace qt_make_unique with std::make_unique So we can remove it. Change-Id: I037373f85c696ce04c55920b41377cc9843b0da3 Reviewed-by: Lars Knoll --- tools/qml/main.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 8db0ce7abe..7e42402dd0 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -60,7 +60,6 @@ #include #include -#include #include #if QT_CONFIG(qml_animation) #include @@ -383,11 +382,11 @@ int main(int argc, char *argv[]) switch (applicationType) { #ifdef QT_GUI_LIB case QmlApplicationTypeGui: - app = qt_make_unique(argc, argv); + app = std::make_unique(argc, argv); break; #ifdef QT_WIDGETS_LIB case QmlApplicationTypeWidget: - app = qt_make_unique(argc, argv); + app = std::make_unique(argc, argv); static_cast(app.get())->setWindowIcon(QIcon(iconResourcePath)); break; #endif // QT_WIDGETS_LIB @@ -395,7 +394,7 @@ int main(int argc, char *argv[]) case QmlApplicationTypeCore: Q_FALLTHROUGH(); default: // QmlApplicationTypeUnknown: not allowed, but we'll exit after checking apptypeOption below - app = qt_make_unique(argc, argv); + app = std::make_unique(argc, argv); break; } -- cgit v1.2.3