summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-08-20 17:36:13 (GMT)
committerShane Kearns <shane.kearns@sosco.com>2009-08-20 17:36:13 (GMT)
commit4ba5a86f530e93c179c9049d36b2f38595a5ef09 (patch)
tree6ce937f760164e2fc8822ba04625af103a49dec0 /src/corelib/io
parentfdda7f1dd01215e36116aa4e3428aae9f23dd711 (diff)
parentef1335b1ab76fb3ee1082b5abab66b43fa45df1d (diff)
downloadQt-4ba5a86f530e93c179c9049d36b2f38595a5ef09.zip
Qt-4ba5a86f530e93c179c9049d36b2f38595a5ef09.tar.gz
Qt-4ba5a86f530e93c179c9049d36b2f38595a5ef09.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/io')
-rw-r--r--src/corelib/io/qdir.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 91d41f1..f9a1aca 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -2447,7 +2447,7 @@ QDebug operator<<(QDebug debug, QDir::Filters filters)
return debug;
}
-QDebug operator<<(QDebug debug, QDir::SortFlags sorting)
+static QDebug operator<<(QDebug debug, QDir::SortFlags sorting)
{
if (sorting == QDir::NoSort) {
debug << "QDir::SortFlags(NoSort)";