diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-09 15:22:24 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-09 15:22:24 +0200 |
| commit | 0eac492b5c66b1774118c387dd527ad419e51be7 (patch) | |
| tree | 37324fdefd615e433dd65073390d7b9996d660d3 /src/webengine/ui_delegates_manager.cpp | |
| parent | 5d6086d1b97461b35c143839a8a6ba1b990bb87c (diff) | |
| parent | 99d46a8a918dee7323bc3d4f1624c47c097f9a3a (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I495adfcbb010ac29dc64e051c030a92d27859ca6
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 cd4b8ed81..19274bedf 100644 --- a/src/webengine/ui_delegates_manager.cpp +++ b/src/webengine/ui_delegates_manager.cpp @@ -64,7 +64,7 @@ namespace QtWebEngineCore { #define NO_SEPARATOR -#if defined(Q_OS_WIN) +#if defined(Q_CC_MSVC) && !defined(Q_CC_CLANG) #define FILE_NAME_CASE_STATEMENT(TYPE, COMPONENT) \ case UIDelegatesManager::TYPE:\ return QString::fromLatin1(#TYPE ##".qml"); |