diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-05 13:46:53 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-05 13:46:53 +0200 |
| commit | 7e5c64b6badc6bda3991a1f016392c850f86640d (patch) | |
| tree | 06b1110094886cff579cf0d4b731e1d52fed0f1f /src/webengine/ui_delegates_manager.cpp | |
| parent | f962cadf8dd0a7aee59573896148c0ea96bd5503 (diff) | |
| parent | d2fa5fd0f5b1972bd372510cc14509e85b972b23 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I8f0fa53b1e202d1932008291ea786a4ed1a49a64
Diffstat (limited to 'src/webengine/ui_delegates_manager.cpp')
| -rw-r--r-- | src/webengine/ui_delegates_manager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp index d324fe75d..cd4b8ed81 100644 --- a/src/webengine/ui_delegates_manager.cpp +++ b/src/webengine/ui_delegates_manager.cpp @@ -324,7 +324,7 @@ void UIDelegatesManager::showDialog(QSharedPointer<JavaScriptDialogController> d return; } - QQmlComponent *dialogComponent = Q_NULLPTR; + QQmlComponent *dialogComponent = nullptr; switch (dialogComponentType) { FOR_EACH_COMPONENT_TYPE(ASSIGN_DIALOG_COMPONENT_DATA_CASE_STATEMENT, NO_SEPARATOR) default: |