summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-20 18:45:43 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-20 18:45:43 (GMT)
commitd63d0c10c0eeef0d2f93f3d0b197e09399087b00 (patch)
tree746a1856103d6367f9821a81b7eee25aeb10a7ed /src/corelib/tools
parent435c87186ff54ebfd481e41e07b9a136fbc87a20 (diff)
parente90a5e819478b656963de0492a1b234c8863a12b (diff)
downloadQt-d63d0c10c0eeef0d2f93f3d0b197e09399087b00.zip
Qt-d63d0c10c0eeef0d2f93f3d0b197e09399087b00.tar.gz
Qt-d63d0c10c0eeef0d2f93f3d0b197e09399087b00.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts: src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qbytearray.h1
-rw-r--r--src/corelib/tools/qregexp.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h
index 635c799..e952ea2 100644
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/tools/qbytearray.h
@@ -310,6 +310,7 @@ public:
// stl compatibility
typedef const char & const_reference;
typedef char & reference;
+ typedef char value_type;
void push_back(char c);
void push_back(const char *c);
void push_back(const QByteArray &a);
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index 0e2f8f2..f54a938 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -832,7 +832,7 @@ struct QRegExpEngineKey
}
};
-bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key2)
+static bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key2)
{
return key1.pattern == key2.pattern && key1.patternSyntax == key2.patternSyntax
&& key1.cs == key2.cs;