diff options
author | Orgad Shaneh <[email protected]> | 2018-07-19 00:07:58 +0300 |
---|---|---|
committer | Orgad Shaneh <[email protected]> | 2018-07-19 05:44:06 +0000 |
commit | 1958c2129e83291f49d4c761c1130af027e508bf (patch) | |
tree | 38127e955e1fb99aa019a35076b357bd353fdaa3 | |
parent | 8fefe0c5914755d4d2fd60adaab3e800010eb28d (diff) |
Revert "Windows: Match the name case of included files"
It breaks cross-compilation on linux/mingw.
This reverts commit 1c014ed3d9256df0330338b34f1c710efa962cf8.
Change-Id: I3e8183ec318541a4393ad242eefbdeaa78b7be44
Reviewed-by: Alessandro Portale <[email protected]>
28 files changed, 28 insertions, 28 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp index 2dc112c027d..449e4ff188f 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp @@ -37,7 +37,7 @@ #if defined(Q_OS_UNIX) #include <unistd.h> #elif defined(Q_OS_WIN) -#include <Windows.h> +#include <windows.h> #endif namespace QmlDesigner { diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp index f32ba81b7f5..22460eaf6bb 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp @@ -41,7 +41,7 @@ #endif #ifdef Q_OS_WIN -#include <Windows.h> +#include <windows.h> #endif int internalMain(QGuiApplication *application) diff --git a/src/libs/qtcreatorcdbext/common.h b/src/libs/qtcreatorcdbext/common.h index 2f70a2af31d..b538313b3f7 100644 --- a/src/libs/qtcreatorcdbext/common.h +++ b/src/libs/qtcreatorcdbext/common.h @@ -32,7 +32,7 @@ #include <string> #include <sstream> -#include <Windows.h> +#include <windows.h> #define KDEXT_64BIT #pragma warning( disable : 4838 ) #include <wdbgexts.h> diff --git a/src/libs/utils/appmainwindow.cpp b/src/libs/utils/appmainwindow.cpp index 37c1f3254ae..bdeb3a4cbf9 100644 --- a/src/libs/utils/appmainwindow.cpp +++ b/src/libs/utils/appmainwindow.cpp @@ -27,7 +27,7 @@ #include "theme/theme_p.h" #ifdef Q_OS_WIN -#include <Windows.h> +#include <windows.h> #endif #include <QEvent> diff --git a/src/libs/utils/consoleprocess_p.h b/src/libs/utils/consoleprocess_p.h index bae258edc51..8fa610a7093 100644 --- a/src/libs/utils/consoleprocess_p.h +++ b/src/libs/utils/consoleprocess_p.h @@ -39,7 +39,7 @@ QT_END_NAMESPACE #ifdef Q_OS_WIN # include <QWinEventNotifier> -# include <Windows.h> +# include <windows.h> #endif namespace Utils { diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index 13a2bbce87a..001dd70a05d 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -43,7 +43,7 @@ #ifdef Q_OS_WIN #include <qt_windows.h> -#include <ShlObj.h> +#include <shlobj.h> #endif #ifdef Q_OS_OSX diff --git a/src/libs/utils/process_ctrlc_stub.cpp b/src/libs/utils/process_ctrlc_stub.cpp index 6632359e96d..cd4b6ccb552 100644 --- a/src/libs/utils/process_ctrlc_stub.cpp +++ b/src/libs/utils/process_ctrlc_stub.cpp @@ -37,7 +37,7 @@ #endif #define WIN32_LEAN_AND_MEAN -#include <Windows.h> +#include <windows.h> #include <shellapi.h> #include <wchar.h> #include <cstdlib> diff --git a/src/libs/utils/process_stub_win.c b/src/libs/utils/process_stub_win.c index 1021350e958..ba731e74065 100644 --- a/src/libs/utils/process_stub_win.c +++ b/src/libs/utils/process_stub_win.c @@ -26,7 +26,7 @@ #undef _WIN32_WINNT #define _WIN32_WINNT 0x0501 /* WinXP, needed for DebugActiveProcessStop() */ -#include <Windows.h> +#include <windows.h> #include <shellapi.h> #include <string.h> #include <stdio.h> diff --git a/src/libs/utils/savefile.cpp b/src/libs/utils/savefile.cpp index cde404bf2d3..13b9db0d849 100644 --- a/src/libs/utils/savefile.cpp +++ b/src/libs/utils/savefile.cpp @@ -27,7 +27,7 @@ #include "qtcassert.h" #include "fileutils.h" #ifdef Q_OS_WIN -# include <Windows.h> +# include <windows.h> # include <io.h> #else # include <unistd.h> diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp index 0ea5a00500e..f9d04a5d77e 100644 --- a/src/libs/utils/winutils.cpp +++ b/src/libs/utils/winutils.cpp @@ -30,7 +30,7 @@ #ifdef Q_OS_WIN #undef _WIN32_WINNT #define _WIN32_WINNT 0x0600 // Needed for QueryFullProcessImageName -#include <Windows.h> +#include <windows.h> #endif #include <QString> diff --git a/src/plugins/debugger/procinterrupt.cpp b/src/plugins/debugger/procinterrupt.cpp index 83997d3f90c..ef49b429e01 100644 --- a/src/plugins/debugger/procinterrupt.cpp +++ b/src/plugins/debugger/procinterrupt.cpp @@ -45,7 +45,7 @@ static inline QString msgCannotInterrupt(qint64 pid, const QString &why) #define _WIN32_WINNT 0x0501 /* WinXP, needed for DebugBreakProcess() */ #include <utils/winutils.h> -#include <Windows.h> +#include <windows.h> #if !defined(PROCESS_SUSPEND_RESUME) // Check flag for MinGW # define PROCESS_SUSPEND_RESUME (0x0800) diff --git a/src/plugins/debugger/registerpostmortemaction.cpp b/src/plugins/debugger/registerpostmortemaction.cpp index f602ab793f2..f1c4b204e0f 100644 --- a/src/plugins/debugger/registerpostmortemaction.cpp +++ b/src/plugins/debugger/registerpostmortemaction.cpp @@ -35,7 +35,7 @@ #include <QDir> #include <QString> -#include <Windows.h> +#include <windows.h> #include <objbase.h> #include <shellapi.h> diff --git a/src/plugins/debugger/shared/hostutils.cpp b/src/plugins/debugger/shared/hostutils.cpp index 773bf788c18..5a65d5a6ea7 100644 --- a/src/plugins/debugger/shared/hostutils.cpp +++ b/src/plugins/debugger/shared/hostutils.cpp @@ -32,7 +32,7 @@ // Enable Win API of XP SP1 and later #undef _WIN32_WINNT #define _WIN32_WINNT 0x0502 -#include <Windows.h> +#include <windows.h> #include <utils/winutils.h> #include <tlhelp32.h> #include <psapi.h> diff --git a/src/plugins/debugger/shared/peutils.cpp b/src/plugins/debugger/shared/peutils.cpp index 8e83e8abdf6..3d89fa77b4d 100644 --- a/src/plugins/debugger/shared/peutils.cpp +++ b/src/plugins/debugger/shared/peutils.cpp @@ -31,7 +31,7 @@ # include <QDir> # include <QDebug> # include <climits> -# include <Windows.h> +# include <windows.h> using Utils::winErrorMessage; diff --git a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp index f57ed6a945c..e0ac77deca4 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp @@ -37,7 +37,7 @@ #ifdef Q_OS_WIN #define _WIN32_WINNT 0x0502 -#include <Windows.h> +#include <windows.h> #ifndef PROCESS_SUSPEND_RESUME #define PROCESS_SUSPEND_RESUME 0x0800 #endif // PROCESS_SUSPEND_RESUME diff --git a/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp index 09e4ded72d3..b0d95c64746 100644 --- a/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp +++ b/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp @@ -43,7 +43,7 @@ // Enable Win API of XP SP1 and later #undef _WIN32_WINNT #define _WIN32_WINNT 0x0502 -#include <Windows.h> +#include <windows.h> #include <utils/winutils.h> #include <tlhelp32.h> #include <psapi.h> diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 6dc151e9abf..7860156db55 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -102,7 +102,7 @@ #include <utils/winutils.h> -#include <Windows.h> +#include <windows.h> #endif using namespace Core; diff --git a/src/shared/proparser/ioutils.cpp b/src/shared/proparser/ioutils.cpp index 6c88b3cfe0d..0552bd10972 100644 --- a/src/shared/proparser/ioutils.cpp +++ b/src/shared/proparser/ioutils.cpp @@ -30,7 +30,7 @@ #include <qregexp.h> #ifdef Q_OS_WIN -# include <Windows.h> +# include <windows.h> #else # include <sys/types.h> # include <sys/stat.h> diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 02290d09078..9d9afdd2afe 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -59,7 +59,7 @@ #include <sys/stat.h> #include <sys/utsname.h> #else -#include <Windows.h> +#include <windows.h> #endif #include <stdio.h> #include <stdlib.h> diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 0cced5d452d..00c87a7a23c 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -54,7 +54,7 @@ # include <sys/sysctl.h> # endif #else -#include <Windows.h> +#include <windows.h> #endif #include <stdio.h> #include <stdlib.h> diff --git a/src/shared/proparser/qmakeglobals.cpp b/src/shared/proparser/qmakeglobals.cpp index b6f243d5fdc..5889cfcc79f 100644 --- a/src/shared/proparser/qmakeglobals.cpp +++ b/src/shared/proparser/qmakeglobals.cpp @@ -49,7 +49,7 @@ #include <unistd.h> #include <sys/utsname.h> #else -#include <Windows.h> +#include <windows.h> #endif #include <stdio.h> #include <stdlib.h> diff --git a/src/shared/registryaccess/registryaccess.h b/src/shared/registryaccess/registryaccess.h index e5c6b01ae12..26c50327678 100644 --- a/src/shared/registryaccess/registryaccess.h +++ b/src/shared/registryaccess/registryaccess.h @@ -32,7 +32,7 @@ #include <QString> #include <QLatin1String> -#include <Windows.h> +#include <windows.h> namespace RegistryAccess { diff --git a/src/tools/qtcdebugger/main.cpp b/src/tools/qtcdebugger/main.cpp index 2bc0a438118..7453c08afca 100644 --- a/src/tools/qtcdebugger/main.cpp +++ b/src/tools/qtcdebugger/main.cpp @@ -43,7 +43,7 @@ #include <registryaccess.h> -#include <Windows.h> +#include <windows.h> #include <psapi.h> #include <app/app_version.h> diff --git a/src/tools/valgrindfake/outputgenerator.cpp b/src/tools/valgrindfake/outputgenerator.cpp index a0b7b7a5653..d2c944dac7a 100644 --- a/src/tools/valgrindfake/outputgenerator.cpp +++ b/src/tools/valgrindfake/outputgenerator.cpp @@ -37,7 +37,7 @@ // Yes, this is ugly. But please don't introduce a libUtils dependency // just to get rid of a single function. #ifdef Q_OS_WIN -#include <Windows.h> +#include <windows.h> void doSleep(int msec) { ::Sleep(msec); } #else #include <time.h> diff --git a/src/tools/wininterrupt/wininterrupt.c b/src/tools/wininterrupt/wininterrupt.c index d494a465b46..f15315effa5 100644 --- a/src/tools/wininterrupt/wininterrupt.c +++ b/src/tools/wininterrupt/wininterrupt.c @@ -31,7 +31,7 @@ #error Must target Windows NT 5.0.1 or later for DebugBreakProcess #endif -#include <Windows.h> +#include <windows.h> #include <stdio.h> /* To debug break a 64bit application under Windows, you must call diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index 94934bbb9fa..c4fc3b705b8 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -258,7 +258,7 @@ void dummyStatement(...) {} #endif #ifdef Q_OS_WIN -#include <Windows.h> +#include <windows.h> #include <basetsd.h> #undef min #undef max diff --git a/tests/manual/debugger/spacy path/app with space.cpp b/tests/manual/debugger/spacy path/app with space.cpp index 12fbca00fb9..1dfa82c0efd 100644 --- a/tests/manual/debugger/spacy path/app with space.cpp +++ b/tests/manual/debugger/spacy path/app with space.cpp @@ -47,7 +47,7 @@ #include <iostream> #ifdef Q_OS_WIN -#include <Windows.h> +#include <windows.h> #endif diff --git a/tests/manual/debugger/spacy-file/app with space.cpp b/tests/manual/debugger/spacy-file/app with space.cpp index 12fbca00fb9..1dfa82c0efd 100644 --- a/tests/manual/debugger/spacy-file/app with space.cpp +++ b/tests/manual/debugger/spacy-file/app with space.cpp @@ -47,7 +47,7 @@ #include <iostream> #ifdef Q_OS_WIN -#include <Windows.h> +#include <windows.h> #endif |