feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.15' into 5.0

Browse Source 
Change-Id: I2e63e1136af4001836044f4e67e3d01c1e9f0369
This commit is contained in:
Eike Ziller
2021-07-09 16:01:31 +02:00
parent 3f06ca7cbb 94d227cd43
commit cfba41c307
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/shared/proparser/proitems.h
View File

@@ -350,6 +350,15 @@ inline ProStringList operator+(const ProStringList &one, const ProStringList &tw
typedef QMap<ProKey, ProStringList> ProValueMap; typedef QMap<ProKey, ProStringList> ProValueMap;
// For std::list (sic!)
#ifdef Q_CC_MSVC
inline bool operator<(const ProValueMap &, const ProValueMap &)
{
Q_ASSERT(false);
return false;
}
#endif
// These token definitions affect both ProFileEvaluator and ProWriter // These token definitions affect both ProFileEvaluator and ProWriter
enum ProToken { enum ProToken {
TokTerminator = 0, // end of stream (possibly not included in length; must be zero) TokTerminator = 0, // end of stream (possibly not included in length; must be zero)