Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6

7 files changed, 130 insertions, 33 deletions

diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index 03ee4a4..e6f8f68 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -62,28 +62,11 @@ QtCore
  - QByteArray
     * New overloads for QByteArray::insert() and QByteArray::prepend()
 
- - QObject
-    * [259514] fixed a possible dead-lock in the destructor
-
- - QVariant
-    * Many optimisations
-    * Added QVariant::toFloat() and QVariant::toReal()
-    * Added QVariant(float) constructor
-    * qvariant_cast<QVariant> and qVariantFromValue<QVariant> are now
-      identify functions
-    * Added support for math3d types.
-
- - Qt::escape
-    * now escape the double quote (&quot;)
-
- - QScopedPointer
-    * New pointer class for cleaning up objects when leaving the
-      current scope
-
  - QFile
     * Make QFile::resize() more robust when operating on buffered files
 
  - QObject
+    * [259514] fixed a possible dead-lock in the destructor
     * Added the possibility to pass the flag Qt::UniqueConnection to QObject::connect
     * Fixed race conditions that occured when moving object to threads while connecting
 
@@ -91,9 +74,17 @@ QtCore
     * Improved performance of plugin loading by reusing the plugin cache instead of loading
       it every time.
 
+ - QProcessEnvironment
+    * New class; support for easy access to key/value pairs in the
+      process environment
+
  - QRegExp
     * New pattern syntax "QRegExp::WildcardUnix" with wildcard characters escaping
 
+ - QScopedPointer
+    * New pointer class for cleaning up objects when leaving the
+      current scope
+
  - QSharedPointer
     * Added support for creating the object along the internal private
       data in one single memory allocation. (QSharedPointer::create)
@@ -110,6 +101,14 @@ QtCore
       to STD3 to validate, thus preventing invalid hostnames from
       being accepted. See below in "Important Behavior Changes".
 
+ - QVariant
+    * Many optimisations
+    * Added QVariant::toFloat() and QVariant::toReal()
+    * Added QVariant(float) constructor
+    * qvariant_cast<QVariant> and qVariantFromValue<QVariant> are now
+      identify functions
+    * Added support for math3d types.
+
  - QXmlStreamWriter
     * [256468] fix comment indentation
 
@@ -118,10 +117,47 @@ QtCore
       attached to a QSharedPointer.
     * Added QWeakPointer::data which allows you to obtain the pointer
       being tracked (without protection).
+    * Added operator-> like the above data(), but requires a #define.
+
+ - QUuid
+    * [QTBUG-3543] Fixed a bug in createUuid() which caused multiple
+      threads to generate the identical UUID sequences
+
+ - QEventDispatcherGlib (internal class)
+    * Fix a regression introduced in 4.5.3 that would cause timers to not
+      be delivered.
+
+ - QEventDispatcherUNIX (internal class)
+    * Improve detection of monotonic clock support to include
+      non-POSIX.1-2001 compliant systems.
+    * [250681] Fix time change detection on UNIX systems without
+      monotonic timers.
+
+ - QEventDispatcherWin32 (internal class)
+    * Changed the threshold for using multimedia timers to 20ms (was 10ms).
+    * Changed the way Qt's posted events are sent by the event
+      dispatcher. The are now driven on top of a Windows message
+      instead of an explicit call in processEvents(). This means that
+      posted events are sent even when a Windows modal message loop is
+      running (for example, when the user is moving a window or when a
+      native modal dialog is visible).
+    * Fixed a bug that would allow the same timer id to be used by
+      multiple QTimer instances.
+
+ - QTextCodec
+    * Instantiate the CP949 codec when building with -no-iconv.
+
+ - QThread
+    * [249997] Document that QThread priority has no effect on Linux.
 
 QtGui
-- QGraphicsAnchorLayout
-    * Support for expanding size policy has been removed. (The Qt 4.6 Beta had support for it).
+
+ - Qt::escape
+    * now escape the double quote (&quot;)
+
+ - QGraphicsAnchorLayout
+    * Support for expanding size policy has been removed. (The Qt 4.6
+      Beta had support for it).
 
  - QCalendarWidget
     * [252943] QCalendarWidget::setDateTextFormat() reset the format if the date is invalid.
