diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-17 13:41:35 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-18 11:43:39 +0000 |
commit | 38088c451d3264eeb95ef697a79904d2461dcdd9 (patch) | |
tree | 6000cb55260361e9c8a3832514169f74e836f639 | |
parent | 56bbdccbb99cc9a08a71c3ee1154e764cbfa888b (diff) |
Replace qt_make_unique with std::make_unique
So we can remove it.
Change-Id: I037373f85c696ce04c55920b41377cc9843b0da3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | tools/qml/main.cpp | 7 |
1 files 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 <qqmldebug.h> #include <qqmlfileselector.h> -#include <private/qmemory_p.h> #include <private/qtqmlglobal_p.h> #if QT_CONFIG(qml_animation) #include <private/qabstractanimation_p.h> @@ -383,11 +382,11 @@ int main(int argc, char *argv[]) switch (applicationType) { #ifdef QT_GUI_LIB case QmlApplicationTypeGui: - app = qt_make_unique<LoaderApplication>(argc, argv); + app = std::make_unique<LoaderApplication>(argc, argv); break; #ifdef QT_WIDGETS_LIB case QmlApplicationTypeWidget: - app = qt_make_unique<QApplication>(argc, argv); + app = std::make_unique<QApplication>(argc, argv); static_cast<QApplication *>(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<QCoreApplication>(argc, argv); + app = std::make_unique<QCoreApplication>(argc, argv); break; } |