diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-08 14:27:19 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-02-08 14:27:19 +0000 |
| commit | 26ebdeff75d9f0f7b1ca2f82c35d7eaa013c0982 (patch) | |
| tree | 88626bb5c88436b0e206907f15224bb035481f6b /src/plugins/platforms/windows/main.cpp | |
| parent | 30178a22ffde5d216a350910668df0d906aced3b (diff) | |
| parent | fbfacd33be482fa3cf0aa5cffaf7006d538a2f92 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'src/plugins/platforms/windows/main.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/main.cpp b/src/plugins/platforms/windows/main.cpp index 8bde87c975..1929f800a4 100644 --- a/src/plugins/platforms/windows/main.cpp +++ b/src/plugins/platforms/windows/main.cpp @@ -112,7 +112,7 @@ QPlatformIntegration *QWindowsIntegrationPlugin::create(const QString& system, c { if (system.compare(system, QLatin1String("windows"), Qt::CaseInsensitive) == 0) return new QWindowsGdiIntegration(paramList); - return 0; + return nullptr; } QT_END_NAMESPACE |