diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2020-04-23 12:17:50 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2020-04-23 12:17:50 (GMT) |
| commit | 153f691c164af542e009a546cdb64b0aee720aa3 (patch) | |
| tree | 7b0205cb80f414889ec77d2b17199633e6f6ac9c | |
| parent | e7802dbdf4fe42665dce2bd1259b7d7c7bfffecd (diff) | |
| download | Qt-153f691c164af542e009a546cdb64b0aee720aa3.zip Qt-153f691c164af542e009a546cdb64b0aee720aa3.tar.gz Qt-153f691c164af542e009a546cdb64b0aee720aa3.tar.bz2 | |
Merged changes from Branch QT_5_14_0refs/changes/35/11035/1
Change-Id: Ibc2047e9f9ac485e223918f6cfc8451bd5e6d70e
| -rw-r--r-- | SOURCE/qt-creator-dllexport.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/SOURCE/qt-creator-dllexport.patch b/SOURCE/qt-creator-dllexport.patch new file mode 100644 index 0000000..090ec84 --- /dev/null +++ b/SOURCE/qt-creator-dllexport.patch @@ -0,0 +1,36 @@ +diff -ruNb qt-creator-opensource-src-4.11.2.orig/src/libs/sqlite/sqlite.pro qt-creator-opensource-src-4.11.2/src/libs/sqlite/sqlite.pro +--- qt-creator-opensource-src-4.11.2.orig/src/libs/sqlite/sqlite.pro 2020-03-27 04:34:54.000000000 +0100 ++++ qt-creator-opensource-src-4.11.2/src/libs/sqlite/sqlite.pro 2020-04-20 19:03:50.059094604 +0200 +@@ -3,7 +3,7 @@ + + include(../../qtcreatorlibrary.pri) + +-win32:DEFINES += SQLITE_API=__declspec(dllexport) ++win32:DEFINES += SQLITE_API=__declspec\(dllexport\) + unix:DEFINES += SQLITE_API=\"__attribute__((visibility(\\\"default\\\")))\" + + include(sqlite-lib.pri) +diff -ruNb qt-creator-opensource-src-4.11.2.orig/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp qt-creator-opensource-src-4.11.2/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +--- qt-creator-opensource-src-4.11.2.orig/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp 2020-03-27 04:34:54.000000000 +0100 ++++ qt-creator-opensource-src-4.11.2/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp 2020-04-20 20:26:17.486219748 +0200 +@@ -54,7 +54,7 @@ + #include <QTimer> + + #ifdef Q_OS_WIN +-#include <Windows.h> ++#include <windows.h> + #endif + + using namespace ProjectExplorer; +diff -ruNb qt-creator-opensource-src-4.11.2.orig/src/tools/winrtdebughelper/winrtdebughelper.cpp qt-creator-opensource-src-4.11.2/src/tools/winrtdebughelper/winrtdebughelper.cpp +--- qt-creator-opensource-src-4.11.2.orig/src/tools/winrtdebughelper/winrtdebughelper.cpp 2020-03-27 04:34:56.000000000 +0100 ++++ qt-creator-opensource-src-4.11.2/src/tools/winrtdebughelper/winrtdebughelper.cpp 2020-04-20 20:41:14.599066226 +0200 +@@ -23,7 +23,7 @@ + ** + ****************************************************************************/ + +-#include <Windows.h> ++#include <windows.h> + #include <stdio.h> + #include <stdlib.h> + |