Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

6 files changed, 30 insertions, 17 deletions

diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index 6aa3b56..033225b 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -263,7 +263,7 @@ QTimerInfoList::QTimerInfoList()
 #  if (_POSIX_MONOTONIC_CLOCK == 0)
     // detect if the system support monotonic timers
     long x = sysconf(_SC_MONOTONIC_CLOCK);
-    useMonotonicTimers = x >= 200112L;
+    useMonotonicTimers = x != -1;
 #  endif
 
     getTime(currentTime);
@@ -420,10 +420,18 @@ bool QTimerInfoList::timerWait(timeval &tm)
     timeval currentTime = updateCurrentTime();
     repairTimersIfNeeded();
 
-    if (isEmpty())
-        return false;
+    // Find first waiting timer not already active
+    QTimerInfo *t = 0;
+    for (QTimerInfoList::const_iterator it = constBegin(); it != constEnd(); ++it) {
+	if (!(*it)->inTimerEvent) {
+	    t = *it;
+	    break;
+	}
+    }
+
+    if (!t)
+      return false;
 
-    QTimerInfo *t = first();        // first waiting timer
     if (currentTime < t->timeout) {
         // time to wait
         tm = t->timeout - currentTime;
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index be622d9..1501351 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -897,7 +897,8 @@ QObjectPrivate::Connection::~Connection()
     \relates QObject
 
     Returns the given \a object cast to type T if the object is of type
-    T (or of a subclass); otherwise returns 0.
+    T (or of a subclass); otherwise returns 0.  If \a object is 0 then 
+    it will also return 0.
 
     The class T must inherit (directly or indirectly) QObject and be
     declared with the \l Q_OBJECT macro.
@@ -2051,7 +2052,7 @@ void QObject::deleteLater()
 
     or
 
-    \tt{/*: ... \starslash}
+    \tt{\begincomment: ... \endcomment}
 
     Examples:
 
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index 08821d4..8ca53b9 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -211,7 +211,7 @@ void QTimer::start()
 */
 void QTimer::start(int msec)
 {
-    setInterval(msec);
+    inter = msec;
     start();
 }
 
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 5ba9898..38fa216 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -149,6 +149,9 @@ static int numerusHelper(int n, const uchar *rules, int rulesSize)
                     leftOperand %= 10;
                 } else if (opcode & Q_MOD_100) {
                     leftOperand %= 100;
+                } else if (opcode & Q_LEAD_1000) {
+                    while (leftOperand >= 1000)
+                        leftOperand /= 1000;
                 }
 
                 int op = opcode & Q_OP_MASK;
diff --git a/src/corelib/kernel/qtranslator_p.h b/src/corelib/kernel/qtranslator_p.h
index 77ec8f5..a7d58c5 100644
--- a/src/corelib/kernel/qtranslator_p.h
+++ b/src/corelib/kernel/qtranslator_p.h
@@ -62,6 +62,7 @@ enum {
     Q_NOT         = 0x08,
     Q_MOD_10      = 0x10,
     Q_MOD_100     = 0x20,
+    Q_LEAD_1000   = 0x40,
 
     Q_AND         = 0xFD,
     Q_OR          = 0xFE,
diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h
index 033b760..02b507e 100644
--- a/src/corelib/kernel/qvariant_p.h
+++ b/src/corelib/kernel/qvariant_p.h
@@ -105,28 +105,28 @@ private:
 
 // constructs a new variant if copy is 0, otherwise copy-constructs
 template <class T>
-inline void v_construct(QVariant::Private *x, const T &t)
+inline void v_construct(QVariant::Private *x, const void *copy, T * = 0)
 {
     if (sizeof(T) > sizeof(QVariant::Private::Data)) {
-        x->data.shared = new QVariantPrivateSharedEx<T>(t);
+        x->data.shared = copy ? new QVariantPrivateSharedEx<T>(*static_cast<const T *>(copy))
+                              : new QVariantPrivateSharedEx<T>;
         x->is_shared = true;
     } else {
-        new (&x->data.ptr) T(t);
+        if (copy)
+            new (&x->data.ptr) T(*static_cast<const T *>(copy));
+        else
+            new (&x->data.ptr) T;
     }
 }
 
 template <class T>
-inline void v_construct(QVariant::Private *x, const void *copy, T * = 0)
+inline void v_construct(QVariant::Private *x, const T &t)
 {
     if (sizeof(T) > sizeof(QVariant::Private::Data)) {
-        x->data.shared = copy ? new QVariantPrivateSharedEx<T>(*static_cast<const T *>(copy))
-                              : new QVariantPrivateSharedEx<T>;
+        x->data.shared = new QVariantPrivateSharedEx<T>(t);
         x->is_shared = true;
     } else {
-        if (copy)
-            new (&x->data.ptr) T(*static_cast<const T *>(copy));
-        else
-            new (&x->data.ptr) T;
+        new (&x->data.ptr) T(t);
     }
 }