From f2f1fc860192367533cf91b37f5eed262bd745da Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 24 Sep 2021 17:07:56 +0300 Subject: [PATCH] Use lowercase for Windows header for supporting cross-compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Linux mingw uses lowercase headers, so cross-building on Linux for Windows target must use the correct form. Windows is case-insensitive, so it won't affect host-native builds. Change-Id: Ic2140412bb367bbce83b5e2546d70e0936928c5c Reviewed-by: André Hartmann Reviewed-by: David Schulz --- .../qml2puppet/instances/qt5nodeinstanceclientproxy.cpp | 2 +- share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp | 2 +- src/libs/qtcreatorcdbext/pytype.cpp | 2 +- src/libs/qtcreatorcdbext/stringutils.cpp | 2 +- .../compilationdatabaseproject.cpp | 2 +- src/tools/winrtdebughelper/winrtdebughelper.cpp | 2 +- tests/manual/cplusplus-tools/main.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp index 1e8828f6849..44eaab88d22 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp @@ -41,7 +41,7 @@ #if defined(Q_OS_UNIX) #include #elif defined(Q_OS_WIN) -#include +#include #endif namespace QmlDesigner { diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp index 51b265a593b..4b3d047142e 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp @@ -54,7 +54,7 @@ #endif #ifdef Q_OS_WIN -#include +#include #endif namespace { diff --git a/src/libs/qtcreatorcdbext/pytype.cpp b/src/libs/qtcreatorcdbext/pytype.cpp index 141175515e1..4c94aee58be 100644 --- a/src/libs/qtcreatorcdbext/pytype.cpp +++ b/src/libs/qtcreatorcdbext/pytype.cpp @@ -31,7 +31,7 @@ #include "stringutils.h" #include "symbolgroupvalue.h" -#include +#include #ifndef _NO_CVCONST_H #define _NO_CVCONST_H #include diff --git a/src/libs/qtcreatorcdbext/stringutils.cpp b/src/libs/qtcreatorcdbext/stringutils.cpp index 5bbd98ed0f0..3ab2ec7e2f2 100644 --- a/src/libs/qtcreatorcdbext/stringutils.cpp +++ b/src/libs/qtcreatorcdbext/stringutils.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include static const char whiteSpace[] = " \t\r\n"; diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index 90ae013eab8..0656dbd8783 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -54,7 +54,7 @@ #include #ifdef Q_OS_WIN -#include +#include #endif using namespace ProjectExplorer; diff --git a/src/tools/winrtdebughelper/winrtdebughelper.cpp b/src/tools/winrtdebughelper/winrtdebughelper.cpp index 79bf3280ae2..f871dbf345d 100644 --- a/src/tools/winrtdebughelper/winrtdebughelper.cpp +++ b/src/tools/winrtdebughelper/winrtdebughelper.cpp @@ -23,7 +23,7 @@ ** ****************************************************************************/ -#include +#include #include #include diff --git a/tests/manual/cplusplus-tools/main.cpp b/tests/manual/cplusplus-tools/main.cpp index da625df65fd..4a2a26533fa 100644 --- a/tests/manual/cplusplus-tools/main.cpp +++ b/tests/manual/cplusplus-tools/main.cpp @@ -31,7 +31,7 @@ #include #include #include -//#include +//#include //#include #include "dummy.h" #include "detail/header.h"