@@ -129,6 +165,9 @@ QtGui
  - QCompleter
     * [246056] Fixed a possible assertion when setting the completer prefix
 
+ - QEvent
+    * Introduced RequestSoftwareInputPanel and CloseSoftwareInputPanel events.
+
  - QFontDialog
     * [256466] fixed the dialog not always returning the selected style.
 
@@ -149,6 +188,7 @@ QtGui
     * Introduced QGraphicsItem::focusProxy(), focus proxy support
     * Introduced QGraphicsItem::ItemNegativeZStacksBehindParent
     * Introduced QGraphicsItem::ItemIsPanel, light-weight window support
+    * Introduced modality support for QGraphicsItem panels.
     * Introduced activation support.
     * Introduced QGraphicsItem::stackBefore()
     * Cached items are now always invalidated when update() is called.
@@ -206,6 +246,7 @@ QtGui
 
  - QLineEdit
     * [248948] Clear selection when redoing a delete operation.
+    * [QTBUG-5261] Fixed: Erasing characters from textedits does not update the text
 
  - QListView
     * [243335] Fixed the visualRect to return correct values when the widget is not yet show
@@ -272,6 +313,7 @@ QtGui
       cause holes in the stroke.
 
  - QWidget
+    * Added inputMethodHints property.
     * [201649] Added QWidget::previousInFocusChain
     * [254563] Fixed a crash when setting a focus in a widget tree that
       contains invisible widgets
@@ -301,13 +343,7 @@ QtGui
  - QApplication
     * [QTBUG-739] Removed internal widgets from QApplication::topLevelWidgets().
 
-QtDBus
-
- - QDBusConnection
-    * Made sending of invalid/incomplete messages consistently fail
-      with error (no more assertions).
-
-   - QPlainTextEdit
+ - QPlainTextEdit
     * Fixed crash when clicking on a text edit which was smaller than the 
       height of the font used.
 	  
@@ -342,6 +378,22 @@ QtDBus
  - QFontMetrics	  
     * [176401] Account for right bearing in bounding rect.
 
+ - QPlastiqueStyle
+    * [QTBUG-3555] Fixed a bug in the Plastique style that would cause an
+      ASSERT failure in QFont when the application font has a pixel size set.
+
+QtDBus
+
+ - QDBusConnection
+    * Made sending of invalid/incomplete messages consistently fail
+      with error (no more assertions).
+    * [249528/QTBUG-3833] Added an overload of connect() that allows
+      one to specify strings for matching arguments.
+
+ - QDBusServiceWatcher
+    * New class; supports efficiently watching for a service to be
+      created, deleted or change owners
+
 QtNetwork
 
  - QAbstractSocket
@@ -452,10 +504,13 @@ QtSql
    * Add proper iODBC linking support.
 
 QtSvg
+
  - QSvgHandler
-   * [245602] Fixed gradient and solid-color referencing.
-   * [202426] Made stroke attribute inheritance work with 'use' tags.
+   * [245602] [204686] Fixed gradient and solid-color referencing.
+   * [202426] Made attribute inheritance work with 'use' tags.
    * [250618] Fixed gradient on strokes.
+   * [254040] Added support for 'vector-effect'.
+   
  - QSvgPaintEngine
    * [257052] Changed drawImage() to ignore aspect ratio.
 
@@ -539,6 +594,21 @@ Qt for Linux/X11
  - Tablet: Disable event compression of events of type QTabletEvent when the
    current event is accepted by the receiver.
 
