Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

8 files changed, 71 insertions, 63 deletions

diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
index 15b8ecd..e93394f 100644
--- a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
+++ b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
@@ -46,6 +46,9 @@
 #include <mach/mach_time.h>
 #include <unistd.h>
 #elif defined(Q_OS_UNIX)
+#if defined(Q_OS_HURD)
+#include <sys/time.h>
+#endif
 #include <time.h>
 #include <unistd.h>
 #elif defined(Q_OS_WIN)
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index ff8c6c8..c1c7812 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -93,7 +93,7 @@ public:
     inline QDebug &maybeSpace() { if (stream->space) stream->ts << ' '; return *this; }
 
     inline QDebug &operator<<(QChar t) { stream->ts << '\'' << t << '\''; return maybeSpace(); }
-    inline QDebug &operator<<(QBool t) { stream->ts << (bool(t) ? "true" : "false"); return maybeSpace(); }
+    inline QDebug &operator<<(QBool t) { stream->ts << (bool(t != 0) ? "true" : "false"); return maybeSpace(); }
     inline QDebug &operator<<(bool t) { stream->ts << (t ? "true" : "false"); return maybeSpace(); }
     inline QDebug &operator<<(char t) { stream->ts << t; return maybeSpace(); }
     inline QDebug &operator<<(signed short t) { stream->ts << t; return maybeSpace(); }
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 61081a1..0a435b9 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -573,6 +573,8 @@ QString QFileInfo::canonicalFilePath() const
 QString QFileInfo::absolutePath() const
 {
     Q_D(const QFileInfo);
+    if (d->data->fileName.isEmpty())
+        qWarning("QFileInfo::absolutePath: Constructed with empty filename");
     if(!d->data->fileEngine)
         return QLatin1String("");
     return d->getFileName(QAbstractFileEngine::AbsolutePathName);
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 71414ce..ea262bf 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -825,10 +825,9 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(FileFlags type) const
             ret |= RootFlag;
         } else {
             QString baseName = fileName(BaseName);
-            if ((baseName.size() > 1
-                 && baseName.at(0) == QLatin1Char('.') && baseName.at(1) != QLatin1Char('.'))
+            if ((baseName.size() > 0 && baseName.at(0) == QLatin1Char('.'))
 #  if !defined(QWS) && defined(Q_OS_MAC)
-                    || _q_isMacHidden(d->filePath)
+                || _q_isMacHidden(d->filePath)
 #  endif
             ) {
                 ret |= HiddenFlag;
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index a6cb5a9..a7719a8 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -1595,13 +1595,10 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(QAbstractFileEngine::Fil
         ret |= LocalDiskFlag;
         if (d->doStat()) {
             ret |= ExistsFlag;
-            if (d->filePath == QLatin1String("/") || isDriveRoot(d->filePath) || isUncRoot(d->filePath)) {
+            if (d->filePath == QLatin1String("/") || isDriveRoot(d->filePath) || isUncRoot(d->filePath))
                 ret |= RootFlag;
-            } else if (d->fileAttrib & FILE_ATTRIBUTE_HIDDEN) {
-                QString baseName = fileName(BaseName);
-                if (baseName != QLatin1String(".") && baseName != QLatin1String(".."))
-                    ret |= HiddenFlag;
-            }
+            else if (d->fileAttrib & FILE_ATTRIBUTE_HIDDEN)
+                ret |= HiddenFlag;
         }
     }
     return ret;
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index fd51bcf..6ac6468 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -3864,14 +3864,18 @@ QByteArray QUrlPrivate::toEncoded(QUrl::FormattingOptions options) const
         url += "//";
 
         if ((options & QUrl::RemoveUserInfo) != QUrl::RemoveUserInfo) {
+            bool hasUserOrPass = false;
             if (!userName.isEmpty()) {
                 url += encodedUserName;
-                if (!(options & QUrl::RemovePassword) && !password.isEmpty()) {
-                    url += ':';
-                    url += encodedPassword;
-                }
-                url += '@';
+                hasUserOrPass = true;
             }
+            if (!(options & QUrl::RemovePassword) && !password.isEmpty()) {
+                url += ':';
+                url += encodedPassword;
+                hasUserOrPass = true;
+            }
+            if (hasUserOrPass)
+                url += '@';
         }
 
         if (host.startsWith(QLatin1Char('['))) {
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
index af68434..3db308f 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -202,7 +202,7 @@ public:
     QStack<QEventLoop *> eventLoops;
     QPostEventList postEventList;
     bool canWait;
-    QMap<int, void *> tls;
+    QVector<void *> tls;
 
     QMutex mutex;
 
diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp
index 8b1f255..a7d53d0 100644
--- a/src/corelib/thread/qthreadstorage.cpp
+++ b/src/corelib/thread/qthreadstorage.cpp
@@ -71,27 +71,32 @@ void qtsDebug(const char *fmt, ...)
 #  define DEBUG_MSG if(false)qDebug
 #endif
 
-static QBasicAtomicInt idCounter = Q_BASIC_ATOMIC_INITIALIZER(INT_MAX);
 Q_GLOBAL_STATIC(QMutex, mutex)
-typedef QMap<int, void (*)(void *)> DestructorMap;
+typedef QVector<void (*)(void *)> DestructorMap;
 Q_GLOBAL_STATIC(DestructorMap, destructors)
 
 QThreadStorageData::QThreadStorageData(void (*func)(void *))
-    : id(idCounter.fetchAndAddRelaxed(-1))
 {
     QMutexLocker locker(mutex());
-    destructors()->insert(id, func);
-
+    DestructorMap *destr = destructors();
+    for (id = 0; id < destr->count(); id++) {
+        if (destr->at(id) == 0)
+            break;
+    }
+    if (id == destr->count()) {
+        destr->append(func);
+    } else {
+        (*destr)[id] = func;
+    }
     DEBUG_MSG("QThreadStorageData: Allocated id %d, destructor %p", id, func);
 }
 
 QThreadStorageData::~QThreadStorageData()
 {
+    DEBUG_MSG("QThreadStorageData: Released id %d", id);
     QMutexLocker locker(mutex());
     if (destructors())
-        destructors()->remove(id);
-
-    DEBUG_MSG("QThreadStorageData: Released id %d", id);
+        (*destructors())[id] = 0;
 }
 
 void **QThreadStorageData::get() const
@@ -101,14 +106,17 @@ void **QThreadStorageData::get() const
         qWarning("QThreadStorage::get: QThreadStorage can only be used with threads started with QThread");
         return 0;
     }
-    QMap<int, void *>::const_iterator it = data->tls.constFind(id);
+    QVector<void *> &tls = data->tls;
+    if (tls.size() <= id)
+        tls.resize(id + 1);
+    void **v = &tls[id];
+
     DEBUG_MSG("QThreadStorageData: Returning storage %d, data %p, for thread %p",
           id,
-          it != data->tls.end() ? it.value() : 0,
+          *v,
           data->thread);
-    // const_cast below is a bit evil - but we have to make sure not to detach here
-    // otherwise we'll go bonkers in oom situations
-    return it != data->tls.constEnd() && it.value() != 0 ? const_cast<void **>(&it.value()) : 0;
+
+    return *v ? v : 0;
 }
 
 void **QThreadStorageData::set(void *p)
@@ -118,51 +126,46 @@ void **QThreadStorageData::set(void *p)
         qWarning("QThreadStorage::set: QThreadStorage can only be used with threads started with QThread");
         return 0;
     }
+    QVector<void *> &tls = data->tls;
+    if (tls.size() <= id)
+        tls.resize(id + 1);
+
+    void *&value = tls[id];
+    // delete any previous data
+    if (value != 0) {
+        DEBUG_MSG("QThreadStorageData: Deleting previous storage %d, data %p, for thread %p",
+                id,
+                value,
+                data->thread);
 
-    QMap<int, void *>::iterator it = data->tls.find(id);
-    if (it != data->tls.end()) {
-        // delete any previous data
-        if (it.value() != 0) {
-            DEBUG_MSG("QThreadStorageData: Deleting previous storage %d, data %p, for thread %p",
-                  id,
-                  it.value(),
-                  data->thread);
-
-            void *q = it.value();
-            it.value() = 0;
-
-            QMutexLocker locker(mutex());
-            void (*destructor)(void *) = destructors()->value(id);
-            locker.unlock();
+        QMutexLocker locker(mutex());
+        void (*destructor)(void *) = destructors()->value(id);
+        locker.unlock();
 
-            destructor(q);
-        }
+        void *q = value;
+        value = 0;
 
-        // store new data
-        it.value() = p;
-        DEBUG_MSG("QThreadStorageData: Set storage %d for thread %p to %p", id, data->thread, p);
-    } else {
-        it = data->tls.insert(id, p);
-        DEBUG_MSG("QThreadStorageData: Inserted storage %d, data %p, for thread %p", id, p, data->thread);
+        destructor(q);
     }
 
-    return &it.value();
+    // store new data
+    value = p;
+    DEBUG_MSG("QThreadStorageData: Set storage %d for thread %p to %p", id, data->thread, p);
+    return &value;
 }
 
 void QThreadStorageData::finish(void **p)
 {
-    QMap<int, void *> *tls = reinterpret_cast<QMap<int, void *> *>(p);
+    QVector<void *> *tls = reinterpret_cast<QVector<void *> *>(p);
     if (!tls || tls->isEmpty() || !mutex())
         return; // nothing to do
 
     DEBUG_MSG("QThreadStorageData: Destroying storage for thread %p", QThread::currentThread());
 
-    QMap<int, void *>::iterator it = tls->begin();
-    while (it != tls->end()) {
-        int id = it.key();
-        void *q = it.value();
-        it.value() = 0;
-        ++it;
+    for(int i = tls->size() - 1; i >= 0; i--) {
+        void *&value = (*tls)[i];
+        void *q = value;
+        value = 0;
 
         if (!q) {
             // data already deleted
@@ -170,16 +173,16 @@ void QThreadStorageData::finish(void **p)
         }
 
         QMutexLocker locker(mutex());
-        void (*destructor)(void *) = destructors()->value(id);
+        void (*destructor)(void *) = destructors()->value(i);
         locker.unlock();
 
         if (!destructor) {
             if (QThread::currentThread())
                 qWarning("QThreadStorage: Thread %p exited after QThreadStorage %d destroyed",
-                         QThread::currentThread(), id);
+                         QThread::currentThread(), i);
             continue;
         }
-        destructor(q);
+        destructor(q); //crash here might mean the thread exited after qthreadstorage was destroyed
     }
     tls->clear();
 }