diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-12-14 07:46:31 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-12-14 07:46:31 +1100 |
| commit | 6f94ed773596f4675685ee0cad7ddeaee9d53767 (patch) | |
| tree | f9ad8cd668fef1b2a9bbd36142d62067ac435492 | |
| parent | ba44752c09788655780cf71960093128c17d956f (diff) | |
| download | scintilla-mirror-6f94ed773596f4675685ee0cad7ddeaee9d53767.tar.gz | |
Stop specifying -std:c++latest as that is no longer needed to enable C++17 with
MSVC 2017 and Qt 5.12 and it caused duplicate flag warnings.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.pro | 4 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.pro | 4 | ||||
| -rw-r--r-- | qt/ScintillaEditPy/ScintillaEditPy.pro | 1 |
4 files changed, 4 insertions, 9 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 9d87269f4..51a438682 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -619,6 +619,10 @@ Improve performance of text insertion when Unicode line indexing off. </li> <li> + For Qt on Windows, stop specifying -std:c++latest as that is no longer needed + to enable C++17 with MSVC 2017 and Qt 5.12 and it caused duplicate flag warnings. + </li> + <li> On Linux, enable Lua to access dynamic libraries. <a href="https://sourceforge.net/p/scintilla/bugs/2058/">Bug #2058</a>. </li> diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index 1d1e5a61a..82b7c5d5c 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -14,10 +14,6 @@ CONFIG += c++1z VERSION = 4.1.2 -win32 { - QMAKE_CXXFLAGS += -std:c++latest -} - SOURCES += \ ScintillaEdit.cpp \ ScintillaDocument.cpp \ diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index 6414cf75f..dddf962ec 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -14,10 +14,6 @@ CONFIG += c++1z VERSION = 4.1.2 -win32 { - QMAKE_CXXFLAGS += -std:c++latest -} - SOURCES += \ PlatQt.cpp \ ScintillaQt.cpp \ diff --git a/qt/ScintillaEditPy/ScintillaEditPy.pro b/qt/ScintillaEditPy/ScintillaEditPy.pro index dce11ccac..188543930 100644 --- a/qt/ScintillaEditPy/ScintillaEditPy.pro +++ b/qt/ScintillaEditPy/ScintillaEditPy.pro @@ -13,7 +13,6 @@ include(sepbuild.pri) VERSION = $$SCINTILLA_VERSION win32 { - QMAKE_CXXFLAGS += -std:c++latest DebugBuild { TARGET_EXT = _d.pyd } |