+ - [QTBUG-4242] Fixed a bug that allowed the user to close a window
+   event though the program is using the QEventLoop::ExcludeUserInputEvents
+   flag.
+
+ - [255559] Fixed generation of XdndLeave events to include the
+   correct source id.
+
+ - [258319] Avoid division by zero on some Xlib/Xserver implementations.
+
+ - Fixed the default QWidget size on X servers with Xinerama to give widgets
+   a default size that should fit on a single screen.
+
+ - Support _NET_WORKAREA on X servers with Xinerama (previously this property
+   was ignored).
+
 Qt for Windows
 --------------
 
@@ -579,6 +649,7 @@ Qt for Windows
    text where several characters were represented by a single glyph, e.g. 
    a double 't' with the Calibri font.
    
+ - Added QSysInfo::WV_WINDOWS7 and QSysInfo::WV_6_1
 
 Qt for Mac OS X
 ---------------
@@ -866,3 +937,10 @@ Qt for Windows CE
   Animation framework for animation.  The hellogl and overpainting examples
   now compile on OpenGL/ES 1.1.  Also common code is factored.
 
+- qmake no longer adds Qt internal dependencies to the linker when Qt
+  is built in shared mode (not static). This means that applications
+  that made use of platform-specific API may need to adjust the LIBS
+  variable in their .pro files to match:
+
+    X11: LIBS += -lX11
+    Mac: LIBS += -framework AppKit -framework Carbon
diff --git a/src/3rdparty/ce-compat/ce_time.cpp b/src/3rdparty/ce-compat/ce_time.c
index 92efae0..92efae0 100644
--- a/src/3rdparty/ce-compat/ce_time.cpp
+++ b/src/3rdparty/ce-compat/ce_time.c
diff --git a/src/3rdparty/ce-compat/ce_time.h b/src/3rdparty/ce-compat/ce_time.h
index 9d946e8..07ca094 100644
--- a/src/3rdparty/ce-compat/ce_time.h
+++ b/src/3rdparty/ce-compat/ce_time.h
@@ -2,15 +2,24 @@
 #define __CE_TIME_H__
 
 #if defined(_WIN32_WCE) && _WIN32_WCE >= 0x600
-// we need to prototype the time functions for Windows CE >= 6.0
+/* we need to prototype the time functions for Windows CE >= 6.0 */
 #include <crtdefs.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct tm;
 
 time_t time(time_t* timer);
 time_t mktime(struct tm *t);
 size_t strftime(char * const s, const size_t maxsize, const char * const format, const struct tm * const t);
 struct tm *localtime(const time_t *timer);
-#endif
 
+#ifdef __cplusplus
+}   /* closing brace for extern "C" */
 #endif
+
+#endif /* defined(_WIN32_WCE) && _WIN32_WCE >= 0x600 */
+
+#endif /* !defined(__CE_TIME_H__) */
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
index 2330de1..ea6e5ab 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
@@ -59,7 +59,8 @@ win32-* {
 }
 
 wince* {
-    SOURCES += $$QT_SOURCE_TREE/src/3rdparty/ce-compat/ce_time.cpp
+    INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
+    SOURCES += $$QT_SOURCE_TREE/src/3rdparty/ce-compat/ce_time.c
     DEFINES += WINCEBASIC
 }
 
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
index 73212db..fa7a006 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -367,6 +367,10 @@
 #   endif
 #endif
 
+#if PLATFORM(WINCE) && PLATFORM(QT)
+#   include <ce_time.h>
+#endif
+
 /* Compiler */
 
 /* COMPILER(MSVC) */
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
index eb26664..8bd4225 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -61,7 +61,8 @@ win32-* {
 }
 
 wince* {
-    SOURCES += $$QT_SOURCE_TREE/src/3rdparty/ce-compat/ce_time.cpp
+    INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
+    SOURCES += $$QT_SOURCE_TREE/src/3rdparty/ce-compat/ce_time.c
     DEFINES += WINCEBASIC
 }
 
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
index 7632435..ddc287f 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
@@ -372,6 +372,10 @@
 #   endif
 #endif
 
+#if PLATFORM(WINCE) && PLATFORM(QT)
+#   include <ce_time.h>
+#endif
+
 /* Compiler */
 
 /* COMPILER(MSVC) */