diff --git a/src/app/qtcreator.rc b/src/app/qtcreator.rc index 9ec34acd659..b23a85f3222 100644 --- a/src/app/qtcreator.rc +++ b/src/app/qtcreator.rc @@ -1,8 +1,8 @@ IDI_ICON1 ICON DISCARDABLE "qtcreator.ico" -IDI_ICON2 ICON DISCARDABLE "winicons\\c.ico" -IDI_ICON3 ICON DISCARDABLE "winicons\\cpp.ico" -IDI_ICON4 ICON DISCARDABLE "winicons\\h.ico" -IDI_ICON5 ICON DISCARDABLE "winicons\\ui.ico" -IDI_ICON6 ICON DISCARDABLE "winicons\\pro.ico" -IDI_ICON7 ICON DISCARDABLE "winicons\\pri.ico" -IDI_ICON8 ICON DISCARDABLE "winicons\\qml.ico" +IDI_ICON2 ICON DISCARDABLE "winicons/c.ico" +IDI_ICON3 ICON DISCARDABLE "winicons/cpp.ico" +IDI_ICON4 ICON DISCARDABLE "winicons/h.ico" +IDI_ICON5 ICON DISCARDABLE "winicons/ui.ico" +IDI_ICON6 ICON DISCARDABLE "winicons/pro.ico" +IDI_ICON7 ICON DISCARDABLE "winicons/pri.ico" +IDI_ICON8 ICON DISCARDABLE "winicons/qml.ico" diff --git a/src/libs/utils/process_ctrlc_stub.qbs b/src/libs/utils/process_ctrlc_stub.qbs index 5d641710156..e09f5756bef 100644 --- a/src/libs/utils/process_ctrlc_stub.qbs +++ b/src/libs/utils/process_ctrlc_stub.qbs @@ -11,7 +11,7 @@ QtcTool { files: [ "process_ctrlc_stub.cpp" ] cpp.dynamicLibraries: [ - "user32.lib", - "shell32.lib" + "user32", + "shell32" ] } diff --git a/src/libs/utils/process_stub.qbs b/src/libs/utils/process_stub.qbs index e101be7378c..e40ed866759 100644 --- a/src/libs/utils/process_stub.qbs +++ b/src/libs/utils/process_stub.qbs @@ -17,7 +17,7 @@ QtcTool { cpp.dynamicLibraries: { if (qbs.targetOS == "windows") { - return [ "shell32.lib" ] + return [ "shell32" ] } } } diff --git a/src/libs/zeroconf/embed/CommonServices.h b/src/libs/zeroconf/embed/CommonServices.h index a1c1f7a11d2..bf878faeee9 100644 --- a/src/libs/zeroconf/embed/CommonServices.h +++ b/src/libs/zeroconf/embed/CommonServices.h @@ -245,7 +245,7 @@ #include #include - #include + #include #if( defined( _MSC_VER ) ) #pragma warning( default:4706 ) diff --git a/src/libs/zeroconf/servicebrowser.cpp b/src/libs/zeroconf/servicebrowser.cpp index 34a71a31e95..2b41a7dd861 100644 --- a/src/libs/zeroconf/servicebrowser.cpp +++ b/src/libs/zeroconf/servicebrowser.cpp @@ -36,7 +36,7 @@ # ifndef NOMINMAX # define NOMINMAX # endif -# include +# include #endif // Q_OS_WIN #include "mdnsderived.h" diff --git a/src/libs/zeroconf/syssocket.h b/src/libs/zeroconf/syssocket.h index fc909199784..f661dfd5bb1 100644 --- a/src/libs/zeroconf/syssocket.h +++ b/src/libs/zeroconf/syssocket.h @@ -41,7 +41,7 @@ #include #ifdef Q_OS_WIN32 -# include +# include # ifndef SHUT_RDWR # ifdef SD_BOTH # define SHUT_RDWR SD_BOTH diff --git a/src/plugins/debugger/registerpostmortemaction.cpp b/src/plugins/debugger/registerpostmortemaction.cpp index 3ceedaaccc4..1d25c24bba2 100644 --- a/src/plugins/debugger/registerpostmortemaction.cpp +++ b/src/plugins/debugger/registerpostmortemaction.cpp @@ -42,9 +42,9 @@ #include #include -#include -#include -#include +#include +#include +#include using namespace RegistryAccess; diff --git a/src/shared/registryaccess/registryaccess.h b/src/shared/registryaccess/registryaccess.h index 8004005912f..057666e5d18 100644 --- a/src/shared/registryaccess/registryaccess.h +++ b/src/shared/registryaccess/registryaccess.h @@ -40,7 +40,7 @@ #include #include -#include +#include namespace RegistryAccess {