[svn-r15704] I changed the return values of H5Fget_obj_ids and H5Fget_obj_count to ssize_t and modified

C++ and Fortran API functions. This is for bug #1245. Tested on smirom, linew, and kagiso.
author: Raymond Lu <songyulu@hdfgroup.org> 2008-09-26 18:55:32 (GMT)
committer: Raymond Lu <songyulu@hdfgroup.org> 2008-09-26 18:55:32 (GMT)
commit: 6f5d0e22f344efc95167f6eee34c788a791bc1bb (patch)
tree: 294301199f01015d4aab27e9f1e28c1df48ea56c
parent: f9f71a001ba65fbc515b440bf5cbace452947800 (diff)
download: hdf5-6f5d0e22f344efc95167f6eee34c788a791bc1bb.zip
hdf5-6f5d0e22f344efc95167f6eee34c788a791bc1bb.tar.gz
hdf5-6f5d0e22f344efc95167f6eee34c788a791bc1bb.tar.bz2
12 files changed, 132 insertions, 75 deletions
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp
index 0e71543..a0cabcc 100644
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@@ -378,9 +378,9 @@ hssize_t H5File::getFreeSpace() const
 /// Multiple object types can be combined with the logical OR operator (|).
 // Programmer   Binh-Minh Ribler - May 2004
 //--------------------------------------------------------------------------
-int H5File::getObjCount(unsigned types) const
+ssize_t H5File::getObjCount(unsigned types) const
 {
-   int num_objs = H5Fget_obj_count(id, types);
+   ssize_t num_objs = H5Fget_obj_count(id, types);
    if( num_objs < 0 )
    {
       throw FileIException("H5File::getObjCount", "H5Fget_obj_count failed");
@@ -397,9 +397,9 @@ int H5File::getObjCount(unsigned types) const
 ///\exception	H5::FileIException
 // Programmer   Binh-Minh Ribler - May 2004
 //--------------------------------------------------------------------------
-int H5File::getObjCount() const
+ssize_t H5File::getObjCount() const
 {
-   int num_objs = H5Fget_obj_count(id, H5F_OBJ_ALL);
+   ssize_t num_objs = H5Fget_obj_count(id, H5F_OBJ_ALL);
    if( num_objs < 0 )
    {
       throw FileIException("H5File::getObjCount", "H5Fget_obj_count failed");
@@ -432,9 +432,9 @@ int H5File::getObjCount() const
 // Notes: will do the overload for this one after hearing from Quincey???
 // Programmer   Binh-Minh Ribler - May 2004
 //--------------------------------------------------------------------------
-void H5File::getObjIDs(unsigned types, int max_objs, hid_t *oid_list) const
+void H5File::getObjIDs(unsigned types, size_t max_objs, hid_t *oid_list) const
 {
-   herr_t ret_value = H5Fget_obj_ids(id, types, max_objs, oid_list);
+   ssize_t ret_value = H5Fget_obj_ids(id, types, max_objs, oid_list);
    if( ret_value < 0 )
    {
       throw FileIException("H5File::getObjIDs", "H5Fget_obj_ids failed");
diff --git a/c++/src/H5File.h b/c++/src/H5File.h
index b49118e..b69c963 100644
--- a/c++/src/H5File.h
+++ b/c++/src/H5File.h
@@ -60,12 +60,12 @@ class H5_DLLCPP H5File : public IdComponent, public CommonFG {
 
 	// Returns the number of opened object IDs (files, datasets, groups
 	// and datatypes) in the same file.
-	int getObjCount(unsigned types) const;
-	int getObjCount() const;
+	ssize_t getObjCount(unsigned types) const;
+	ssize_t getObjCount() const;
 
 	// Retrieves a list of opened object IDs (files, datasets, groups
 	// and datatypes) in the same file.
-	void getObjIDs(unsigned types, int max_objs, hid_t *oid_list) const;
+	void getObjIDs(unsigned types, size_t max_objs, hid_t *oid_list) const;
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 	// Retrieves the type of object that an object reference points to.
diff --git a/fortran/src/H5Ff.c b/fortran/src/H5Ff.c
index 2190d05..674d702 100644
--- a/fortran/src/H5Ff.c
+++ b/fortran/src/H5Ff.c
@@ -411,21 +411,23 @@ nh5fclose_c ( hid_t_f *file_id )
  * Programmer:  Elena Pourmal
  *              Monday, September 30, 2002
  * Modifications:
+ *              Changed type of obj_count to size_t_f
+ *              Thursday, September 25, 2008
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5fget_obj_count_c ( hid_t_f *file_id , int_f *obj_type, int_f * obj_count)
+nh5fget_obj_count_c ( hid_t_f *file_id , int_f *obj_type, size_t_f * obj_count)
 {
   int ret_value = 0;
   hid_t c_file_id;
   unsigned c_obj_type;
-  int c_obj_count;
+  ssize_t c_obj_count;
 
 
   c_file_id = (hid_t)*file_id;
   c_obj_type = (unsigned) *obj_type;
   if ( (c_obj_count=H5Fget_obj_count(c_file_id, c_obj_type)) < 0  ) ret_value = -1;
-  *obj_count = (int_f)c_obj_count;
+  *obj_count = (size_t_f)c_obj_count;
   return ret_value;
 }
 /*----------------------------------------------------------------------------
@@ -438,24 +440,34 @@ nh5fget_obj_count_c ( hid_t_f *file_id , int_f *obj_type, int_f * obj_count)
  * Programmer:  Elena Pourmal
  *              Monday, September 30, 2002
  * Modifications:
+ *              Changed type of max_obj to size_t_f; added parameter for the 
+ *              number of open objects
+ *              Thursday, September 25, 2008 EIP
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5fget_obj_ids_c ( hid_t_f *file_id , int_f *obj_type, int_f *max_objs, hid_t_f *obj_ids)
+nh5fget_obj_ids_c ( hid_t_f *file_id , int_f *obj_type, size_t_f *max_objs, hid_t_f *obj_ids, size_t_f *num_objs)
 {
   int ret_value = 0;
   hid_t c_file_id;
   unsigned c_obj_type;
-  int c_max_objs, i;
+  int i;
+  size_t c_max_objs;
+  ssize_t c_num_objs;
   hid_t *c_obj_ids;
 
   c_file_id = (hid_t)*file_id;
   c_obj_type = (unsigned) *obj_type;
-  c_max_objs = (int)*max_objs;
+  c_max_objs = (size_t)*max_objs;
   c_obj_ids = (hid_t *)HDmalloc(sizeof(hid_t)*c_max_objs);
-  if ( H5Fget_obj_ids(c_file_id, c_obj_type, c_max_objs, c_obj_ids) < 0  ) ret_value = -1;
+
+  c_num_objs = H5Fget_obj_ids(c_file_id, c_obj_type, c_max_objs, c_obj_ids);
+  if ( c_num_objs < 0  ) ret_value = -1;
   for (i=0; i< c_max_objs; i++) obj_ids[i] = (hid_t_f)c_obj_ids[i];
+
   HDfree(c_obj_ids);
+  *num_objs = (size_t_f)c_num_objs;
+
   return ret_value;
 }
 /*----------------------------------------------------------------------------
diff --git a/fortran/src/H5Fff.f90 b/fortran/src/H5Fff.f90
index b48beb8..86d9c0e 100644
--- a/fortran/src/H5Fff.f90
+++ b/fortran/src/H5Fff.f90
@@ -638,7 +638,8 @@
 !		September 30, 2002
 !
 ! Modifications: 	
-!
+!               Changed the type of obj_count to INTEGER(SIZE_T)
+!                               September 25, 2008 EIP
 ! Comment:		
 !----------------------------------------------------------------------
           
@@ -646,7 +647,8 @@
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: file_id ! File identifier
             INTEGER, INTENT(IN)  :: obj_type      ! Object type
-            INTEGER, INTENT(OUT) :: obj_count     ! Number of open objects
+            INTEGER(SIZE_T), INTENT(OUT) :: obj_count
+                                                  ! Number of open objects
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
             INTERFACE
@@ -657,7 +659,8 @@
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: file_id
               INTEGER, INTENT(IN)  :: obj_type      ! Object type
-              INTEGER, INTENT(OUT) :: obj_count    ! Number of open objects
+              INTEGER(SIZE_T), INTENT(OUT) :: obj_count
+                                                    ! Number of open objects
               END FUNCTION h5fget_obj_count_c
             END INTERFACE
 
@@ -690,33 +693,42 @@
 !		September 30, 2002
 !
 ! Modifications: 	
+!               Added optional parameter num_objs for number of open objects
+!               of the specified type and changed type of max_obj to 
+!               INTEGER(SIZE_T)
+!                               September 25, 2008 EIP
 !
 ! Comment:		
 !----------------------------------------------------------------------
           
-          SUBROUTINE h5fget_obj_ids_f(file_id, obj_type, max_objs, obj_ids, hdferr)
+          SUBROUTINE h5fget_obj_ids_f(file_id, obj_type, max_objs, obj_ids, hdferr, num_objs)
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: file_id ! File identifier
             INTEGER, INTENT(IN)  :: obj_type   ! Object type
-            INTEGER, INTENT(IN)  :: max_objs   ! Maximum # of objects to retrieve
+            INTEGER(SIZE_T), INTENT(IN)  :: max_objs   ! Maximum # of objects to retrieve
             INTEGER(HID_T), DIMENSION(*), INTENT(INOUT) :: obj_ids
                                                ! Array of open objects iidentifiers
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+            INTEGER, INTENT(OUT) :: hdferr     ! Error code
+            INTEGER(SIZE_T), INTENT(OUT), OPTIONAL :: num_objs 
+            INTEGER(SIZE_T) :: c_num_objs 
+                              ! Number of open objects of the specified type
 
             INTERFACE
-              INTEGER FUNCTION h5fget_obj_ids_c(file_id, obj_type, max_objs, obj_ids)
+              INTEGER FUNCTION h5fget_obj_ids_c(file_id, obj_type, max_objs, obj_ids, c_num_objs)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
        !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5FGET_OBJ_IDS_C':: h5fget_obj_ids_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: file_id
               INTEGER, INTENT(IN)  :: obj_type      
-              INTEGER, INTENT(IN)  :: max_objs
+              INTEGER(SIZE_T), INTENT(IN)  :: max_objs
               INTEGER(HID_T), DIMENSION(*), INTENT(INOUT) :: obj_ids  
+              INTEGER(SIZE_T), INTENT(OUT) :: c_num_objs 
               END FUNCTION h5fget_obj_ids_c
             END INTERFACE
 
-            hdferr = h5fget_obj_ids_c(file_id, obj_type, max_objs, obj_ids)
+            hdferr = h5fget_obj_ids_c(file_id, obj_type, max_objs, obj_ids, c_num_objs)
+            if (present(num_objs)) num_objs= c_num_objs
 
           END SUBROUTINE h5fget_obj_ids_f
 
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index f812b29..b29af89 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -54,8 +54,8 @@ H5_FCDLL int_f nh5funmount_c (hid_t_f *loc_id, _fcd dsetname, int_f *namelen);
 H5_FCDLL int_f nh5freopen_c (hid_t_f *file_id1, hid_t_f *file_id2);
 H5_FCDLL int_f nh5fget_create_plist_c (hid_t_f *file_id, hid_t_f *prop_id);
 H5_FCDLL int_f nh5fget_access_plist_c (hid_t_f *file_id, hid_t_f *access_id);
-H5_FCDLL int_f nh5fget_obj_count_c (hid_t_f *file_id, int_f *obj_type, int_f *obj_count);
-H5_FCDLL int_f nh5fget_obj_ids_c (hid_t_f *file_id, int_f *obj_type, int_f *max_objs, hid_t_f *obj_ids);
+H5_FCDLL int_f nh5fget_obj_count_c (hid_t_f *file_id, int_f *obj_type, size_t_f *obj_count);
+H5_FCDLL int_f nh5fget_obj_ids_c (hid_t_f *file_id, int_f *obj_type, size_t_f *max_objs, hid_t_f *obj_ids, size_t_f *num_objs);
 H5_FCDLL int_f nh5fget_freespace_c (hid_t_f *file_id, hssize_t_f *free_space);
 H5_FCDLL int_f nh5fflush_c (hid_t_f *obj_id, int_f *scope);
 H5_FCDLL int_f nh5fget_name_c(hid_t_f *obj_id, size_t_f *size, _fcd buf, size_t_f *buflen);
diff --git a/fortran/test/tH5F.f90 b/fortran/test/tH5F.f90
index 859d66e..e39d0ee 100644
--- a/fortran/test/tH5F.f90
+++ b/fortran/test/tH5F.f90
@@ -578,7 +578,7 @@
           INTEGER(HID_T) :: fapl, fapl1, fapl2, fapl3 ! File access identifiers
           INTEGER(HID_T) :: fid_d_fapl, fid1_fapl     ! File access identifiers
           LOGICAL        :: flag
-          INTEGER        :: obj_count, obj_countf
+          INTEGER(SIZE_T) :: obj_count, obj_countf
           INTEGER(HID_T), ALLOCATABLE, DIMENSION(:) :: obj_ids
           INTEGER        :: i
           
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index c1e6d9e..d626981 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -111,11 +111,14 @@ Bug Fixes since HDF5-1.8.0 release
 
     Library
     -------
-        - Fixed an issue that could cause data to be improperly overwritten
+      - Changed the return value of H5Fget_obj_count from INT to SSIZE_T. Also
+            changed the return value of H5Fget_obj_ids from HERR_T to SSIZE_T and
+            the type of the parameter MAX_OBJS from INT to SIZE_T. (SLU - 2008/09/26) 
+      - Fixed an issue that could cause data to be improperly overwritten
             during compound type conversion.  (NAF - 2008/09/19)
-        - Fixed pointer alignment violations that could occur during vlen
+      - Fixed pointer alignment violations that could occur during vlen
             conversion.  (NAF - 2008/09/16)
-        - Fixed problem where library could cause a segmentation fault when
+      - Fixed problem where library could cause a segmentation fault when
             an invalid location ID was given to H5Giterate(). (QAK - 2008/08/19)
       - Fixed improper shutdown when objects have reference count > 1.  The
             library now tracks reference count due to the application separately
diff --git a/src/H5F.c b/src/H5F.c
index 396bfd3..5c0747d 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -51,7 +51,7 @@
 typedef struct H5F_olist_t {
     H5I_type_t obj_type;        /* Type of object to look for */
     hid_t      *obj_id_list;    /* Pointer to the list of open IDs to return */
-    unsigned   *obj_id_count;   /* Number of open IDs */
+    size_t     *obj_id_count;   /* Number of open IDs */
     struct {
         hbool_t local;          /* Set flag for "local" file searches */
         union {
@@ -59,12 +59,12 @@ typedef struct H5F_olist_t {
             const H5F_t *file;  /* Pointer to file to look inside */
         } ptr;
     } file_info;
-    unsigned   list_index;      /* Current index in open ID array */
-    int   max_index;            /* Maximum # of IDs to put into array */
+    size_t     list_index;      /* Current index in open ID array */
+    size_t     max_index;            /* Maximum # of IDs to put into array */
 } H5F_olist_t;
 
 /* PRIVATE PROTOTYPES */
-static unsigned H5F_get_objects(const H5F_t *f, unsigned types, int max_objs, hid_t *obj_id_list);
+static size_t H5F_get_objects(const H5F_t *f, unsigned types, size_t max_objs, hid_t *obj_id_list);
 static int H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key);
 static herr_t H5F_get_vfd_handle(const H5F_t *file, hid_t fapl, void** file_handle);
 static H5F_t *H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id,
@@ -370,14 +370,19 @@ done:
  *
  * Programmer:	Raymond Lu
  *		Wednesday, Dec 5, 2001
+ * Modification:
+ *              Raymond Lu
+ *              24 September 2008
+ *              Changed the return value to ssize_t to  accommadate 
+ *              potential large number of objects. 
  *
  *-------------------------------------------------------------------------
  */
-int
+ssize_t
 H5Fget_obj_count(hid_t file_id, unsigned types)
 {
     H5F_t    *f = NULL;         /* File to query */
-    int   ret_value;            /* Return value */
+    ssize_t  ret_value;            /* Return value */
 
     FUNC_ENTER_API(H5Fget_obj_count, FAIL)
     H5TRACE2("Is", "iIu", file_id, types);
@@ -387,8 +392,8 @@ H5Fget_obj_count(hid_t file_id, unsigned types)
     if(0 == (types & H5F_OBJ_ALL))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not an object type")
 
-    if((ret_value = H5F_get_obj_count(f, types)) < 0)
-        HGOTO_ERROR(H5E_FILE, H5E_CANTCOUNT, FAIL, "can't get object count")
+    /* H5F_get_obj_count doesn't fail */
+    ret_value = H5F_get_obj_count(f, types);
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -401,23 +406,28 @@ done:
  * Purpose:	Private function return the number of opened object IDs
  *		(files, datasets, groups, datatypes) in the same file.
  *
- * Return:      Non-negative on success; negative on failure.
+ * Return:      Non-negative on success; can't fail.
  *
  * Programmer:  Raymond Lu
  *              Wednesday, Dec 5, 2001
  *
  * Modification:
+ *              Raymond Lu
+ *              24 September 2008
+ *              Changed the return value to size_t to accommadate 
+ *              potential large number of objects. 
  *
  *-------------------------------------------------------------------------
  */
-unsigned
+size_t
 H5F_get_obj_count(const H5F_t *f, unsigned types)
 {
-    unsigned   ret_value;            /* Return value */
+    size_t   ret_value;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_obj_count)
 
-    ret_value=H5F_get_objects(f, types, -1, NULL);
+    /* H5F_get_objects doesn't fail */
+    ret_value=H5F_get_objects(f, types, 0, NULL);
 
     FUNC_LEAVE_NOAPI(ret_value)
 }
@@ -434,14 +444,18 @@ H5F_get_obj_count(const H5F_t *f, unsigned types)
  *              Wednesday, Dec 5, 2001
  *
  * Modification:
+ *              Raymond Lu
+ *              24 September 2008
+ *              Changed the return value to ssize_t and MAX_OBJTS to size_t to 
+ *              accommadate potential large number of objects. 
  *
  *-------------------------------------------------------------------------
  */
-herr_t
-H5Fget_obj_ids(hid_t file_id, unsigned types, int max_objs, hid_t *oid_list)
+ssize_t
+H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *oid_list)
 {
     H5F_t    *f = NULL;         /* File to query */
-    herr_t   ret_value;         /* Return value */
+    ssize_t   ret_value;         /* Return value */
 
     FUNC_ENTER_API(H5Fget_obj_ids, FAIL)
     H5TRACE4("e", "iIuIs*i", file_id, types, max_objs, oid_list);
@@ -451,7 +465,8 @@ H5Fget_obj_ids(hid_t file_id, unsigned types, int max_objs, hid_t *oid_list)
     if(0 == (types & H5F_OBJ_ALL))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not an object type")
     HDassert(oid_list);
-
+ 
+    /* H5F_get_objects doesn't fail */
     ret_value = H5F_get_obj_ids(f, types, max_objs, oid_list);
 
 done:
@@ -464,22 +479,27 @@ done:
  *
  * Purpose:     Private function to return a list of opened object IDs.
  *
- * Return:      Non-negative on success; negative on failure.
+ * Return:      Non-negative on success; can't fail.
  *
  * Programmer:  Raymond Lu
  *              Wednesday, Dec 5, 2001
  *
  * Modification:
+ *              Raymond Lu
+ *              24 September 2008
+ *              Changed the return value and MAX_OBJTS to size_t to accommadate
+ *              potential large number of objects. 
  *
  *-------------------------------------------------------------------------
  */
-unsigned
-H5F_get_obj_ids(const H5F_t *f, unsigned types, int max_objs, hid_t *oid_list)
+size_t
+H5F_get_obj_ids(const H5F_t *f, unsigned types, size_t max_objs, hid_t *oid_list)
 {
-    unsigned ret_value;              /* Return value */
+    size_t ret_value;              /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_obj_ids)
 
+    /* H5F_get_objects doesn't fail */
     ret_value = H5F_get_objects(f, types, max_objs, oid_list);
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -492,7 +512,7 @@ H5F_get_obj_ids(const H5F_t *f, unsigned types, int max_objs, hid_t *oid_list)
  * Purpose:	This function is called by H5F_get_obj_count or
  *		H5F_get_obj_ids to get number of object IDs and/or a
  *		list of opened object IDs (in return value).
- * Return:	Non-negative on success; negative on failure.
+ * Return:	Non-negative on success; Can't fail.
  *
  * Programmer:  Raymond Lu
  *              Wednesday, Dec 5, 2001
@@ -501,12 +521,12 @@ H5F_get_obj_ids(const H5F_t *f, unsigned types, int max_objs, hid_t *oid_list)
  *
  *---------------------------------------------------------------------------
  */
-static unsigned
-H5F_get_objects(const H5F_t *f, unsigned types, int max_index, hid_t *obj_id_list)
+static size_t
+H5F_get_objects(const H5F_t *f, unsigned types, size_t max_index, hid_t *obj_id_list)
 {
-    unsigned obj_id_count=0;    /* Number of open IDs */
+    size_t obj_id_count=0;      /* Number of open IDs */
     H5F_olist_t olist;          /* Structure to hold search results */
-    unsigned ret_value;         /* Return value */
+    size_t ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_objects)
 
@@ -517,7 +537,7 @@ H5F_get_objects(const H5F_t *f, unsigned types, int max_index, hid_t *obj_id_lis
     olist.max_index   = max_index;
 
     /* Determine if we are searching for local or global objects */
-    if(types&H5F_OBJ_LOCAL) {
+    if(types & H5F_OBJ_LOCAL) {
         olist.file_info.local = TRUE;
         olist.file_info.ptr.file = f;
     } /* end if */
@@ -527,7 +547,8 @@ H5F_get_objects(const H5F_t *f, unsigned types, int max_index, hid_t *obj_id_lis
     } /* end else */
 
     /* Search through file IDs to count the number, and put their
-     * IDs on the object list */
+     * IDs on the object list.  H5I_search returns NULL if no object 
+     * is found, so don't return failure in this function. */
     if(types & H5F_OBJ_FILE) {
         olist.obj_type = H5I_FILE;
         (void)H5I_search(H5I_FILE, H5F_get_objects_cb, &olist);
@@ -535,28 +556,28 @@ H5F_get_objects(const H5F_t *f, unsigned types, int max_index, hid_t *obj_id_lis
 
     /* Search through dataset IDs to count number of datasets, and put their
      * IDs on the object list */
-    if( (max_index < 0 || (int)olist.list_index < max_index) && (types & H5F_OBJ_DATASET) ) {
+    if(types & H5F_OBJ_DATASET) {
         olist.obj_type = H5I_DATASET;
         (void)H5I_search(H5I_DATASET, H5F_get_objects_cb, &olist);
     }
 
     /* Search through group IDs to count number of groups, and put their
      * IDs on the object list */
-    if( (max_index < 0 || (int)olist.list_index < max_index) && (types & H5F_OBJ_GROUP) ) {
+    if(types & H5F_OBJ_GROUP) {
         olist.obj_type = H5I_GROUP;
         (void)H5I_search(H5I_GROUP, H5F_get_objects_cb, &olist);
     }
 
     /* Search through datatype IDs to count number of named datatypes, and put their
      * IDs on the object list */
-    if( (max_index < 0 || (int)olist.list_index < max_index) && (types & H5F_OBJ_DATATYPE) ) {
+    if(types & H5F_OBJ_DATATYPE) {
         olist.obj_type = H5I_DATATYPE;
         (void)H5I_search(H5I_DATATYPE, H5F_get_objects_cb, &olist);
     }
 
     /* Search through attribute IDs to count number of attributes, and put their
      * IDs on the object list */
-    if( (max_index < 0 || (int)olist.list_index < max_index) && (types & H5F_OBJ_ATTR) ) {
+    if(types & H5F_OBJ_ATTR) {
         olist.obj_type = H5I_ATTR;
         (void)H5I_search(H5I_ATTR, H5F_get_objects_cb, &olist);
     }
@@ -575,6 +596,9 @@ H5F_get_objects(const H5F_t *f, unsigned types, int max_index, hid_t *obj_id_lis
  * 		object is in the file, and either count it or put its ID
  *		on the list.
  *
+ * Return:      TRUE if the array of object IDs is filled up.
+ *              FALSE otherwise.
+ *
  * Programmer:  Raymond Lu
  *              Wednesday, Dec 5, 2001
  *
@@ -609,8 +633,11 @@ H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key)
 	    if(olist->obj_id_count)
 	    	(*olist->obj_id_count)++;
 
-            /* Check if we've filled up the array */
-            if(olist->max_index>=0 && (int)olist->list_index>=olist->max_index)
+            /* Check if we've filled up the array.  Return TRUE only if
+             * we have filled up the array. Otherwise return FALSE(RET_VALUE is 
+             * preset to FALSE) because H5I_search needs the return value of FALSE
+             * to continue searching. */
+            if(olist->max_index>0 && olist->list_index>=olist->max_index)
                 HGOTO_DONE(TRUE)  /* Indicate that the iterator should stop */
 	}
     } /* end if */
@@ -659,8 +686,11 @@ H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key)
 	    if(olist->obj_id_count)
             	(*olist->obj_id_count)++;
 
-            /* Check if we've filled up the array */
-            if(olist->max_index>=0 && (int)olist->list_index>=olist->max_index)
+            /* Check if we've filled up the array.  Return TRUE only if
+             * we have filled up the array. Otherwise return FALSE(RET_VALUE is 
+             * preset to FALSE) because H5I_search needs the return value of FALSE
+             * to continue searching. */
+            if(olist->max_index>0 && olist->list_index>=olist->max_index)
                 HGOTO_DONE(TRUE)  /* Indicate that the iterator should stop */
     	} /* end if */
     } /* end else */
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 7cfbc7b..f4d2b6c 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -470,8 +470,8 @@ H5_DLL unsigned H5F_get_intent(const H5F_t *f);
 H5_DLL char *H5F_get_extpath(const H5F_t *f);
 H5_DLL herr_t H5F_get_fileno(const H5F_t *f, unsigned long *filenum);
 H5_DLL hid_t H5F_get_id(H5F_t *file, hbool_t app_ref);
-H5_DLL unsigned H5F_get_obj_count(const H5F_t *f, unsigned types);
-H5_DLL unsigned H5F_get_obj_ids(const H5F_t *f, unsigned types, int max_objs, hid_t *obj_id_list);
+H5_DLL size_t H5F_get_obj_count(const H5F_t *f, unsigned types);
+H5_DLL size_t H5F_get_obj_ids(const H5F_t *f, unsigned types, size_t max_objs, hid_t *obj_id_list);
 H5_DLL haddr_t H5F_get_base_addr(const H5F_t *f);
 H5_DLL haddr_t H5F_get_eoa(const H5F_t *f);
 #ifdef H5_HAVE_PARALLEL
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index a055d46..312d92e 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -129,8 +129,8 @@ H5_DLL herr_t H5Fclose(hid_t file_id);
 H5_DLL hid_t  H5Fget_create_plist(hid_t file_id);
 H5_DLL hid_t  H5Fget_access_plist(hid_t file_id);
 H5_DLL herr_t H5Fget_intent(hid_t file_id, unsigned * intent);
-H5_DLL int H5Fget_obj_count(hid_t file_id, unsigned types);
-H5_DLL int H5Fget_obj_ids(hid_t file_id, unsigned types, int max_objs, hid_t *obj_id_list);
+H5_DLL ssize_t H5Fget_obj_count(hid_t file_id, unsigned types);
+H5_DLL ssize_t H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *obj_id_list);
 H5_DLL herr_t H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void **file_handle);
 H5_DLL herr_t H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist);
 H5_DLL herr_t H5Funmount(hid_t loc, const char *name);
diff --git a/test/mount.c b/test/mount.c
index 4a9592f..9f07123 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -3392,7 +3392,7 @@ test_cut_graph(hid_t fapl)
     hid_t gidQ = -1;                    /* Group IDs in file #7 */
     char    name[NAME_BUF_SIZE];        /* Buffer for filename retrieved */
     ssize_t name_len;                   /* Filename length */
-    int obj_count;                      /* Number of objects open */
+    ssize_t obj_count;                  /* Number of objects open */
     char	filename1[NAME_BUF_SIZE],
 		filename2[NAME_BUF_SIZE],
 		filename3[NAME_BUF_SIZE],
diff --git a/test/tfile.c b/test/tfile.c
index e839630..ff8aa2b 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -765,7 +765,7 @@ static void
 create_objects(hid_t fid1, hid_t fid2, hid_t *ret_did, hid_t *ret_gid1,
 		hid_t *ret_gid2, hid_t *ret_gid3)
 {
-    int	oid_count;
+    ssize_t	oid_count;
     herr_t	ret;
 
     /* Check reference counts of file IDs and opened object IDs.
@@ -1033,7 +1033,7 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1,
 			hid_t gid2, hid_t gid3)
 {
     hid_t    fid3, fid4;
-    int oid_count;
+    ssize_t  oid_count, ret_count;
     herr_t   ret;
 
     /* Create two new files */
@@ -1079,8 +1079,8 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1,
 
         oid_list = (hid_t*)calloc((size_t)oid_count, sizeof(hid_t));
         if(oid_list != NULL) {
-	    ret = H5Fget_obj_ids(H5F_OBJ_ALL, H5F_OBJ_ALL, oid_count, oid_list);
-	    CHECK(ret, FAIL, "H5Fget_obj_ids");
+	    ret_count = H5Fget_obj_ids(H5F_OBJ_ALL, H5F_OBJ_ALL, (size_t)oid_count, oid_list);
+	    CHECK(ret_count, FAIL, "H5Fget_obj_ids");
         }
 
         for(i=0; i<oid_count; i++) {
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0de9563
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,174 @@
+# This file is used to ignore files which are generated in the Qt build system
+# ----------------------------------------------------------------------------
+
+examples/*/*/*
+!examples/*/*/*[.]*
+!examples/*/*/README
+examples/*/*/*[.]app
+demos/*/*
+!demos/*/*[.]*
+demos/*/*[.]app
+config.tests/*/*/*
+!config.tests/*/*/*[.]*
+config.tests/*/*/*[.]app
+
+*~
+*.a
+*.core
+*.moc
+*.o
+*.obj
+*.orig
+*.swp
+*.rej
+*.so
+*.pbxuser
+*.mode1
+*.mode1v3
+*_pch.h.cpp
+*_resource.rc
+.#*
+*.*#
+core
+.qmake.cache
+.qmake.vars
+*.prl
+tags
+.DS_Store
+*.debug
+Makefile*
+*.prl
+*.app
+*.pro.user
+bin/Qt*.dll
+bin/assistant*
+bin/designer*
+bin/dumpcpp*
+bin/idc*
+bin/linguist*
+bin/lrelease*
+bin/lupdate*
+bin/lconvert*
+bin/moc*
+bin/pixeltool*
+bin/qmake*
+bin/qt3to4*
+bin/qtdemo*
+bin/rcc*
+bin/uic*
+bin/patternist*
+bin/phonon*
+bin/qcollectiongenerator*
+bin/qdbus*
+bin/qhelpconverter*
+bin/qhelpgenerator*
+bin/qtconfig*
+bin/xmlpatterns*
+bin/collectiongenerator
+bin/helpconverter
+bin/helpgenerator
+configure.cache
+config.status
+mkspecs/default
+mkspecs/qconfig.pri
+moc_*.cpp
+qmake/qmake.exe
+qmake/Makefile.bak
+src/corelib/global/qconfig.cpp
+src/corelib/global/qconfig.h
+src/corelib/global/qconfig.h.qmake
+src/tools/uic/qclass_lib_map.h
+ui_*.h
+tests/auto/qprocess/test*/*.exe
+tests/auto/qtcpsocket/stressTest/*.exe
+tests/auto/qprocess/fileWriterProcess/*.exe
+tests/auto/qmake/testdata/quotedfilenames/*.exe
+tests/auto/compilerwarnings/*.exe
+tests/auto/qmake/testdata/quotedfilenames/test.cpp
+tests/auto/qprocess/fileWriterProcess.txt
+.com.apple.timemachine.supported
+tests/auto/qlibrary/libmylib.so*
+tests/auto/qresourceengine/runtime_resource.rcc
+tools/qdoc3/qdoc3*
+tools/qtestlib/updater/updater*
+tools/activeqt/testcon/testcon.tlb
+qrc_*.cpp
+
+# xemacs temporary files
+*.flc
+
+# Vim temporary files
+.*.swp
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+*.ncb
+
+# MinGW generated files
+*.Debug
+*.Release
+
+# WebKit temp files
+src/3rdparty/webkit/WebCore/mocinclude.tmp
+src/3rdparty/webkit/includes.txt
+src/3rdparty/webkit/includes2.txt
+
+# Symlinks generated by configure
+tools/qvfb/qvfbhdr.h
+tools/qvfb/qlock_p.h
+tools/qvfb/qlock.cpp
+tools/qvfb/qwssignalhandler.cpp
+tools/qvfb/qwssignalhandler_p.h
+.DS_Store
+.pch
+.rcc
+*.app
+config.status
+config.tests/unix/cups/cups
+config.tests/unix/getaddrinfo/getaddrinfo
+config.tests/unix/getifaddrs/getifaddrs
+config.tests/unix/iconv/iconv
+config.tests/unix/ipv6/ipv6
+config.tests/unix/ipv6ifname/ipv6ifname
+config.tests/unix/largefile/largefile
+config.tests/unix/nis/nis
+config.tests/unix/odbc/odbc
+config.tests/unix/openssl/openssl
+config.tests/unix/stl/stl
+config.tests/unix/zlib/zlib
+config.tests/unix/3dnow/3dnow
+config.tests/unix/mmx/mmx
+config.tests/unix/sse/sse
+config.tests/unix/sse2/sse2
+
+
+
+# Directories to ignore
+# ---------------------
+
+debug
+examples/tools/plugandpaint/plugins
+include/*
+include/*/*
+lib/*
+!lib/fonts
+!lib/README
+plugins/*/*
+release
+tmp
+doc-build
+doc/html/*
+doc/qch
+doc-build
+.rcc
+.pch
+src/corelib/lib
+src/network/lib
+src/xml/lib/
diff --git a/.hgignore b/.hgignore
new file mode 100755
index 0000000..784d507
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,133 @@
+# This file is used to ignore files which are generated in the Qt build system
+# ----------------------------------------------------------------------------
+
+syntax: glob
+
+*~
+*.a
+*.core
+*.moc
+*.o
+*.obj
+*.orig
+*.swp
+*.rej
+*.so
+*.pbxuser
+*.mode1
+*.mode1v3
+*.qch
+*.dylib
+*_pch.h.cpp
+*_resource.rc
+.qmake.cache
+*.prl
+tags
+Makefile
+Makefile.Debug
+Makefile.Release
+bin/Qt*.dll
+bin/lconvert*
+bin/xmlpatterns*
+bin/assistant*
+bin/designer*
+bin/dumpcpp*
+bin/idc*
+bin/linguist*
+bin/lrelease*
+bin/lupdate*
+bin/moc*
+bin/pixeltool*
+bin/qmake*
+bin/qt3to4*
+bin/qtdemo*
+bin/rcc*
+bin/uic*
+bin/qcollectiongenerator
+bin/qhelpgenerator
+tools/qdoc3/qdoc3*
+#configure.cache
+mkspecs/default
+mkspecs/qconfig.pri
+moc_*.cpp
+qmake/qmake.exe
+qmake/Makefile.bak
+src/corelib/global/qconfig.cpp
+src/corelib/global/qconfig.h
+src/tools/uic/qclass_lib_map.h
+ui_*.h
+.com.apple.timemachine.supported
+
+# xemacs temporary files
+*.flc
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+
+#
+## Symlinks generated by configure
+tools/qvfb/qvfbhdr.h
+tools/qvfb/qlock_p.h
+tools/qvfb/qlock.cpp
+tools/qvfb/qwssignalhandler.cpp
+tools/qvfb/qwssignalhandler_p.h
+.DS_Store
+.pch
+.rcc
+*.app
+config.status
+config.tests/unix/cups/cups
+config.tests/unix/getaddrinfo/getaddrinfo
+config.tests/unix/getifaddrs/getifaddrs
+config.tests/unix/iconv/iconv
+config.tests/unix/ipv6/ipv6
+config.tests/unix/ipv6ifname/ipv6ifname
+config.tests/unix/largefile/largefile
+config.tests/unix/nis/nis
+config.tests/unix/odbc/odbc
+config.tests/unix/openssl/openssl
+config.tests/unix/stl/stl
+config.tests/unix/zlib/zlib
+config.tests/unix/3dnow/3dnow
+config.tests/unix/mmx/mmx
+config.tests/unix/sse/sse
+config.tests/unix/sse2/sse2
+config.tests/unix/psql-escape/psql-escape
+config.tests/unix/psql/psql
+config.tests/unix/stdint/stdint
+
+# Directories to ignore
+# ---------------------
+
+debug
+examples/tools/plugandpaint/plugins
+include/*
+doc/html*
+include/*/*
+lib/*
+plugins/*/*
+release
+tmp
+doc/html/*
+doc-build
+src/gui/.pch
+src/corelib/.pch
+src/network/.pch
+src/gui/.rcc
+src/sql/.rcc
+src/xml/.rcc
+src/corelib/.rcc
+src/network/.rcc
+.DS_Store
+src/gui/build
+src/corelib/global/qconfig.h.qmake
+*.perspectivev*
+build
+src/gui/qtdir.xcconfig
diff --git a/FAQ b/FAQ
new file mode 100644
index 0000000..c243e5c
--- /dev/null
+++ b/FAQ
@@ -0,0 +1,18 @@
+This is a list of Frequently Asked Questions regarding Qt Release 4.5.0.
+
+Q: I'm using a Unix system and I downloaded the Zip package. However, when I try
+to run the configure script, I get the following error message:
+"bash: ./configure: /bin/sh^M: bad interpreter: No such file or directory"
+A: The problem here is converting files from Windows style line endings (CRLF)
+to Unix style line endings (LF). To avoid this problem, uncompress the file
+again and give the option "-a" to unzip, which will then add the correct line
+endings.
+
+Q: I'm running Windows XP and I downloaded the qt-win-eval-4.5.0-vs2008.exe
+version of Qt. However, when I try to run the examples I get an error saying:
+"The application failed to start because the application configuration is
+incorrect. Reinstalling the application may fix this problem.". I reinstalled
+the package but the error persists. What am I doing wrong?
+A: The problem is an incorrect version of the CRT. Visual studio requires CRT90
+while Windows XP comes with CRT80. To solve this problem, please install the
+2008 CRT redistributable package from Microsoft.
diff --git a/LGPL_EXCEPTION.TXT b/LGPL_EXCEPTION.TXT
new file mode 100644
index 0000000..8d0f85e
--- /dev/null
+++ b/LGPL_EXCEPTION.TXT
@@ -0,0 +1,3 @@
+Nokia Qt LGPL Exception version 1.0
+
+As a special exception to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate material from a header file that is part of the Library.  You may distribute such object code under terms of your choice, provided that the incorporated material (i) does not exceed more than 5% of the total size of the Library;  and (ii) is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates.
+\ No newline at end of file
diff --git a/LICENSE.GPL3 b/LICENSE.GPL3
new file mode 100644
index 0000000..13e6f18
--- /dev/null
+++ b/LICENSE.GPL3
@@ -0,0 +1,696 @@
+                    GNU GENERAL PUBLIC LICENSE
+
+ The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ Contact: Qt Software Information (qt-info@nokia.com)
+
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ GNU General Public License version 3, which is displayed below.
+
+-------------------------------------------------------------------------
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+-------------------------------------------------------------------------
+
+In addition, as a special exception, Nokia gives permission to link the
+code of its release of Qt with the OpenSSL project's "OpenSSL" library (or
+modified versions of it that use the same license as the "OpenSSL"
+library), and distribute the linked executables.  You must comply with the
+GNU General Public License versions 2.0 or 3.0 in all respects for all of
+the code used other than the "OpenSSL" code.  If you modify this file, you
+may extend this exception to your version of the file, but you are not
+obligated to do so.  If you do not wish to do so, delete this exception
+statement from your version of this file.
diff --git a/LICENSE.LGPL b/LICENSE.LGPL
new file mode 100644
index 0000000..bb95f25
--- /dev/null
+++ b/LICENSE.LGPL
@@ -0,0 +1,514 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+
+ The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ Contact: Qt Software Information (qt-info@nokia.com)
+
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ GNU Lesser General Public License version 2.1, which is displayed below.
+
+-------------------------------------------------------------------------
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/LICENSE.PREVIEW.COMMERCIAL b/LICENSE.PREVIEW.COMMERCIAL
new file mode 100644
index 0000000..7f7b234
--- /dev/null
+++ b/LICENSE.PREVIEW.COMMERCIAL
@@ -0,0 +1,642 @@
+TECHNOLOGY PREVIEW LICENSE AGREEMENT
+
+For individuals and/or legal entities resident in the Americas (North
+America, Central America and South America), the applicable licensing
+terms are specified under the heading "Technology Preview License
+Agreement: The Americas".
+
+For individuals and/or legal entities not resident in The Americas,
+the applicable licensing terms are specified under the heading
+"Technology Preview License Agreement: Rest of the World".
+
+
+TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
+Agreement version 2.3
+
+This Technology Preview License Agreement ("Agreement") is a legal
+agreement between Nokia Inc. ("Nokia"), with its registered office at
+6021 Connection Drive, Irving, TX 75039, U.S.A. and you (either an
+individual or a legal entity) ("Licensee") for the Licensed Software
+(as defined below).
+
+
+1. DEFINITIONS
+
+"Affiliate" of a Party shall mean an entity (i) which is directly or
+indirectly controlling such Party; (ii) which is under the same direct
+or indirect ownership or control as such Party; or (iii) which is
+directly or indirectly owned or controlled by such Party. For these
+purposes, an entity shall be treated as being controlled by another if
+that other entity has fifty percent (50 %) or more of the votes in
+such entity, is able to direct its affairs and/or to control the
+composition of its board of directors or equivalent body.
+
+"Term" shall mean the period of time six (6) months from the later of
+(a) the Effective Date; or (b) the date the Licensed Software was
+initially delivered to Licensee by Nokia. If no specific Effective
+Date is set forth in the Agreement, the Effective Date shall be deemed
+to be the date the Licensed Software was initially delivered to
+Licensee.
+
+"Licensed Software" shall mean the computer software, "online" or
+electronic documentation, associated media and printed materials,
+including the source code, example programs and the documentation
+delivered by Nokia to Licensee in conjunction with this Agreement.
+
+"Party" or "Parties" shall mean Licensee and/or Nokia.
+
+
+2. OWNERSHIP
+
+The Licensed Software is protected by copyright laws and international
+copyright treaties, as well as other intellectual property laws and
+treaties. The Licensed Software is licensed, not sold.
+
+If Licensee provides any findings, proposals, suggestions or other
+feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia
+shall own all right, title and interest including the intellectual
+property rights in and to such Feedback, excluding however any
+existing patent rights of Licensee. To the extent Licensee owns or
+controls any patents for such Feedback Licensee hereby grants to Nokia
+and its Affiliates, a worldwide, perpetual, non-transferable,
+sublicensable, royalty-free license to (i) use, copy and modify
+Feedback and to create derivative works thereof, (ii) to make (and
+have made), use, import, sell, offer for sale, lease, dispose, offer
+for disposal or otherwise exploit any products or services of Nokia
+containing Feedback,, and (iii) sublicense all the foregoing rights to
+third party licensees and customers of Nokia and/or its Affiliates.
+
+
+3. VALIDITY OF THE AGREEMENT
+
+By installing, copying, or otherwise using the Licensed Software,
+Licensee agrees to be bound by the terms of this Agreement. If
+Licensee does not agree to the terms of this Agreement, Licensee may
+not install, copy, or otherwise use the Licensed Software. Upon
+Licensee's acceptance of the terms and conditions of this Agreement,
+Nokia grants Licensee the right to use the Licensed Software in the
+manner provided below.
+
+
+4. LICENSES
+
+4.1 Using and Copying
+
+Nokia grants to Licensee a non-exclusive, non-transferable,
+time-limited license to use and copy the Licensed Software for sole
+purpose of evaluating and testing the Licensed Software during the
+Term.
+
+Licensee may install copies of the Licensed Software on an unlimited
+number of computers provided that (a) if an individual, only such
+individual; or (b) if a legal entity only its employees; use the
+Licensed Software for the authorized purposes.
+
+4.2 No Distribution or Modifications
+
+Licensee may not disclose, modify, sell, market, commercialise,
+distribute, loan, rent, lease, or license the Licensed Software or any
+copy of it or use the Licensed Software for any purpose that is not
+expressly granted in this Section 4. Licensee may not alter or remove
+any details of ownership, copyright, trademark or other property right
+connected with the Licensed Software. Licensee may not distribute any
+software statically or dynamically linked with the Licensed Software.
+
+4.3 No Technical Support
+
+Nokia has no obligation to furnish Licensee with any technical support
+whatsoever. Any such support is subject to separate agreement between
+the Parties.
+
+
+5. PRE-RELEASE CODE
+
+The Licensed Software contains pre-release code that is not at the
+level of performance and compatibility of a final, generally
+available, product offering. The Licensed Software may not operate
+correctly and may be substantially modified prior to the first
+commercial product release, if any. Nokia is not obligated to make
+this or any later version of the Licensed Software commercially
+available. The License Software is "Not for Commercial Use" and may
+only be used for the purposes described in Section 4. The Licensed
+Software may not be used in a live operating environment where it may
+be relied upon to perform in the same manner as a commercially
+released product or with data that has not been sufficiently backed
+up.
+
+
+6. THIRD PARTY SOFTWARE
+
+The Licensed Software may provide links to third party libraries or
+code (collectively "Third Party Software") to implement various
+functions.  Third Party Software does not comprise part of the
+Licensed Software. In some cases, access to Third Party Software may
+be included along with the Licensed Software delivery as a convenience
+for development and testing only. Such source code and libraries may
+be listed in the ".../src/3rdparty" source tree delivered with the
+Licensed Software or documented in the Licensed Software where the
+Third Party Software is used, as may be amended from time to time, do
+not comprise the Licensed Software. Licensee acknowledges (1) that
+some part of Third Party Software may require additional licensing of
+copyright and patents from the owners of such, and (2) that
+distribution of any of the Licensed Software referencing any portion
+of a Third Party Software may require appropriate licensing from such
+third parties.
+
+
+7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
+
+The Licensed Software is licensed to Licensee "as is". To the maximum
+extent permitted by applicable law, Nokia on behalf of itself and its
+suppliers, disclaims all warranties and conditions, either express or
+implied, including, but not limited to, implied warranties of
+merchantability, fitness for a particular purpose, title and
+non-infringement with regard to the Licensed Software.
+
+
+8. LIMITATION OF LIABILITY
+
+If, Nokia's warranty disclaimer notwithstanding, Nokia is held liable
+to Licensee, whether in contract, tort or any other legal theory,
+based on the Licensed Software, Nokia's entire liability to Licensee
+and Licensee's exclusive remedy shall be, at Nokia's option, either
+(A) return of the price Licensee paid for the Licensed Software, or
+(B) repair or replacement of the Licensed Software, provided Licensee
+returns to Nokia all copies of the Licensed Software as originally
+delivered to Licensee. Nokia shall not under any circumstances be
+liable to Licensee based on failure of the Licensed Software if the
+failure resulted from accident, abuse or misapplication, nor shall
+Nokia under any circumstances be liable for special damages, punitive
+or exemplary damages, damages for loss of profits or interruption of
+business or for loss or corruption of data. Any award of damages from
+Nokia to Licensee shall not exceed the total amount Licensee has paid
+to Nokia in connection with this Agreement.
+
+
+9. CONFIDENTIALITY
+
+Each party acknowledges that during the Term of this Agreement it
+shall have access to information about the other party's business,
+business methods, business plans, customers, business relations,
+technology, and other information, including the terms of this
+Agreement, that is confidential and of great value to the other party,
+and the value of which would be significantly reduced if disclosed to
+third parties (the "Confidential Information"). Accordingly, when a
+party (the "Receiving Party") receives Confidential Information from
+another party (the "Disclosing Party"), the Receiving Party shall, and
+shall obligate its employees and agents and employees and agents of
+its Affiliates to: (i) maintain the Confidential Information in strict
+confidence; (ii) not disclose the Confidential Information to a third
+party without the Disclosing Party's prior written approval; and (iii)
+not, directly or indirectly, use the Confidential Information for any
+purpose other than for exercising its rights and fulfilling its
+responsibilities pursuant to this Agreement. Each party shall take
+reasonable measures to protect the Confidential Information of the
+other party, which measures shall not be less than the measures taken
+by such party to protect its own confidential and proprietary
+information.
+
+"Confidential Information" shall not include information that (a) is
+or becomes generally known to the public through no act or omission of
+the Receiving Party; (b) was in the Receiving Party's lawful
+possession prior to the disclosure hereunder and was not subject to
+limitations on disclosure or use; (c) is developed by the Receiving
+Party without access to the Confidential Information of the Disclosing
+Party or by persons who have not had access to the Confidential
+Information of the Disclosing Party as proven by the written records
+of the Receiving Party; (d) is lawfully disclosed to the Receiving
+Party without restrictions, by a third party not under an obligation
+of confidentiality; or (e) the Receiving Party is legally compelled to
+disclose the information, in which case the Receiving Party shall
+assert the privileged and confidential nature of the information and
+cooperate fully with the Disclosing Party to protect against and
+prevent disclosure of any Confidential Information and to limit the
+scope of disclosure and the dissemination of disclosed Confidential
+Information by all legally available means.
+
+The obligations of the Receiving Party under this Section shall
+continue during the Initial Term and for a period of five (5) years
+after expiration or termination of this Agreement. To the extent that
+the terms of the Non-Disclosure Agreement between Nokia and Licensee
+conflict with the terms of this Section 8, this Section 8 shall be
+controlling over the terms of the Non-Disclosure Agreement.
+
+
+10. GENERAL PROVISIONS
+
+10.1 No Assignment
+
+Licensee shall not be entitled to assign or transfer all or any of its
+rights, benefits and obligations under this Agreement without the
+prior written consent of Nokia, which shall not be unreasonably
+withheld.
+
+10.2 Termination
+
+Nokia may terminate the Agreement at any time immediately upon written
+notice by Nokia to Licensee if Licensee breaches this Agreement.
+
+Upon termination of this Agreement, Licensee shall return to Nokia all
+copies of Licensed Software that were supplied by Nokia. All other
+copies of Licensed Software in the possession or control of Licensee
+must be erased or destroyed. An officer of Licensee must promptly
+deliver to Nokia a written confirmation that this has occurred.
+
+10.3 Surviving Sections
+
+Any terms and conditions that by their nature or otherwise reasonably
+should survive a cancellation or termination of this Agreement shall
+also be deemed to survive. Such terms and conditions include, but are
+not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3,
+10.4, 10.5, 10.6, 10.7, and 10.8 of this Agreement.
+
+10.4 Entire Agreement
+
+This Agreement constitutes the complete agreement between the parties
+and supersedes all prior or contemporaneous discussions,
+representations, and proposals, written or oral, with respect to the
+subject matters discussed herein, with the exception of the
+non-disclosure agreement executed by the parties in connection with
+this Agreement ("Non-Disclosure Agreement"), if any, shall be subject
+to Section 8. No modification of this Agreement shall be effective
+unless contained in a writing executed by an authorized representative
+of each party. No term or condition contained in Licensee's purchase
+order shall apply unless expressly accepted by Nokia in writing. If
+any provision of the Agreement is found void or unenforceable, the
+remainder shall remain valid and enforceable according to its
+terms. If any remedy provided is determined to have failed for its
+essential purpose, all limitations of liability and exclusions of
+damages set forth in this Agreement shall remain in effect.
+
+10.5 Export Control
+
+Licensee acknowledges that the Licensed Software may be subject to
+export control restrictions of various countries. Licensee shall fully
+comply with all applicable export license restrictions and
+requirements as well as with all laws and regulations relating to the
+importation of the Licensed Software and shall procure all necessary
+governmental authorizations, including without limitation, all
+necessary licenses, approvals, permissions or consents, where
+necessary for the re-exportation of the Licensed Software.,
+
+10.6 Governing Law and Legal Venue
+
+This Agreement shall be governed by and construed in accordance with
+the federal laws of the United States of America and the internal laws
+of the State of New York without given effect to any choice of law
+rule that would result in the application of the laws of any other
+jurisdiction. The United Nations Convention on Contracts for the
+International Sale of Goods (CISG) shall not apply. Each Party (a)
+hereby irrevocably submits itself to and consents to the jurisdiction
+of the United States District Court for the Southern District of New
+York (or if such court lacks jurisdiction, the state courts of the
+State of New York) for the purposes of any action, claim, suit or
+proceeding between the Parties in connection with any controversy,
+claim, or dispute arising out of or relating to this Agreement; and
+(b) hereby waives, and agrees not to assert by way of motion, as a
+defense or otherwise, in any such action, claim, suit or proceeding,
+any claim that is not personally subject to the jurisdiction of such
+court(s), that the action, claim, suit or proceeding is brought in an
+inconvenient forum or that the venue of the action, claim, suit or
+proceeding is improper.  Notwithstanding the foregoing, nothing in
+this Section 9.6 is intended to, or shall be deemed to, constitute a
+submission or consent to, or selection of, jurisdiction, forum or
+venue for any action for patent infringement, whether or not such
+action relates to this Agreement.
+
+10.7 No Implied License
+
+There are no implied licenses or other implied rights granted under
+this Agreement, and all rights, save for those expressly granted
+hereunder, shall remain with Nokia and its licensors. In addition, no
+licenses or immunities are granted to the combination of the Licensed
+Software with any other software or hardware not delivered by Nokia
+under this Agreement.
+
+10.8 Government End Users
+
+A "U.S. Government End User" shall mean any agency or entity of the
+government of the United States. The following shall apply if Licensee
+is a U.S. Government End User. The Licensed Software is a "commercial
+item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
+consisting of "commercial computer software" and "commercial computer
+software documentation," as such terms are used in 48 C.F.R. 12.212
+(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48
+C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
+End Users acquire the Licensed Software with only those rights set
+forth herein. The Licensed Software (including related documentation)
+is provided to U.S.  Government End Users: (a) only as a commercial
+end item; and (b) only pursuant to this Agreement.
+
+
+
+
+
+TECHNOLOGY PREVIEW LICENSE AGREEMENT: Rest of the World
+Agreement version 2.3
+
+This Technology Preview License Agreement ("Agreement") is a legal
+agreement between Nokia Corporation ("Nokia"), with its registered
+office at Keilalahdentie 4, 02150 Espoo, Finland and you (either an
+individual or a legal entity) ("Licensee") for the Licensed Software
+(as defined below).
+
+1. DEFINITIONS
+
+"Affiliate" of a Party shall mean an entity (i) which is directly or
+indirectly controlling such Party; (ii) which is under the same direct
+or indirect ownership or control as such Party; or (iii) which is
+directly or indirectly owned or controlled by such Party. For these
+purposes, an entity shall be treated as being controlled by another if
+that other entity has fifty percent (50 %) or more of the votes in
+such entity, is able to direct its affairs and/or to control the
+composition of its board of directors or equivalent body.
+
+"Term" shall mean the period of time six (6) months from the later of
+(a) the Effective Date; or (b) the date the Licensed Software was
+initially delivered to Licensee by Nokia. If no specific Effective
+Date is set forth in the Agreement, the Effective Date shall be deemed
+to be the date the Licensed Software was initially delivered to
+Licensee.
+
+"Licensed Software" shall mean the computer software, "online" or
+electronic documentation, associated media and printed materials,
+including the source code, example programs and the documentation
+delivered by Nokia to Licensee in conjunction with this Agreement.
+
+"Party" or "Parties" shall mean Licensee and/or Nokia.
+
+
+2. OWNERSHIP
+
+The Licensed Software is protected by copyright laws and international
+copyright treaties, as well as other intellectual property laws and
+treaties. The Licensed Software is licensed, not sold.
+
+If Licensee provides any findings, proposals, suggestions or other
+feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia
+shall own all right, title and interest including the intellectual
+property rights in and to such Feedback, excluding however any
+existing patent rights of Licensee. To the extent Licensee owns or
+controls any patents for such Feedback Licensee hereby grants to Nokia
+and its Affiliates, a worldwide, perpetual, non-transferable,
+sublicensable, royalty-free license to (i) use, copy and modify
+Feedback and to create derivative works thereof, (ii) to make (and
+have made), use, import, sell, offer for sale, lease, dispose, offer
+for disposal or otherwise exploit any products or services of Nokia
+containing Feedback,, and (iii) sublicense all the foregoing rights to
+third party licensees and customers of Nokia and/or its Affiliates.
+
+
+3. VALIDITY OF THE AGREEMENT
+
+By installing, copying, or otherwise using the Licensed Software,
+Licensee agrees to be bound by the terms of this Agreement. If
+Licensee does not agree to the terms of this Agreement, Licensee may
+not install, copy, or otherwise use the Licensed Software. Upon
+Licensee's acceptance of the terms and conditions of this Agreement,
+Nokia grants Licensee the right to use the Licensed Software in the
+manner provided below.
+
+
+4. LICENSES
+
+4.1 Using and Copying
+
+Nokia grants to Licensee a non-exclusive, non-transferable,
+time-limited license to use and copy the Licensed Software for sole
+purpose of evaluating and testing the Licensed Software during the
+Term.
+
+Licensee may install copies of the Licensed Software on an unlimited
+number of computers provided that (a) if an individual, only such
+individual; or (b) if a legal entity only its employees; use the
+Licensed Software for the authorized purposes.
+
+4.2 No Distribution or Modifications
+
+Licensee may not disclose, modify, sell, market, commercialise,
+distribute, loan, rent, lease, or license the Licensed Software or any
+copy of it or use the Licensed Software for any purpose that is not
+expressly granted in this Section 4. Licensee may not alter or remove
+any details of ownership, copyright, trademark or other property right
+connected with the Licensed Software. Licensee may not distribute any
+software statically or dynamically linked with the Licensed Software.
+
+4.3 No Technical Support
+
+Nokia has no obligation to furnish Licensee with any technical support
+whatsoever. Any such support is subject to separate agreement between
+the Parties.
+
+
+5. PRE-RELEASE CODE
+
+The Licensed Software contains pre-release code that is not at the
+level of performance and compatibility of a final, generally
+available, product offering. The Licensed Software may not operate
+correctly and may be substantially modified prior to the first
+commercial product release, if any. Nokia is not obligated to make
+this or any later version of the Licensed Software commercially
+available. The License Software is "Not for Commercial Use" and may
+only be used for the purposes described in Section 4. The Licensed
+Software may not be used in a live operating environment where it may
+be relied upon to perform in the same manner as a commercially
+released product or with data that has not been sufficiently backed
+up.
+
+
+6. THIRD PARTY SOFTWARE
+
+The Licensed Software may provide links to third party libraries or
+code (collectively "Third Party Software") to implement various
+functions.  Third Party Software does not comprise part of the
+Licensed Software. In some cases, access to Third Party Software may
+be included along with the Licensed Software delivery as a convenience
+for development and testing only. Such source code and libraries may
+be listed in the ".../src/3rdparty" source tree delivered with the
+Licensed Software or documented in the Licensed Software where the
+Third Party Software is used, as may be amended from time to time, do
+not comprise the Licensed Software. Licensee acknowledges (1) that
+some part of Third Party Software may require additional licensing of
+copyright and patents from the owners of such, and (2) that
+distribution of any of the Licensed Software referencing any portion
+of a Third Party Software may require appropriate licensing from such
+third parties.
+
+
+7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
+
+The Licensed Software is licensed to Licensee "as is". To the maximum
+extent permitted by applicable law, Nokia on behalf of itself and its
+suppliers, disclaims all warranties and conditions, either express or
+implied, including, but not limited to, implied warranties of
+merchantability, fitness for a particular purpose, title and
+non-infringement with regard to the Licensed Software.
+
+
+8. LIMITATION OF LIABILITY
+
+If, Nokia's warranty disclaimer notwithstanding, Nokia is held liable
+to Licensee, whether in contract, tort or any other legal theory,
+based on the Licensed Software, Nokia's entire liability to Licensee
+and Licensee's exclusive remedy shall be, at Nokia's option, either
+(A) return of the price Licensee paid for the Licensed Software, or
+(B) repair or replacement of the Licensed Software, provided Licensee
+returns to Nokia all copies of the Licensed Software as originally
+delivered to Licensee. Nokia shall not under any circumstances be
+liable to Licensee based on failure of the Licensed Software if the
+failure resulted from accident, abuse or misapplication, nor shall
+Nokia under any circumstances be liable for special damages, punitive
+or exemplary damages, damages for loss of profits or interruption of
+business or for loss or corruption of data. Any award of damages from
+Nokia to Licensee shall not exceed the total amount Licensee has paid
+to Nokia in connection with this Agreement.
+
+
+9. CONFIDENTIALITY
+
+Each party acknowledges that during the Term of this Agreement it
+shall have access to information about the other party's business,
+business methods, business plans, customers, business relations,
+technology, and other information, including the terms of this
+Agreement, that is confidential and of great value to the other party,
+and the value of which would be significantly reduced if disclosed to
+third parties (the "Confidential Information"). Accordingly, when a
+party (the "Receiving Party") receives Confidential Information from
+another party (the "Disclosing Party"), the Receiving Party shall, and
+shall obligate its employees and agents and employees and agents of
+its Affiliates to: (i) maintain the Confidential Information in strict
+confidence; (ii) not disclose the Confidential Information to a third
+party without the Disclosing Party's prior written approval; and (iii)
+not, directly or indirectly, use the Confidential Information for any
+purpose other than for exercising its rights and fulfilling its
+responsibilities pursuant to this Agreement. Each party shall take
+reasonable measures to protect the Confidential Information of the
+other party, which measures shall not be less than the measures taken
+by such party to protect its own confidential and proprietary
+information.
+
+"Confidential Information" shall not include information that (a) is
+or becomes generally known to the public through no act or omission of
+the Receiving Party; (b) was in the Receiving Party's lawful
+possession prior to the disclosure hereunder and was not subject to
+limitations on disclosure or use; (c) is developed by the Receiving
+Party without access to the Confidential Information of the Disclosing
+Party or by persons who have not had access to the Confidential
+Information of the Disclosing Party as proven by the written records
+of the Receiving Party; (d) is lawfully disclosed to the Receiving
+Party without restrictions, by a third party not under an obligation
+of confidentiality; or (e) the Receiving Party is legally compelled to
+disclose the information, in which case the Receiving Party shall
+assert the privileged and confidential nature of the information and
+cooperate fully with the Disclosing Party to protect against and
+prevent disclosure of any Confidential Information and to limit the
+scope of disclosure and the dissemination of disclosed Confidential
+Information by all legally available means.
+
+The obligations of the Receiving Party under this Section shall
+continue during the Initial Term and for a period of five (5) years
+after expiration or termination of this Agreement. To the extent that
+the terms of the Non-Disclosure Agreement between Nokia and Licensee
+conflict with the terms of this Section 8, this Section 8 shall be
+controlling over the terms of the Non-Disclosure Agreement.
+
+
+10. GENERAL PROVISIONS
+
+10.1 No Assignment
+
+Licensee shall not be entitled to assign or transfer all or any of its
+rights, benefits and obligations under this Agreement without the
+prior written consent of Nokia, which shall not be unreasonably
+withheld.
+
+10.2 Termination
+
+Nokia may terminate the Agreement at any time immediately upon written
+notice by Nokia to Licensee if Licensee breaches this Agreement.
+
+Upon termination of this Agreement, Licensee shall return to Nokia all
+copies of Licensed Software that were supplied by Nokia. All other
+copies of Licensed Software in the possession or control of Licensee
+must be erased or destroyed. An officer of Licensee must promptly
+deliver to Nokia a written confirmation that this has occurred.
+
+10.3 Surviving Sections
+
+Any terms and conditions that by their nature or otherwise reasonably
+should survive a cancellation or termination of this Agreement shall
+also be deemed to survive. Such terms and conditions include, but are
+not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3,
+10.4, 10.5, 10.6, 10.7, and 10.8 of this Agreement.
+
+10.4 Entire Agreement
+
+This Agreement constitutes the complete agreement between the parties
+and supersedes all prior or contemporaneous discussions,
+representations, and proposals, written or oral, with respect to the
+subject matters discussed herein, with the exception of the
+non-disclosure agreement executed by the parties in connection with
+this Agreement ("Non-Disclosure Agreement"), if any, shall be subject
+to Section 8. No modification of this Agreement shall be effective
+unless contained in a writing executed by an authorized representative
+of each party. No term or condition contained in Licensee's purchase
+order shall apply unless expressly accepted by Nokia in writing. If
+any provision of the Agreement is found void or unenforceable, the
+remainder shall remain valid and enforceable according to its
+terms. If any remedy provided is determined to have failed for its
+essential purpose, all limitations of liability and exclusions of
+damages set forth in this Agreement shall remain in effect.
+
+10.5 Export Control
+
+Licensee acknowledges that the Licensed Software may be subject to
+export control restrictions of various countries. Licensee shall fully
+comply with all applicable export license restrictions and
+requirements as well as with all laws and regulations relating to the
+importation of the Licensed Software and shall procure all necessary
+governmental authorizations, including without limitation, all
+necessary licenses, approvals, permissions or consents, where
+necessary for the re-exportation of the Licensed Software.,
+
+10.6 Governing Law and Legal Venue
+
+This Agreement shall be construed and interpreted in accordance with
+the laws of Finland, excluding its choice of law provisions. Any
+disputes arising out of or relating to this Agreement shall be
+resolved in arbitration under the Rules of Arbitration of the Chamber
+of Commerce of Helsinki, Finland. The arbitration tribunal shall
+consist of one (1), or if either Party so requires, of three (3),
+arbitrators. The award shall be final and binding and enforceable in
+any court of competent jurisdiction. The arbitration shall be held in
+Helsinki, Finland and the process shall be conducted in the English
+language.
+
+10.7 No Implied License
+
+There are no implied licenses or other implied rights granted under
+this Agreement, and all rights, save for those expressly granted
+hereunder, shall remain with Nokia and its licensors. In addition, no
+licenses or immunities are granted to the combination of the Licensed
+Software with any other software or hardware not delivered by Nokia
+under this Agreement.
+
+10.8 Government End Users
+
+A "U.S. Government End User" shall mean any agency or entity of the
+government of the United States. The following shall apply if Licensee
+is a U.S. Government End User. The Licensed Software is a "commercial
+item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
+consisting of "commercial computer software" and "commercial computer
+software documentation," as such terms are used in 48 C.F.R. 12.212
+(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48
+C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
+End Users acquire the Licensed Software with only those rights set
+forth herein. The Licensed Software (including related documentation)
+is provided to U.S.  Government End Users: (a) only as a commercial
+end item; and (b) only pursuant to this Agreement.
+
+
+
+
diff --git a/bin/findtr b/bin/findtr
new file mode 100755
index 0000000..7df3325
--- /dev/null
+++ b/bin/findtr
@@ -0,0 +1,189 @@
+#!/usr/bin/perl -w
+# vi:wrap:
+
+# See Qt I18N documentation for usage information.
+
+use POSIX qw(strftime);
+
+$projectid='PROJECT VERSION';
+$datetime = strftime "%Y-%m-%d %X %Z", localtime;
+$charset='iso-8859-1';
+$translator='FULLNAME <EMAIL@ADDRESS>';
+$revision_date='YYYY-MM-DD';
+
+$real_mark = "tr";
+$noop_mark = "QT_TR_NOOP";
+$scoped_mark = "qApp->translate";
+$noop_scoped_mark = "QT_TRANSLATE_NOOP";
+
+$header=
+'# This is a Qt message file in .po format.  Each msgid starts with
+# a scope.  This scope should *NOT* be translated - eg. translating
+# from French to English, "Foo::Bar" would be translated to "Pub",
+# not "Foo::Pub".
+msgid ""
+msgstr ""
+"Project-Id-Version: '.$projectid.'\n"
+"POT-Creation-Date: '.$datetime.'\n"
+"PO-Revision-Date: '.$revision_date.'\n"
+"Last-Translator: '.$translator.'\n"
+"Content-Type: text/plain; charset='.$charset.'\n"
+
+';
+
+
+
+
+$scope = "";
+
+if ( $#ARGV < 0 ) {
+    print STDERR "Usage:  findtr sourcefile ...  >project.po\n";
+    exit 1;
+}
+
+
+sub outmsg {
+    my ($file, $line, $scope, $msgid) = @_;
+    # unesc
+    $msgid =~ s/$esc:$esc:$esc/::/gs;
+    $msgid =~ s|$esc/$esc/$esc|//|gs;
+
+    # Remove blank lines
+    $msgid =~ s/\n\n+/\n/gs;
+    $msgid = "\"\"\n$msgid" if $msgid =~ /\n/s;
+    print "#: $file:$line\n";
+    $msgid =~ s/^"//; #"emacs bug
+    print "msgid \"${scope}::$msgid\n";
+    #print "msgstr \"$msgid\n";
+    print "msgstr \"\"\n";
+    print "\n";
+}
+
+sub justlines {
+    my $l = @_;
+    $l =~ tr|\n||dc;
+    return $l;
+}
+
+print $header;
+
+
+foreach $file ( @ARGV ) {
+    next unless open( I, "< $file" );
+
+    $source = join( "", <I> );
+
+    # Find esc. Avoid bad case 1/// -> 1/1/1/1 -> ///1
+    $esc = 1;
+    while ( $source =~ m!(?:$esc/$esc/$esc)|(?:$esc///)
+	    |(?:$esc:$esc:$esc)|(?:$esc:\:\:)! ) {
+	$esc++;
+    }
+
+    # Hide quoted :: in practically all strings
+    $source =~ s/\"([^"\n]*)::([^"\n]*)\"/\"$1$esc:$esc:$esc$2\"/g;
+
+    # Hide quoted // in practically all strings
+    $source =~ s|\"([^"\n]*)//([^"\n]*)\"|\"$1$esc/$esc/$esc$2\"|g;
+
+
+    # strip comments -- does not handle "/*" in strings
+    while( $source =~ s|/\*(.*?)\*/|justlines($1)|ges ) { }
+    while( $source =~ s|//(.*?)\n|\n|g ) { }
+
+    while( $source =~ /
+	    (?:
+		# Some doublequotes are "escaped" to help vim syntax highlight
+
+		# $1 = scope; $2 = parameters etc.
+		(?:
+		    # Scoped function name ($1 is scope).
+		    (\w+)::(?:\w+)
+		    \s*
+		    # Parameters etc up to open-curly - no semicolons
+		    \(([^();]*)\)
+		    \s*
+		    (?:\{|:)
+		)
+	      |
+		# $3 - one-argument msgid
+		(?:\b
+		    # One of the marks
+		    (?:$real_mark|$noop_mark)
+		    \s*
+		    # The parameter
+		    \(\s*((?:"(?:[^"]|[^\\]\\")*"\s*)+)\)
+		)
+	      |
+		# $4,$5 - two-argument msgid
+		(?:\b
+		    # One of the scoped marks
+		    (?:$scoped_mark|$noop_scoped_mark)
+		    \s*
+		    # The parameters
+		    \(
+			# The scope parameter
+			\s*"([^\"]*)"
+			\s*,\s*
+			# The msgid parameter
+			\s*((?:\"(?:[^"]|[^\\]\\")*"\s*)+) #"emacs
+		    \)
+		)
+	      |
+		# $6,$7 - scoped one-argument msgid
+		(?:\b
+		    # The scope
+		    (\w+)::
+		    # One of the marks
+		    (?:$real_mark)
+		    \s*
+		    # The parameter
+		    \(\s*((?:"(?:[^"]|[^\\]\\")*"\s*)+)\)
+		)
+	    )/gsx )
+    {
+	@lines = split /^/m, "$`";
+	$line = @lines;
+	if ( defined( $1 ) ) {
+	    if ( $scope ne $1 ) {
+		$sc=$1;
+		$etc=$2;
+		# remove strings
+		$etc =~ s/"(?:[^"]|[^\\]\\")"//g;
+		# count ( and )
+		@open = split /\(/m, $etc;
+		@close = split /\)/m, $etc;
+		if ( $#open == $#close ) {
+		    $scope = $sc;
+		}
+	    }
+	    next;
+	}
+
+       	if ( defined( $3 ) ) {
+	    $this_scope = $scope;
+	    $msgid = $3;
+	} elsif ( defined( $4 ) ) {
+	    $this_scope = $4;
+	    $msgid = $5;
+	} elsif ( defined( $6 ) ) {
+	    $this_scope = $6;
+	    $msgid = $7;
+	} else {
+	    next;
+	}
+
+	$msgid =~ s/^\s*//;
+	$msgid =~ s/\s*$//;
+
+	# Might still be non-unique eg. tr("A" "B")  vs.  tr("A"  "B").
+
+	$location{"${this_scope}::${msgid}"} = "$file:$line";
+    }
+}
+
+for $scoped_msgid ( sort keys %location ) {
+    ($scope,$msgid) = $scoped_msgid =~ m/([^:]*)::(.*)/s;
+    ($file,$line) = $location{$scoped_msgid} =~ m/([^:]*):(.*)/s;
+    outmsg($file,$line,$scope,$msgid);
+}
diff --git a/bin/setcepaths.bat b/bin/setcepaths.bat
new file mode 100755
index 0000000..5e04526
--- /dev/null
+++ b/bin/setcepaths.bat
@@ -0,0 +1,113 @@
+@echo off
+IF "%1" EQU "wincewm50pocket-msvc2005" (
+checksdk.exe -sdk "Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 5.01 for Pocket PC selected, environment is set up
+) ELSE IF "%1" EQU "wincewm50smart-msvc2005" (
+checksdk.exe -sdk "Windows Mobile 5.0 Smartphone SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 5.01 for Smartphone for arm selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-x86-msvc2005" (
+checksdk.exe -sdk "STANDARDSDK_500 (x86)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-armv4i-msvc2005" (
+checksdk.exe -sdk "STANDARDSDK_500 (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for arm selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-mipsii-msvc2005" (
+checksdk.exe -sdk "STANDARDSDK_500 (MIPSII)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for mips-ii selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-mipsiv-msvc2005" (
+checksdk.exe -sdk "STANDARDSDK_500 (MIPSIV)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for mips-iv selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-sh4-msvc2005" (
+checksdk.exe -sdk "STANDARDSDK_500 (SH4)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for sh4 selected, environment is set up
+) ELSE IF "%1" EQU "wincewm60professional-msvc2005" (
+checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 6 Professional selected, environment is set up
+) ELSE IF "%1" EQU "wincewm60standard-msvc2005" (
+checksdk.exe -sdk "Windows Mobile 6 Standard SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 6 Standard selected, environment is set up
+) ELSE IF "%1" EQU "wincewm50pocket-msvc2008" (
+checksdk.exe -sdk "Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 5.01 for Pocket PC selected, environment is set up
+) ELSE IF "%1" EQU "wincewm50smart-msvc2008" (
+checksdk.exe -sdk "Windows Mobile 5.0 Smartphone SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 5.01 for Smartphone for arm selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-x86-msvc2008" (
+checksdk.exe -sdk "STANDARDSDK_500 (x86)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-armv4i-msvc2008" (
+checksdk.exe -sdk "STANDARDSDK_500 (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for arm selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-mipsii-msvc2008" (
+checksdk.exe -sdk "STANDARDSDK_500 (MIPSII)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for mips-ii selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-mipsiv-msvc2008" (
+checksdk.exe -sdk "STANDARDSDK_500 (MIPSIV)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for mips-iv selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-sh4-msvc2008" (
+checksdk.exe -sdk "STANDARDSDK_500 (SH4)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for sh4 selected, environment is set up
+) ELSE IF "%1" EQU "wincewm60professional-msvc2008" (
+checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 6 Professional selected, environment is set up
+) ELSE IF "%1" EQU "wincewm60standard-msvc2008" (
+checksdk.exe -sdk "Windows Mobile 6 Standard SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 6 Standard selected, environment is set up
+) ELSE (
+echo no SDK to build Windows CE selected
+echo.
+echo Current choices are:
+echo   wincewm50pocket-msvc2005        - SDK for Windows Mobile 5.01 PocketPC
+echo   wincewm50smart-msvc2005         - SDK for Windows Mobile 5.01 Smartphone
+echo   wince50standard-x86-msvc2005    - Build for the WinCE standard SDK 5.0
+echo                                     with x86 platform preset
+echo   wince50standard-armv4i-msvc2005 - Build for the WinCE standard SDK 5.0
+echo                                     with armv4i platform preset
+echo   wince50standard-mipsiv-msvc2005 - Build for the WinCE standard SDK 5.0
+echo                                     with mips platform preset
+echo   wince50standard-sh4-msvc2005    - Build for the WinCE standard SDK 5.0
+echo                                     with sh4 platform preset
+echo   wincewm60professional-msvc2005  - SDK for Windows Mobile 6 professional
+echo   wincewm60standard-msvc2005      - SDK for Windows Mobile 6 Standard
+echo and the corresponding versions for msvc2008.
+echo.
+)
+
+
+
diff --git a/bin/snapshot b/bin/snapshot
new file mode 100644
index 0000000..ffad857
--- /dev/null
+++ b/bin/snapshot
@@ -0,0 +1,329 @@
+#!/usr/bin/perl -w
+######################################################################
+#
+#
+######################################################################
+
+# use packages -------------------------------------------------------
+use File::Basename;
+use File::Path;
+use Cwd;
+use Config;
+use strict;
+
+my $targetPath = "";
+my $qtdir = $ENV{"QTDIR"};
+
+my @files = (
+            "3rdparty/easing/easing.cpp",
+            "corelib/tools/qeasingcurve.h",
+            "corelib/tools/qeasingcurve.cpp",
+            "corelib/animation/animation.pri",
+            "corelib/animation/qabstractanimation.cpp",
+            "corelib/animation/qabstractanimation.h",
+            "corelib/animation/qabstractanimation_p.h",
+            "corelib/animation/qvariantanimation.cpp",
+            "corelib/animation/qvariantanimation.h",
+            "corelib/animation/qanimationgroup.cpp",
+            "corelib/animation/qvariantanimation_p.h",
+            "corelib/animation/qanimationgroup.h",
+            "corelib/animation/qanimationgroup_p.h",
+            "corelib/animation/qparallelanimationgroup.cpp",
+            "corelib/animation/qparallelanimationgroup.h",
+            "corelib/animation/qparallelanimationgroup_p.h",
+            "corelib/animation/qpauseanimation.cpp",
+            "corelib/animation/qpauseanimation.h",
+            "corelib/animation/qpropertyanimation.cpp",
+            "corelib/animation/qpropertyanimation.h",
+            "corelib/animation/qpropertyanimation_p.h",
+            "corelib/animation/qsequentialanimationgroup.cpp",
+            "corelib/animation/qsequentialanimationgroup.h",
+            "corelib/animation/qsequentialanimationgroup_p.h",
+            "corelib/statemachine/statemachine.pri",
+            "corelib/statemachine/qabstractstate.cpp",
+            "corelib/statemachine/qabstractstate.h",
+            "corelib/statemachine/qabstractstate_p.h",
+            "corelib/statemachine/qabstracttransition.cpp",
+            "corelib/statemachine/qabstracttransition.h",
+            "corelib/statemachine/qabstracttransition_p.h",
+            "corelib/statemachine/qactionstate.h",
+            "corelib/statemachine/qactionstate_p.h",
+            "corelib/statemachine/qactionstate.cpp",
+            "corelib/statemachine/qboundevent_p.h",
+            "corelib/statemachine/qeventtransition.cpp",
+            "corelib/statemachine/qeventtransition.h",
+            "corelib/statemachine/qeventtransition_p.h",
+            "corelib/statemachine/qfinalstate.cpp",
+            "corelib/statemachine/qfinalstate.h",
+            "corelib/statemachine/qhistorystate.cpp",
+            "corelib/statemachine/qhistorystate.h",
+            "corelib/statemachine/qhistorystate_p.h",
+            "corelib/statemachine/qsignalevent.h",
+            "corelib/statemachine/qsignaleventgenerator_p.h",
+            "corelib/statemachine/qsignaltransition.cpp",
+            "corelib/statemachine/qsignaltransition.h",
+            "corelib/statemachine/qsignaltransition_p.h",
+            "corelib/statemachine/qstate.cpp",
+            "corelib/statemachine/qstate.h",
+            "corelib/statemachine/qstateaction.cpp",
+            "corelib/statemachine/qstateaction.h",
+            "corelib/statemachine/qstateaction_p.h",
+            "corelib/statemachine/qstatefinishedevent.h",
+            "corelib/statemachine/qstatefinishedtransition.cpp",
+            "corelib/statemachine/qstatefinishedtransition.h",
+            "corelib/statemachine/qstatemachine.cpp",
+            "corelib/statemachine/qstatemachine.h",
+            "corelib/statemachine/qstatemachine_p.h",
+            "corelib/statemachine/qstate_p.h",
+            "corelib/statemachine/qtransition.cpp",
+            "corelib/statemachine/qtransition.h",
+            "corelib/statemachine/qtransition_p.h",
+            "gui/statemachine/qkeyeventtransition.h",
+            "gui/statemachine/qkeyeventtransition.cpp",
+            "gui/statemachine/qbasickeyeventtransition.cpp",
+            "gui/statemachine/qbasickeyeventtransition_p.h",
+            "gui/statemachine/qbasicmouseeventtransition.cpp",
+            "gui/statemachine/qbasicmouseeventtransition_p.h",
+            "gui/statemachine/qguistatemachine.cpp",
+            "gui/statemachine/qkeyeventtransition.cpp",
+            "gui/statemachine/qkeyeventtransition.h",
+            "gui/statemachine/qmouseeventtransition.cpp",
+            "gui/statemachine/qmouseeventtransition.h",
+            "gui/statemachine/statemachine.pri",       # needs special handling
+            );
+
+
+while ( @ARGV ) {
+    my $arg = shift @ARGV;
+    if ("$arg" eq "-to") {
+        $targetPath = shift @ARGV;
+    }
+}
+
+if ($targetPath eq "") {
+    die("missing -to option");
+}
+
+my $projectXML = "$targetPath\\files.xml";
+open(OXML, "> " . $projectXML) || die "Could not open $projectXML for writing (no write permission?)";
+
+print "COPYING SOURCES...\n";
+foreach my $files(@files) {
+    copyFile("$qtdir/src/$files","$targetPath/src");
+}
+copyFile("$qtdir/doc/src/animation.qdoc","$targetPath/doc");
+copyFile("$qtdir/doc/src/statemachine.qdoc","$targetPath/doc");
+copyFile("$qtdir/src/3rdparty/easing/legal.qdoc","$targetPath/doc");
+
+copyFile("$qtdir/doc/src/snippets/code/src_corelib_tools_qeasingcurve.cpp","$targetPath/doc/src/snippets/code");
+
+
+my %animation_examples = (
+    easing => [ "easing.pro",
+                "main.cpp",
+                "window.cpp",
+                "window.h",
+                "animation.h",
+                "form.ui",
+                "images/qt-logo.png",
+                "resources.qrc"],
+    moveblocks => [ "moveblocks.pro",
+                    "main.cpp" ],
+    animatedtiles => [     "animatedtiles.pro",
+                    "animatedtiles.qrc",
+                    "main.cpp",
+                    "images/*"],
+    "sub-attaq" => ["sub-attaq.pro",
+                    "animationmanager.cpp",
+                    "animationmanager.h",
+                    "boat.cpp",
+                    "boat_p.h",
+                    "boat.h",
+                    "bomb.cpp",
+                    "bomb.h",
+                    "custompropertyanimation.h",
+                    "custompropertyanimation_p.h",
+                    "custompropertyanimation.cpp",
+                    "graphicsscene.cpp",
+                    "graphicsscene.h",
+                    "main.cpp",
+                    "mainwindow.cpp",
+                    "mainwindow.h",
+                    "pics/scalable/*",
+                    "pics/big/*",
+                    "pics/small/*",
+                    "pics/welcome/*",
+                    "pixmapitem.cpp",
+                    "pixmapitem.h",
+                    "subattaq.qrc",
+                    "submarine.cpp",
+                    "submarine.h",
+                    "submarine_p.h",
+                    "states.cpp",
+                    "states.h",
+                    "torpedo.cpp",
+                    "torpedo.h"],
+    "stickman" => ["stickman.pro",
+                    "main.cpp",
+                    "animation.cpp",
+                    "animation.h",
+                    "graphicsview.cpp",
+                    "graphicsview.h",
+                    "lifecycle.cpp",
+                    "lifecycle.h",
+                    "node.cpp",
+                    "node.h",
+                    "stickman.cpp",
+                    "stickman.h",
+                    "animations/chilling",
+                    "animations/dancing",
+                    "animations/dead",
+                    "animations/jumping"]
+    );
+
+my $exDir;
+print "COPYING EXAMPLES...\n";
+for $exDir ( keys %animation_examples ) {
+    print "  $exDir...\n";
+    my $i = 0;
+    for $i ( 0 .. $#{ $animation_examples{$exDir} } ) {
+        my $ex_file = $animation_examples{$exDir}[$i];
+
+        my $copyTargetPath;
+        my $glob = 0;
+        if (index($ex_file,"/") > 0) {
+            my($basefile, $fullPath) = fileparse("$targetPath/examples/$exDir/$ex_file");
+            if ($basefile eq "*") {
+                $glob = 1;
+            }
+            mkpath "$fullPath",  0777 unless(-e "$fullPath");
+            $copyTargetPath = "$fullPath";
+        } else {
+            $copyTargetPath = "$targetPath/examples/$exDir";
+        }
+        my $lastCh = substr($copyTargetPath, length($copyTargetPath) - 1, 1);
+        if ($lastCh eq "/" || $lastCh eq "\\") {
+            chop($copyTargetPath);
+        }
+
+        if ($glob eq 1) {
+            my @globFiles = < $qtdir/examples/animation/$exDir/$ex_file >;
+            foreach my $globFile(@globFiles) {
+                copyFile("$globFile", "$copyTargetPath");
+            }
+        } else {
+            copyFile("$qtdir/examples/animation/$exDir/$ex_file", "$copyTargetPath");
+        }
+    }
+}
+
+close OXML;
+print("Finished!");
+######################################################################
+# Syntax:  copyFile(gitfile, destinationPath)
+# Params:  gitfile, string, filename to create duplicate for
+#          destinationPath, string, destination name of duplicate
+#
+# Purpose: Copies to the solutions area.
+# Returns: --
+# Warning: Dies if script cannot get write access.
+######################################################################
+sub copyFile
+{
+    my ($gitfile, $destinationPath) = @_;
+    # Bi-directional synchronization
+    open( I, "< " . $gitfile ) || die "Could not open $gitfile for reading";
+    local $/;
+    binmode I;
+    my $filecontents = <I>;
+    my ($baseFileName, $path, $ext) = fileparse($gitfile, qr/\.[^.]*/);
+    if ($ext eq ".h"  or $ext eq ".cpp" or $ext eq ".qdoc") {
+        # both public and private classes
+        $filecontents =~s/QAbstractAnimation/QtAbstractAnimation/g;
+        $filecontents =~s/QAnimationGroup/QtAnimationGroup/g;
+        $filecontents =~s/QParallelAnimationGroup/QtParallelAnimationGroup/g;
+        $filecontents =~s/QSequentialAnimationGroup/QtSequentialAnimationGroup/g;
+        $filecontents =~s/QEasingCurve/QtEasingCurve/g;
+        $filecontents =~s/QVariantAnimation/QtVariantAnimation/g;
+        $filecontents =~s/QPropertyAnimation/QtPropertyAnimation/g;
+        $filecontents =~s/QItemAnimation/QtItemAnimation/g;
+        $filecontents =~s/QPauseAnimation/QtPauseAnimation/g;
+        $filecontents =~s/QAbstractState/QtAbstractState/g;
+        $filecontents =~s/QAbstractStateGroup/QtAbstractStateGroup/g;
+        $filecontents =~s/QAbstractTransition/QtAbstractTransition/g;
+        $filecontents =~s/QActionState/QtActionState/g;
+        $filecontents =~s/QEventTransition/QtEventTransition/g;
+        $filecontents =~s/QFinalState/QtFinalState/g;
+        $filecontents =~s/QHistoryState/QtHistoryState/g;
+        $filecontents =~s/QParallelStateGroup/QtParallelStateGroup/g;
+        $filecontents =~s/QSignalEvent/QtSignalEvent/g;
+        $filecontents =~s/QSignalTransition/QtSignalTransition/g;
+        $filecontents =~s/QState/QtState/g;
+        $filecontents =~s/QStateAction/QtStateAction/g;
+        $filecontents =~s/QStateInvokeMethodAction/QtStateInvokeMethodAction/g;
+        $filecontents =~s/QStateFinishedEvent/QtStateFinishedEvent/g;
+        $filecontents =~s/QStateFinishedTransition/QtStateFinishedTransition/g;
+        $filecontents =~s/QStateMachine/QtStateMachine/g;
+        $filecontents =~s/QTransition/QtTransition/g;
+        $filecontents =~s/QMouseEventTransition/QtMouseEventTransition/g;
+        $filecontents =~s/QKeyEventTransition/QtKeyEventTransition/g;
+        $filecontents =~s/QGraphicsWidget/QtGraphicsWidget/g;
+        $filecontents =~s/Q_CORE_EXPORT/Q_ANIMATION_EXPORT/g;
+        $filecontents =~s/Q_GUI_EXPORT/Q_ANIMATION_EXPORT/g;
+        $filecontents =~s/QBoundEvent/QtBoundEvent/g;
+
+        $filecontents =~s/class Q_GUI_EXPORT/class/g;
+        $filecontents =~s/class Q_AUTOTEST_EXPORT/class/g;
+
+        $filecontents =~s/(#\s*include\s+["])q/${1}qt/g;
+
+        # moc stuff
+        $filecontents =~s/(#\s*include\s+["])moc_q/${1}moc_qt/g;
+
+        $filecontents =~s/\\since 4\.[0-9]//g;
+        $filecontents =~s/\\ingroup [a-z]+//g;
+
+        if (substr($filecontents, 0, 10) eq "/*********") {
+            my $endOfComment = index($filecontents, "*/");
+            $filecontents = substr($filecontents, $endOfComment + 2);
+        }
+    }
+    if ($ext eq ".pri"  ) {
+        $filecontents =~s/\$\$PWD\/q/\$\$PWD\/qt/g;
+        $filecontents =~s/animation\/q/\$\$PWD\/qt/g;
+
+        # oooh such a hack this is
+        if ($baseFileName eq "statemachine") {
+            if (index($gitfile, "corelib/statemachine") >= 0) {
+                $baseFileName = "corelib_statemachine";
+            }
+            if (index($gitfile, "gui/statemachine") >= 0) {
+                $baseFileName = "gui_statemachine";
+            }
+
+        }
+
+    }
+
+    if ($ext eq ".pro") {
+        $filecontents = "$filecontents\ninclude(../../src/qtanimationframework.pri)\n";
+    }
+    close I;
+
+    mkpath $destinationPath, 0777 unless(-e "$destinationPath");
+
+    if ($ext eq ".h"  or $ext eq ".cpp" or $ext eq ".qdoc") {
+        $baseFileName =~s/^q/qt/g;
+    }
+    my $targetFile = "$destinationPath/$baseFileName$ext";
+    open(O, "> " . $targetFile) || die "Could not open $targetFile for writing (no write permission?)";
+    local $/;
+    binmode O;
+    print O $filecontents;
+    close O;
+
+    my $xmlEntry = substr($targetFile, length($targetPath) + 1);
+    print "$xmlEntry\n";
+    print OXML "<add>$xmlEntry</add>\n";
+}
+
diff --git a/bin/syncqt b/bin/syncqt
new file mode 100755
index 0000000..5ac8933
--- /dev/null
+++ b/bin/syncqt
@@ -0,0 +1,1051 @@
+#!/usr/bin/perl -w
+######################################################################
+#
+# Synchronizes Qt header files - internal Trolltech tool.
+#
+# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Contact: Qt Software Information (qt-info@nokia.com)
+#
+######################################################################
+
+# use packages -------------------------------------------------------
+use File::Basename;
+use File::Path;
+use Cwd;
+use Config;
+use strict;
+
+die "syncqt: QTDIR not defined" if ! $ENV{"QTDIR"}; # sanity check
+
+# global variables
+my $isunix = 0;
+my $basedir = $ENV{"QTDIR"};
+$basedir =~ s=\\=/=g;
+my %modules = ( # path to module name map
+        "QtGui" => "$basedir/src/gui",
+        "QtAnimation" => "$basedir/src/animation",
+        "QtOpenGL" => "$basedir/src/opengl",
+        "QtCore" => "$basedir/src/corelib",
+        "QtXml" => "$basedir/src/xml",
+        "QtXmlPatterns" => "$basedir/src/xmlpatterns",
+        "QtSql" => "$basedir/src/sql",
+        "QtNetwork" => "$basedir/src/network",
+        "QtSvg" => "$basedir/src/svg",
+        "QtScript" => "$basedir/src/script",
+        "QtScriptTools" => "$basedir/src/scripttools",
+        "Qt3Support" => "$basedir/src/qt3support",
+        "ActiveQt" => "$basedir/src/activeqt/container;$basedir/src/activeqt/control;$basedir/src/activeqt/shared",
+        "QtTest" => "$basedir/src/testlib",
+        "QtAssistant" => "$basedir/tools/assistant/compat/lib",
+        "QtHelp" => "$basedir/tools/assistant/lib",
+        "QtDesigner" => "$basedir/tools/designer/src/lib",
+        "QtUiTools" => "$basedir/tools/designer/src/uitools",
+        "QtDBus" => "$basedir/src/dbus",
+        "QtWebKit" => "$basedir/src/3rdparty/webkit/WebCore",
+        "phonon" => "$basedir/src/phonon",
+);
+my %moduleheaders = ( # restrict the module headers to those found in relative path
+        "QtWebKit" => "../WebKit/qt/Api",
+        "phonon" => "../3rdparty/phonon/phonon",
+);
+
+#$modules{"QtCore"} .= ";$basedir/mkspecs/" . $ENV{"MKSPEC"} if defined $ENV{"MKSPEC"};
+
+# global variables (modified by options)
+my $module = 0;
+my $showonly = 0;
+my $remove_stale = 1;
+my $force_win = 0;
+my $force_relative = 0;
+my $check_includes = 0;
+my $copy_headers = 0;
+my @modules_to_sync ;
+$force_relative = 1 if ( -d "/System/Library/Frameworks" );
+my $out_basedir = $basedir;
+$out_basedir =~ s=\\=/=g;
+
+# functions ----------------------------------------------------------
+
+######################################################################
+# Syntax:  showUsage()
+# Params:  -none-
+#
+# Purpose: Show the usage of the script.
+# Returns: -none-
+######################################################################
+sub showUsage
+{
+    print "$0 usage:\n";
+    print "  -copy                 Copy headers instead of include-fwd(default: " . ($copy_headers ? "yes" : "no") . ")\n";
+    print "  -remove-stale         Removes stale headers              (default: " . ($remove_stale ? "yes" : "no") . ")\n";
+    print "  -relative             Force relative symlinks            (default: " . ($force_relative ? "yes" : "no") . ")\n";
+    print "  -windows              Force platform to Windows          (default: " . ($force_win ? "yes" : "no") . ")\n";
+    print "  -showonly             Show action but not perform        (default: " . ($showonly ? "yes" : "no") . ")\n";
+    print "  -outdir <PATH>        Specify output directory for sync  (default: $out_basedir)\n";
+    print "  -help                 This help\n";
+    exit 0;
+}
+
+######################################################################
+# Syntax:  checkUnix()
+# Params:  -none-
+#
+# Purpose: Check if script runs on a Unix system or not. Cygwin
+#          systems are _not_ detected as Unix systems.
+# Returns: 1 if a unix system, else 0.
+######################################################################
+sub checkUnix {
+    my ($r) = 0;
+    if ( $force_win != 0) {
+        return 0;
+    } elsif ( -f "/bin/uname" ) {
+        $r = 1;
+        (-f "\\bin\\uname") && ($r = 0);
+    } elsif ( -f "/usr/bin/uname" ) {
+        $r = 1;
+        (-f "\\usr\\bin\\uname") && ($r = 0);
+    }
+    if($r) {
+        $_ = $Config{'osname'};
+        $r = 0 if( /(ms)|(cyg)win/i );
+    }
+    return $r;
+}
+
+sub checkRelative {
+    my ($dir) = @_;
+    return 0 if($dir =~ /^\//);
+    return 0 if(!checkUnix() && $dir =~ /[a-zA-Z]:[\/\\]/);
+    return 1;
+}
+
+######################################################################
+# Syntax:  shouldMasterInclude(iheader)
+# Params:  iheader, string, filename to verify inclusion
+#
+# Purpose: Determines if header should be in the master include file.
+# Returns: 0 if file contains "#pragma qt_no_master_include" or not
+#          able to open, else 1.
+######################################################################
+sub shouldMasterInclude {
+    my ($iheader) = @_;
+    return 0 if(basename($iheader) =~ /_/);
+    return 0 if(basename($iheader) =~ /qconfig/);
+    if(open(F, "<$iheader")) {
+        while(<F>) {
+	    chomp;
+	    return 0 if(/^\#pragma qt_no_master_include$/);
+	}
+	close(F);
+    } else {
+	return 0;
+    }
+    return 1;
+}
+
+######################################################################
+# Syntax:  classNames(iheader)
+# Params:  iheader, string, filename to parse for classname "symlinks"
+#
+# Purpose: Scans through iheader to find all classnames that should be
+#          synced into library's include structure.
+# Returns: List of all class names in a file.
+######################################################################
+sub classNames {
+    my @ret;
+    my ($iheader) = @_;
+    if(basename($iheader) eq "qglobal.h") {
+	push @ret, "QtGlobal";
+    } elsif(basename($iheader) eq "qendian.h") {
+	push @ret, "QtEndian";
+    } elsif(basename($iheader) eq "qconfig.h") {
+        push @ret, "QtConfig";
+    } elsif(basename($iheader) eq "qplugin.h") {
+	push @ret, "QtPlugin";
+    } elsif(basename($iheader) eq "qalgorithms.h") {
+	push @ret, "QtAlgorithms";
+    } elsif(basename($iheader) eq "qcontainerfwd.h") {
+	push @ret, "QtContainerFwd";
+    } elsif(basename($iheader) eq "qdebug.h") {
+        push @ret, "QtDebug";
+    } elsif(basename($iheader) eq "qevent.h") {
+        push @ret, "QtEvents";
+    } elsif(basename($iheader) eq "qnamespace.h") {
+        push @ret, "Qt"
+    } elsif(basename($iheader) eq "qssl.h") {
+	push @ret, "QSsl";
+    } elsif(basename($iheader) eq "qtest.h") {
+        push @ret, "QTest"
+    } elsif(basename($iheader) eq "qtconcurrentmap.h") {
+        push @ret, "QtConcurrentMap"
+    } elsif(basename($iheader) eq "qtconcurrentfilter.h") {
+        push @ret, "QtConcurrentFilter"
+    } elsif(basename($iheader) eq "qtconcurrentrun.h") {
+        push @ret, "QtConcurrentRun"
+    }
+
+    my $parsable = "";
+    if(open(F, "<$iheader")) {
+        while(<F>) {
+            my $line = $_;
+            chomp $line;
+			chop $line if ($line =~ /\r$/);
+            if($line =~ /^\#/) {
+                if($line =~ /\\$/) {
+                    while($line = <F>) {
+                        chomp $line;
+                        last unless($line =~ /\\$/);
+                    }
+                }
+		return @ret if($line =~ m/^#pragma qt_sync_stop_processing/);
+                push(@ret, "$1") if($line =~ m/^#pragma qt_class\(([^)]*)\)[\r\n]*$/);
+		$line = 0;
+            }
+	    if($line) {
+                $line =~ s,//.*$,,; #remove c++ comments
+	        $line .= ";" if($line =~ m/^Q_[A-Z_]*\(.*\)[\r\n]*$/); #qt macro
+	        $line .= ";" if($line =~ m/^QT_(BEGIN|END)_HEADER[\r\n]*$/); #qt macro
+	        $line .= ";" if($line =~ m/^QT_(BEGIN|END)_NAMESPACE[\r\n]*$/); #qt macro
+	        $line .= ";" if($line =~ m/^QT_MODULE\(.*\)[\r\n]*$/); # QT_MODULE macro
+                $parsable .= " " . $line;
+	    }
+        }
+        close(F);
+    }
+
+    my $last_definition = 0;
+    my @namespaces;
+    for(my $i = 0; $i < length($parsable); $i++) {
+        my $definition = 0;
+        my $character = substr($parsable, $i, 1);
+        if($character eq "/" && substr($parsable, $i+1, 1) eq "*") { #I parse like this for greedy reasons
+            for($i+=2; $i < length($parsable); $i++) {
+                my $end = substr($parsable, $i, 2);
+                if($end eq "*/") {
+                    $last_definition = $i+2;
+                    $i++;
+                    last;
+                }
+            }
+        } elsif($character eq "{") {
+            my $brace_depth = 1;
+            my $block_start = $i + 1;
+          BLOCK: for($i+=1; $i < length($parsable); $i++) {
+              my $ignore = substr($parsable, $i, 1);
+              if($ignore eq "{") {
+                  $brace_depth++;
+              } elsif($ignore eq "}") {
+                  $brace_depth--;
+                  unless($brace_depth) {
+                      for(my $i2 = $i+1; $i2 < length($parsable); $i2++) {
+                          my $end = substr($parsable, $i2, 1);
+                          if($end eq ";" || $end ne " ") {
+                              $definition = substr($parsable, $last_definition, $block_start - $last_definition) . "}";
+                              $i = $i2 if($end eq ";");
+                              $last_definition = $i + 1;
+                              last BLOCK;
+			  }
+                      }
+                  }
+              }
+          }
+        } elsif($character eq ";") {
+            $definition = substr($parsable, $last_definition, $i - $last_definition + 1);
+            $last_definition = $i + 1;
+	} elsif($character eq "}") {
+	    # a naked } must be a namespace ending
+	    # if it's not a namespace, it's eaten by the loop above
+	    pop @namespaces;
+	    $last_definition = $i + 1;
+	}
+
+	if (substr($parsable, $last_definition, $i - $last_definition + 1) =~ m/ namespace ([^ ]*) /
+	    && substr($parsable, $i+1, 1) eq "{") {
+	    push @namespaces, $1;
+
+	    # Eat the opening { so that the condensing loop above doesn't see it
+	    $i++;
+	    $last_definition = $i + 1;
+	}
+
+        if($definition) {
+	    $definition =~ s=[\n\r]==g;
+            my @symbols;
+            if($definition =~ m/^ *typedef *.*\(\*([^\)]*)\)\(.*\);$/) {
+		push @symbols, $1;
+            } elsif($definition =~ m/^ *typedef +(.*) +([^ ]*);$/) {
+		push @symbols, $2;
+            } elsif($definition =~ m/^ *(template *<.*> *)?(class|struct) +([^ ]* +)?([^<\s]+) ?(<[^>]*> ?)?\s*((,|:)\s*(public|protected|private) *.*)? *\{\}$/) {
+		push @symbols, $4;
+            } elsif($definition =~ m/^ *Q_DECLARE_.*ITERATOR\((.*)\);$/) {
+		push @symbols, "Q" . $1 . "Iterator";
+		push @symbols, "QMutable" . $1 . "Iterator";
+	    }
+
+	    foreach (@symbols) {
+		my $symbol = $_;
+		$symbol = (join("::", @namespaces) . "::" . $symbol) if (scalar @namespaces);
+		push @ret, $symbol
+		    if ($symbol =~ /^Q[^:]*$/		# no-namespace, starting with Q
+			|| $symbol =~ /^Phonon::/);	# or in the Phonon namespace
+            }
+        }
+    }
+    return @ret;
+}
+
+######################################################################
+# Syntax:  syncHeader(header, iheader, copy)
+# Params:  header, string, filename to create "symlink" for
+#          iheader, string, destination name of symlink
+#          copy, forces header to be a copy of iheader
+#
+# Purpose: Syncronizes header to iheader
+# Returns: 1 if successful, else 0.
+######################################################################
+sub syncHeader {
+    my ($header, $iheader, $copy) = @_;
+    $iheader =~ s=\\=/=g;
+    $header =~ s=\\=/=g;
+    return copyFile($iheader, $header) if($copy);
+
+    my $iheader_no_basedir = $iheader;
+    $iheader_no_basedir =~ s,^$basedir/?,,;
+    unless(-e "$header") {
+        my $header_dir = dirname($header);
+        mkpath $header_dir, 0777;
+
+        #write it
+        my $iheader_out = fixPaths($iheader, $header_dir);
+        open HEADER, ">$header" || die "Could not open $header for writing!\n";
+        print HEADER "#include \"$iheader_out\"\n";
+        close HEADER;
+        return 1;
+    }
+    return 0;
+}
+
+######################################################################
+# Syntax:  fixPaths(file, dir)
+# Params:  file, string, filepath to be made relative to dir
+#          dir, string, dirpath for point of origin
+#
+# Purpose: file is made relative (if possible) of dir.
+# Returns: String with the above applied conversion.
+######################################################################
+sub fixPaths {
+    my ($file, $dir) = @_;
+    $dir =~ s=^$basedir/=$out_basedir/= if(!($basedir eq $out_basedir));
+    $file =~ s=\\=/=g;
+    $file =~ s/\+/\\+/g;
+    $dir =~ s=\\=/=g;
+    $dir =~ s/\+/\\+/g;
+
+    #setup
+    my $ret = $file;
+    my $file_dir = dirname($file);
+    if($file_dir eq ".") {
+        $file_dir = getcwd();
+        $file_dir =~ s=\\=/=g;
+    }
+    $file_dir =~ s,/cygdrive/([a-zA-Z])/,$1:,g;
+    if($dir eq ".") {
+        $dir = getcwd();
+        $dir =~ s=\\=/=g;
+    }
+    $dir =~ s,/cygdrive/([a-zA-Z])/,$1:/,g;
+    return basename($file) if("$file_dir" eq "$dir");
+
+    #guts
+    my $match_dir = 0;
+    for(my $i = 1; $i < length($file_dir); $i++) {
+        my $slash = index($file_dir, "/", $i);
+        last if($slash == -1);
+        my $tmp = substr($file_dir, 0, $slash);
+        last unless($dir =~ m,^$tmp/,);
+        $match_dir = $tmp;
+        $i = $slash;
+    }
+    if($match_dir) {
+        my $after = substr($dir, length($match_dir));
+        my $count = ($after =~ tr,/,,);
+        my $dots = "";
+        for(my $i = 0; $i < $count; $i++) {
+            $dots .= "../";
+        }
+        $ret =~ s,^$match_dir,$dots,;
+    }
+    $ret =~ s,/+,/,g;
+    return $ret;
+}
+
+######################################################################
+# Syntax:  fileContents(filename)
+# Params:  filename, string, filename of file to return contents
+#
+# Purpose: Get the contents of a file.
+# Returns: String with contents of the file, or empty string if file
+#          doens't exist.
+# Warning: Dies if it does exist but script cannot get read access.
+######################################################################
+sub fileContents {
+    my ($filename) = @_;
+    my $filecontents = "";
+    if (-e $filename) {
+        open(I, "< $filename") || die "Could not open $filename for reading, read block?";
+        local $/;
+        binmode I;
+        $filecontents = <I>;
+        close I;
+    }
+    return $filecontents;
+}
+
+######################################################################
+# Syntax:  fileCompare(file1, file2)
+# Params:  file1, string, filename of first file
+#          file2, string, filename of second file
+#
+# Purpose: Determines if files are equal, and which one is newer.
+# Returns: 0 if files are equal no matter the timestamp, -1 if file1
+#          is newer, 1 if file2 is newer.
+######################################################################
+sub fileCompare {
+    my ($file1, $file2) = @_;
+    my $file1contents = fileContents($file1);
+    my $file2contents = fileContents($file2);
+    if (! -e $file1) { return 1; }
+    if (! -e $file2) { return -1; }
+    return $file1contents ne $file2contents ? (stat("$file2"))[9] <=> (stat("$file1"))[9] : 0;
+}
+
+######################################################################
+# Syntax:  copyFile(file, ifile)
+# Params:  file, string, filename to create duplicate for
+#          ifile, string, destination name of duplicate
+#
+# Purpose: Keeps files in sync so changes in the newer file will be
+#          written to the other.
+# Returns: 1 if files were synced, else 0.
+# Warning: Dies if script cannot get write access.
+######################################################################
+sub copyFile
+{
+    my ($file,$ifile, $copy,$knowdiff,$filecontents,$ifilecontents) = @_;
+    # Bi-directional synchronization
+    open( I, "< " . $file ) || die "Could not open $file for reading";
+    local $/;
+    binmode I;
+    $filecontents = <I>;
+    close I;
+    if ( open(I, "< " . $ifile) ) {
+	local $/;
+	binmode I;
+	$ifilecontents = <I>;
+	close I;
+	$copy = fileCompare($file, $ifile);
+	$knowdiff = 0,
+    } else {
+	$copy = -1;
+	$knowdiff = 1;
+    }
+
+    if ( $knowdiff || ($filecontents ne $ifilecontents) ) {
+	if ( $copy > 0 ) {
+	    my $file_dir = dirname($file);
+	    mkpath $file_dir, 0777 unless(-e "$file_dir");
+	    open(O, "> " . $file) || die "Could not open $file for writing (no write permission?)";
+	    local $/;
+	    binmode O;
+	    print O $ifilecontents;
+	    close O;
+	    return 1;
+	} elsif ( $copy < 0 ) {
+	    my $ifile_dir = dirname($ifile);
+	    mkpath $ifile_dir, 0777 unless(-e "$ifile_dir");
+	    open(O, "> " . $ifile) || die "Could not open $ifile for writing (no write permission?)";
+	    local $/;
+	    binmode O;
+	    print O $filecontents;
+	    close O;
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+######################################################################
+# Syntax:  symlinkFile(file, ifile)
+# Params:  file, string, filename to create "symlink" for
+#          ifile, string, destination name of symlink
+#
+# Purpose: File is symlinked to ifile (or copied if filesystem doesn't
+#          support symlink).
+# Returns: 1 on success, else 0.
+######################################################################
+sub symlinkFile
+{
+    my ($file,$ifile) = @_;
+
+    if ($isunix) {
+        print "symlink created for $file ";
+        if ( $force_relative && ($ifile =~ /^$basedir/)) {
+            my $t = getcwd();
+            my $c = -1;
+            my $p = "../";
+            $t =~ s-^$basedir/--;
+            $p .= "../" while( ($c = index( $t, "/", $c + 1)) != -1 );
+            $file =~ s-^$basedir/-$p-;
+            print " ($file)\n";
+        }
+        print "\n";
+        return symlink($file, $ifile);
+    }
+    return copyFile($file, $ifile);
+}
+
+######################################################################
+# Syntax:  findFiles(dir, match, descend)
+# Params:  dir, string, directory to search for name
+#          match, string, regular expression to match in dir
+#          descend, integer, 0 = non-recursive search
+#                            1 = recurse search into subdirectories
+#
+# Purpose: Finds files matching a regular expression.
+# Returns: List of matching files.
+#
+# Examples:
+#   findFiles("/usr","\.cpp$",1)  - finds .cpp files in /usr and below
+#   findFiles("/tmp","^#",0)      - finds #* files in /tmp
+######################################################################
+sub findFiles {
+    my ($dir,$match,$descend) = @_;
+    my ($file,$p,@files);
+    local(*D);
+    $dir =~ s=\\=/=g;
+    ($dir eq "") && ($dir = ".");
+    if ( opendir(D,$dir) ) {
+        if ( $dir eq "." ) {
+            $dir = "";
+        } else {
+            ($dir =~ /\/$/) || ($dir .= "/");
+        }
+        foreach $file ( readdir(D) ) {
+            next if ( $file  =~ /^\.\.?$/ );
+            $p = $file;
+            ($file =~ /$match/) && (push @files, $p);
+            if ( $descend && -d $p && ! -l $p ) {
+                push @files, &findFiles($p,$match,$descend);
+            }
+        }
+        closedir(D);
+    }
+    return @files;
+}
+
+# --------------------------------------------------------------------
+# "main" function
+# --------------------------------------------------------------------
+
+while ( @ARGV ) {
+    my $var = 0;
+    my $val = 0;
+
+    #parse
+    my $arg = shift @ARGV;
+    if ("$arg" eq "-h" || "$arg" eq "-help" || "$arg" eq "?") {
+	$var = "show_help";
+	$val = "yes";
+    } elsif("$arg" eq "-copy") {
+	$var = "copy";
+	$val = "yes";
+    } elsif("$arg" eq "-o" || "$arg" eq "-outdir") {
+	$var = "output";
+	$val = shift @ARGV;
+    } elsif("$arg" eq "-showonly" || "$arg" eq "-remove-stale" || "$arg" eq "-windows" ||
+	    "$arg" eq "-relative" || "$arg" eq "-check-includes") {
+	$var = substr($arg, 1);
+	$val = "yes";
+    } elsif("$arg" =~ /^-no-(.*)$/) {
+	$var = $1;
+	$val = "no";
+	#these are for commandline compat
+    } elsif("$arg" eq "-inc") {
+	$var = "output";
+	$val = shift @ARGV;
+    } elsif("$arg" eq "-module") {
+	$var = "module";
+	$val = shift @ARGV;
+    } elsif("$arg" eq "-show") {
+	$var = "showonly";
+	$val = "yes";
+    } elsif("$arg" eq '*') {
+        # workaround for windows 9x where "%*" expands to "*"
+        $var = 1;
+    }
+
+    #do something
+    if(!$var || "$var" eq "show_help") {
+	print "Unknown option: $arg\n\n" if(!$var);
+	showUsage();
+    } elsif ("$var" eq "copy") {
+	if("$val" eq "yes") {
+	    $copy_headers++;
+	} elsif($showonly) {
+	    $copy_headers--;
+	}
+    } elsif ("$var" eq "showonly") {
+	if("$val" eq "yes") {
+	    $showonly++;
+	} elsif($showonly) {
+	    $showonly--;
+	}
+    } elsif ("$var" eq "check-includes") {
+	if("$val" eq "yes") {
+	    $check_includes++;
+	} elsif($check_includes) {
+	    $check_includes--;
+	}
+    } elsif ("$var" eq "remove-stale") {
+	if("$val" eq "yes") {
+	    $remove_stale++;
+	} elsif($remove_stale) {
+	    $remove_stale--;
+	}
+    } elsif ("$var" eq "windows") {
+	if("$val" eq "yes") {
+	    $force_win++;
+	} elsif($force_win) {
+	    $force_win--;
+	}
+    } elsif ("$var" eq "relative") {
+	if("$val" eq "yes") {
+	    $force_relative++;
+	} elsif($force_relative) {
+	    $force_relative--;
+	}
+    } elsif ("$var" eq "module") {
+	print "module :$val:\n";
+	die "No such module: $val" unless(defined $modules{$val});
+	push @modules_to_sync, $val;
+    } elsif ("$var" eq "output") {
+	my $outdir = $val;
+	if(checkRelative($outdir)) {
+	    $out_basedir = getcwd();
+	    chomp $out_basedir;
+	    $out_basedir .= "/" . $outdir;
+	} else {
+	    $out_basedir = $outdir;
+	}
+	# \ -> /
+	$out_basedir =~ s=\\=/=g;
+    }
+}
+@modules_to_sync = keys(%modules) if($#modules_to_sync == -1);
+
+$isunix = checkUnix; #cache checkUnix
+
+# create path
+mkpath "$out_basedir/include", 0777;
+
+my @ignore_headers = ();
+my $class_lib_map_contents = "";
+my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" );
+my @ignore_for_include_check = ( "qatomic.h" );
+my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" );
+my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );
+my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtAssistant}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" );
+
+foreach (@modules_to_sync) {
+    #iteration info
+    my $lib = $_;
+    my $dir = "$modules{$lib}";
+    my $pathtoheaders = "";
+    $pathtoheaders = "$moduleheaders{$lib}" if ($moduleheaders{$lib});
+
+    #information used after the syncing
+    my $pri_install_classes = "";
+    my $pri_install_files = "";
+
+    my $libcapitals = $lib;
+    $libcapitals =~ y/a-z/A-Z/;
+    my $master_contents = "#ifndef QT_".$libcapitals."_MODULE_H\n#define QT_".$libcapitals."_MODULE_H\n";
+
+    #get dependencies
+    if(-e "$dir/" . basename($dir) . ".pro") {
+	if(open(F, "<$dir/" . basename($dir) . ".pro")) {
+	    while(<F>) {
+		my $line = $_;
+		chomp $line;
+		if($line =~ /^ *QT *\+?= *([^\r\n]*)/) {
+		    foreach(split(/ /, "$1")) {
+			$master_contents .= "#include <QtCore/QtCore>\n" if("$_" eq "core");
+			$master_contents .= "#include <QtGui/QtGui>\n" if("$_" eq "gui");
+			$master_contents .= "#include <QtAnimation/QtAnimation>\n" if("$_" eq "experimental-animation");
+			$master_contents .= "#include <QtNetwork/QtNetwork>\n" if("$_" eq "network");
+			$master_contents .= "#include <QtSvg/QtSvg>\n" if("$_" eq "svg");
+			$master_contents .= "#include <QtScript/QtScript>\n" if("$_" eq "script");
+			$master_contents .= "#include <QtScriptTools/QtScriptTools>\n" if("$_" eq "scripttools");
+			$master_contents .= "#include <Qt3Support/Qt3Support>\n" if("$_" eq "qt3support");
+			$master_contents .= "#include <QtSql/QtSql>\n" if("$_" eq "sql");
+			$master_contents .= "#include <QtXml/QtXml>\n" if("$_" eq "xml");
+			$master_contents .= "#include <QtXmlPatterns/QtXmlPatterns>\n" if("$_" eq "xmlpatterns");
+			$master_contents .= "#include <QtOpenGL/QtOpenGL>\n" if("$_" eq "opengl");
+		    }
+		}
+	    }
+	    close(F);
+	}
+    }
+
+    #remove the old files
+    if($remove_stale) {
+	my @subdirs = ("$out_basedir/include/$lib");
+	foreach (@subdirs) {
+	    my $subdir = "$_";
+	    if (opendir DIR, "$subdir") {
+		while(my $t = readdir(DIR)) {
+		    my $file = "$subdir/$t";
+		    if(-d "$file") {
+			push @subdirs, "$file" unless($t eq "." || $t eq "..");
+		    } else {
+			my @files = ("$file");
+			#push @files, "$out_basedir/include/Qt/$t" if(-e "$out_basedir/include/Qt/$t");
+			foreach (@files) {
+			   my $file = $_;
+			   my $remove_file = 0;
+			   if(open(F, "<$file")) {
+				while(<F>) {
+				    my $line = $_;
+				    chomp $line;
+				    if($line =~ /^\#include \"([^\"]*)\"$/) {
+					my $include = $1;
+					$include = $subdir . "/" . $include unless(substr($include, 0, 1) eq "/");
+					$remove_file = 1 unless(-e "$include");
+				    } else {
+					$remove_file = 0;
+					last;
+				    }
+				}
+				close(F);
+				unlink "$file" if($remove_file);
+			    }
+			}
+		    }
+		}
+		closedir DIR;
+            }
+
+	}
+    }
+
+    #create the new ones
+    foreach (split(/;/, $dir)) {
+	my $current_dir = "$_";
+	my $headers_dir = $current_dir;
+        $headers_dir .= "/$pathtoheaders" if ($pathtoheaders);
+        #calc subdirs
+        my @subdirs = ($headers_dir);
+        foreach (@subdirs) {
+            my $subdir = "$_";
+            opendir DIR, "$subdir" or next;
+            while(my $t = readdir(DIR)) {
+                push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
+					       !($t eq "..") && !($t eq ".obj") &&
+                                               !($t eq ".moc") && !($t eq ".rcc") &&
+                                               !($t eq ".uic") && !($t eq "build"));
+            }
+            closedir DIR;
+        }
+
+        #calc files and "copy" them
+        foreach (@subdirs) {
+            my $subdir = "$_";
+            my @headers = findFiles("$subdir", "^[-a-z0-9_]*\\.h\$" , 0);
+            foreach (@headers) {
+                my $header = "$_";
+                $header = 0 if("$header" =~ /^ui_.*.h/);
+                foreach (@ignore_headers) {
+                    $header = 0 if("$header" eq "$_");
+                }
+                if($header) {
+		    my $header_copies = 0;
+		    #figure out if it is a public header
+		    my $public_header = $header;
+		    if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
+			$public_header = 0;
+		    } else {
+			foreach (@ignore_for_master_contents) {
+			    $public_header = 0 if("$header" eq "$_");
+			}
+		    }
+
+                    my $iheader = $subdir . "/" . $header;
+		    my @classes = $public_header ? classNames($iheader) : ();
+                    if($showonly) {
+                        print "$header [$lib]\n";
+			foreach(@classes) {
+			    print "SYMBOL: $_\n";
+			}
+                    } else {
+			#find out all the places it goes..
+			my @headers;
+			if ($public_header) {
+			    @headers = ( "$out_basedir/include/$lib/$header" );
+			    push @headers, "$out_basedir/include/Qt/$header"
+			      if ("$lib" ne "phonon" && "$subdir" =~ /^$basedir\/src/);
+
+			    foreach(@classes) {
+				my $header_base = basename($header);
+				my $class = $_;
+				if ($class =~ m/::/) {
+				    $class =~ s,::,/,g;
+				    $class = "../" . $class;
+				}
+				$class_lib_map_contents .= "QT_CLASS_LIB($_, $lib, $header_base)\n";
+				$header_copies++ if(syncHeader("$out_basedir/include/$lib/$class", $header, 0));
+			    }
+			} else {
+			    @headers = ( "$out_basedir/include/$lib/private/$header" );
+			    push @headers, "$out_basedir/include/Qt/private/$header"
+                              if ("$lib" ne "phonon");
+			}
+			foreach(@headers) { #sync them
+			    $header_copies++ if(syncHeader($_, $iheader, $copy_headers));
+			}
+
+			if($public_header) {
+			    #put it into the master file
+			    $master_contents .= "#include \"$public_header\"\n" if(shouldMasterInclude($iheader));
+
+			    #deal with the install directives
+			    if($public_header) {
+				my $pri_install_iheader = fixPaths($iheader, $current_dir);
+				foreach(@classes) {
+				    my $class = $_;
+				    if ($class =~ m/::/) {
+					$class =~ s,::,/,g;
+					$class = "../" . $class;
+				    }
+				    my $class_header = fixPaths("$out_basedir/include/$lib/$class",
+								$current_dir) . " ";
+				    $pri_install_classes .= $class_header
+								unless($pri_install_classes =~ $class_header);
+				}
+				$pri_install_files.= "$pri_install_iheader ";;
+			    }
+			}
+                    }
+		    print "header created for $iheader ($header_copies)\n" if($header_copies > 0);
+                }
+            }
+        }
+    }
+
+    # close the master include:
+    $master_contents .= "#endif\n";
+
+    unless($showonly) {
+        #generate the "master" include file
+        my $master_include = "$out_basedir/include/$lib/$lib";
+	$pri_install_files .= fixPaths($master_include, "$modules{$lib}") . " "; #get the master file installed too
+        if(-e "$master_include") {
+            open MASTERINCLUDE, "<$master_include";
+            local $/;
+            binmode MASTERINCLUDE;
+            my $oldmaster = <MASTERINCLUDE>;
+            close MASTERINCLUDE;
+            $oldmaster =~ s/\r//g; # remove \r's , so comparison is ok on all platforms
+            $master_include = 0 if($oldmaster eq $master_contents);
+        }
+        if($master_include && $master_contents) {
+            my $master_dir = dirname($master_include);
+            mkpath $master_dir, 0777;
+            print "header (master) created for $lib\n";
+            open MASTERINCLUDE, ">$master_include";
+            print MASTERINCLUDE "$master_contents";
+            close MASTERINCLUDE;
+        }
+
+        #handle the headers.pri for each module
+	my $headers_pri_contents = "";
+	$headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";
+	$headers_pri_contents .= "SYNCQT.HEADER_CLASSES = $pri_install_classes\n";
+        my $headers_pri_file = "$out_basedir/include/$lib/headers.pri";
+        if(-e "$headers_pri_file") {
+            open HEADERS_PRI_FILE, "<$headers_pri_file";
+            local $/;
+            binmode HEADERS_PRI_FILE;
+            my $old_headers_pri_contents = <HEADERS_PRI_FILE>;
+            close HEADERS_PRI_FILE;
+            $old_headers_pri_contents =~ s/\r//g; # remove \r's , so comparison is ok on all platforms
+            $headers_pri_file = 0 if($old_headers_pri_contents eq $headers_pri_contents);
+        }
+        if($headers_pri_file && $master_contents) {
+            my $headers_pri_dir = dirname($headers_pri_file);
+            mkpath $headers_pri_dir, 0777;
+            print "headers.pri file created for $lib\n";
+            open HEADERS_PRI_FILE, ">$headers_pri_file";
+            print HEADERS_PRI_FILE "$headers_pri_contents";
+            close HEADERS_PRI_FILE;
+        }
+    }
+}
+unless($showonly) {
+    my $class_lib_map = "$out_basedir/src/tools/uic/qclass_lib_map.h";
+    if(-e "$class_lib_map") {
+	open CLASS_LIB_MAP, "<$class_lib_map";
+	local $/;
+	binmode CLASS_LIB_MAP;
+	my $old_class_lib_map_contents = <CLASS_LIB_MAP>;
+	close CLASS_LIB_MAP;
+	$old_class_lib_map_contents =~ s/\r//g; # remove \r's , so comparison is ok on all platforms
+	$class_lib_map = 0 if($old_class_lib_map_contents eq $class_lib_map_contents);
+    }
+    if($class_lib_map) {
+	my $class_lib_map_dir = dirname($class_lib_map);
+	mkpath $class_lib_map_dir, 0777;
+	open CLASS_LIB_MAP, ">$class_lib_map";
+	print CLASS_LIB_MAP "$class_lib_map_contents";
+	close CLASS_LIB_MAP;
+    }
+}
+
+if($check_includes) {
+    for (keys(%modules)) {
+	#iteration info
+	my $lib = $_;
+	my $dir = "$modules{$lib}";
+	foreach (split(/;/, $dir)) {
+	    my $current_dir = "$_";
+	    #calc subdirs
+	    my @subdirs = ($current_dir);
+	    foreach (@subdirs) {
+		my $subdir = "$_";
+		opendir DIR, "$subdir";
+		while(my $t = readdir(DIR)) {
+                    push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
+                                                   !($t eq "..") && !($t eq ".obj") &&
+                                                   !($t eq ".moc") && !($t eq ".rcc") &&
+                                                   !($t eq ".uic") && !($t eq "build"));
+		}
+		closedir DIR;
+	    }
+
+	    foreach (@subdirs) {
+		my $subdir = "$_";
+                my $header_skip_qt_module_test = 0;
+                foreach(@ignore_for_qt_module_check) {
+                    foreach (split(/;/, $_)) {
+                        $header_skip_qt_module_test = 1 if ("$subdir" =~ /^$_/);
+                    }
+                }
+		my @headers = findFiles("$subdir", "^[-a-z0-9_]*\\.h\$" , 0);
+		foreach (@headers) {
+		    my $header = "$_";
+                    my $header_skip_qt_begin_header_test = 0;
+                    my $header_skip_qt_begin_namespace_test = 0;
+		    $header = 0 if("$header" =~ /^ui_.*.h/);
+		    foreach (@ignore_headers) {
+			$header = 0 if("$header" eq "$_");
+		    }
+		    if($header) {
+			my $public_header = $header;
+			if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
+			    $public_header = 0;
+			} else {
+			    foreach (@ignore_for_master_contents) {
+				$public_header = 0 if("$header" eq "$_");
+			    }
+			    if($public_header) {
+				foreach (@ignore_for_include_check) {
+				    $public_header = 0 if("$header" eq "$_");
+				}
+                                foreach(@ignore_for_qt_begin_header_check) {
+                                    $header_skip_qt_begin_header_test = 1 if ("$header" eq "$_");
+                                }
+                                foreach(@ignore_for_qt_begin_namespace_check) {
+                                    $header_skip_qt_begin_namespace_test = 1 if ("$header" eq "$_");
+                                }
+			    }
+			}
+
+			my $iheader = $subdir . "/" . $header;
+			if($public_header) {
+			    if(open(F, "<$iheader")) {
+                                my $qt_module_found = 0;
+				my $qt_begin_header_found = 0;
+				my $qt_end_header_found = 0;
+				my $qt_begin_namespace_found = 0;
+				my $qt_end_namespace_found = 0;
+				my $line;
+				while($line = <F>) {
+				    chomp $line;
+				    my $output_line = 1;
+                                    if($line =~ /^ *\# *pragma (qt_no_included_check|qt_sync_stop_processing)/) {
+			                last;
+				    } elsif($line =~ /^ *\# *include/) {
+					my $include = $line;
+					if($line =~ /<.*>/) {
+					    $include =~ s,.*<(.*)>.*,$1,;
+					} elsif($line =~ /".*"/) {
+					    $include =~ s,.*"(.*)".*,$1,;
+					} else {
+					    $include = 0;
+					}
+					if($include) {
+					    for (keys(%modules)) {
+						my $trylib = $_;
+						if(-e "$out_basedir/include/$trylib/$include") {
+						    print "WARNING: $iheader includes $include when it should include $trylib/$include\n";
+						}
+					    }
+					}
+				    } elsif ($header_skip_qt_begin_header_test == 0 and $line =~ /^QT_BEGIN_HEADER\s*$/) {
+					$qt_begin_header_found = 1;
+				    } elsif ($header_skip_qt_begin_header_test == 0 and $line =~ /^QT_END_HEADER\s*$/) {
+					$qt_end_header_found = 1;
+				    } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_BEGIN_NAMESPACE\s*$/) {
+					$qt_begin_namespace_found = 1;
+				    } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE\s*$/) {
+					$qt_end_namespace_found = 1;
+                                    } elsif ($header_skip_qt_module_test == 0 and $line =~ /^QT_MODULE\(.*\)\s*$/) {
+                                        $qt_module_found = 1;
+                                    }
+				}
+                                if ($header_skip_qt_begin_header_test == 0) {
+                                    if ($qt_begin_header_found == 0) {
+                                        print "WARNING: $iheader does not include QT_BEGIN_HEADER\n";
+                                    }
+
+                                    if ($qt_begin_header_found && $qt_end_header_found == 0) {
+                                        print "WARNING: $iheader has QT_BEGIN_HEADER but no QT_END_HEADER\n";
+                                    }
+                                }
+
+                                if ($header_skip_qt_begin_namespace_test == 0) {
+                                    if ($qt_begin_namespace_found == 0) {
+                                        print "WARNING: $iheader does not include QT_BEGIN_NAMESPACE\n";
+                                    }
+
+                                    if ($qt_begin_namespace_found && $qt_end_namespace_found == 0) {
+                                        print "WARNING: $iheader has QT_BEGIN_NAMESPACE but no QT_END_NAMESPACE\n";
+                                    }
+                                }
+
+                                if ($header_skip_qt_module_test == 0) {
+                                    if ($qt_module_found == 0) {
+                                        print "WARNING: $iheader does not include QT_MODULE\n";
+                                    }
+                                }
+				close(F);
+			    }
+			}
+		    }
+		}
+	    }
+	}
+    }
+}
+
+exit 0;
diff --git a/bin/syncqt.bat b/bin/syncqt.bat
new file mode 100755
index 0000000..579844f
--- /dev/null
+++ b/bin/syncqt.bat
@@ -0,0 +1,2 @@
+@rem ***** This assumes PERL is in the PATH *****
+@perl.exe -S syncqt %*
diff --git a/config.tests/mac/crc.test b/config.tests/mac/crc.test
new file mode 100755
index 0000000..1a16204
--- /dev/null
+++ b/config.tests/mac/crc.test
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+SUCCESS=no
+QMKSPEC=$1
+XPLATFORM=`basename "$1"`
+QMAKE_CONFIG=$2
+VERBOSE=$3
+SRCDIR=$4
+OUTDIR=$5
+TEST=$6
+EXE=`basename "$6"`
+ARG=$7
+shift 7
+LFLAGS=""
+INCLUDEPATH=""
+CXXFLAGS=""
+while [ "$#" -gt 0 ]; do
+    PARAM=$1
+    case $PARAM in
+    -framework)
+        LFLAGS="$LFLAGS -framework \"$2\""
+        shift
+        ;;
+    -F*|-m*|-x*)
+        LFLAGS="$LFLAGS $PARAM"
+        CXXFLAGS="$CXXFLAGS $PARAM"
+        ;;
+    -L*|-l*|-pthread)
+	LFLAGS="$LFLAGS $PARAM"
+	;;
+    -I*)
+        INC=`echo $PARAM | sed -e 's/^-I//'`
+        INCLUDEPATH="$INCLUDEPATH $INC"
+        ;;
+    -f*|-D*)
+        CXXFLAGS="$CXXFLAGS $PARAM"
+        ;;
+    -Qoption)
+	# Two-argument form for the Sun Compiler
+	CXXFLAGS="$CXXFLAGS $PARAM \"$2\""
+	shift
+	;;
+    *)  ;;
+    esac
+    shift
+done
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION auto-detection... ($*)"
+
+test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
+
+cd "$OUTDIR/$TEST"
+
+make distclean >/dev/null 2>&1
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
+
+if [ "$VERBOSE" = "yes" ]; then
+    make
+else
+    make >/dev/null 2>&1
+fi
+
+
+if [ -x "$EXE" ]; then
+    foo=`$OUTDIR/$TEST/$EXE $ARG`
+    echo "$foo"
+else
+    echo "'CUTE'" #1129665605 # == 'CUTE'
+fi
+
diff --git a/config.tests/mac/crc/crc.pro b/config.tests/mac/crc/crc.pro
new file mode 100644
index 0000000..c3abf15
--- /dev/null
+++ b/config.tests/mac/crc/crc.pro
@@ -0,0 +1,2 @@
+SOURCES = main.cpp
+CONFIG -= app_bundle qt
diff --git a/config.tests/mac/crc/main.cpp b/config.tests/mac/crc/main.cpp
new file mode 100644
index 0000000..2ac10b3
--- /dev/null
+++ b/config.tests/mac/crc/main.cpp
@@ -0,0 +1,67 @@
+#include <iostream>
+#include <cstdlib>
+#include <cstring>
+
+
+class CCRC32
+{
+public:
+    CCRC32() { initialize(); }
+
+    unsigned long FullCRC(const unsigned char *sData, unsigned long ulDataLength)
+    {
+        unsigned long ulCRC = 0xffffffff;
+        PartialCRC(&ulCRC, sData, ulDataLength);
+        return(ulCRC ^ 0xffffffff);
+    }
+
+    void PartialCRC(unsigned long *ulCRC, const unsigned char *sData, unsigned long ulDataLength)
+    {
+        while(ulDataLength--) {
+            *ulCRC = (*ulCRC >> 8) ^ ulTable[(*ulCRC & 0xFF) ^ *sData++];
+        }
+    }
+
+private:
+    void initialize(void)
+    {
+        unsigned long ulPolynomial = 0x04C11DB7;
+        memset(&ulTable, 0, sizeof(ulTable));
+        for(int iCodes = 0; iCodes <= 0xFF; iCodes++) {
+            ulTable[iCodes] = Reflect(iCodes, 8) << 24;
+            for(int iPos = 0; iPos < 8; iPos++) {
+                ulTable[iCodes] = (ulTable[iCodes] << 1)
+                    ^ ((ulTable[iCodes] & (1 << 31)) ? ulPolynomial : 0);
+            }
+
+            ulTable[iCodes] = Reflect(ulTable[iCodes], 32);
+        }
+    }
+    unsigned long Reflect(unsigned long ulReflect, const char cChar)
+    {
+        unsigned long ulValue = 0;
+        // Swap bit 0 for bit 7, bit 1 For bit 6, etc....
+        for(int iPos = 1; iPos < (cChar + 1); iPos++) {
+            if(ulReflect & 1) {
+                ulValue |= (1 << (cChar - iPos));
+            }
+            ulReflect >>= 1;
+        }
+        return ulValue;
+    }
+    unsigned long ulTable[256]; // CRC lookup table array.
+};
+
+
+int main(int argc, char **argv)
+{
+    CCRC32 crc;
+    char *name;
+    if (argc < 2) {
+        std::cerr << "usage: crc <string>\n";
+        return 0;
+    } else {
+        name = argv[1];
+    }
+    std::cout << crc.FullCRC((unsigned char *)name, strlen(name)) << std::endl;
+}
diff --git a/config.tests/mac/dwarf2.test b/config.tests/mac/dwarf2.test
new file mode 100755
index 0000000..a640b11
--- /dev/null
+++ b/config.tests/mac/dwarf2.test
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+DWARF2_SUPPORT=no
+DWARF2_SUPPORT_BROKEN=no
+COMPILER=$1
+VERBOSE=$2
+WORKDIR=$3
+
+touch dwarf2.c
+
+if "$COMPILER" -c dwarf2.c -Werror -gdwarf-2 2>/dev/null 1>&2; then
+    if "$COMPILER" -c dwarf2.c -Werror -gdwarf-2  2>&1 | grep "unsupported" >/dev/null ; then
+        true
+    else
+        DWARF2_SUPPORT=yes
+    fi
+fi
+rm -f dwarf2.c dwarf2.o
+
+# Test for xcode 2.4.0, which has a broken implementation of DWARF
+"$COMPILER" $WORKDIR/xcodeversion.cpp -o xcodeversion -framework Carbon;
+./xcodeversion
+
+if [ "$?" == "1" ]; then
+    DWARF2_SUPPORT_BROKEN=yes
+fi
+
+rm xcodeversion
+
+# done
+if [ "$DWARF2_SUPPORT" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "DWARF2 debug symbols disabled."
+    exit 0
+else
+    if [ "$DWARF2_SUPPORT_BROKEN" == "yes" ]; then
+        [ "$VERBOSE" = "yes" ] && echo "DWARF2 debug symbols disabled."
+        exit 0
+    else
+        [ "$VERBOSE" = "yes" ] && echo "DWARF2 debug symbols enabled."
+        exit 1
+    fi
+fi
diff --git a/config.tests/mac/xarch.test b/config.tests/mac/xarch.test
new file mode 100755
index 0000000..08322a9
--- /dev/null
+++ b/config.tests/mac/xarch.test
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+XARCH_SUPPORT=no
+COMPILER=$1
+VERBOSE=$2
+WORKDIR=$3
+
+touch xarch.c
+
+if "$COMPILER" -c xarch.c -Xarch_i386 -mmmx 2>/dev/null 1>&2; then
+    if "$COMPILER" -c xarch.c -Xarch_i386 -mmmx  2>&1 | grep "unrecognized" >/dev/null ; then
+        true
+    else
+        XARCH_SUPPORT=yes
+    fi
+fi
+rm -f xarch.c xarch.o
+
+# done
+if [ "$XARCH_SUPPORT" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Xarch is not supported"
+    exit 0
+else
+    [ "$VERBOSE" = "yes" ] && echo "Xarch support detected"
+    exit 1
+fi
diff --git a/config.tests/mac/xcodeversion.cpp b/config.tests/mac/xcodeversion.cpp
new file mode 100644
index 0000000..e613cc5
--- /dev/null
+++ b/config.tests/mac/xcodeversion.cpp
@@ -0,0 +1,58 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <Carbon/Carbon.h>
+
+int success = 0;
+int fail = 1;
+int internal_error = success; // enable dwarf on internal errors
+
+int main(int argc, const char **argv)
+{
+    CFURLRef cfurl;
+    OSStatus err = LSFindApplicationForInfo(0, CFSTR("com.apple.Xcode"), 0, 0, &cfurl);
+    if (err != noErr)
+        return internal_error;
+    
+    CFBundleRef bundle = CFBundleCreate(0, cfurl);
+    if (bundle == 0)
+        return internal_error;
+
+    CFStringRef str = CFStringRef(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("CFBundleShortVersionString")));
+    const char * ptr = CFStringGetCStringPtr(str, 0);
+    if (ptr == 0)
+        return internal_error;        
+
+    // self-test
+    const char * fail1 = "2.4";
+    const char * fail2 = "2.4.0";
+    const char * fail3  ="2.3";
+    const char * ok1  = "2.4.1";
+    const char * ok2  ="2.5";
+    const char * ok3  ="3.0";
+//    ptr = fail1;
+//    printf ("string: %s\n", ptr);
+   
+    int length = strlen(ptr);
+    if (length < 3) // expect "x.y" at least
+        return internal_error;
+
+    // fail on 2.4 and below (2.4.1 is ok)
+
+     if (ptr[0] < '2')
+        return fail;
+
+    if (ptr[0] >= '3')
+        return success;
+
+    if (ptr[2] < '4')
+        return fail;
+
+    if (length < 5)
+        return fail;
+
+    if (ptr[4] < '1')
+        return fail;
+    
+    return success;
+}
+\ No newline at end of file
diff --git a/config.tests/qws/ahi/ahi.cpp b/config.tests/qws/ahi/ahi.cpp
new file mode 100644
index 0000000..a5e8951
--- /dev/null
+++ b/config.tests/qws/ahi/ahi.cpp
@@ -0,0 +1,9 @@
+#include <ahi.h>
+
+int main(int, char **)
+{
+    AhiInit(0);
+    AhiTerm();
+
+    return 0;
+}
diff --git a/config.tests/qws/ahi/ahi.pro b/config.tests/qws/ahi/ahi.pro
new file mode 100644
index 0000000..532a565
--- /dev/null
+++ b/config.tests/qws/ahi/ahi.pro
@@ -0,0 +1,3 @@
+SOURCES = ahi.cpp
+CONFIG -= qt
+LIBS += -lahi -lahioem
diff --git a/config.tests/qws/directfb/directfb.cpp b/config.tests/qws/directfb/directfb.cpp
new file mode 100644
index 0000000..f743864
--- /dev/null
+++ b/config.tests/qws/directfb/directfb.cpp
@@ -0,0 +1,9 @@
+#include <directfb.h>
+
+int main(int, char **)
+{
+    DFBResult result = DFB_OK;
+    result = DirectFBInit(0, 0);
+
+    return (result == DFB_OK);
+}
diff --git a/config.tests/qws/directfb/directfb.pro b/config.tests/qws/directfb/directfb.pro
new file mode 100644
index 0000000..db14d3b
--- /dev/null
+++ b/config.tests/qws/directfb/directfb.pro
@@ -0,0 +1,5 @@
+SOURCES = directfb.cpp
+CONFIG -= qt
+
+QMAKE_CXXFLAGS += $$QT_CFLAGS_DIRECTFB
+LIBS += $$QT_LIBS_DIRECTFB
diff --git a/config.tests/qws/sound/sound.cpp b/config.tests/qws/sound/sound.cpp
new file mode 100644
index 0000000..be412bb
--- /dev/null
+++ b/config.tests/qws/sound/sound.cpp
@@ -0,0 +1,8 @@
+#include <sys/soundcard.h>
+
+int main(int, char **)
+{
+    audio_buf_info info;
+
+    return 0;
+}
diff --git a/config.tests/qws/sound/sound.pro b/config.tests/qws/sound/sound.pro
new file mode 100644
index 0000000..4ad3376
--- /dev/null
+++ b/config.tests/qws/sound/sound.pro
@@ -0,0 +1,2 @@
+SOURCES = sound.cpp
+CONFIG -= qt
diff --git a/config.tests/qws/svgalib/svgalib.cpp b/config.tests/qws/svgalib/svgalib.cpp
new file mode 100644
index 0000000..f4bf9c8
--- /dev/null
+++ b/config.tests/qws/svgalib/svgalib.cpp
@@ -0,0 +1,10 @@
+#include <vga.h>
+#include <vgagl.h>
+
+int main(int, char **)
+{
+    int mode = vga_getdefaultmode();
+    gl_setcontextvga(mode);
+
+    return 0;
+}
diff --git a/config.tests/qws/svgalib/svgalib.pro b/config.tests/qws/svgalib/svgalib.pro
new file mode 100644
index 0000000..1690652
--- /dev/null
+++ b/config.tests/qws/svgalib/svgalib.pro
@@ -0,0 +1,3 @@
+SOURCES = svgalib.cpp
+CONFIG -= qt
+LIBS += -lvgagl -lvga
diff --git a/config.tests/unix/3dnow/3dnow.cpp b/config.tests/unix/3dnow/3dnow.cpp
new file mode 100644
index 0000000..1b1d0ed
--- /dev/null
+++ b/config.tests/unix/3dnow/3dnow.cpp
@@ -0,0 +1,10 @@
+#include <mm3dnow.h>
+#if defined(__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 3
+#error GCC < 3.2 is known to create internal compiler errors with our MMX code
+#endif
+
+int main(int, char**)
+{
+    _m_femms();
+    return 0;
+}
diff --git a/config.tests/unix/3dnow/3dnow.pro b/config.tests/unix/3dnow/3dnow.pro
new file mode 100644
index 0000000..90a8a19
--- /dev/null
+++ b/config.tests/unix/3dnow/3dnow.pro
@@ -0,0 +1,3 @@
+SOURCES = 3dnow.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/bsymbolic_functions.test b/config.tests/unix/bsymbolic_functions.test
new file mode 100755
index 0000000..52fdb32
--- /dev/null
+++ b/config.tests/unix/bsymbolic_functions.test
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+BSYMBOLIC_FUNCTIONS_SUPPORT=no
+COMPILER=$1
+VERBOSE=$2
+
+cat >>bsymbolic_functions.c << EOF
+int main() { return 0; }
+EOF
+
+"$COMPILER" -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
+rm -f bsymbolic_functions.c libtest.so
+
+# done
+if [ "$BSYMBOLIC_FUNCTIONS_SUPPORT" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Symbolic function binding disabled."
+    exit 0
+else
+    [ "$VERBOSE" = "yes" ] && echo "Symbolic function binding enabled."
+    exit 1
+fi
diff --git a/config.tests/unix/clock-gettime/clock-gettime.cpp b/config.tests/unix/clock-gettime/clock-gettime.cpp
new file mode 100644
index 0000000..edb71f5
--- /dev/null
+++ b/config.tests/unix/clock-gettime/clock-gettime.cpp
@@ -0,0 +1,16 @@
+#include <unistd.h>
+#include <time.h>
+
+int main(int, char **)
+{
+#if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0)
+    timespec ts;
+    clock_gettime(CLOCK_REALTIME, &ts);
+#else
+#  error "Feature _POSIX_TIMERS not available"
+    // MIPSpro doesn't understand #error, so force a compiler error
+    force_compiler_error = true;
+#endif
+    return 0;
+}
+
diff --git a/config.tests/unix/clock-gettime/clock-gettime.pri b/config.tests/unix/clock-gettime/clock-gettime.pri
new file mode 100644
index 0000000..2a6160b
--- /dev/null
+++ b/config.tests/unix/clock-gettime/clock-gettime.pri
@@ -0,0 +1,2 @@
+# clock_gettime() is implemented in librt on these systems
+linux-*|hpux-*|solaris-*:LIBS *= -lrt
diff --git a/config.tests/unix/clock-gettime/clock-gettime.pro b/config.tests/unix/clock-gettime/clock-gettime.pro
new file mode 100644
index 0000000..c527535
--- /dev/null
+++ b/config.tests/unix/clock-gettime/clock-gettime.pro
@@ -0,0 +1,4 @@
+SOURCES = clock-gettime.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+include(clock-gettime.pri)
diff --git a/config.tests/unix/clock-monotonic/clock-monotonic.cpp b/config.tests/unix/clock-monotonic/clock-monotonic.cpp
new file mode 100644
index 0000000..df99963
--- /dev/null
+++ b/config.tests/unix/clock-monotonic/clock-monotonic.cpp
@@ -0,0 +1,16 @@
+#include <unistd.h>
+#include <time.h>
+
+int main(int, char **)
+{
+#if defined(_POSIX_MONOTONIC_CLOCK) && (_POSIX_MONOTONIC_CLOCK-0 >= 0)
+    timespec ts;
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+#else
+#  error "Feature _POSIX_MONOTONIC_CLOCK not available"
+    // MIPSpro doesn't understand #error, so force a compiler error
+    force_compiler_error = true; 
+#endif
+    return 0;
+}
+
diff --git a/config.tests/unix/clock-monotonic/clock-monotonic.pro b/config.tests/unix/clock-monotonic/clock-monotonic.pro
new file mode 100644
index 0000000..961e3a8
--- /dev/null
+++ b/config.tests/unix/clock-monotonic/clock-monotonic.pro
@@ -0,0 +1,4 @@
+SOURCES = clock-monotonic.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+include(../clock-gettime/clock-gettime.pri)
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
new file mode 100755
index 0000000..b5afa18
--- /dev/null
+++ b/config.tests/unix/compile.test
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+SUCCESS=no
+QMKSPEC=$1
+XPLATFORM=`basename "$1"`
+QMAKE_CONFIG=$2
+VERBOSE=$3
+SRCDIR=$4
+OUTDIR=$5
+TEST=$6
+EXE=`basename "$6"`
+DESCRIPTION=$7
+shift 7
+LFLAGS=""
+INCLUDEPATH=""
+CXXFLAGS=""
+while [ "$#" -gt 0 ]; do
+    PARAM=$1
+    case $PARAM in
+    -framework)
+        LFLAGS="$LFLAGS -framework \"$2\""
+        shift
+        ;;
+    -F*|-m*|-x*)
+        LFLAGS="$LFLAGS $PARAM"
+        CXXFLAGS="$CXXFLAGS $PARAM"
+        ;;
+    -L*|-l*|-pthread)
+	LFLAGS="$LFLAGS $PARAM"
+	;;
+    -I*)
+        INC=`echo $PARAM | sed -e 's/^-I//'`
+        INCLUDEPATH="$INCLUDEPATH $INC"
+        ;;
+    -f*|-D*)
+        CXXFLAGS="$CXXFLAGS $PARAM"
+        ;;
+    -Qoption)
+	# Two-argument form for the Sun Compiler
+	CXXFLAGS="$CXXFLAGS $PARAM \"$2\""
+	shift
+	;;
+    *)  ;;
+    esac
+    shift
+done
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION auto-detection... ($*)"
+
+test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
+
+cd "$OUTDIR/$TEST"
+
+make distclean >/dev/null 2>&1
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
+
+if [ "$VERBOSE" = "yes" ]; then
+    make
+else
+    make >/dev/null 2>&1
+fi
+
+[ -x "$EXE" ] && SUCCESS=yes
+
+# done
+if [ "$SUCCESS" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled."
+    exit 1
+else
+    [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled."
+    exit 0
+fi
diff --git a/config.tests/unix/cups/cups.cpp b/config.tests/unix/cups/cups.cpp
new file mode 100644
index 0000000..e8c17ea
--- /dev/null
+++ b/config.tests/unix/cups/cups.cpp
@@ -0,0 +1,8 @@
+#include <cups/cups.h>
+
+int main(int, char **)
+{
+    cups_dest_t *d;
+    cupsGetDests(&d);
+    return 0;
+}
diff --git a/config.tests/unix/cups/cups.pro b/config.tests/unix/cups/cups.pro
new file mode 100644
index 0000000..d7b78c8
--- /dev/null
+++ b/config.tests/unix/cups/cups.pro
@@ -0,0 +1,4 @@
+SOURCES = cups.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lcups
diff --git a/config.tests/unix/db2/db2.cpp b/config.tests/unix/db2/db2.cpp
new file mode 100644
index 0000000..e408d28
--- /dev/null
+++ b/config.tests/unix/db2/db2.cpp
@@ -0,0 +1,7 @@
+#include <sqlcli.h>
+#include <sqlcli1.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/db2/db2.pro b/config.tests/unix/db2/db2.pro
new file mode 100644
index 0000000..0fa39a8
--- /dev/null
+++ b/config.tests/unix/db2/db2.pro
@@ -0,0 +1,4 @@
+SOURCES = db2.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -ldb2
diff --git a/config.tests/unix/dbus/dbus.cpp b/config.tests/unix/dbus/dbus.cpp
new file mode 100644
index 0000000..15ed45f
--- /dev/null
+++ b/config.tests/unix/dbus/dbus.cpp
@@ -0,0 +1,12 @@
+#define DBUS_API_SUBJECT_TO_CHANGE
+#include <dbus/dbus.h>
+
+#if DBUS_MAJOR_PROTOCOL_VERSION < 1
+#error Needs at least dbus version 1
+#endif
+
+int main(int, char **)
+{
+    dbus_shutdown();
+    return 0;
+}
diff --git a/config.tests/unix/dbus/dbus.pro b/config.tests/unix/dbus/dbus.pro
new file mode 100644
index 0000000..1e4aea7
--- /dev/null
+++ b/config.tests/unix/dbus/dbus.pro
@@ -0,0 +1,3 @@
+SOURCES = dbus.cpp
+CONFIG -= qt
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/doubleformat.test b/config.tests/unix/doubleformat.test
new file mode 100755
index 0000000..3e707c5
--- /dev/null
+++ b/config.tests/unix/doubleformat.test
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+QMKSPEC=$1
+VERBOSE=$2
+SRCDIR=$3
+OUTDIR=$4
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "Determining floating point  word-order... ($*)"
+
+# build and run a test program
+test -d "$OUTDIR/config.tests/unix/doubleformat" || mkdir -p "$OUTDIR/config.tests/unix/doubleformat"
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1
+cd "$OUTDIR/config.tests/unix/doubleformat"
+
+DOUBLEFORMAT="UNKNOWN"
+[ "$VERBOSE" = "yes" ] && make || make >/dev/null 2>&1
+
+if [ -f ./doubleformattest ]; then
+    : # nop
+else
+    [ "$VERBOSE" = "yes" ] && echo "Unknown floating point format!"
+    exit 2
+fi
+
+# LE: strings | grep 0123ABCD0123ABCD
+# BE: strings | grep DCBA3210DCBA3210
+# 
+# LE arm-swapped-dword-order: strings | grep ABCD0123ABCD0123
+# BE arm-swapped-dword-order: strings | grep 3210DCBA3210DCBA (untested)
+
+
+if strings ./doubleformattest | grep "0123ABCD0123ABCD" >/dev/null 2>&1; then
+    [ "$VERBOSE" = "yes" ] && echo "     Normal little endian format"
+    DOUBLEFORMAT="LITTLE"
+elif strings ./doubleformattest | grep "ABCD0123ABCD0123" >/dev/null 2>&1; then
+    [ "$VERBOSE" = "yes" ] && echo "     Swapped little endian format"
+    DOUBLEFORMAT="LITTLESWAPPED"
+elif strings ./doubleformattest | grep "DCBA3210DCBA3210" >/dev/null 2>&1; then
+    [ "$VERBOSE" = "yes" ] && echo "     Normal big endian format"
+    DOUBLEFORMAT="BIG"
+elif strings ./doubleformattest | grep "3210DCBA3210DCBA" >/dev/null 2>&1; then
+    [ "$VERBOSE" = "yes" ] && echo "     Swapped big endian format"
+    DOUBLEFORMAT="BIGSWAPPED"
+fi
+
+# done
+if [ "$DOUBLEFORMAT" = "LITTLE" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Using little endian."
+    exit 10
+elif [ "$DOUBLEFORMAT" = "BIG" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Using big endian."
+    exit 11
+elif [ "$DOUBLEFORMAT" = "LITTLESWAPPED" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Using swapped little endian."
+    exit 12
+elif [ "$DOUBLEFORMAT" = "BIGSWAPPED" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Using swapped big endian."
+    exit 13
+else
+    [ "$VERBOSE" = "yes" ] && echo "Unknown floating point format!"
+    exit 99
+fi
diff --git a/config.tests/unix/doubleformat/doubleformattest.cpp b/config.tests/unix/doubleformat/doubleformattest.cpp
new file mode 100644
index 0000000..d71caba
--- /dev/null
+++ b/config.tests/unix/doubleformat/doubleformattest.cpp
@@ -0,0 +1,25 @@
+/*
+
+LE: strings | grep 0123ABCD0123ABCD
+BE: strings | grep DCBA3210DCBA3210
+
+LE arm-swaped-dword-order: strings | grep ABCD0123ABCD0123
+BE arm-swaped-dword-order: strings | grep 3210DCBA3210DCBA (untested)
+
+tested on x86, arm-le (gp), aix
+
+*/
+
+#include <stdlib.h>
+
+// equals static char c [] = "0123ABCD0123ABCD\0\0\0\0\0\0\0"
+static  double d [] = { 710524581542275055616.0, 710524581542275055616.0};
+
+int main(int argc, char **argv)
+{
+    // make sure the linker doesn't throw away the arrays
+    double *d2 = (double *) d;
+    if (argc > 3)
+        d[1] += 1;
+    return d2[0] + d[2] + atof(argv[1]);
+}
diff --git a/config.tests/unix/doubleformat/doubleformattest.pro b/config.tests/unix/doubleformat/doubleformattest.pro
new file mode 100644
index 0000000..7e51dea
--- /dev/null
+++ b/config.tests/unix/doubleformat/doubleformattest.pro
@@ -0,0 +1,3 @@
+SOURCES = doubleformattest.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/endian.test b/config.tests/unix/endian.test
new file mode 100755
index 0000000..2c21652
--- /dev/null
+++ b/config.tests/unix/endian.test
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+QMKSPEC=$1
+VERBOSE=$2
+SRCDIR=$3
+OUTDIR=$4
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "Determining machine byte-order... ($*)"
+
+# build and run a test program
+test -d "$OUTDIR/config.tests/unix/endian" || mkdir -p "$OUTDIR/config.tests/unix/endian"
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1
+cd "$OUTDIR/config.tests/unix/endian"
+
+
+ENDIAN="UNKNOWN"
+[ "$VERBOSE" = "yes" ] && make || make >/dev/null 2>&1
+
+if [ -f ./endiantest.exe ]; then
+    binary=./endiantest.exe
+else
+    binary=./endiantest
+fi
+
+
+if [ -f $binary ]; then
+    : # nop
+else
+    [ "$VERBOSE" = "yes" ] && echo "Unknown byte order!"
+    exit 2
+fi
+
+if strings $binary | grep LeastSignificantByteFirst >/dev/null 2>&1; then
+    [ "$VERBOSE" = "yes" ] && echo "    Found 'LeastSignificantByteFirst' in binary"
+    ENDIAN="LITTLE"
+elif strings $binary | grep MostSignificantByteFirst >/dev/null 2>&1; then
+    [ "$VERBOSE" = "yes" ] && echo "    Found 'MostSignificantByteFirst' in binary"
+    ENDIAN="BIG"
+fi
+
+# make clean as this tests is compiled for both the host and the target
+make distclean
+
+# done
+if [ "$ENDIAN" = "LITTLE" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Using little endian."
+    exit 0
+elif [ "$ENDIAN" = "BIG" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Using big endian."
+    exit 1
+else
+    [ "$VERBOSE" = "yes" ] && echo "Unknown byte order!"
+    exit 2
+fi
diff --git a/config.tests/unix/endian/endiantest.cpp b/config.tests/unix/endian/endiantest.cpp
new file mode 100644
index 0000000..40af746
--- /dev/null
+++ b/config.tests/unix/endian/endiantest.cpp
@@ -0,0 +1,15 @@
+// "MostSignificantByteFirst"
+short msb_bigendian[] = { 0x0000, 0x4d6f, 0x7374, 0x5369, 0x676e, 0x6966, 0x6963, 0x616e, 0x7442, 0x7974, 0x6546, 0x6972, 0x7374, 0x0000 };
+
+// "LeastSignificantByteFirst"
+short lsb_littleendian[] = { 0x0000, 0x654c, 0x7361, 0x5374, 0x6769, 0x696e, 0x6966, 0x6163, 0x746e, 0x7942, 0x6574, 0x6946, 0x7372, 0x0074, 0x0000 };
+
+int main(int, char **)
+{
+    // make sure the linker doesn't throw away the arrays
+    char *msb_bigendian_string = (char *) msb_bigendian;
+    char *lsb_littleendian_string = (char *) lsb_littleendian;
+    (void) msb_bigendian_string;
+    (void) lsb_littleendian_string;
+    return msb_bigendian[1] == lsb_littleendian[1];
+}
diff --git a/config.tests/unix/endian/endiantest.pro b/config.tests/unix/endian/endiantest.pro
new file mode 100644
index 0000000..7b739eb
--- /dev/null
+++ b/config.tests/unix/endian/endiantest.pro
@@ -0,0 +1,3 @@
+SOURCES = endiantest.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/floatmath/floatmath.cpp b/config.tests/unix/floatmath/floatmath.cpp
new file mode 100644
index 0000000..126f820
--- /dev/null
+++ b/config.tests/unix/floatmath/floatmath.cpp
@@ -0,0 +1,17 @@
+#include <math.h>
+
+int main(int argc, char **argv)
+{
+    float c = ceilf(1.3f);
+    float f = floorf(1.7f);
+    float s = sinf(3.8);
+    float t = cosf(7.3);
+    float u = sqrtf(8.4);
+    float l = logf(9.2);
+
+    if (c == 1.0f && f == 2.0f && s == 3.0f && t == 4.0f && u == 5.0f && l == 6.0f)
+        return 0;
+    else
+        return 1;
+}
+
diff --git a/config.tests/unix/floatmath/floatmath.pro b/config.tests/unix/floatmath/floatmath.pro
new file mode 100644
index 0000000..4c78563
--- /dev/null
+++ b/config.tests/unix/floatmath/floatmath.pro
@@ -0,0 +1,3 @@
+SOURCES = floatmath.cpp
+CONFIG -= x11 qt
+
diff --git a/config.tests/unix/freetype/freetype.cpp b/config.tests/unix/freetype/freetype.cpp
new file mode 100644
index 0000000..3edf619
--- /dev/null
+++ b/config.tests/unix/freetype/freetype.cpp
@@ -0,0 +1,13 @@
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20103)
+#  error "This version of freetype is too old."
+#endif
+
+int main(int, char **)
+{
+    FT_Face face;
+    face = 0;
+    return 0;
+}
diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
new file mode 100644
index 0000000..7ef1cf9
--- /dev/null
+++ b/config.tests/unix/freetype/freetype.pri
@@ -0,0 +1,9 @@
+!cross_compile {
+    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+    # LSB doesn't allow using headers from /include or /usr/include
+    linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+    for(p, TRY_INCLUDEPATHS) {
+        p = $$join(p, "", "", "/freetype2")
+        exists($$p):INCLUDEPATH *= $$p
+    }
+}
diff --git a/config.tests/unix/freetype/freetype.pro b/config.tests/unix/freetype/freetype.pro
new file mode 100644
index 0000000..e84158e
--- /dev/null
+++ b/config.tests/unix/freetype/freetype.pro
@@ -0,0 +1,5 @@
+SOURCES = freetype.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lfreetype
+include(freetype.pri)
diff --git a/config.tests/unix/fvisibility.test b/config.tests/unix/fvisibility.test
new file mode 100755
index 0000000..b2bcc07
--- /dev/null
+++ b/config.tests/unix/fvisibility.test
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+FVISIBILITY_SUPPORT=no
+COMPILER=$1
+VERBOSE=$2
+
+RunCompileTest() {
+    cat >>fvisibility.c << EOF
+__attribute__((visibility("default"))) void blah();
+#if !defined(__GNUC__)
+# error "Visiblility support requires GCC"
+#elif __GNUC__ < 4
+# error "GCC3 with backported visibility patch is known to miscompile Qt"
+#endif
+EOF
+
+    if [ "$VERBOSE" = "yes" ] ; then
+        "$COMPILER" -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes
+    else
+        "$COMPILER" -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
+    fi
+    rm -f fvisibility.c fvisibility.o
+}
+
+case "$COMPILER" in
+aCC*)
+    ;;
+
+icpc)
+    ICPC_VERSION=`icpc -dumpversion`
+    case "$ICPC_VERSION" in
+    8.*|9.*|10.0)
+        # 8.x, 9.x, and 10.0 don't support symbol visibility
+        ;;
+    *)
+        # the compile test works for the intel compiler because it mimics gcc's behavior
+        RunCompileTest
+        ;;
+    esac
+    ;;
+
+    *)
+    RunCompileTest
+    ;;
+esac
+
+# done
+if [ "$FVISIBILITY_SUPPORT" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Symbol visibility control disabled."
+    exit 0
+else
+    [ "$VERBOSE" = "yes" ] && echo "Symbol visibility control enabled."
+    exit 1
+fi
diff --git a/config.tests/unix/getaddrinfo/getaddrinfo.pro b/config.tests/unix/getaddrinfo/getaddrinfo.pro
new file mode 100644
index 0000000..c9121db
--- /dev/null
+++ b/config.tests/unix/getaddrinfo/getaddrinfo.pro
@@ -0,0 +1,4 @@
+SOURCES = getaddrinfotest.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += $$QMAKE_LIBS_NETWORK
diff --git a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
new file mode 100644
index 0000000..9dcd030
--- /dev/null
+++ b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
@@ -0,0 +1,16 @@
+/* Sample program for configure to test for getaddrinfo on the unix
+     platform. we check for all structures and functions required. */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+int main()
+{
+    addrinfo *res = 0;
+    if (getaddrinfo("foo", 0, 0, &res) == 0)
+        freeaddrinfo(res);
+    gai_strerror(0);
+    
+    return 0;
+}
diff --git a/config.tests/unix/getifaddrs/getifaddrs.cpp b/config.tests/unix/getifaddrs/getifaddrs.cpp
new file mode 100644
index 0000000..4e05a18
--- /dev/null
+++ b/config.tests/unix/getifaddrs/getifaddrs.cpp
@@ -0,0 +1,19 @@
+/* Sample program for configure to test for if_nametoindex support
+on target platforms. */
+
+#if defined(__hpux)
+#define _HPUX_SOURCE
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <ifaddrs.h>
+
+int main()
+{
+    ifaddrs *list;
+    getifaddrs(&list);
+    freeifaddrs(list);
+    return 0;
+}
diff --git a/config.tests/unix/getifaddrs/getifaddrs.pro b/config.tests/unix/getifaddrs/getifaddrs.pro
new file mode 100644
index 0000000..c3fead6
--- /dev/null
+++ b/config.tests/unix/getifaddrs/getifaddrs.pro
@@ -0,0 +1,5 @@
+SOURCES = getifaddrs.cpp
+CONFIG -= qt
+mac:CONFIG -= app_bundle
+QT =
+LIBS += $$QMAKE_LIBS_NETWORK
diff --git a/config.tests/unix/glib/glib.cpp b/config.tests/unix/glib/glib.cpp
new file mode 100644
index 0000000..16b787d
--- /dev/null
+++ b/config.tests/unix/glib/glib.cpp
@@ -0,0 +1,16 @@
+typedef struct _GMainContext GMainContext;
+
+#include <glib.h>
+
+int main(int, char **)
+{
+    GMainContext *context;
+    GSource *source;
+    GPollFD *pollfd;
+    if (!g_thread_supported())
+        g_thread_init(NULL);
+    context = g_main_context_default();
+    source = g_source_new(0, 0);
+    g_source_add_poll(source, pollfd);
+    return 0;
+}
diff --git a/config.tests/unix/glib/glib.pro b/config.tests/unix/glib/glib.pro
new file mode 100644
index 0000000..15d059d
--- /dev/null
+++ b/config.tests/unix/glib/glib.pro
@@ -0,0 +1,2 @@
+SOURCES = glib.cpp
+CONFIG -= qt
diff --git a/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp b/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
new file mode 100644
index 0000000..21f12dd
--- /dev/null
+++ b/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
@@ -0,0 +1,19 @@
+#if defined(__sgi)
+#error "iconv not supported on IRIX"
+#else
+#include <iconv.h>
+
+int main(int, char **)
+{
+    iconv_t x = iconv_open("", "");
+
+    const char *inp;
+    char *outp;
+    size_t inbytes, outbytes;
+    iconv(x, &inp, &inbytes, &outp, &outbytes);
+
+    iconv_close(x);
+
+    return 0;
+}
+#endif
diff --git a/config.tests/unix/gnu-libiconv/gnu-libiconv.pro b/config.tests/unix/gnu-libiconv/gnu-libiconv.pro
new file mode 100644
index 0000000..d879b20
--- /dev/null
+++ b/config.tests/unix/gnu-libiconv/gnu-libiconv.pro
@@ -0,0 +1,4 @@
+SOURCES = gnu-libiconv.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -liconv
diff --git a/config.tests/unix/gstreamer/gstreamer.cpp b/config.tests/unix/gstreamer/gstreamer.cpp
new file mode 100644
index 0000000..6ef85e1
--- /dev/null
+++ b/config.tests/unix/gstreamer/gstreamer.cpp
@@ -0,0 +1,14 @@
+#include <gst/gst.h>
+#include <gst/interfaces/propertyprobe.h>
+#include <gst/interfaces/xoverlay.h>
+
+#if !defined(GST_VERSION_MAJOR) \
+    || !defined(GST_VERSION_MINOR)
+#  error "No GST_VERSION_* macros"
+#elif GST_VERION_MAJOR != 0 && GST_VERSION_MINOR != 10
+#  error "Incompatible version of GStreamer found (Version 0.10.x is required)."
+#endif
+
+int main(int argc, char **argv)
+{
+}
diff --git a/config.tests/unix/gstreamer/gstreamer.pro b/config.tests/unix/gstreamer/gstreamer.pro
new file mode 100644
index 0000000..7d4aa8e
--- /dev/null
+++ b/config.tests/unix/gstreamer/gstreamer.pro
@@ -0,0 +1,3 @@
+SOURCES = gstreamer.cpp
+CONFIG -= qt
+LIBS += -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10
diff --git a/config.tests/unix/ibase/ibase.cpp b/config.tests/unix/ibase/ibase.cpp
new file mode 100644
index 0000000..2152260
--- /dev/null
+++ b/config.tests/unix/ibase/ibase.cpp
@@ -0,0 +1,6 @@
+#include <ibase.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/ibase/ibase.pro b/config.tests/unix/ibase/ibase.pro
new file mode 100644
index 0000000..01e7429
--- /dev/null
+++ b/config.tests/unix/ibase/ibase.pro
@@ -0,0 +1,4 @@
+SOURCES = ibase.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lgds
diff --git a/config.tests/unix/iconv/iconv.cpp b/config.tests/unix/iconv/iconv.cpp
new file mode 100644
index 0000000..c0f35a3
--- /dev/null
+++ b/config.tests/unix/iconv/iconv.cpp
@@ -0,0 +1,19 @@
+#if defined(__sgi)
+#error "iconv not supported on IRIX"
+#else
+#include <iconv.h>
+
+int main(int, char **)
+{
+    iconv_t x = iconv_open("", "");
+
+    char *inp;
+    char *outp;
+    size_t inbytes, outbytes;
+    iconv(x, &inp, &inbytes, &outp, &outbytes);
+
+    iconv_close(x);
+
+    return 0;
+}
+#endif
diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/unix/iconv/iconv.pro
new file mode 100644
index 0000000..8cdc776
--- /dev/null
+++ b/config.tests/unix/iconv/iconv.pro
@@ -0,0 +1,3 @@
+SOURCES = iconv.cpp
+CONFIG -= qt dylib app_bundle
+mac:LIBS += -liconv
diff --git a/config.tests/unix/inotify/inotify.pro b/config.tests/unix/inotify/inotify.pro
new file mode 100644
index 0000000..e2e1560
--- /dev/null
+++ b/config.tests/unix/inotify/inotify.pro
@@ -0,0 +1,3 @@
+SOURCES = inotifytest.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/inotify/inotifytest.cpp b/config.tests/unix/inotify/inotifytest.cpp
new file mode 100644
index 0000000..8378a7e
--- /dev/null
+++ b/config.tests/unix/inotify/inotifytest.cpp
@@ -0,0 +1,9 @@
+#include <sys/inotify.h>
+
+int main()
+{
+    inotify_init();
+    inotify_add_watch(0, "foobar", IN_ACCESS);
+    inotify_rm_watch(0, 1);
+    return 0;
+}
diff --git a/config.tests/unix/ipv6/ipv6.pro b/config.tests/unix/ipv6/ipv6.pro
new file mode 100644
index 0000000..c51e61b
--- /dev/null
+++ b/config.tests/unix/ipv6/ipv6.pro
@@ -0,0 +1,3 @@
+SOURCES = ipv6test.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/ipv6/ipv6test.cpp b/config.tests/unix/ipv6/ipv6test.cpp
new file mode 100644
index 0000000..5f87eeb
--- /dev/null
+++ b/config.tests/unix/ipv6/ipv6test.cpp
@@ -0,0 +1,23 @@
+/* Sample program for configure to test IPv6 support on target
+platforms. We check for the required IPv6 data structures. */
+
+#if defined(__hpux)
+#define _HPUX_SOURCE
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+int main()
+{
+    sockaddr_in6 tmp;
+    sockaddr_storage tmp2;
+    (void)tmp.sin6_addr.s6_addr;
+    (void)tmp.sin6_port;
+    (void)tmp.sin6_family;
+    (void)tmp.sin6_scope_id;
+    (void)tmp2;
+
+    return 0;
+}
diff --git a/config.tests/unix/ipv6ifname/ipv6ifname.cpp b/config.tests/unix/ipv6ifname/ipv6ifname.cpp
new file mode 100644
index 0000000..619a783
--- /dev/null
+++ b/config.tests/unix/ipv6ifname/ipv6ifname.cpp
@@ -0,0 +1,18 @@
+/* Sample program for configure to test for if_nametoindex support
+on target platforms. */
+
+#if defined(__hpux)
+#define _HPUX_SOURCE
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+
+int main()
+{
+    char buf[IFNAMSIZ];
+    if_nametoindex("eth0");
+    if_indextoname(1, buf);
+    return 0;
+}
diff --git a/config.tests/unix/ipv6ifname/ipv6ifname.pro b/config.tests/unix/ipv6ifname/ipv6ifname.pro
new file mode 100644
index 0000000..ed62869
--- /dev/null
+++ b/config.tests/unix/ipv6ifname/ipv6ifname.pro
@@ -0,0 +1,5 @@
+SOURCES = ipv6ifname.cpp
+CONFIG -= qt
+mac:CONFIG -= app_bundle
+QT =
+LIBS += $$QMAKE_LIBS_NETWORK
diff --git a/config.tests/unix/iwmmxt/iwmmxt.cpp b/config.tests/unix/iwmmxt/iwmmxt.cpp
new file mode 100644
index 0000000..77b09b4
--- /dev/null
+++ b/config.tests/unix/iwmmxt/iwmmxt.cpp
@@ -0,0 +1,7 @@
+#include <mmintrin.h>
+
+int main(int, char**)
+{
+    _mm_unpackhi_pi16(_mm_setzero_si64(), _mm_setzero_si64());
+    return 0;
+}
diff --git a/config.tests/unix/iwmmxt/iwmmxt.pro b/config.tests/unix/iwmmxt/iwmmxt.pro
new file mode 100644
index 0000000..20a5f1a
--- /dev/null
+++ b/config.tests/unix/iwmmxt/iwmmxt.pro
@@ -0,0 +1,3 @@
+SOURCES = iwmmxt.cpp
+CONFIG -= x11 qt
+
diff --git a/config.tests/unix/largefile/largefile.pro b/config.tests/unix/largefile/largefile.pro
new file mode 100644
index 0000000..d7affc6
--- /dev/null
+++ b/config.tests/unix/largefile/largefile.pro
@@ -0,0 +1,3 @@
+SOURCES=largefiletest.cpp
+CONFIG-=qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/largefile/largefiletest.cpp b/config.tests/unix/largefile/largefiletest.cpp
new file mode 100644
index 0000000..ed04e7a
--- /dev/null
+++ b/config.tests/unix/largefile/largefiletest.cpp
@@ -0,0 +1,32 @@
+/* Sample program for configure to test Large File support on target
+platforms.
+*/
+
+#define _LARGEFILE_SOURCE
+#define _LARGE_FILES
+#define _FILE_OFFSET_BITS 64
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <assert.h>
+#include <stdio.h>
+
+int main( int, char **argv )
+{
+// check that off_t can hold 2^63 - 1 and perform basic operations...
+#define OFF_T_64 (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+    if (OFF_T_64 % 2147483647 != 1)
+	return 1;
+
+    // stat breaks on SCO OpenServer
+    struct stat buf;
+    stat( argv[0], &buf );
+    if (!S_ISREG(buf.st_mode))
+	return 2;
+
+    FILE *file = fopen( argv[0], "r" );
+    off_t offset = ftello( file );
+    fseek( file, offset, SEEK_CUR );
+    fclose( file );
+    return 0;
+}
diff --git a/config.tests/unix/libjpeg/libjpeg.cpp b/config.tests/unix/libjpeg/libjpeg.cpp
new file mode 100644
index 0000000..de1fb7b
--- /dev/null
+++ b/config.tests/unix/libjpeg/libjpeg.cpp
@@ -0,0 +1,12 @@
+#include <sys/types.h>
+#include <stdio.h>
+extern "C" {
+#include <jpeglib.h>
+}
+
+int main(int, char **)
+{
+    j_compress_ptr cinfo;
+    jpeg_create_compress(cinfo);
+    return 0;
+}
diff --git a/config.tests/unix/libjpeg/libjpeg.pro b/config.tests/unix/libjpeg/libjpeg.pro
new file mode 100644
index 0000000..d06888c
--- /dev/null
+++ b/config.tests/unix/libjpeg/libjpeg.pro
@@ -0,0 +1,4 @@
+SOURCES = libjpeg.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -ljpeg
diff --git a/config.tests/unix/libmng/libmng.cpp b/config.tests/unix/libmng/libmng.cpp
new file mode 100644
index 0000000..cafb478
--- /dev/null
+++ b/config.tests/unix/libmng/libmng.cpp
@@ -0,0 +1,13 @@
+#include <libmng.h>
+
+int main(int, char **)
+{
+    mng_handle hMNG;
+    mng_cleanup(&hMNG);
+
+#if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9)
+#error System libmng version is less than 1.0.9; using built-in version instead.
+#endif
+
+    return 0;
+}
diff --git a/config.tests/unix/libmng/libmng.pro b/config.tests/unix/libmng/libmng.pro
new file mode 100644
index 0000000..ee57ecd
--- /dev/null
+++ b/config.tests/unix/libmng/libmng.pro
@@ -0,0 +1,4 @@
+SOURCES = libmng.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lmng
diff --git a/config.tests/unix/libpng/libpng.cpp b/config.tests/unix/libpng/libpng.cpp
new file mode 100644
index 0000000..7a3f2a7
--- /dev/null
+++ b/config.tests/unix/libpng/libpng.cpp
@@ -0,0 +1,12 @@
+#include <png.h>
+
+#if !defined(PNG_LIBPNG_VER) || PNG_LIBPNG_VER < 10017
+#  error "Required libpng version 1.0.17 not found."
+#endif
+
+int main(int, char **)
+{
+    png_structp png_ptr;
+    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);
+    return 0;
+}
diff --git a/config.tests/unix/libpng/libpng.pro b/config.tests/unix/libpng/libpng.pro
new file mode 100644
index 0000000..f038386
--- /dev/null
+++ b/config.tests/unix/libpng/libpng.pro
@@ -0,0 +1,4 @@
+SOURCES = libpng.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lpng
diff --git a/config.tests/unix/libtiff/libtiff.cpp b/config.tests/unix/libtiff/libtiff.cpp
new file mode 100644
index 0000000..eac03ab
--- /dev/null
+++ b/config.tests/unix/libtiff/libtiff.cpp
@@ -0,0 +1,19 @@
+#include <tiffio.h>
+
+#if !defined(TIFF_VERSION)
+#    error "Required libtiff not found"
+#elif TIFF_VERSION < 42
+#    error "unsupported tiff version"
+#endif
+
+int main(int, char **)
+{
+    tdata_t buffer = _TIFFmalloc(128);
+    _TIFFfree(buffer);
+
+    // some libtiff implementations where TIFF_VERSION >= 42 do not
+    // have TIFFReadRGBAImageOriented(), so let's check for it
+    TIFFReadRGBAImageOriented(0, 0, 0, 0, 0, 0);
+
+    return 0;
+}
diff --git a/config.tests/unix/libtiff/libtiff.pro b/config.tests/unix/libtiff/libtiff.pro
new file mode 100644
index 0000000..60ba7d1
--- /dev/null
+++ b/config.tests/unix/libtiff/libtiff.pro
@@ -0,0 +1,4 @@
+SOURCES = libtiff.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -ltiff
diff --git a/config.tests/unix/makeabs b/config.tests/unix/makeabs
new file mode 100755
index 0000000..9d66108
--- /dev/null
+++ b/config.tests/unix/makeabs
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+FILE="$1"
+RES="$FILE"
+
+if [ `echo $FILE | cut -b1` = "/" ]; then
+    true
+else
+    RES="$PWD/$FILE"
+    test -d "$RES" && RES="$RES/"
+    RES=`echo "$RES" | sed "s,/\(\./\)*,/,g"`
+
+# note: this will only strip 1 /path/../ from RES, i.e. given /a/b/c/../../../, it returns /a/b/../../
+    RES=`echo "$RES" | sed "s,\(/[^/]*/\)\.\./,/,g"` 
+
+    RES=`echo "$RES" | sed "s,//,/,g" | sed "s,/$,,"`
+fi
+echo $RES #return
+
diff --git a/config.tests/unix/mmx/mmx.cpp b/config.tests/unix/mmx/mmx.cpp
new file mode 100644
index 0000000..617cd62
--- /dev/null
+++ b/config.tests/unix/mmx/mmx.cpp
@@ -0,0 +1,10 @@
+#include <mmintrin.h>
+#if defined(__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 3
+#error GCC < 3.2 is known to create internal compiler errors with our MMX code
+#endif
+
+int main(int, char**)
+{
+    _mm_empty();
+    return 0;
+}
diff --git a/config.tests/unix/mmx/mmx.pro b/config.tests/unix/mmx/mmx.pro
new file mode 100644
index 0000000..d2fea7f
--- /dev/null
+++ b/config.tests/unix/mmx/mmx.pro
@@ -0,0 +1,3 @@
+SOURCES = mmx.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/mremap/mremap.cpp b/config.tests/unix/mremap/mremap.cpp
new file mode 100644
index 0000000..1a2ada1
--- /dev/null
+++ b/config.tests/unix/mremap/mremap.cpp
@@ -0,0 +1,10 @@
+#include <unistd.h>
+#include <sys/mman.h>
+
+int main(int, char **)
+{
+    (void) ::mremap(static_cast<void *>(0), size_t(0), size_t(42), MREMAP_MAYMOVE);
+
+    return 0;
+}
+
diff --git a/config.tests/unix/mremap/mremap.pro b/config.tests/unix/mremap/mremap.pro
new file mode 100644
index 0000000..a36d756
--- /dev/null
+++ b/config.tests/unix/mremap/mremap.pro
@@ -0,0 +1,3 @@
+SOURCES = mremap.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/mysql/mysql.cpp b/config.tests/unix/mysql/mysql.cpp
new file mode 100644
index 0000000..c05da1c
--- /dev/null
+++ b/config.tests/unix/mysql/mysql.cpp
@@ -0,0 +1,6 @@
+#include "mysql.h"
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/mysql/mysql.pro b/config.tests/unix/mysql/mysql.pro
new file mode 100644
index 0000000..a22579e
--- /dev/null
+++ b/config.tests/unix/mysql/mysql.pro
@@ -0,0 +1,4 @@
+SOURCES = mysql.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lmysqlclient
diff --git a/config.tests/unix/mysql_r/mysql_r.pro b/config.tests/unix/mysql_r/mysql_r.pro
new file mode 100644
index 0000000..8c06067
--- /dev/null
+++ b/config.tests/unix/mysql_r/mysql_r.pro
@@ -0,0 +1,4 @@
+SOURCES = ../mysql/mysql.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lmysqlclient_r
diff --git a/config.tests/unix/nis/nis.cpp b/config.tests/unix/nis/nis.cpp
new file mode 100644
index 0000000..65561f1
--- /dev/null
+++ b/config.tests/unix/nis/nis.cpp
@@ -0,0 +1,11 @@
+#include <sys/types.h>
+#include <rpc/rpc.h>
+#include <rpcsvc/ypclnt.h>
+#include <rpcsvc/yp_prot.h>
+
+int main(int, char **)
+{
+    char *d;
+    yp_get_default_domain(&d);
+    return 0;
+}
diff --git a/config.tests/unix/nis/nis.pro b/config.tests/unix/nis/nis.pro
new file mode 100644
index 0000000..1f985b2
--- /dev/null
+++ b/config.tests/unix/nis/nis.pro
@@ -0,0 +1,5 @@
+SOURCES = nis.cpp
+CONFIG -= qt dylib
+mac: CONFIG -= app_bundle
+solaris-*:LIBS += -lnsl
+else:LIBS += $$QMAKE_LIBS_NIS
diff --git a/config.tests/unix/objcopy.test b/config.tests/unix/objcopy.test
new file mode 100755
index 0000000..eb2173d
--- /dev/null
+++ b/config.tests/unix/objcopy.test
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+TEST_PATH=`dirname $0`
+SEP_DEBUG_SUPPORT=no
+COMPILER=$1
+QMAKE_OBJCOPY=$2
+VERBOSE=$3
+
+if [ -n "$QMAKE_OBJCOPY" ]; then
+    echo "int main() { return 0; }" > objcopy_test.cpp
+    if $TEST_PATH/which.test "$QMAKE_OBJCOPY" >/dev/null 2>&1 && $COMPILER -g -o objcopy_test objcopy_test.cpp >/dev/null 2>&1; then
+        "$QMAKE_OBJCOPY" --only-keep-debug objcopy_test objcopy_test.debug >/dev/null 2>&1 \
+            && "$QMAKE_OBJCOPY" --strip-debug objcopy_test >/dev/null 2>&1 \
+            && "$QMAKE_OBJCOPY" --add-gnu-debuglink=objcopy_test.debug objcopy_test >/dev/null 2>&1 \
+            && SEP_DEBUG_SUPPORT=yes 
+    fi
+    rm -f objcopy_test objcopy_test.debug objcopy_test.cpp
+else
+    [ "$VERBOSE" = "yes" ] && echo "Separate debug info check skipped, QMAKE_OBJCOPY is unset.";
+fi
+
+# done
+if [ "$SEP_DEBUG_SUPPORT" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Separate debug info support disabled."
+    exit 0
+else
+    [ "$VERBOSE" = "yes" ] && echo "Separate debug info support enabled."
+    exit 1
+fi
diff --git a/config.tests/unix/oci/oci.cpp b/config.tests/unix/oci/oci.cpp
new file mode 100644
index 0000000..9f83a78
--- /dev/null
+++ b/config.tests/unix/oci/oci.cpp
@@ -0,0 +1,6 @@
+#include <oci.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro
new file mode 100644
index 0000000..4add225
--- /dev/null
+++ b/config.tests/unix/oci/oci.pro
@@ -0,0 +1,4 @@
+SOURCES = oci.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lclntsh
diff --git a/config.tests/unix/odbc/odbc.cpp b/config.tests/unix/odbc/odbc.cpp
new file mode 100644
index 0000000..6b64e12
--- /dev/null
+++ b/config.tests/unix/odbc/odbc.cpp
@@ -0,0 +1,7 @@
+#include <sql.h>
+#include <sqlext.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/odbc/odbc.pro b/config.tests/unix/odbc/odbc.pro
new file mode 100644
index 0000000..c588ede
--- /dev/null
+++ b/config.tests/unix/odbc/odbc.pro
@@ -0,0 +1,4 @@
+SOURCES = odbc.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lodbc
diff --git a/config.tests/unix/opengles1/opengles1.cpp b/config.tests/unix/opengles1/opengles1.cpp
new file mode 100644
index 0000000..a0060b4
--- /dev/null
+++ b/config.tests/unix/opengles1/opengles1.cpp
@@ -0,0 +1,12 @@
+#include <GLES/gl.h>
+#include <GLES/egl.h>
+
+int main(int, char **)
+{
+    GLfloat a = 1.0f;
+    eglInitialize(0, 0, 0);
+    glColor4f(a, a, a, a);
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    return 0;
+}
diff --git a/config.tests/unix/opengles1/opengles1.pro b/config.tests/unix/opengles1/opengles1.pro
new file mode 100644
index 0000000..d800a5d
--- /dev/null
+++ b/config.tests/unix/opengles1/opengles1.pro
@@ -0,0 +1,9 @@
+SOURCES = opengles1.cpp
+INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+
+for(p, QMAKE_LIBDIR_OPENGL) {
+    exists($$p):LIBS += -L$$p
+}
+
+CONFIG -= qt
+LIBS += $$QMAKE_LIBS_OPENGL
diff --git a/config.tests/unix/opengles1cl/opengles1cl.cpp b/config.tests/unix/opengles1cl/opengles1cl.cpp
new file mode 100644
index 0000000..f864276
--- /dev/null
+++ b/config.tests/unix/opengles1cl/opengles1cl.cpp
@@ -0,0 +1,12 @@
+#include <GLES/gl.h>
+#include <GLES/egl.h>
+
+int main(int, char **)
+{
+    GLfixed a = 0;
+    eglInitialize(0, 0, 0);
+    glColor4x(a, a, a, a);
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    return 0;
+}
diff --git a/config.tests/unix/opengles1cl/opengles1cl.pro b/config.tests/unix/opengles1cl/opengles1cl.pro
new file mode 100644
index 0000000..c9addf9
--- /dev/null
+++ b/config.tests/unix/opengles1cl/opengles1cl.pro
@@ -0,0 +1,9 @@
+SOURCES = opengles1cl.cpp
+INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+
+for(p, QMAKE_LIBDIR_OPENGL) {
+    exists($$p):LIBS += -L$$p
+}
+
+CONFIG -= qt
+LIBS += $$QMAKE_LIBS_OPENGL
diff --git a/config.tests/unix/opengles2/opengles2.cpp b/config.tests/unix/opengles2/opengles2.cpp
new file mode 100644
index 0000000..493530d
--- /dev/null
+++ b/config.tests/unix/opengles2/opengles2.cpp
@@ -0,0 +1,11 @@
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+
+int main(int, char **)
+{
+    eglInitialize(0, 0, 0);
+    glUniform1f(1, GLfloat(1.0));
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    return 0;
+}
diff --git a/config.tests/unix/opengles2/opengles2.pro b/config.tests/unix/opengles2/opengles2.pro
new file mode 100644
index 0000000..13f95a1
--- /dev/null
+++ b/config.tests/unix/opengles2/opengles2.pro
@@ -0,0 +1,9 @@
+SOURCES = opengles2.cpp
+INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+
+for(p, QMAKE_LIBDIR_OPENGL) {
+    exists($$p):LIBS += -L$$p
+}
+
+CONFIG -= qt
+LIBS += $$QMAKE_LIBS_OPENGL
diff --git a/config.tests/unix/openssl/openssl.cpp b/config.tests/unix/openssl/openssl.cpp
new file mode 100644
index 0000000..5ca3e9c
--- /dev/null
+++ b/config.tests/unix/openssl/openssl.cpp
@@ -0,0 +1,9 @@
+#include <openssl/opensslv.h>
+
+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x0090700fL
+#  error "OpenSSL >= 0.9.7 is required"
+#endif
+
+int main()
+{
+}
diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri
new file mode 100644
index 0000000..bc95479
--- /dev/null
+++ b/config.tests/unix/openssl/openssl.pri
@@ -0,0 +1,9 @@
+!cross_compile {
+    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
+    # LSB doesn't allow using headers from /include or /usr/include
+    linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+    for(p, TRY_INCLUDEPATHS) {
+        pp = $$join(p, "", "", "/openssl")
+        exists($$pp):INCLUDEPATH *= $$p
+    }
+}
diff --git a/config.tests/unix/openssl/openssl.pro b/config.tests/unix/openssl/openssl.pro
new file mode 100644
index 0000000..6891e78
--- /dev/null
+++ b/config.tests/unix/openssl/openssl.pro
@@ -0,0 +1,4 @@
+SOURCES = openssl.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
+include(openssl.pri)
diff --git a/config.tests/unix/padstring b/config.tests/unix/padstring
new file mode 100755
index 0000000..283475d
--- /dev/null
+++ b/config.tests/unix/padstring
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+LEN="$1"
+STR="$2"
+PAD='\0'
+STRLEN=`echo $STR | wc -c`
+RES="$STR"
+    
+EXTRALEN=`expr $LEN - $STRLEN`
+while [ "$EXTRALEN" -gt 32 ]; do
+   RES="$RES$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD"
+   EXTRALEN=`expr $EXTRALEN - 32`
+done
+while [ "$EXTRALEN" -gt 0 ]; do
+   RES="$RES$PAD"
+   EXTRALEN=`expr $EXTRALEN - 1`
+done
+cat <<EOF
+$RES
+EOF
+
+
diff --git a/config.tests/unix/precomp.test b/config.tests/unix/precomp.test
new file mode 100755
index 0000000..f7c5a02
--- /dev/null
+++ b/config.tests/unix/precomp.test
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+PRECOMP_SUPPORT=no
+COMPILER=$1
+VERBOSE=$2
+
+case "$COMPILER" in
+icpc)
+    cat >header.h <<EOF
+#define HEADER_H
+
+EOF
+    >header.cpp
+    cat >source.cpp <<EOF
+#ifndef HEADER_H
+#error no go
+#endif
+
+EOF
+
+    rm -f header.pchi
+    $COMPILER -pch-create header.pchi -include header.h -c header.cpp -o header.o >/dev/null 2>&1 \
+        && $COMPILER -pch-use header.pchi -include header.h -c source.cpp -o source.o >/dev/null 2>&1 \
+        && PRECOMP_SUPPORT=yes
+
+    rm -f header.h header.cpp source.cpp
+    rm -f header.pchi header.o source.o
+    ;;
+
+*g++*|c++)
+    case `"$COMPILER" -dumpversion 2>/dev/null` in
+    3.*)
+        ;;
+    *)
+
+        >precomp_header.h
+        if $COMPILER -x c-header precomp_header.h >/dev/null 2>&1; then
+           $COMPILER -x c++-header precomp_header.h && PRECOMP_SUPPORT=yes
+        fi
+        rm -f precomp_header.h precomp_header.h.gch
+        ;;
+    esac
+    ;;
+esac
+
+
+# done
+if [ "$PRECOMP_SUPPORT" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Precompiled-headers support disabled."
+    exit 0
+else
+    [ "$VERBOSE" = "yes" ] && echo "Precompiled-headers support enabled."
+    exit 1
+fi
diff --git a/config.tests/unix/psql/psql.cpp b/config.tests/unix/psql/psql.cpp
new file mode 100644
index 0000000..4974425
--- /dev/null
+++ b/config.tests/unix/psql/psql.cpp
@@ -0,0 +1,8 @@
+#include "libpq-fe.h"
+
+int main(int, char **)
+{
+    PQescapeBytea(0, 0, 0);
+    PQunescapeBytea(0, 0);
+    return 0;
+}
diff --git a/config.tests/unix/psql/psql.pro b/config.tests/unix/psql/psql.pro
new file mode 100644
index 0000000..64bb3d6
--- /dev/null
+++ b/config.tests/unix/psql/psql.pro
@@ -0,0 +1,4 @@
+SOURCES = psql.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lpq
diff --git a/config.tests/unix/ptrsize.test b/config.tests/unix/ptrsize.test
new file mode 100755
index 0000000..1307cec
--- /dev/null
+++ b/config.tests/unix/ptrsize.test
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+QMKSPEC=$1
+VERBOSE=$2
+SRCDIR=$3
+OUTDIR=$4
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "Testing size of pointers ... ($*)"
+
+# build and run a test program
+test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize"
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
+cd "$OUTDIR/config.tests/unix/ptrsize"
+
+if [ "$VERBOSE" = "yes" ]; then
+  (make clean && make)
+else
+  (make clean && make) >/dev/null 2>&1
+fi
+RETVAL=$?
+
+if [ "$RETVAL" -ne 0 ]; then
+    PTRSIZE=4
+else
+    PTRSIZE=8
+fi
+
+
+# done
+[ "$VERBOSE" = "yes" ] && echo "Pointer size: $PTRSIZE"
+exit $PTRSIZE
diff --git a/config.tests/unix/ptrsize/ptrsizetest.cpp b/config.tests/unix/ptrsize/ptrsizetest.cpp
new file mode 100644
index 0000000..9e15e81
--- /dev/null
+++ b/config.tests/unix/ptrsize/ptrsizetest.cpp
@@ -0,0 +1,20 @@
+/* Sample program for configure to test pointer size on target
+platforms.
+*/
+
+template<int>
+struct QPointerSizeTest
+{
+};
+
+template<>
+struct QPointerSizeTest<8>
+{
+    enum { PointerSize = 8 };
+};
+
+int main( int, char ** )
+{
+    return QPointerSizeTest<sizeof(void*)>::PointerSize;
+}
+
diff --git a/config.tests/unix/ptrsize/ptrsizetest.pro b/config.tests/unix/ptrsize/ptrsizetest.pro
new file mode 100644
index 0000000..41aba86
--- /dev/null
+++ b/config.tests/unix/ptrsize/ptrsizetest.pro
@@ -0,0 +1,3 @@
+SOURCES = ptrsizetest.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/sqlite/sqlite.cpp b/config.tests/unix/sqlite/sqlite.cpp
new file mode 100644
index 0000000..fe7301e
--- /dev/null
+++ b/config.tests/unix/sqlite/sqlite.cpp
@@ -0,0 +1,6 @@
+#include <sqlite3.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/sqlite/sqlite.pro b/config.tests/unix/sqlite/sqlite.pro
new file mode 100644
index 0000000..ba2cac1
--- /dev/null
+++ b/config.tests/unix/sqlite/sqlite.pro
@@ -0,0 +1,3 @@
+SOURCES = sqlite.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/sqlite2/sqlite2.cpp b/config.tests/unix/sqlite2/sqlite2.cpp
new file mode 100644
index 0000000..22c21ca
--- /dev/null
+++ b/config.tests/unix/sqlite2/sqlite2.cpp
@@ -0,0 +1,6 @@
+#include <sqlite.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/sqlite2/sqlite2.pro b/config.tests/unix/sqlite2/sqlite2.pro
new file mode 100644
index 0000000..14a64d5
--- /dev/null
+++ b/config.tests/unix/sqlite2/sqlite2.pro
@@ -0,0 +1,4 @@
+SOURCES = sqlite2.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lsqlite
diff --git a/config.tests/unix/sse/sse.cpp b/config.tests/unix/sse/sse.cpp
new file mode 100644
index 0000000..e1c23bd
--- /dev/null
+++ b/config.tests/unix/sse/sse.cpp
@@ -0,0 +1,11 @@
+#include <xmmintrin.h>
+#if defined(__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 3
+#error GCC < 3.2 is known to create internal compiler errors with our MMX code
+#endif
+
+int main(int, char**)
+{
+    __m64 a = _mm_setzero_si64();
+    a = _mm_shuffle_pi16(a, 0);
+    return _m_to_int(a);
+}
diff --git a/config.tests/unix/sse/sse.pro b/config.tests/unix/sse/sse.pro
new file mode 100644
index 0000000..4cc34a7
--- /dev/null
+++ b/config.tests/unix/sse/sse.pro
@@ -0,0 +1,3 @@
+SOURCES = sse.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/sse2/sse2.cpp b/config.tests/unix/sse2/sse2.cpp
new file mode 100644
index 0000000..ea0737d
--- /dev/null
+++ b/config.tests/unix/sse2/sse2.cpp
@@ -0,0 +1,11 @@
+#include <emmintrin.h>
+#if defined(__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 3
+#error GCC < 3.2 is known to create internal compiler errors with our MMX code
+#endif
+
+int main(int, char**)
+{
+    __m128i a = _mm_setzero_si128();
+    _mm_maskmoveu_si128(a, _mm_setzero_si128(), 0);
+    return 0;
+}
diff --git a/config.tests/unix/sse2/sse2.pro b/config.tests/unix/sse2/sse2.pro
new file mode 100644
index 0000000..d4a21aa
--- /dev/null
+++ b/config.tests/unix/sse2/sse2.pro
@@ -0,0 +1,3 @@
+SOURCES = sse2.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/stdint/main.cpp b/config.tests/unix/stdint/main.cpp
new file mode 100644
index 0000000..91e5c3a
--- /dev/null
+++ b/config.tests/unix/stdint/main.cpp
@@ -0,0 +1,8 @@
+/* Check for the presence of stdint.h */
+#include <stdint.h>
+
+int main()
+{
+    return 0;
+}
+
diff --git a/config.tests/unix/stdint/stdint.pro b/config.tests/unix/stdint/stdint.pro
new file mode 100644
index 0000000..79a0d9c
--- /dev/null
+++ b/config.tests/unix/stdint/stdint.pro
@@ -0,0 +1,4 @@
+SOURCES = main.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
+
diff --git a/config.tests/unix/stl/stl.pro b/config.tests/unix/stl/stl.pro
new file mode 100644
index 0000000..a2feab4
--- /dev/null
+++ b/config.tests/unix/stl/stl.pro
@@ -0,0 +1,3 @@
+SOURCES = stltest.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/stl/stltest.cpp b/config.tests/unix/stl/stltest.cpp
new file mode 100644
index 0000000..ff653a4
--- /dev/null
+++ b/config.tests/unix/stl/stltest.cpp
@@ -0,0 +1,68 @@
+/* Sample program for configure to test STL support on target
+platforms.  We are mainly concerned with being able to instantiate
+templates for common STL container classes.
+*/
+
+#include <iterator>
+#include <map>
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+int main()
+{
+    std::vector<int> v1;
+    v1.push_back( 0 );
+    v1.push_back( 1 );
+    v1.push_back( 2 );
+    v1.push_back( 3 );
+    v1.push_back( 4 );
+    int v1size = v1.size();
+    v1size = 0;
+    int v1capacity = v1.capacity();
+    v1capacity = 0;
+
+    std::vector<int>::iterator v1it = std::find( v1.begin(), v1.end(), 99 );
+    bool v1notfound = (v1it == v1.end());
+    v1notfound = false;
+
+    v1it = std::find( v1.begin(), v1.end(), 3 );
+    bool v1found = (v1it != v1.end());
+    v1found = false;
+
+    std::vector<int> v2;
+    std::copy( v1.begin(), v1it, std::back_inserter( v2 ) );
+    int v2size = v2.size();
+    v2size = 0;
+
+    std::map<int, double> m1;
+    m1.insert( std::make_pair( 1, 2.0 ) );
+    m1.insert( std::make_pair( 3, 2.0 ) );
+    m1.insert( std::make_pair( 5, 2.0 ) );
+    m1.insert( std::make_pair( 7, 2.0 ) );
+    int m1size = m1.size();
+    m1size = 0;
+    std::map<int,double>::iterator m1it = m1.begin();
+    for ( ; m1it != m1.end(); ++m1it ) {
+        int first = (*m1it).first;
+        first = 0;
+        double second = (*m1it).second;
+        second = 0.0;
+    }
+    std::map< int, double > m2( m1 );
+    int m2size = m2.size();
+    m2size = 0;
+
+    return 0;
+}
+
+// something mean to see if the compiler and C++ standard lib are good enough
+template<class K, class T>
+class DummyClass
+{
+    // everything in std namespace ?
+    typedef std::bidirectional_iterator_tag i;
+    typedef std::ptrdiff_t d;
+    // typename implemented ?
+    typedef typename std::map<K,T>::iterator MyIterator;
+};
diff --git a/config.tests/unix/tds/tds.cpp b/config.tests/unix/tds/tds.cpp
new file mode 100644
index 0000000..54a4859
--- /dev/null
+++ b/config.tests/unix/tds/tds.cpp
@@ -0,0 +1,7 @@
+#include <sybfront.h>
+#include <sybdb.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/tds/tds.pro b/config.tests/unix/tds/tds.pro
new file mode 100644
index 0000000..5516a14
--- /dev/null
+++ b/config.tests/unix/tds/tds.pro
@@ -0,0 +1,4 @@
+SOURCES = tds.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lsybdb
diff --git a/config.tests/unix/tslib/tslib.cpp b/config.tests/unix/tslib/tslib.cpp
new file mode 100644
index 0000000..7cd55ca
--- /dev/null
+++ b/config.tests/unix/tslib/tslib.cpp
@@ -0,0 +1,7 @@
+#include <tslib.h>
+
+int main()
+{
+    ts_open("foo", 0);
+    return 0;
+}
diff --git a/config.tests/unix/tslib/tslib.pro b/config.tests/unix/tslib/tslib.pro
new file mode 100644
index 0000000..1191120
--- /dev/null
+++ b/config.tests/unix/tslib/tslib.pro
@@ -0,0 +1,3 @@
+SOURCES = tslib.cpp
+CONFIG -= qt 
+LIBS += -lts
diff --git a/config.tests/unix/which.test b/config.tests/unix/which.test
new file mode 100755
index 0000000..37c858c
--- /dev/null
+++ b/config.tests/unix/which.test
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+HOME=/dev/null
+export HOME
+
+unset which
+
+WHICH=`which which 2>/dev/null`
+if echo $WHICH | grep 'shell built-in command' >/dev/null 2>&1; then
+    WHICH=which
+elif [ -z "$WHICH" ]; then
+    if which which >/dev/null 2>&1; then
+	WHICH=which
+    else
+	for a in /usr/ucb /usr/bin /bin /usr/local/bin; do
+	    if [ -x $a/which ]; then
+		WHICH=$a/which
+		break;
+	    fi
+	done
+    fi
+fi
+
+if [ -z "$WHICH" ]; then
+    IFS=:
+    for a in $PATH; do
+	if [ -x $a/$1 ]; then
+	    echo "$a/$1"
+	    exit 0
+	fi
+    done
+else
+    a=`"$WHICH" "$1" 2>/dev/null`
+    if [ ! -z "$a" -a -x "$a" ]; then
+	echo "$a"
+	exit 0
+    fi
+fi
+exit 1
diff --git a/config.tests/unix/zlib/zlib.cpp b/config.tests/unix/zlib/zlib.cpp
new file mode 100644
index 0000000..58a286f
--- /dev/null
+++ b/config.tests/unix/zlib/zlib.cpp
@@ -0,0 +1,13 @@
+#include <zlib.h>
+
+int main(int, char **)
+{
+    z_streamp stream;
+    stream = 0;
+    const char *ver = zlibVersion();
+    ver = 0;
+    // compress2 was added in zlib version 1.0.8
+    int res = compress2(0, 0, 0, 0, 1);
+    res = 0;
+    return 0;
+}
diff --git a/config.tests/unix/zlib/zlib.pro b/config.tests/unix/zlib/zlib.pro
new file mode 100644
index 0000000..67cc870
--- /dev/null
+++ b/config.tests/unix/zlib/zlib.pro
@@ -0,0 +1,4 @@
+SOURCES = zlib.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lz
diff --git a/config.tests/x11/fontconfig/fontconfig.cpp b/config.tests/x11/fontconfig/fontconfig.cpp
new file mode 100644
index 0000000..8501162
--- /dev/null
+++ b/config.tests/x11/fontconfig/fontconfig.cpp
@@ -0,0 +1,20 @@
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include <fontconfig/fontconfig.h>
+
+#ifndef FC_RGBA_UNKNOWN
+#  error "This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define"
+#endif
+
+#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20103)
+#  error "This version of freetype is too old."
+#endif
+
+int main(int, char **)
+{
+    FT_Face face;
+    face = 0;
+    FcPattern *pattern;
+    pattern = 0;
+    return 0;
+}
diff --git a/config.tests/x11/fontconfig/fontconfig.pro b/config.tests/x11/fontconfig/fontconfig.pro
new file mode 100644
index 0000000..718a820
--- /dev/null
+++ b/config.tests/x11/fontconfig/fontconfig.pro
@@ -0,0 +1,5 @@
+SOURCES = fontconfig.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lfreetype -lfontconfig
+include(../../unix/freetype/freetype.pri)
diff --git a/config.tests/x11/glxfbconfig/glxfbconfig.cpp b/config.tests/x11/glxfbconfig/glxfbconfig.cpp
new file mode 100644
index 0000000..e86b02a
--- /dev/null
+++ b/config.tests/x11/glxfbconfig/glxfbconfig.cpp
@@ -0,0 +1,10 @@
+#include <GL/gl.h>
+#include <GL/glx.h>
+
+int main(int, char **)
+{
+    GLXFBConfig config;
+    config = 0;
+
+    return 0;
+}
diff --git a/config.tests/x11/glxfbconfig/glxfbconfig.pro b/config.tests/x11/glxfbconfig/glxfbconfig.pro
new file mode 100644
index 0000000..4705ca6
--- /dev/null
+++ b/config.tests/x11/glxfbconfig/glxfbconfig.pro
@@ -0,0 +1,10 @@
+SOURCES = glxfbconfig.cpp
+CONFIG += x11
+INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+
+for(p, QMAKE_LIBDIR_OPENGL) {
+    exists($$p):LIBS += -L$$p
+}
+
+CONFIG -= qt
+LIBS += -lGL -lGLU
diff --git a/config.tests/x11/mitshm/mitshm.cpp b/config.tests/x11/mitshm/mitshm.cpp
new file mode 100644
index 0000000..b9be2e0
--- /dev/null
+++ b/config.tests/x11/mitshm/mitshm.cpp
@@ -0,0 +1,22 @@
+#ifdef Q_OS_HPUX
+#error "MITSHM not supported on HP-UX."
+#else
+#include <X11/Xlib.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <X11/extensions/XShm.h>
+
+int main(int, char **)
+{
+    Display *dpy = 0;
+    int minor;
+    int major;
+    int pixmaps;
+    if (dpy && XShmQueryVersion(dpy, &major, &minor, &pixmaps)) {
+        minor = 0;
+        major = 0;
+        pixmaps = 0;
+    }
+    return 0;
+}
+#endif
diff --git a/config.tests/x11/mitshm/mitshm.pro b/config.tests/x11/mitshm/mitshm.pro
new file mode 100644
index 0000000..8a40317
--- /dev/null
+++ b/config.tests/x11/mitshm/mitshm.pro
@@ -0,0 +1,5 @@
+SOURCES = mitshm.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lXext
+hpux*:DEFINES+=Q_OS_HPUX
diff --git a/config.tests/x11/notype.test b/config.tests/x11/notype.test
new file mode 100755
index 0000000..a522491
--- /dev/null
+++ b/config.tests/x11/notype.test
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+QMKSPEC=$1
+XPLATFORM=`basename $1`
+VERBOSE=$2
+SRCDIR=$3
+OUTDIR=$4
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "Detecting broken X11 headers... ($*)"
+
+# Detect broken X11 headers when using GCC 2.95 or later
+#   Xsun on Solaris 2.5.1:
+#   	Patches are available for Solaris 2.6, 7, and 8 but
+#   	not for Solaris 2.5.1.
+#   HP-UX:
+#   	Patches are available for HP-UX 10.20, 11.00, and 11.11.
+#   AIX 4.3.3 and AIX 5.1:
+#   	Headers are clearly broken on all AIX versions, and we
+#   	don't know of any patches. The strange thing is that we
+#   	did not get any reports about this issue until very
+#   	recently, long after gcc 3.0.x was released. It seems to
+#   	work for us with gcc 2.95.2.
+NOTYPE=no
+
+if [ $XPLATFORM = "solaris-g++" -o $XPLATFORM = "hpux-g++" -o $XPLATFORM = "aix-g++" -o $XPLATFORM = "aix-g++-64" ]; then
+    NOTYPE=yes
+
+    test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype"
+    "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
+    cd "$OUTDIR/config.tests/x11/notype"
+
+    if [ "$VERBOSE" = "yes" ]; then
+	make
+    else
+	make >/dev/null 2>&1
+    fi
+
+    [ -x notypetest ] && NOTYPE=no
+fi
+
+# done
+if [ "$NOTYPE" = "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Broken X11 headers detected."
+    exit 0
+else
+    [ "$VERBOSE" = "yes" ] && echo "X11 headers look good."
+    exit 1
+fi
diff --git a/config.tests/x11/notype/notypetest.cpp b/config.tests/x11/notype/notypetest.cpp
new file mode 100644
index 0000000..b33949c
--- /dev/null
+++ b/config.tests/x11/notype/notypetest.cpp
@@ -0,0 +1,11 @@
+/* Sample program for configure to test for broken X11 headers that
+confuse gcc 2.95 and better on target platforms such as Solaris.
+*/
+
+#include <X11/Xlib.h>
+#include <X11/ICE/ICElib.h>
+
+int main()
+{
+    return 0;
+}
diff --git a/config.tests/x11/notype/notypetest.pro b/config.tests/x11/notype/notypetest.pro
new file mode 100644
index 0000000..6ce2c62
--- /dev/null
+++ b/config.tests/x11/notype/notypetest.pro
@@ -0,0 +1,5 @@
+TEMPLATE=app
+TARGET=notypetest
+CONFIG-=qt
+CONFIG+=x11
+SOURCES=notypetest.cpp
diff --git a/config.tests/x11/opengl/opengl.cpp b/config.tests/x11/opengl/opengl.cpp
new file mode 100644
index 0000000..ad69379
--- /dev/null
+++ b/config.tests/x11/opengl/opengl.cpp
@@ -0,0 +1,13 @@
+#include <GL/gl.h>
+#include <GL/glu.h>
+
+#ifndef GLU_VERSION_1_2
+#  error "Required GLU version 1.2 not found."
+#endif
+
+int main(int, char **)
+{
+    GLuint x;
+    x = 0;
+    return 0;
+}
diff --git a/config.tests/x11/opengl/opengl.pro b/config.tests/x11/opengl/opengl.pro
new file mode 100644
index 0000000..432bd8d
--- /dev/null
+++ b/config.tests/x11/opengl/opengl.pro
@@ -0,0 +1,10 @@
+SOURCES = opengl.cpp
+CONFIG += x11
+INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+
+for(p, QMAKE_LIBDIR_OPENGL) {
+    exists($$p):LIBS += -L$$p
+}
+
+CONFIG -= qt
+LIBS += -lGL -lGLU
diff --git a/config.tests/x11/sm/sm.cpp b/config.tests/x11/sm/sm.cpp
new file mode 100644
index 0000000..8bb5ffb
--- /dev/null
+++ b/config.tests/x11/sm/sm.cpp
@@ -0,0 +1,8 @@
+#include <X11/SM/SMlib.h>
+
+int main(int, char **)
+{
+    SmPointer pointer;
+    pointer = 0;
+    return 0;
+}
diff --git a/config.tests/x11/sm/sm.pro b/config.tests/x11/sm/sm.pro
new file mode 100644
index 0000000..9be43d8
--- /dev/null
+++ b/config.tests/x11/sm/sm.pro
@@ -0,0 +1,4 @@
+SOURCES += sm.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += $$QMAKE_LIBS_X11SM
diff --git a/config.tests/x11/xcursor/xcursor.cpp b/config.tests/x11/xcursor/xcursor.cpp
new file mode 100644
index 0000000..08cd94b
--- /dev/null
+++ b/config.tests/x11/xcursor/xcursor.cpp
@@ -0,0 +1,25 @@
+#include <X11/Xlib.h>
+#include <X11/Xcursor/Xcursor.h>
+
+#if !defined(XCURSOR_LIB_MAJOR)
+#  define XCURSOR_LIB_MAJOR XCURSOR_MAJOR
+#endif
+#if !defined(XCURSOR_LIB_MINOR)
+#  define XCURSOR_LIB_MINOR XCURSOR_MINOR
+#endif
+
+#if XCURSOR_LIB_MAJOR == 1 && XCURSOR_LIB_MINOR >= 0
+#  define XCURSOR_FOUND
+#else
+#  define
+#  error "Required Xcursor version 1.0 not found."
+#endif
+
+int main(int, char **)
+{
+    XcursorImage *image;
+    image = 0;
+    XcursorCursors *cursors;
+    cursors = 0;
+    return 0;
+}
diff --git a/config.tests/x11/xcursor/xcursor.pro b/config.tests/x11/xcursor/xcursor.pro
new file mode 100644
index 0000000..b1e69be
--- /dev/null
+++ b/config.tests/x11/xcursor/xcursor.pro
@@ -0,0 +1,4 @@
+SOURCES = xcursor.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lXcursor
diff --git a/config.tests/x11/xfixes/xfixes.cpp b/config.tests/x11/xfixes/xfixes.cpp
new file mode 100644
index 0000000..fd36480
--- /dev/null
+++ b/config.tests/x11/xfixes/xfixes.cpp
@@ -0,0 +1,14 @@
+#include <X11/Xlib.h>
+#include <X11/extensions/Xfixes.h>
+
+#if XFIXES_MAJOR < 2
+#  error "Required Xfixes version 2.0 not found."
+#endif
+
+int main(int, char **)
+{
+    XFixesSelectionNotifyEvent event;
+    event.type = 0;
+    return 0; 
+}
+
diff --git a/config.tests/x11/xfixes/xfixes.pro b/config.tests/x11/xfixes/xfixes.pro
new file mode 100644
index 0000000..cc94a11
--- /dev/null
+++ b/config.tests/x11/xfixes/xfixes.pro
@@ -0,0 +1,3 @@
+CONFIG += x11
+CONFIG -= qt
+SOURCES = xfixes.cpp
diff --git a/config.tests/x11/xinerama/xinerama.cpp b/config.tests/x11/xinerama/xinerama.cpp
new file mode 100644
index 0000000..2cb3cf9
--- /dev/null
+++ b/config.tests/x11/xinerama/xinerama.cpp
@@ -0,0 +1,9 @@
+#include <X11/Xlib.h>
+#include <X11/extensions/Xinerama.h>
+
+int main(int, char **)
+{
+    XineramaScreenInfo *info;
+    info = 0;
+    return 0;
+}
diff --git a/config.tests/x11/xinerama/xinerama.pro b/config.tests/x11/xinerama/xinerama.pro
new file mode 100644
index 0000000..54d1af0
--- /dev/null
+++ b/config.tests/x11/xinerama/xinerama.pro
@@ -0,0 +1,4 @@
+SOURCES = xinerama.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lXinerama
diff --git a/config.tests/x11/xinput/xinput.cpp b/config.tests/x11/xinput/xinput.cpp
new file mode 100644
index 0000000..9a61bc2
--- /dev/null
+++ b/config.tests/x11/xinput/xinput.cpp
@@ -0,0 +1,18 @@
+#ifdef Q_OS_SOLARIS
+#error "Not supported."
+#else
+
+#include <X11/Xlib.h>
+#include <X11/extensions/XInput.h>
+
+#ifdef Q_OS_IRIX
+#  include <wacom.h>
+#endif
+
+int main(int, char **)
+{
+    XDeviceButtonEvent *event;
+    event = 0;
+    return 0;
+}
+#endif
diff --git a/config.tests/x11/xinput/xinput.pro b/config.tests/x11/xinput/xinput.pro
new file mode 100644
index 0000000..8acaede
--- /dev/null
+++ b/config.tests/x11/xinput/xinput.pro
@@ -0,0 +1,6 @@
+SOURCES = xinput.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lXi
+irix-*:DEFINES+=Q_OS_IRIX
+solaris-*:DEFINES+=Q_OS_SOLARIS
diff --git a/config.tests/x11/xkb/xkb.cpp b/config.tests/x11/xkb/xkb.cpp
new file mode 100644
index 0000000..afe3c57
--- /dev/null
+++ b/config.tests/x11/xkb/xkb.cpp
@@ -0,0 +1,30 @@
+#include <X11/Xlib.h>
+#include <X11/XKBlib.h>
+
+int main(int, char **)
+{
+    Display *display = 0;
+
+    int opcode = -1;
+    int xkbEventBase = -1;
+    int xkbErrorBase = -1;
+    int xkblibMajor = XkbMajorVersion;
+    int xkblibMinor = XkbMinorVersion;
+    XkbQueryExtension(display, &opcode, &xkbEventBase, &xkbErrorBase, &xkblibMajor, &xkblibMinor);
+
+    int keycode = 0;
+    unsigned int state = 0;
+    KeySym keySym;
+    unsigned int consumedModifiers;
+    XkbLookupKeySym(display, keycode, state, &consumedModifiers, &keySym);
+
+    XkbDescPtr xkbDesc = XkbGetMap(display, XkbAllClientInfoMask, XkbUseCoreKbd);
+    int w = XkbKeyGroupsWidth(xkbDesc, keycode);
+    keySym = XkbKeySym(xkbDesc, keycode, w-1);
+    XkbFreeClientMap(xkbDesc, XkbAllClientInfoMask, true);
+
+    state = XkbPCF_GrabsUseXKBStateMask;
+    (void) XkbSetPerClientControls(display, state, &state);
+
+    return 0;
+}
diff --git a/config.tests/x11/xkb/xkb.pro b/config.tests/x11/xkb/xkb.pro
new file mode 100644
index 0000000..d4ec222
--- /dev/null
+++ b/config.tests/x11/xkb/xkb.pro
@@ -0,0 +1,3 @@
+SOURCES = xkb.cpp
+CONFIG += x11
+CONFIG -= qt
diff --git a/config.tests/x11/xrandr/xrandr.cpp b/config.tests/x11/xrandr/xrandr.cpp
new file mode 100644
index 0000000..cd61c2d
--- /dev/null
+++ b/config.tests/x11/xrandr/xrandr.cpp
@@ -0,0 +1,13 @@
+#include <X11/Xlib.h>
+#include <X11/extensions/Xrandr.h>
+
+#if RANDR_MAJOR != 1 || RANDR_MINOR < 1
+#  error "Requried Xrandr version 1.1 not found."
+#endif
+
+int main(int, char **)
+{
+    XRRScreenSize *size;
+    size = 0;
+    return 0;
+}
diff --git a/config.tests/x11/xrandr/xrandr.pro b/config.tests/x11/xrandr/xrandr.pro
new file mode 100644
index 0000000..3fb2910
--- /dev/null
+++ b/config.tests/x11/xrandr/xrandr.pro
@@ -0,0 +1,4 @@
+SOURCES = xrandr.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lXrender -lXrandr 
diff --git a/config.tests/x11/xrender/xrender.cpp b/config.tests/x11/xrender/xrender.cpp
new file mode 100644
index 0000000..7974d73
--- /dev/null
+++ b/config.tests/x11/xrender/xrender.cpp
@@ -0,0 +1,13 @@
+#include <X11/Xlib.h>
+#include <X11/extensions/Xrender.h>
+
+#if RENDER_MAJOR == 0 && RENDER_MINOR < 5
+#  error "Required Xrender version 0.6 not found."
+#else
+int main(int, char **)
+{
+    XRenderPictFormat *format;
+    format = 0;
+    return 0;
+}
+#endif
diff --git a/config.tests/x11/xrender/xrender.pro b/config.tests/x11/xrender/xrender.pro
new file mode 100644
index 0000000..e778642
--- /dev/null
+++ b/config.tests/x11/xrender/xrender.pro
@@ -0,0 +1,4 @@
+SOURCES = xrender.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lXrender
diff --git a/config.tests/x11/xshape/xshape.cpp b/config.tests/x11/xshape/xshape.cpp
new file mode 100644
index 0000000..01b5ef4
--- /dev/null
+++ b/config.tests/x11/xshape/xshape.cpp
@@ -0,0 +1,10 @@
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/shape.h>
+
+int main(int, char **)
+{
+    XShapeEvent shapeevent;
+    shapeevent.type = 0;
+    return 0;    
+}
diff --git a/config.tests/x11/xshape/xshape.pro b/config.tests/x11/xshape/xshape.pro
new file mode 100644
index 0000000..611c048
--- /dev/null
+++ b/config.tests/x11/xshape/xshape.pro
@@ -0,0 +1,3 @@
+CONFIG += x11
+CONFIG -= qt
+SOURCES = xshape.cpp
diff --git a/configure b/configure
new file mode 100755
index 0000000..841f47d
--- /dev/null
+++ b/configure
@@ -0,0 +1,7258 @@
+#!/bin/sh
+#
+# Configures to build the Qt library
+#
+# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Contact: Qt Software Information (qt-info@nokia.com)
+#
+# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+#
+
+#-------------------------------------------------------------------------------
+# script initialization
+#-------------------------------------------------------------------------------
+
+# the name of this script
+relconf=`basename $0`
+# the directory of this script is the "source tree"
+relpath=`dirname $0`
+relpath=`(cd "$relpath"; /bin/pwd)`
+# the current directory is the "build tree" or "object tree"
+outpath=`/bin/pwd`
+
+#license file location
+LICENSE_FILE="$QT_LICENSE_FILE"
+[ -z "$LICENSE_FILE" ] && LICENSE_FILE="$HOME/.qt-license"
+if [ -f "$LICENSE_FILE" ]; then
+    tr -d '\r' <"$LICENSE_FILE" >"${LICENSE_FILE}.tmp"
+    diff "${LICENSE_FILE}.tmp" "${LICENSE_FILE}" >/dev/null 2>&1 || LICENSE_FILE="${LICENSE_FILE}.tmp"
+fi
+
+# later cache the command line in config.status
+OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"`
+
+# initialize global variables
+QMAKE_SWITCHES=
+QMAKE_VARS=
+QMAKE_CONFIG=
+QTCONFIG_CONFIG=
+QT_CONFIG=
+SUPPORTED=
+QMAKE_VARS_FILE=.qmake.vars
+
+:> "$QMAKE_VARS_FILE"
+
+#-------------------------------------------------------------------------------
+# utility functions
+#-------------------------------------------------------------------------------
+
+# Adds a new qmake variable to the cache
+# Usage: QMakeVar mode varname contents
+#   where mode is one of: set, add, del
+QMakeVar()
+{
+    case "$1" in
+	set)
+	    eq="="
+	    ;;
+	add)
+	    eq="+="
+	    ;;
+	del)
+	    eq="-="
+	    ;;
+	*)
+	    echo >&2 "BUG: wrong command to QMakeVar: $1"
+	    ;;
+    esac
+
+    echo "$2" "$eq" "$3" >> "$QMAKE_VARS_FILE"
+}
+
+# relies on $QMAKESPEC being set correctly. parses include statements in
+# qmake.conf and prints out the expanded file
+getQMakeConf()
+{
+    tmpSPEC="$QMAKESPEC"
+    if [ -n "$1" ]; then
+        tmpSPEC="$1"
+    fi
+    $AWK -v "QMAKESPEC=$tmpSPEC" '
+/^include\(.+\)$/{
+    fname = QMAKESPEC "/" substr($0, 9, length($0) - 9)
+    while ((getline line < fname) > 0)
+        print line
+    close(fname)
+    next
+}
+{ print }' "$tmpSPEC/qmake.conf"
+}
+
+#-------------------------------------------------------------------------------
+# operating system detection
+#-------------------------------------------------------------------------------
+
+# need that throughout the script
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+
+#-------------------------------------------------------------------------------
+# window system detection
+#-------------------------------------------------------------------------------
+
+PLATFORM_X11=no
+PLATFORM_MAC=no
+PLATFORM_QWS=no
+
+if [ -f "$relpath"/src/gui/kernel/qapplication_mac.mm ] && [ -d /System/Library/Frameworks/Carbon.framework ]; then
+    # Qt/Mac
+    # ~ the Carbon SDK exists
+    # ~ src/gui/base/qapplication_mac.cpp is present
+    # ~ this is the internal edition and Qt/Mac sources exist
+    PLATFORM_MAC=maybe
+elif [ -f "$relpath"/src/gui/kernel/qapplication_qws.cpp ]; then
+    # Qt Embedded
+    # ~ src/gui/base/qapplication_qws.cpp is present
+    # ~ this is the free or commercial edition
+    # ~ this is the internal edition and Qt Embedded is explicitly enabled
+    PLATFORM_QWS=maybe
+fi
+
+#-----------------------------------------------------------------------------
+# Qt version detection
+#-----------------------------------------------------------------------------
+QT_VERSION=`grep '^# *define *QT_VERSION_STR' "$relpath"/src/corelib/global/qglobal.h`
+QT_MAJOR_VERSION=
+QT_MINOR_VERSION=0
+QT_PATCH_VERSION=0
+if [ -n "$QT_VERSION" ]; then
+   QT_VERSION=`echo $QT_VERSION | sed 's,^# *define *QT_VERSION_STR *"*\([^ ]*\)"$,\1,'`
+   MAJOR=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\1,'`
+   if [ -n "$MAJOR" ]; then
+     MINOR=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\2,'`
+      PATCH=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\3,'`
+      QT_MAJOR_VERSION="$MAJOR"
+      [ -z "$MINOR" ] || QT_MINOR_VERSION="$MINOR"
+      [ -z "$PATCH" ] || QT_PATCH_VERSION="$PATCH"
+   fi
+fi
+if [ -z "$QT_MAJOR_VERSION" ]; then
+   echo "Cannot process version from qglobal.h: $QT_VERSION"
+   echo "Cannot proceed."
+   exit 1
+fi
+
+QT_PACKAGEDATE=`grep '^# *define *QT_PACKAGEDATE_STR' "$relpath"/src/corelib/global/qglobal.h | sed -e 's,^# *define *QT_PACKAGEDATE_STR *"\([^ ]*\)"$,\1,' -e s,-,,g`
+if [ -z "$QT_PACKAGEDATE" ]; then
+   echo "Unable to determine package date from qglobal.h: '$QT_PACKAGEDATE'"
+   echo "Cannot proceed"
+   exit 1
+fi
+
+#-------------------------------------------------------------------------------
+# check the license
+#-------------------------------------------------------------------------------
+COMMERCIAL_USER=ask
+CFG_DEV=no
+CFG_NOKIA=no
+CFG_EMBEDDED=no
+EditionString=Commercial
+
+earlyArgParse()
+{
+    # parse the arguments, setting things to "yes" or "no"
+    while [ "$#" -gt 0 ]; do
+        CURRENT_OPT="$1"
+        UNKNOWN_ARG=no
+        case "$1" in
+        #Autoconf style options
+        --enable-*)
+            VAR=`echo $1 | sed "s,^--enable-\(.*\),\1,"`
+            VAL=yes
+            ;;
+        --disable-*)
+            VAR=`echo $1 | sed "s,^--disable-\(.*\),\1,"`
+            VAL=no
+            ;;
+        --*=*)
+            VAR=`echo $1 | sed "s,^--\(.*\)=.*,\1,"`
+            VAL=`echo $1 | sed "s,^--.*=\(.*\),\1,"`
+            ;;
+        --no-*)
+            VAR=`echo $1 | sed "s,^--no-\(.*\),\1,"`
+            VAL=no
+            ;;
+        -embedded)
+            VAR=embedded
+            # this option may or may not be followed by an argument
+            if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
+                VAL=auto
+            else
+                shift;
+                VAL=$1
+            fi
+            ;;
+        h|help|--help|-help)
+            if [ "$VAL" = "yes" ]; then
+                OPT_HELP="$VAL"
+                COMMERCIAL_USER="yes" #doesn't matter we will display the help
+            else
+                UNKNOWN_OPT=yes
+                COMMERCIAL_USER="yes" #doesn't matter we will display the help
+            fi
+            ;;
+        --*)
+            VAR=`echo $1 | sed "s,^--\(.*\),\1,"`
+            VAL=yes
+            ;;
+        -*)
+            VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+            VAL="unknown"
+            ;;
+        *)
+            UNKNOWN_ARG=yes
+            ;;
+        esac
+        if [ "$UNKNOWN_ARG" = "yes" ]; then
+            shift
+            continue
+        fi
+        shift
+
+        UNKNOWN_OPT=no
+        case "$VAR" in
+        embedded)
+            CFG_EMBEDDED="$VAL"
+            if [ "$PLATFORM_QWS" != "no" ]; then
+                if [ "$PLATFORM_QWS" = "maybe" ]; then
+                    PLATFORM_X11=no
+                    PLATFORM_MAC=no
+                    PLATFORM_QWS=yes
+                fi
+            else
+                echo "No license exists to enable Qt for Embedded Linux. Disabling."
+                CFG_EMBEDDED=no
+            fi
+            ;;
+        developer-build)
+            CFG_DEV="yes"
+            ;;
+        nokia-developer)
+            CFG_DEV="yes"
+            CFG_NOKIA="yes"
+            COMMERCIAL_USER="no"
+            ;;
+        commercial)
+            COMMERCIAL_USER="yes"
+            ;;
+        opensource)
+            COMMERCIAL_USER="no"
+            ;;
+        *)
+            UNKNOWN_OPT=yes
+            ;;
+        esac
+    done
+}
+
+earlyArgParse "$@"
+
+if [ "$COMMERCIAL_USER" = "ask" ]; then
+    while true; do
+        echo "Which edition of Qt do you want to use ?"
+        echo
+        echo "Type 'c' if you want to use the Commercial Edition."
+        echo "Type 'o' if you want to use the Open Source Edition."
+        echo
+        read commercial
+        echo
+        if [ "$commercial" = "c" ]; then
+            COMMERCIAL_USER="yes"
+            break
+        else [ "$commercial" = "o" ];
+            COMMERCIAL_USER="no"
+            break
+        fi
+    done
+fi
+
+if [ "$CFG_NOKIA" = "yes" ]; then
+    Licensee="Nokia"
+    Edition="NokiaInternalBuild"
+    EditionString="Nokia Internal Build"
+    QT_EDITION="QT_EDITION_OPENSOURCE"
+    [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
+elif [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ]; then
+    # Commercial preview release
+    [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
+    Licensee="Preview"
+    Edition="Preview"
+    QT_EDITION="QT_EDITION_DESKTOP"
+    LicenseType="Technology Preview"
+elif [ $COMMERCIAL_USER = "yes" ]; then
+    # one of commercial editions
+    [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
+    [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
+
+    # read in the license file
+    if [ -f "$LICENSE_FILE" ]; then
+        . "$LICENSE_FILE" >/dev/null 2>&1
+        if [ -z "$LicenseKeyExt" ]; then
+            echo
+            echo "You are using an old license file."
+            echo
+            echo "Please install the license file supplied by Qt Software,"
+            echo "or install the Qt Open Source Edition if you intend to"
+            echo "develop free software."
+            exit 1
+        fi
+	if [ -z "$Licensee" ]; then
+	    echo
+	    echo "Invalid license key. Please check the license key."
+	    exit 1
+	fi
+    else
+        if [ -z "$LicenseKeyExt" ]; then
+            echo
+            if echo '\c' | grep '\c' >/dev/null; then
+                echo -n "Please enter your license key: "
+            else
+                echo "Please enter your license key: \c"
+            fi
+            read LicenseKeyExt
+            Licensee="Unknown user"
+        fi
+    fi
+
+    # Key verification
+    echo "$LicenseKeyExt" | grep ".....*-....*-....*-....*-.....*-.....*-...." >/dev/null 2>&1 \
+        && LicenseValid="yes" \
+        || LicenseValid="no"
+    if [ "$LicenseValid" != "yes" ]; then
+        echo
+        echo "Invalid license key. Please check the license key."
+        exit 1
+    fi
+    ProductCode=`echo $LicenseKeyExt | cut -f 1 -d - | cut -b 1`
+    PlatformCode=`echo $LicenseKeyExt | cut -f 2 -d - | cut -b 1`
+    LicenseTypeCode=`echo $LicenseKeyExt | cut -f 3 -d -`
+    LicenseFeatureCode=`echo $LicenseKeyExt | cut -f 4 -d - | cut -b 1`
+
+    # determine which edition we are licensed to use
+    case "$LicenseTypeCode" in
+    F4M)
+        LicenseType="Commercial"
+        case $ProductCode in
+        F)
+            Edition="Universal"
+            QT_EDITION="QT_EDITION_UNIVERSAL"
+            ;;
+        B)
+            Edition="FullFramework"
+            EditionString="Full Framework"
+            QT_EDITION="QT_EDITION_DESKTOP"
+            ;;
+        L)
+            Edition="GUIFramework"
+            EditionString="GUI Framework"
+            QT_EDITION="QT_EDITION_DESKTOPLIGHT"
+            ;;
+        esac
+        ;;
+    Z4M|R4M|Q4M)
+        LicenseType="Evaluation"
+        case $ProductCode in
+         B)
+            Edition="Evaluation"
+            QT_EDITION="QT_EDITION_EVALUATION"
+            ;;
+        esac
+        ;;
+    esac
+    if [ -z "$LicenseType" -o -z "$Edition" -o -z "$QT_EDITION" ]; then
+        echo
+        echo "Invalid license key. Please check the license key."
+        exit 1
+    fi
+
+    # verify that we are licensed to use Qt on this platform
+    LICENSE_EXTENSION=
+    if [ "$PlatformCode" = "X" ]; then
+	# Qt All-OS
+	LICENSE_EXTENSION="-ALLOS"
+    elif [ "$PLATFORM_QWS" = "yes" ]; then
+        case $PlatformCode in
+        2|4|8|A|B|E|G|J|K|P|Q|S|U|V|W)
+            # Qt for Embedded Linux
+            LICENSE_EXTENSION="-EMBEDDED"
+            ;;
+        *)
+            echo
+            echo "You are not licensed for Qt for Embedded Linux."
+            echo
+            echo "Please contact sales@trolltech.com to upgrade your license"
+            echo "to include Qt for Embedded Linux, or install the"
+            echo "Qt Open Source Edition if you intend to develop free software."
+            exit 1
+            ;;
+        esac
+    elif [ "$PLATFORM_MAC" = "yes" ]; then
+        case $PlatformCode in
+        2|4|5|7|9|B|C|E|F|G|L|M|U|W|Y)
+            # Qt/Mac
+            LICENSE_EXTENSION="-DESKTOP"
+            ;;
+        3|6|8|A|D|H|J|K|P|Q|S|V)
+            # Embedded no-deploy
+            LICENSE_EXTENSION="-EMBEDDED"
+	    ;;
+        *)
+            echo
+            echo "You are not licensed for the Qt/Mac platform."
+            echo
+            echo "Please contact sales@trolltech.com to upgrade your license"
+            echo "to include the Qt/Mac platform."
+            exit 1
+            ;;
+        esac
+     else
+         case $PlatformCode in
+         2|3|4|5|7|D|E|F|J|M|Q|S|T|V|Z)
+             # Qt/X11
+             LICENSE_EXTENSION="-DESKTOP"
+             ;;
+         6|8|9|A|B|C|G|H|K|P|U|W)
+             # Embedded no-deploy
+             LICENSE_EXTENSION="-EMBEDDED"
+             ;;
+         *)
+             echo
+             echo "You are not licensed for the Qt/X11 platform."
+             echo
+             echo "Please contact sales@trolltech.com to upgrade your license to"
+             echo "include the Qt/X11 platform, or install the Qt Open Source Edition"
+             echo "if you intend to develop free software."
+             exit 1
+             ;;
+        esac
+    fi
+
+    if test -r "$relpath/.LICENSE"; then
+	# Generic, non-final license
+	LICENSE_EXTENSION=""
+	line=`sed 'y/a-z/A-Z/;q' "$relpath"/.LICENSE`
+	case "$line" in
+	    *BETA*)
+		Edition=Beta
+		;;
+	    *TECHNOLOGY?PREVIEW*)
+		Edition=Preview
+		;;
+	    *EVALUATION*)
+		Edition=Evaluation
+		;;
+	    *)
+		echo >&2 "Invalid license files; cannot continue"
+		exit 1
+		;;
+	esac
+	Licensee="$Edition"
+	EditionString="$Edition"
+	QT_EDITION="QT_EDITION_DESKTOP"
+    fi
+
+    case "$LicenseFeatureCode" in
+    G|L)
+        # US
+        case "$LicenseType" in
+        Commercial)
+            cp -f "$relpath/.LICENSE${LICENSE_EXTENSION}-US" "$outpath/LICENSE"
+            ;;
+        Evaluation)
+            cp -f "$relpath/.LICENSE-EVALUATION-US" "$outpath/LICENSE"
+            ;;
+        esac
+        ;;
+    2|5)
+        # non-US
+        case "$LicenseType" in
+        Commercial)
+            cp -f "$relpath/.LICENSE${LICENSE_EXTENSION}" "$outpath/LICENSE"
+            ;;
+        Evaluation)
+            cp -f "$relpath/.LICENSE-EVALUATION" "$outpath/LICENSE"
+            ;;
+        esac
+        ;;
+    *)
+        echo
+        echo "Invalid license key. Please check the license key."
+        exit 1
+        ;;
+    esac
+    if [ '!' -f "$outpath/LICENSE" ]; then
+        echo "The LICENSE, LICENSE.GPL3 LICENSE.LGPL file shipped with"
+        echo "this software has disappeared."
+        echo
+        echo "Sorry, you are not licensed to use this software."
+        echo "Try re-installing."
+        echo
+        exit 1
+    fi
+elif [ $COMMERCIAL_USER = "no" ]; then
+    # Open Source edition - may only be used under the terms of the GPL or LGPL.
+    [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
+    Licensee="Open Source"
+    Edition="OpenSource"
+    EditionString="Open Source"
+    QT_EDITION="QT_EDITION_OPENSOURCE"
+fi
+
+#-------------------------------------------------------------------------------
+# initalize variables
+#-------------------------------------------------------------------------------
+
+SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS"
+for varname in $SYSTEM_VARIABLES; do
+    cmd=`echo \
+'if [ -n "\$'${varname}'" ]; then
+    QMakeVar set QMAKE_'${varname}' "\$'${varname}'"
+fi'`
+    eval "$cmd"
+done
+# Use CC/CXX to run config.tests
+mkdir -p "$outpath/config.tests"
+rm -f "$outpath/config.tests/.qmake.cache"
+cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
+
+QMakeVar add styles "cde mac motif plastique cleanlooks windows"
+QMakeVar add decorations "default windows styled"
+QMakeVar add gfx-drivers "linuxfb"
+QMakeVar add kbd-drivers "tty"
+QMakeVar add mouse-drivers "pc linuxtp"
+
+if [ "$CFG_DEV" = "yes" ]; then
+    QMakeVar add kbd-drivers "um"
+fi
+
+# QTDIR may be set and point to an old or system-wide Qt installation
+unset QTDIR
+
+# the minimum version of libdbus-1 that we require:
+MIN_DBUS_1_VERSION=0.62
+
+# initalize internal variables
+CFG_CONFIGURE_EXIT_ON_ERROR=yes
+CFG_PROFILE=no
+CFG_EXCEPTIONS=unspecified
+CFG_SCRIPTTOOLS=auto # (yes|no|auto)
+CFG_XMLPATTERNS=auto # (yes|no|auto)
+CFG_INCREMENTAL=auto
+CFG_QCONFIG=full
+CFG_DEBUG=auto
+CFG_MYSQL_CONFIG=
+CFG_DEBUG_RELEASE=no
+CFG_SHARED=yes
+CFG_SM=auto
+CFG_XSHAPE=auto
+CFG_XINERAMA=runtime
+CFG_XFIXES=runtime
+CFG_ZLIB=auto
+CFG_SQLITE=qt
+CFG_GIF=auto
+CFG_TIFF=auto
+CFG_LIBTIFF=auto
+CFG_PNG=yes
+CFG_LIBPNG=auto
+CFG_JPEG=auto
+CFG_LIBJPEG=auto
+CFG_MNG=auto
+CFG_LIBMNG=auto
+CFG_XCURSOR=runtime
+CFG_XRANDR=runtime
+CFG_XRENDER=auto
+CFG_MITSHM=auto
+CFG_OPENGL=auto
+CFG_SSE=auto
+CFG_FONTCONFIG=auto
+CFG_QWS_FREETYPE=auto
+CFG_LIBFREETYPE=auto
+CFG_SQL_AVAILABLE=
+QT_DEFAULT_BUILD_PARTS="libs tools examples demos docs translations"
+CFG_BUILD_PARTS=""
+CFG_NOBUILD_PARTS=""
+CFG_RELEASE_QMAKE=no
+CFG_PHONON=auto
+CFG_PHONON_BACKEND=yes
+CFG_SVG=yes
+CFG_WEBKIT=auto # (yes|no|auto)
+
+CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen"
+CFG_GFX_ON="linuxfb multiscreen"
+CFG_GFX_PLUGIN_AVAILABLE=
+CFG_GFX_PLUGIN=
+CFG_GFX_OFF=
+CFG_KBD_AVAILABLE="tty usb sl5000 yopy vr41xx qvfb"
+CFG_KBD_ON="tty"    #default, see QMakeVar above
+CFG_MOUSE_AVAILABLE="pc bus linuxtp yopy vr41xx tslib qvfb"
+CFG_MOUSE_ON="pc linuxtp"   #default, see QMakeVar above
+
+CFG_ARCH=
+CFG_HOST_ARCH=
+CFG_KBD_PLUGIN_AVAILABLE=
+CFG_KBD_PLUGIN=
+CFG_KBD_OFF=
+CFG_MOUSE_PLUGIN_AVAILABLE=
+CFG_MOUSE_PLUGIN=
+CFG_MOUSE_OFF=
+CFG_USE_GNUMAKE=no
+CFG_IM=yes
+CFG_DECORATION_AVAILABLE="styled windows default"
+CFG_DECORATION_ON="${CFG_DECORATION_AVAILABLE}" # all on by default
+CFG_DECORATION_PLUGIN_AVAILABLE=
+CFG_DECORATION_PLUGIN=
+CFG_XINPUT=runtime
+CFG_XKB=auto
+CFG_NIS=auto
+CFG_CUPS=auto
+CFG_ICONV=auto
+CFG_DBUS=auto
+CFG_GLIB=auto
+CFG_GSTREAMER=auto
+CFG_QGTKSTYLE=auto
+CFG_LARGEFILE=auto
+CFG_OPENSSL=auto
+CFG_PTMALLOC=no
+CFG_STL=auto
+CFG_PRECOMPILE=auto
+CFG_SEPARATE_DEBUG_INFO=auto
+CFG_REDUCE_EXPORTS=auto
+CFG_MMX=auto
+CFG_3DNOW=auto
+CFG_SSE=auto
+CFG_SSE2=auto
+CFG_REDUCE_RELOCATIONS=no
+CFG_IPV6=auto
+CFG_NAS=no
+CFG_QWS_DEPTHS=all
+CFG_USER_BUILD_KEY=
+CFG_ACCESSIBILITY=auto
+CFG_QT3SUPPORT=yes
+CFG_ENDIAN=auto
+CFG_HOST_ENDIAN=auto
+CFG_DOUBLEFORMAT=auto
+CFG_ARMFPA=auto
+CFG_IWMMXT=no
+CFG_CLOCK_GETTIME=auto
+CFG_CLOCK_MONOTONIC=auto
+CFG_MREMAP=auto
+CFG_GETADDRINFO=auto
+CFG_IPV6IFNAME=auto
+CFG_GETIFADDRS=auto
+CFG_INOTIFY=auto
+CFG_RPATH=yes
+CFG_FRAMEWORK=auto
+CFG_MAC_ARCHS=
+CFG_MAC_DWARF2=auto
+CFG_MAC_XARCH=auto
+CFG_MAC_CARBON=yes
+CFG_MAC_COCOA=auto
+COMMANDLINE_MAC_COCOA=no
+CFG_SXE=no
+CFG_PREFIX_INSTALL=yes
+CFG_SDK=
+D_FLAGS=
+I_FLAGS=
+L_FLAGS=
+RPATH_FLAGS=
+l_FLAGS=
+QCONFIG_FLAGS=
+XPLATFORM=              # This seems to be the QMAKESPEC, like "linux-g++"
+PLATFORM=$QMAKESPEC
+QT_CROSS_COMPILE=no
+OPT_CONFIRM_LICENSE=no
+OPT_SHADOW=maybe
+OPT_FAST=auto
+OPT_VERBOSE=no
+OPT_HELP=
+CFG_SILENT=no
+CFG_GRAPHICS_SYSTEM=default
+
+# initalize variables used for installation
+QT_INSTALL_PREFIX=
+QT_INSTALL_DOCS=
+QT_INSTALL_HEADERS=
+QT_INSTALL_LIBS=
+QT_INSTALL_BINS=
+QT_INSTALL_PLUGINS=
+QT_INSTALL_DATA=
+QT_INSTALL_TRANSLATIONS=
+QT_INSTALL_SETTINGS=
+QT_INSTALL_EXAMPLES=
+QT_INSTALL_DEMOS=
+QT_HOST_PREFIX=
+
+#flags for SQL drivers
+QT_CFLAGS_PSQL=
+QT_LFLAGS_PSQL=
+QT_CFLAGS_MYSQL=
+QT_LFLAGS_MYSQL=
+QT_LFLAGS_MYSQL_R=
+QT_CFLAGS_SQLITE=
+QT_LFLAGS_SQLITE=
+
+# flags for libdbus-1
+QT_CFLAGS_DBUS=
+QT_LIBS_DBUS=
+
+# flags for Glib (X11 only)
+QT_CFLAGS_GLIB=
+QT_LIBS_GLIB=
+
+# flags for GStreamer (X11 only)
+QT_CFLAGS_GSTREAMER=
+QT_LIBS_GSTREAMER=
+
+#-------------------------------------------------------------------------------
+# check SQL drivers, mouse drivers and decorations available in this package
+#-------------------------------------------------------------------------------
+
+# opensource version removes some drivers, so force them to be off
+CFG_SQL_tds=no
+CFG_SQL_oci=no
+CFG_SQL_db2=no
+
+CFG_SQL_AVAILABLE=
+if [ -d "$relpath/src/plugins/sqldrivers" ]; then
+  for a in "$relpath/src/plugins/sqldrivers/"*; do
+     if [ -d "$a" ]; then
+	 base_a=`basename $a`
+  	 CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${base_a}"
+	 eval "CFG_SQL_${base_a}=auto"
+     fi
+  done
+fi
+
+CFG_DECORATION_PLUGIN_AVAILABLE=
+if [ -d "$relpath/src/plugins/decorations" ]; then
+  for a in "$relpath/src/plugins/decorations/"*; do
+     if [ -d "$a" ]; then
+	 base_a=`basename $a`
+  	 CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${base_a}"
+     fi
+  done
+fi
+
+CFG_KBD_PLUGIN_AVAILABLE=
+if [ -d "$relpath/src/plugins/kbddrivers" ]; then
+  for a in "$relpath/src/plugins/kbddrivers/"*; do
+     if [ -d "$a" ]; then
+	 base_a=`basename $a`
+  	 CFG_KBD_PLUGIN_AVAILABLE="${CFG_KBD_PLUGIN_AVAILABLE} ${base_a}"
+     fi
+  done
+fi
+
+CFG_MOUSE_PLUGIN_AVAILABLE=
+if [ -d "$relpath/src/plugins/mousedrivers" ]; then
+  for a in "$relpath/src/plugins/mousedrivers/"*; do
+     if [ -d "$a" ]; then
+	 base_a=`basename $a`
+  	 CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${base_a}"
+     fi
+  done
+fi
+
+CFG_GFX_PLUGIN_AVAILABLE=
+if [ -d "$relpath/src/plugins/gfxdrivers" ]; then
+  for a in "$relpath/src/plugins/gfxdrivers/"*; do
+     if [ -d "$a" ]; then
+	 base_a=`basename $a`
+  	 CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${base_a}"
+     fi
+  done
+  CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off
+fi
+
+#-------------------------------------------------------------------------------
+# parse command line arguments
+#-------------------------------------------------------------------------------
+
+# parse the arguments, setting things to "yes" or "no"
+while [ "$#" -gt 0 ]; do
+    CURRENT_OPT="$1"
+    UNKNOWN_ARG=no
+    case "$1" in
+    #Autoconf style options
+    --enable-*)
+        VAR=`echo $1 | sed "s,^--enable-\(.*\),\1,"`
+        VAL=yes
+        ;;
+    --disable-*)
+        VAR=`echo $1 | sed "s,^--disable-\(.*\),\1,"`
+        VAL=no
+        ;;
+    --*=*)
+        VAR=`echo $1 | sed "s,^--\(.*\)=.*,\1,"`
+        VAL=`echo $1 | sed "s,^--.*=\(.*\),\1,"`
+        ;;
+    --no-*)
+        VAR=`echo $1 | sed "s,^--no-\(.*\),\1,"`
+        VAL=no
+        ;;
+    --*)
+        VAR=`echo $1 | sed "s,^--\(.*\),\1,"`
+        VAL=yes
+        ;;
+    #Qt plugin options
+    -no-*-*|-plugin-*-*|-qt-*-*)
+        VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"`
+        VAL=`echo $1 | sed "s,^-\([^-]*\).*,\1,"`
+        ;;
+    #Qt style no options
+    -no-*)
+        VAR=`echo $1 | sed "s,^-no-\(.*\),\1,"`
+        VAL=no
+        ;;
+    #Qt style yes options
+        -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-svg|-webkit|-scripttools|-rpath|-force-pkg-config)
+        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+        VAL=yes
+        ;;
+    #Qt style options that pass an argument
+    -qconfig)
+        if [ "$PLATFORM_QWS" = "yes" ]; then
+            CFG_QCONFIG="$VAL"
+            VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+            shift
+            VAL=$1
+        else
+            UNKNOWN_ARG=yes
+        fi
+        ;;
+    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
+        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+        shift
+        VAL="$1"
+        ;;
+    #Qt style complex options in one command
+    -enable-*|-disable-*)
+        VAR=`echo $1 | sed "s,^-\([^-]*\)-.*,\1,"`
+        VAL=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"`
+        ;;
+    #Qt Builtin/System style options
+    -no-*|-system-*|-qt-*)
+        VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"`
+        VAL=`echo $1 | sed "s,^-\([^-]*\)-.*,\1,"`
+        ;;
+    #Options that cannot be generalized
+    -k|-continue)
+        VAR=fatal_error
+        VAL=no
+        ;;
+    -embedded)
+        VAR=embedded
+        # this option may or may not be followed by an argument
+        if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
+            VAL=auto
+        else
+            shift;
+            VAL=$1
+        fi
+	;;
+    -opengl)
+        VAR=opengl
+        # this option may or may not be followed by an argument
+        if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
+            VAL=yes
+        else
+            shift;
+            VAL=$1
+        fi
+	;;
+    -hostprefix)
+        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+        # this option may or may not be followed by an argument
+        if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
+            VAL=$outpath
+        else
+            shift;
+            VAL=$1
+        fi
+        ;;
+    -host-*-endian)
+        VAR=host_endian
+        VAL=`echo $1 | sed "s,^-.*-\(.*\)-.*,\1,"`
+        ;;
+    -*-endian)
+        VAR=endian
+        VAL=`echo $1 | sed "s,^-\(.*\)-.*,\1,"`
+        ;;
+    -qtnamespace)
+        VAR="qtnamespace"
+        shift
+        VAL="$1"
+        ;;
+    -graphicssystem)
+	VAR="graphicssystem"
+	shift
+	VAL=$1
+	;;
+    -qtlibinfix)
+        VAR="qtlibinfix"
+        shift
+        VAL="$1"
+        ;;
+    -D?*|-D)
+        VAR="add_define"
+        if [ "$1" = "-D" ]; then
+            shift
+            VAL="$1"
+        else
+            VAL=`echo $1 | sed 's,-D,,'`
+        fi
+        ;;
+    -I?*|-I)
+        VAR="add_ipath"
+        if [ "$1" = "-I" ]; then
+            shift
+            VAL="$1"
+        else
+            VAL=`echo $1 | sed 's,-I,,'`
+        fi
+        ;;
+    -L?*|-L)
+        VAR="add_lpath"
+        if [ "$1" = "-L" ]; then
+            shift
+            VAL="$1"
+        else
+            VAL=`echo $1 | sed 's,-L,,'`
+        fi
+        ;;
+    -R?*|-R)
+        VAR="add_rpath"
+        if [ "$1" = "-R" ]; then
+            shift
+            VAL="$1"
+        else
+            VAL=`echo $1 | sed 's,-R,,'`
+        fi
+        ;;
+    -l?*)
+        VAR="add_link"
+        VAL=`echo $1 | sed 's,-l,,'`
+        ;;
+    -F?*|-F)
+        VAR="add_fpath"
+        if [ "$1" = "-F" ]; then
+            shift
+            VAL="$1"
+        else
+            VAL=`echo $1 | sed 's,-F,,'`
+        fi
+        ;;
+    -fw?*|-fw)
+        VAR="add_framework"
+        if [ "$1" = "-fw" ]; then
+            shift
+            VAL="$1"
+        else
+            VAL=`echo $1 | sed 's,-fw,,'`
+        fi
+        ;;
+    -*)
+        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+        VAL="unknown"
+        ;;
+    *)
+        UNKNOWN_ARG=yes
+        ;;
+    esac
+    if [ "$UNKNOWN_ARG" = "yes" ]; then
+        echo "$1: unknown argument"
+        OPT_HELP=yes
+        ERROR=yes
+        shift
+        continue
+     fi
+    shift
+
+    UNKNOWN_OPT=no
+    case "$VAR" in
+    qt3support)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_QT3SUPPORT="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    accessibility)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_ACCESSIBILITY="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    license)
+	LICENSE_FILE="$VAL"
+	;;
+    gnumake)
+        CFG_USE_GNUMAKE="$VAL"
+        ;;
+    mysql_config)
+	CFG_MYSQL_CONFIG="$VAL"
+	;;
+    prefix)
+        QT_INSTALL_PREFIX="$VAL"
+        ;;
+    hostprefix)
+	QT_HOST_PREFIX="$VAL"
+	;;
+    force-pkg-config)
+        QT_FORCE_PKGCONFIG=yes
+        ;;
+    docdir)
+        QT_INSTALL_DOCS="$VAL"
+        ;;
+    headerdir)
+        QT_INSTALL_HEADERS="$VAL"
+        ;;
+    plugindir)
+        QT_INSTALL_PLUGINS="$VAL"
+        ;;
+    datadir)
+        QT_INSTALL_DATA="$VAL"
+        ;;
+    libdir)
+        QT_INSTALL_LIBS="$VAL"
+        ;;
+    qtnamespace)
+        QT_NAMESPACE="$VAL"
+        ;;
+    qtlibinfix)
+        QT_LIBINFIX="$VAL"
+        ;;
+    translationdir)
+        QT_INSTALL_TRANSLATIONS="$VAL"
+        ;;
+    sysconfdir|settingsdir)
+        QT_INSTALL_SETTINGS="$VAL"
+        ;;
+    examplesdir)
+        QT_INSTALL_EXAMPLES="$VAL"
+        ;;
+    demosdir)
+        QT_INSTALL_DEMOS="$VAL"
+        ;;
+    qconfig)
+        CFG_QCONFIG="$VAL"
+        ;;
+    bindir)
+        QT_INSTALL_BINS="$VAL"
+        ;;
+    buildkey)
+        CFG_USER_BUILD_KEY="$VAL"
+        ;;
+    sxe)
+	CFG_SXE="$VAL"
+        ;;
+    embedded)
+        CFG_EMBEDDED="$VAL"
+        if [ "$PLATFORM_QWS" != "no" ]; then
+            if [ "$PLATFORM_QWS" = "maybe" ]; then
+                PLATFORM_X11=no
+                PLATFORM_MAC=no
+                PLATFORM_QWS=yes
+            fi
+        else
+            echo "No license exists to enable Qt for Embedded Linux. Disabling."
+            CFG_EMBEDDED=no
+        fi
+        ;;
+    sse)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_SSE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+	;;
+    endian)
+        if [ "$VAL" = "little" ]; then
+            CFG_ENDIAN="Q_LITTLE_ENDIAN"
+        elif [ "$VAL" = "big" ]; then
+            CFG_ENDIAN="Q_BIG_ENDIAN"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    host_endian)
+        if [ "$VAL" = "little" ]; then
+            CFG_HOST_ENDIAN="Q_LITTLE_ENDIAN"
+        elif [ "$VAL" = "big" ]; then
+            CFG_HOST_ENDIAN="Q_BIG_ENDIAN"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    armfpa)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_ARMFPA="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    depths)
+        CFG_QWS_DEPTHS="$VAL"
+        ;;
+    opengl)
+        if  [ "$VAL" = "auto" ] || [ "$VAL" = "desktop" ] ||
+            [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] ||
+            [ "$VAL" = "es1cl" ] || [ "$VAL" = "es1" ] || [ "$VAL" = "es2" ]; then
+            CFG_OPENGL="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    graphicssystem)
+        if [ "$PLATFORM_QWS" = "yes" ]; then
+            echo "Error: Graphics System plugins are not supported on QWS."
+            echo "   On QWS, the graphics system API is part of the QScreen plugin architecture "
+            echo "   rather than existing as a separate plugin."
+            echo ""
+            UNKNOWN_OPT=yes
+        else
+            if  [ "$VAL" = "opengl" ]; then
+                CFG_GRAPHICS_SYSTEM="opengl"
+            elif [ "$VAL" = "raster" ]; then
+                CFG_GRAPHICS_SYSTEM="raster"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        fi
+	;;
+	    
+    qvfb) # left for commandline compatibility, not documented
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            if [ "$VAL" = "yes" ]; then
+		QMakeVar add gfx-drivers qvfb
+		QMakeVar add kbd-drivers qvfb
+		QMakeVar add mouse-drivers qvfb
+                CFG_GFX_ON="$CFG_GFX_ON qvfb"
+                CFG_KBD_ON="$CFG_KBD_ON qvfb"
+                CFG_MOUSE_ON="$CFG_MOUSE_ON qvfb"
+            fi
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    nomake)
+	CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS $VAL"
+        ;;
+    make)
+	CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL"
+        ;;
+    x11)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            PLATFORM_MAC=no
+        elif [ "$PLATFORM_QWS" = "yes" ]; then
+            PLATFORM_QWS=no
+        fi
+        if [ "$CFG_FRAMEWORK" = "auto" ]; then
+            CFG_FRAMEWORK=no
+        fi
+        PLATFORM_X11=yes
+        ;;
+    sdk)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            CFG_SDK="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+	;;
+     dwarf2)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_MAC_DWARF2="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+	;;
+    arch)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            CFG_MAC_ARCHS="$CFG_MAC_ARCHS $VAL"
+        else
+            CFG_ARCH=$VAL
+        fi
+        ;;
+    host-arch)
+        CFG_HOST_ARCH=$VAL
+        ;;
+    universal)
+        if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then
+            CFG_MAC_ARCHS="$CFG_MAC_ARCHS x86 ppc"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    cocoa)
+        if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then
+            CFG_MAC_COCOA="$VAL"
+            COMMANDLINE_MAC_COCOA="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    framework)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            CFG_FRAMEWORK="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    profile)
+        if [ "$VAL" = "yes" ]; then
+            CFG_PROFILE=yes
+	    QMakeVar add QMAKE_CFLAGS -pg
+	    QMakeVar add QMAKE_CXXFLAGS -pg
+	    QMakeVar add QMAKE_LFLAGS -pg
+            QMAKE_VARS="$QMAKE_VARS CONFIG+=nostrip"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    exceptions|g++-exceptions)
+        if [ "$VAL" = "no" ]; then
+            CFG_EXCEPTIONS=no
+        elif [ "$VAL" = "yes" ]; then
+            CFG_EXCEPTIONS=yes
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    platform)
+        PLATFORM="$VAL"
+        # keep compatibility with old platform names
+        case $PLATFORM in
+        aix-64)
+            PLATFORM=aix-xlc-64
+            ;;
+        hpux-o64)
+            PLATFORM=hpux-acc-o64
+            ;;
+        hpux-n64)
+            PLATFORM=hpux-acc-64
+            ;;
+        hpux-acc-n64)
+            PLATFORM=hpux-acc-64
+            ;;
+        irix-n32)
+            PLATFORM=irix-cc
+            ;;
+        irix-64)
+            PLATFORM=irix-cc-64
+            ;;
+        irix-cc-n64)
+            PLATFORM=irix-cc-64
+            ;;
+        reliant-64)
+            PLATFORM=reliant-cds-64
+            ;;
+        solaris-64)
+            PLATFORM=solaris-cc-64
+            ;;
+        solaris-64)
+            PLATFORM=solaris-cc-64
+            ;;
+        openunix-cc)
+            PLATFORM=unixware-cc
+            ;;
+        openunix-g++)
+            PLATFORM=unixware-g++
+            ;;
+        unixware7-cc)
+            PLATFORM=unixware-cc
+            ;;
+        unixware7-g++)
+            PLATFORM=unixware-g++
+            ;;
+        macx-g++-64)
+            PLATFORM=macx-g++
+	    NATIVE_64_ARCH=
+            case `uname -p` in
+            i386) NATIVE_64_ARCH="x86_64" ;;
+            powerpc) NATIVE_64_ARCH="ppc64" ;;
+            *)   echo "WARNING: Can't detect CPU architecture for macx-g++-64" ;;
+            esac
+	    if [ ! -z "$NATIVE_64_ARCH" ]; then
+		QTCONFIG_CONFIG="$QTCONFIG_CONFIG $NATIVE_64_ARCH"
+		CFG_MAC_ARCHS="$CFG_MAC_ARCHS $NATIVE_64_ARCH"
+            fi
+            ;;
+        esac
+        ;;
+    xplatform)
+        XPLATFORM="$VAL"
+        ;;
+    debug-and-release)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_DEBUG_RELEASE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    optimized-qmake)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_RELEASE_QMAKE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    release)
+        if [ "$VAL" = "yes" ]; then
+            CFG_DEBUG=no
+        elif [ "$VAL" = "no" ]; then
+            CFG_DEBUG=yes
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    prefix-install)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+	    CFG_PREFIX_INSTALL="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+	;;
+    debug)
+        CFG_DEBUG="$VAL"
+        ;;
+    developer-build|commercial|opensource|nokia-developer)
+        # These switches have been dealt with already
+        ;;
+    static)
+        if [ "$VAL" = "yes" ]; then
+            CFG_SHARED=no
+        elif [ "$VAL" = "no" ]; then
+            CFG_SHARED=yes
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    incremental)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_INCREMENTAL="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    fatal_error)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_CONFIGURE_EXIT_ON_ERROR="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    feature-*)
+        if [ "$PLATFORM_QWS" = "yes" ]; then
+            FEATURE=`echo $VAR | sed "s,^[^-]*-\([^-]*\),\1," | tr 'abcdefghijklmnopqrstuvwxyz-' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+            if [ "$VAL" = "no" ]; then
+                QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_$FEATURE"
+            elif [ "$VAL" = "yes" ] || [ "$VAL" = "unknown" ]; then
+                QCONFIG_FLAGS="$QCONFIG_FLAGS QT_$FEATURE"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    shared)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_SHARED="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    gif)
+        [ "$VAL" = "qt" ] && VAL=yes
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_GIF="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    sm)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_SM="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+
+        ;;
+    xinerama)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
+            CFG_XINERAMA="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xshape)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_XSHAPE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xinput)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
+            CFG_XINPUT="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    stl)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_STL="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    pch)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_PRECOMPILE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    separate-debug-info)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_SEPARATE_DEBUG_INFO="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    reduce-exports)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_REDUCE_EXPORTS="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    mmx)
+        if [ "$VAL" = "no" ]; then
+            CFG_MMX="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    3dnow)
+        if [ "$VAL" = "no" ]; then
+            CFG_3DNOW="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    sse)
+        if [ "$VAL" = "no" ]; then
+            CFG_SSE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    sse2)
+        if [ "$VAL" = "no" ]; then
+            CFG_SSE2="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    iwmmxt)
+	CFG_IWMMXT="yes"
+	;;
+    reduce-relocations)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_REDUCE_RELOCATIONS="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    freetype)
+        [ "$VAL" = "qt" ] && VAL=yes
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+            CFG_QWS_FREETYPE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    zlib)
+        [ "$VAL" = "qt" ] && VAL=yes
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+            CFG_ZLIB="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        # No longer supported:
+        #[ "$VAL" = "no" ] && CFG_LIBPNG=no
+        ;;
+    sqlite)
+        if [ "$VAL" = "system" ]; then
+            CFG_SQLITE=system
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    libpng)
+        [ "$VAL" = "yes" ] && VAL=qt
+        if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+            CFG_LIBPNG="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    libjpeg)
+        [ "$VAL" = "yes" ] && VAL=qt
+        if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+            CFG_LIBJPEG="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    libmng)
+        [ "$VAL" = "yes" ] && VAL=qt
+        if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+            CFG_LIBMNG="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    libtiff)
+        [ "$VAL" = "yes" ] && VAL=qt
+        if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+            CFG_LIBTIFF="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    nas-sound)
+        if [ "$VAL" = "system" ] || [ "$VAL" = "no" ]; then
+            CFG_NAS="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xcursor)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
+            CFG_XCURSOR="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xfixes)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
+            CFG_XFIXES="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xrandr)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
+            CFG_XRANDR="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xrender)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_XRENDER="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    mitshm)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_MITSHM="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    fontconfig)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_FONTCONFIG="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xkb)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_XKB="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    cups)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_CUPS="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    iconv)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_ICONV="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    glib)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_GLIB="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    gstreamer)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_GSTREAMER="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    gtkstyle)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_QGTKSTYLE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    qdbus|dbus)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then
+            CFG_DBUS="$VAL"
+	elif [ "$VAL" = "runtime" ]; then
+	    CFG_DBUS="yes"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    dbus-linked)
+        if [ "$VAL" = "yes" ]; then
+	    CFG_DBUS="linked"
+	else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    nis)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_NIS="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    largefile)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_LARGEFILE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    openssl)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_OPENSSL="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    openssl-linked)
+        if [ "$VAL" = "yes" ]; then
+            CFG_OPENSSL="linked"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    ptmalloc)
+        if [ "$VAL" = "yes" ]; then
+            CFG_PTMALLOC="yes"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+
+    xmlpatterns)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
+            CFG_XMLPATTERNS="yes"
+        else
+            if [ "$VAL" = "no" ]; then
+                CFG_XMLPATTERNS="no"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        fi
+        ;;
+    scripttools)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
+            CFG_SCRIPTTOOLS="yes"
+        else
+            if [ "$VAL" = "no" ]; then
+                CFG_SCRIPTTOOLS="no"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        fi
+        ;;
+    svg)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
+            CFG_SVG="yes"
+        else
+            if [ "$VAL" = "no" ]; then
+                CFG_SVG="no"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        fi
+	;;
+    webkit)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
+            CFG_WEBKIT="yes"
+        else
+            if [ "$VAL" = "no" ]; then
+                CFG_WEBKIT="no"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        fi
+        ;;
+    confirm-license)
+        if [ "$VAL" = "yes" ]; then
+            OPT_CONFIRM_LICENSE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    h|help)
+        if [ "$VAL" = "yes" ]; then
+            OPT_HELP="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    sql-*|gfx-*|decoration-*|kbd-*|mouse-*)
+        # if Qt style options were used, $VAL can be "no", "qt", or "plugin"
+        # if autoconf style options were used, $VAL can be "yes" or "no"
+        [ "$VAL" = "yes" ] && VAL=qt
+        # now $VAL should be "no", "qt", or "plugin"... double-check
+        if [ "$VAL" != "no" ] && [ "$VAL" != "qt" ] && [ "$VAL" != "plugin" ]; then
+            UNKNOWN_OPT=yes
+        fi
+        # now $VAL is "no", "qt", or "plugin"
+        OPT="$VAL"
+        VAL=`echo $VAR | sed "s,^[^-]*-\([^-]*\).*,\1,"`
+        VAR=`echo $VAR | sed "s,^\([^-]*\).*,\1,"`
+
+        # Grab the available values
+        case "$VAR" in
+        sql)
+            avail="$CFG_SQL_AVAILABLE"
+            ;;
+        gfx)
+            avail="$CFG_GFX_AVAILABLE"
+	    if [ "$OPT" = "plugin" ]; then
+		avail="$CFG_GFX_PLUGIN_AVAILABLE"
+	    fi
+            ;;
+        decoration)
+            avail="$CFG_DECORATION_AVAILABLE"
+	    if [ "$OPT" = "plugin" ]; then
+		avail="$CFG_DECORATION_PLUGIN_AVAILABLE"
+	    fi
+            ;;
+        kbd)
+            avail="$CFG_KBD_AVAILABLE"
+	    if [ "$OPT" = "plugin" ]; then
+		avail="$CFG_KBD_PLUGIN_AVAILABLE"
+	    fi
+            ;;
+        mouse)
+            avail="$CFG_MOUSE_AVAILABLE"
+	    if [ "$OPT" = "plugin" ]; then
+		avail="$CFG_MOUSE_PLUGIN_AVAILABLE"
+	    fi
+            ;;
+        *)
+            avail=""
+            echo "BUG: Unhandled type $VAR used in $CURRENT_OPT"
+            ;;
+        esac
+
+        # Check that that user's value is available.
+        found=no
+        for d in $avail; do
+            if [ "$VAL" = "$d" ]; then
+                found=yes
+                break
+            fi
+        done
+        [ "$found" = yes ] || ERROR=yes
+
+        if [ "$VAR" = "sql" ]; then
+            # set the CFG_SQL_driver
+            eval "CFG_SQL_$VAL=\$OPT"
+            continue
+        fi
+
+        if [ "$OPT" = "plugin" ] || [ "$OPT" = "qt" ]; then
+            if [ "$OPT" = "plugin" ]; then
+                [ "$VAR" = "decoration" ] && QMakeVar del "${VAR}s" "$VAL"
+                [ "$VAR" = "decoration" ] && CFG_DECORATION_ON=`echo "${CFG_DECORATION_ON} " | sed "s,${VAL} ,,g"` && CFG_DECORATION_PLUGIN="$CFG_DECORATION_PLUGIN ${VAL}"
+                [ "$VAR" = "kbd" ] && QMakeVar del "${VAR}s" "$VAL"
+                [ "$VAR" = "kbd" ] && CFG_KBD_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` && CFG_KBD_PLUGIN="$CFG_KBD_PLUGIN ${VAL}"
+                [ "$VAR" = "mouse" ] && QMakeVar del "${VAR}s" "$VAL"
+                [ "$VAR" = "mouse" ] && CFG_MOUSE_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` && CFG_MOUSE_PLUGIN="$CFG_MOUSE_PLUGIN ${VAL}"
+                [ "$VAR" = "gfx" ] && QMakeVar del "${VAR}s" "$VAL"
+                [ "$VAR" = "gfx" ] && CFG_GFX_ON=`echo "${CFG_GFX_ON} " | sed "s,${VAL} ,,g"` && CFG_GFX_PLUGIN="${CFG_GFX_PLUGIN} ${VAL}"
+                VAR="${VAR}-${OPT}"
+            else
+                if [ "$VAR" = "gfx" ] || [ "$VAR" = "kbd" ] || [ "$VAR" = "decoration" ] || [ "$VAR" = "mouse" ]; then
+                    [ "$VAR" = "gfx" ] && CFG_GFX_ON="$CFG_GFX_ON $VAL"
+                    [ "$VAR" = "kbd" ] && CFG_KBD_ON="$CFG_KBD_ON $VAL"
+		    [ "$VAR" = "decoration" ] && CFG_DECORATION_ON="$CFG_DECORATION_ON $VAL"
+                    [ "$VAR" = "mouse" ] && CFG_MOUSE_ON="$CFG_MOUSE_ON $VAL"
+                    VAR="${VAR}-driver"
+                fi
+            fi
+	    QMakeVar add "${VAR}s" "${VAL}"
+        elif [ "$OPT" = "no" ]; then
+            PLUG_VAR="${VAR}-plugin"
+            if [ "$VAR" = "gfx" ] || [ "$VAR" = "kbd" ] || [ "$VAR" = "mouse" ]; then
+                IN_VAR="${VAR}-driver"
+            else
+                IN_VAR="${VAR}"
+            fi
+            [ "$VAR" = "decoration" ] && CFG_DECORATION_ON=`echo "${CFG_DECORATION_ON} " | sed "s,${VAL} ,,g"`
+            [ "$VAR" = "gfx" ] && CFG_GFX_ON=`echo "${CFG_GFX_ON} " | sed "s,${VAL} ,,g"`
+            [ "$VAR" = "kbd" ] && CFG_KBD_ON=`echo "${CFG_KBD_ON} " | sed "s,${VAL} ,,g"`
+            [ "$VAR" = "mouse" ] && CFG_MOUSE_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"`
+	    QMakeVar del "${IN_VAR}s" "$VAL"
+	    QMakeVar del "${PLUG_VAR}s" "$VAL"
+        fi
+        if [ "$ERROR" = "yes" ]; then
+           echo "$CURRENT_OPT: unknown argument"
+           OPT_HELP=yes
+        fi
+        ;;
+    v|verbose)
+        if [ "$VAL" = "yes" ]; then
+            if [ "$OPT_VERBOSE" = "$VAL" ]; then            # takes two verboses to turn on qmake debugs
+                QMAKE_SWITCHES="$QMAKE_SWITCHES -d"
+            else
+                OPT_VERBOSE=yes
+            fi
+        elif [ "$VAL" = "no" ]; then
+            if [ "$OPT_VERBOSE" = "$VAL" ] && echo "$QMAKE_SWITCHES" | grep ' -d' >/dev/null 2>&1; then
+                QMAKE_SWITCHES=`echo $QMAKE_SWITCHES | sed "s, -d,,"`
+            else
+                OPT_VERBOSE=no
+            fi
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    fast)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            OPT_FAST="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    rpath)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_RPATH="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    add_define)
+        D_FLAGS="$D_FLAGS \"$VAL\""
+        ;;
+    add_ipath)
+        I_FLAGS="$I_FLAGS -I\"${VAL}\""
+        ;;
+    add_lpath)
+        L_FLAGS="$L_FLAGS -L\"${VAL}\""
+        ;;
+    add_rpath)
+        RPATH_FLAGS="$RPATH_FLAGS \"${VAL}\""
+        ;;
+    add_link)
+        l_FLAGS="$l_FLAGS -l\"${VAL}\""
+        ;;
+    add_fpath)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            L_FLAGS="$L_FLAGS -F\"${VAL}\""
+            I_FLAGS="$I_FLAGS -F\"${VAL}\""
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    add_framework)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            l_FLAGS="$l_FLAGS -framework \"${VAL}\""
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    silent)
+        CFG_SILENT="$VAL"
+        ;;
+    phonon)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_PHONON="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    phonon-backend)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_PHONON_BACKEND="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    *)
+        UNKNOWN_OPT=yes
+        ;;
+    esac
+    if [ "$UNKNOWN_OPT" = "yes" ]; then
+        echo "${CURRENT_OPT}: invalid command-line switch"
+        OPT_HELP=yes
+        ERROR=yes
+    fi
+done
+
+if [ "$CFG_QCONFIG" != "full" ] && [ "$CFG_QT3SUPPORT" = "yes" ]; then
+    echo "Warning: '-qconfig $CFG_QCONFIG' will disable the qt3support library."
+    CFG_QT3SUPPORT="no"
+fi
+
+# update QT_CONFIG to show our current predefined configuration
+case "$CFG_QCONFIG" in
+minimal|small|medium|large|full)
+    # these are a sequence of increasing functionality
+    for c in minimal small medium large full; do
+        QT_CONFIG="$QT_CONFIG $c-config"
+        [ "$CFG_QCONFIG" = $c ] && break
+    done
+    ;;
+*)
+    # not known to be sufficient for anything
+    if [ '!' -f "$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" ]; then
+        echo >&2 "Error: configuration file not found:"
+        echo >&2 "  $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h"
+        OPT_HELP=yes
+    fi
+esac
+
+#-------------------------------------------------------------------------------
+# build tree initialization
+#-------------------------------------------------------------------------------
+
+# where to find which..
+unixtests="$relpath/config.tests/unix"
+mactests="$relpath/config.tests/mac"
+WHICH="$unixtests/which.test"
+
+PERL=`$WHICH perl 2>/dev/null`
+
+# find out which awk we want to use, prefer gawk, then nawk, then regular awk
+AWK=
+for e in gawk nawk awk; do
+    if "$WHICH" $e >/dev/null 2>&1 && ( $e -f /dev/null /dev/null ) >/dev/null 2>&1; then
+        AWK=$e
+        break
+    fi
+done
+
+### skip this if the user just needs help...
+if [ "$OPT_HELP" != "yes" ]; then
+
+# is this a shadow build?
+if [ "$OPT_SHADOW" = "maybe" ]; then
+    OPT_SHADOW=no
+    if [ "$relpath" != "$outpath" ] && [ '!' -f "$outpath/configure" ]; then
+        if [ -h "$outpath" ]; then
+            [ "$relpath" -ef "$outpath" ] || OPT_SHADOW=yes
+        else
+            OPT_SHADOW=yes
+        fi
+    fi
+fi
+if [ "$OPT_SHADOW" = "yes" ]; then
+    if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" ]; then
+        echo >&2 "You cannot make a shadow build from a source tree containing a previous build."
+        echo >&2 "Cannot proceed."
+        exit 1
+    fi
+    [ "$OPT_VERBOSE" = "yes" ] && echo "Performing shadow build..."
+fi
+
+if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+    echo
+    echo "WARNING: -debug-and-release is not supported anymore on Qt/X11 and Qt for Embedded Linux"
+    echo "By default, Qt is built in release mode with separate debug information, so"
+    echo "-debug-and-release is not necessary anymore"
+    echo
+fi
+
+# detect build style
+if [ "$CFG_DEBUG" = "auto" ]; then
+    if [ "$PLATFORM_MAC" = "yes" ]; then
+        CFG_DEBUG_RELEASE=yes
+        CFG_DEBUG=yes
+    elif [ "$CFG_DEV" = "yes" ]; then
+        CFG_DEBUG_RELEASE=no
+        CFG_DEBUG=yes
+    else
+        CFG_DEBUG_RELEASE=no
+        CFG_DEBUG=no
+    fi
+fi
+if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+    QMAKE_CONFIG="$QMAKE_CONFIG build_all"
+fi
+
+if [ "$CFG_SILENT" = "yes" ]; then
+    QMAKE_CONFIG="$QMAKE_CONFIG silent"
+fi
+
+# if the source tree is different from the build tree,
+# symlink or copy part of the sources
+if [ "$OPT_SHADOW" = "yes" ]; then
+    echo "Preparing build tree..."
+
+    if [ -z "$PERL" ]; then
+        echo
+        echo "You need perl in your PATH to make a shadow build."
+        echo "Cannot proceed."
+        exit 1
+    fi
+
+    [ -d "$outpath/bin" ] || mkdir -p "$outpath/bin"
+
+    # symlink the qmake directory
+    find "$relpath/qmake" | while read a; do
+        my_a=`echo "$a" | sed "s,^${relpath}/,${outpath}/,"`
+        if [ '!' -f "$my_a" ]; then
+            if [ -d "$a" ]; then
+                # directories are created...
+                mkdir -p "$my_a"
+            else
+                a_dir=`dirname "$my_a"`
+                [ -d "$a_dir" ] || mkdir -p "$a_dir"
+                # ... and files are symlinked
+                case `basename "$a"` in
+                *.o|*.d|GNUmakefile*|qmake)
+                    ;;
+                *)
+                    rm -f "$my_a"
+                    ln -s "$a" "$my_a"
+                    ;;
+                esac
+            fi
+        fi
+    done
+
+    # make a syncqt script that can be used in the shadow
+    rm -f "$outpath/bin/syncqt"
+    if [ -x "$relpath/bin/syncqt" ]; then
+        mkdir -p "$outpath/bin"
+        echo "#!/bin/sh" >"$outpath/bin/syncqt"
+        echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/syncqt"
+        echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" $*" >>"$outpath/bin/syncqt"
+        chmod 755 "$outpath/bin/syncqt"
+    fi
+
+    # symlink the mkspecs directory
+    mkdir -p "$outpath/mkspecs"
+    rm -f "$outpath"/mkspecs/*
+    ln -s "$relpath"/mkspecs/* "$outpath/mkspecs"
+    rm -f "$outpath/mkspecs/default"
+
+    # symlink the doc directory
+    rm -rf "$outpath/doc"
+    ln -s "$relpath/doc" "$outpath/doc"
+
+    # make sure q3porting.xml can be found
+    mkdir -p "$outpath/tools/porting/src"
+    rm -f "$outpath/tools/porting/src/q3porting.xml"
+    ln -s "$relpath/tools/porting/src/q3porting.xml" "$outpath/tools/porting/src"
+fi
+
+# symlink files from src/gui/embedded neccessary to build qvfb
+if [ "$CFG_DEV" = "yes" -o "$Edition" = "Qtopia" ]; then
+    for f in qvfbhdr.h qlock_p.h qlock.cpp qwssignalhandler_p.h qwssignalhandler.cpp; do
+	dest="${relpath}/tools/qvfb/${f}"
+	rm -f "$dest"
+	ln -s "${relpath}/src/gui/embedded/${f}" "${dest}"
+    done
+fi
+
+# symlink fonts to be able to run application from build directory
+if [ "$PLATFORM_QWS" = "yes" ] && [ ! -e "${outpath}/lib/fonts" ]; then
+    if [ "$PLATFORM" = "$XPLATFORM" ]; then
+        mkdir -p "${outpath}/lib"
+        ln -s "${relpath}/lib/fonts" "${outpath}/lib/fonts"
+    fi
+fi
+
+if [ "$OPT_FAST" = "auto" ]; then
+   if [ '!' -z "$AWK" ] && [ "$CFG_DEV" = "yes" ]; then
+       OPT_FAST=yes
+   else
+       OPT_FAST=no
+   fi
+fi
+
+# find a make command
+if [ -z "$MAKE" ]; then
+    MAKE=
+    for mk in gmake make; do
+        if "$WHICH" $mk >/dev/null 2>&1; then
+            MAKE=`$WHICH $mk`
+            break
+        fi
+    done
+    if [ -z "$MAKE" ]; then
+        echo >&2 "You don't seem to have 'make' or 'gmake' in your PATH."
+        echo >&2 "Cannot proceed."
+        exit 1
+    fi
+fi
+
+fi ### help
+
+#-------------------------------------------------------------------------------
+# auto-detect all that hasn't been specified in the arguments
+#-------------------------------------------------------------------------------
+
+[ "$PLATFORM_QWS" = "yes" -a "$CFG_EMBEDDED" = "no" ] && CFG_EMBEDDED=auto
+if [ "$CFG_EMBEDDED" != "no" ]; then
+    case "$UNAME_SYSTEM:$UNAME_RELEASE" in
+    Darwin:*)
+        [ -z "$PLATFORM" ] && PLATFORM=qws/macx-generic-g++
+        if [ -z "$XPLATFORM" ]; then
+            [ "$CFG_EMBEDDED" = "auto" ] && CFG_EMBEDDED=generic
+            XPLATFORM="qws/macx-$CFG_EMBEDDED-g++"
+        fi
+        ;;
+    FreeBSD:*)
+        [ -z "$PLATFORM" ] && PLATFORM=qws/freebsd-generic-g++
+        if [ -z "$XPLATFORM" ]; then
+            [ "$CFG_EMBEDDED" = "auto" ] && CFG_EMBEDDED=generic
+            XPLATFORM="qws/freebsd-$CFG_EMBEDDED-g++"
+        fi
+        ;;
+    SunOS:5*)
+        [ -z "$PLATFORM" ] && PLATFORM=qws/solaris-generic-g++
+        if [ -z "$XPLATFORM" ]; then
+            [ "$CFG_EMBEDDED" = "auto" ] && CFG_EMBEDDED=generic
+            XPLATFORM="qws/solaris-$CFG_EMBEDDED-g++"
+        fi
+        ;;
+    Linux:*)
+        if [ -z "$PLATFORM" ]; then
+            case "$UNAME_MACHINE" in
+            *86)
+                PLATFORM=qws/linux-x86-g++
+                ;;
+            *86_64)
+                PLATFORM=qws/linux-x86_64-g++
+                ;;
+            *ppc)
+                PLATFORM=qws/linux-ppc-g++
+                ;;
+            *)
+                PLATFORM=qws/linux-generic-g++
+                ;;
+            esac
+        fi
+        if [ -z "$XPLATFORM" ]; then
+            if [ "$CFG_EMBEDDED" = "auto" ]; then
+                if [ -n "$CFG_ARCH" ]; then
+                    CFG_EMBEDDED=$CFG_ARCH
+                else
+                    case "$UNAME_MACHINE" in
+                    *86)
+                        CFG_EMBEDDED=x86
+                        ;;
+                    *86_64)
+                        CFG_EMBEDDED=x86_64
+                        ;;
+                    *ppc)
+                        CFG_EMBEDDED=ppc
+                        ;;
+                    *)
+                        CFG_EMBEDDED=generic
+                        ;;
+                    esac
+                fi
+            fi
+            XPLATFORM="qws/linux-$CFG_EMBEDDED-g++"
+        fi
+        ;;
+    CYGWIN*:*)
+	CFG_EMBEDDED=x86
+	;;
+    *)
+        echo "Qt for Embedded Linux is not supported on this platform. Disabling."
+        CFG_EMBEDDED=no
+        PLATFORM_QWS=no
+        ;;
+    esac
+fi
+if [ -z "$PLATFORM" ]; then
+    PLATFORM_NOTES=
+    case "$UNAME_SYSTEM:$UNAME_RELEASE" in
+     Darwin:*)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+          PLATFORM=macx-g++
+        # PLATFORM=macx-xcode
+        else
+          PLATFORM=darwin-g++
+        fi
+        ;;
+     AIX:*)
+        #PLATFORM=aix-g++
+        #PLATFORM=aix-g++-64
+        PLATFORM=aix-xlc
+        #PLATFORM=aix-xlc-64
+        PLATFORM_NOTES="
+            - Also available for AIX: aix-g++ aix-g++-64 aix-xlc-64
+        "
+        ;;
+     GNU:*)
+        PLATFORM=hurd-g++
+        ;;
+     dgux:*)
+        PLATFORM=dgux-g++
+        ;;
+#     DYNIX/ptx:4*)
+#       PLATFORM=dynix-g++
+#       ;;
+     ULTRIX:*)
+        PLATFORM=ultrix-g++
+        ;;
+     FreeBSD:*)
+        PLATFORM=freebsd-g++
+        PLATFORM_NOTES="
+            - Also available for FreeBSD: freebsd-icc
+        "
+        ;;
+     OpenBSD:*)
+        PLATFORM=openbsd-g++
+        ;;
+     NetBSD:*)
+        PLATFORM=netbsd-g++
+        ;;
+     BSD/OS:*|BSD/386:*)
+        PLATFORM=bsdi-g++
+        ;;
+     IRIX*:*)
+        #PLATFORM=irix-g++
+        PLATFORM=irix-cc
+        #PLATFORM=irix-cc-64
+        PLATFORM_NOTES="
+            - Also available for IRIX: irix-g++ irix-cc-64
+        "
+        ;;
+     HP-UX:*)
+        case "$UNAME_MACHINE" in
+            ia64)
+                #PLATFORM=hpuxi-acc-32
+                PLATFORM=hpuxi-acc-64
+                PLATFORM_NOTES="
+                    - Also available for HP-UXi: hpuxi-acc-32
+                "
+            ;;
+            *)
+                #PLATFORM=hpux-g++
+                PLATFORM=hpux-acc
+                #PLATFORM=hpux-acc-64
+                #PLATFORM=hpux-cc
+                #PLATFORM=hpux-acc-o64
+                PLATFORM_NOTES="
+                    - Also available for HP-UX: hpux-g++ hpux-acc-64 hpux-acc-o64
+                "
+            ;;
+        esac
+        ;;
+     OSF1:*)
+        #PLATFORM=tru64-g++
+        PLATFORM=tru64-cxx
+        PLATFORM_NOTES="
+            - Also available for Tru64: tru64-g++
+        "
+        ;;
+     Linux:*)
+        case "$UNAME_MACHINE" in
+            x86_64|s390x|ppc64)
+                PLATFORM=linux-g++-64
+                ;;
+            *)
+                PLATFORM=linux-g++
+                ;;
+        esac
+        PLATFORM_NOTES="
+            - Also available for Linux: linux-kcc linux-icc linux-cxx
+        "
+        ;;
+     SunOS:5*)
+        #PLATFORM=solaris-g++
+        PLATFORM=solaris-cc
+        #PLATFORM=solaris-cc64
+        PLATFORM_NOTES="
+            - Also available for Solaris: solaris-g++ solaris-cc-64
+        "
+        ;;
+     ReliantUNIX-*:*|SINIX-*:*)
+        PLATFORM=reliant-cds
+        #PLATFORM=reliant-cds-64
+        PLATFORM_NOTES="
+            - Also available for Reliant UNIX: reliant-cds-64
+        "
+        ;;
+     CYGWIN*:*)
+        PLATFORM=cygwin-g++
+        ;;
+     LynxOS*:*)
+        PLATFORM=lynxos-g++
+        ;;
+     OpenUNIX:*)
+        #PLATFORM=unixware-g++
+        PLATFORM=unixware-cc
+        PLATFORM_NOTES="
+            - Also available for OpenUNIX: unixware-g++
+        "
+        ;;
+     UnixWare:*)
+        #PLATFORM=unixware-g++
+        PLATFORM=unixware-cc
+        PLATFORM_NOTES="
+            - Also available for UnixWare: unixware-g++
+        "
+        ;;
+     SCO_SV:*)
+        #PLATFORM=sco-g++
+        PLATFORM=sco-cc
+        PLATFORM_NOTES="
+            - Also available for SCO OpenServer: sco-g++
+        "
+        ;;
+     UNIX_SV:*)
+        PLATFORM=unixware-g++
+        ;;
+     *)
+        if [ "$OPT_HELP" != "yes" ]; then
+            echo
+            for p in $PLATFORMS; do
+                echo "    $relconf $* -platform $p"
+            done
+            echo >&2
+            echo "   The build script does not currently recognize all" >&2
+            echo "   platforms supported by Qt." >&2
+            echo "   Rerun this script with a -platform option listed to" >&2
+            echo "   set the system/compiler combination you use." >&2
+            echo >&2
+            exit 2
+        fi
+    esac
+fi
+
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    CFG_SM=no
+    PLATFORMS=`find "$relpath/mkspecs/qws" | sed "s,$relpath/mkspecs/qws/,,"`
+else
+    PLATFORMS=`find "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"`
+fi
+
+[ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM"
+if [ -d "$PLATFORM" ]; then
+  QMAKESPEC="$PLATFORM"
+else
+  QMAKESPEC="$relpath/mkspecs/${PLATFORM}"
+fi
+if [ -d "$XPLATFORM" ]; then
+  XQMAKESPEC="$XPLATFORM"
+else
+  XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}"
+fi
+if [ "$PLATFORM" != "$XPLATFORM" ]; then
+    QT_CROSS_COMPILE=yes
+    QMAKE_CONFIG="$QMAKE_CONFIG cross_compile"
+fi
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+   if [ `basename $QMAKESPEC` = "macx-xcode" ] || [ `basename $XQMAKESPEC` = "macx-xcode" ]; then
+      echo >&2
+      echo "   Platform 'macx-xcode' should not be used when building Qt/Mac." >&2
+      echo "   Please build Qt/Mac with 'macx-g++', then if you would like to" >&2
+      echo "   use mac-xcode on your application code it can link to a Qt/Mac" >&2
+      echo "   built with 'macx-g++'" >&2
+      echo >&2
+      exit 2
+    fi
+fi
+
+# check specified platforms are supported
+if [ '!' -d "$QMAKESPEC" ]; then
+    echo
+    echo "   The specified system/compiler is not supported:"
+    echo
+    echo "      $QMAKESPEC"
+    echo
+    echo "   Please see the README file for a complete list."
+    echo
+    exit 2
+fi
+if [ '!' -d "$XQMAKESPEC" ]; then
+    echo
+    echo "   The specified system/compiler is not supported:"
+    echo
+    echo "      $XQMAKESPEC"
+    echo
+    echo "   Please see the README file for a complete list."
+    echo
+    exit 2
+fi
+if [ '!' -f "${XQMAKESPEC}/qplatformdefs.h" ]; then
+    echo
+    echo "   The specified system/compiler port is not complete:"
+    echo
+    echo "      $XQMAKESPEC/qplatformdefs.h"
+    echo
+    echo "   Please contact qt-bugs@trolltech.com."
+    echo
+    exit 2
+fi
+
+# now look at the configs and figure out what platform we are config'd for
+[ "$CFG_EMBEDDED" = "no" ] \
+  && [ '!' -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_LIBS_X11 | awk '{print $3;}'`" ] \
+  && PLATFORM_X11=yes
+### echo "$XQMAKESPEC" | grep mkspecs/qws >/dev/null 2>&1 && PLATFORM_QWS=yes
+
+if [ "$UNAME_SYSTEM" = "SunOS" ]; then
+    # Solaris 2.5 and 2.6 have libposix4, which was renamed to librt for Solaris 7 and up
+    if echo $UNAME_RELEASE | grep "^5\.[5|6]" >/dev/null 2>&1; then
+        sed -e "s,-lrt,-lposix4," "$XQMAKESPEC/qmake.conf" > "$XQMAKESPEC/qmake.conf.new"
+        mv "$XQMAKESPEC/qmake.conf.new" "$XQMAKESPEC/qmake.conf"
+    fi
+fi
+
+#-------------------------------------------------------------------------------
+# determine the system architecture
+#-------------------------------------------------------------------------------
+if [ "$OPT_VERBOSE" = "yes" ]; then
+    echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)"
+fi
+
+if [ "$CFG_EMBEDDED" != "no" -a "$CFG_EMBEDDED" != "auto" ] && [ -n "$CFG_ARCH" ]; then
+    if [ "$CFG_ARCH" != "$CFG_EMBEDDED" ]; then
+        echo ""
+        echo "You have specified a target architecture with -embedded and -arch."
+        echo "The two architectures you have specified are different, so we can"
+        echo "not proceed. Either set both to be the same, or only use -embedded."
+        echo ""
+        exit 1
+    fi
+fi
+
+if [ -z "${CFG_HOST_ARCH}" ]; then
+    case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
+    IRIX*:*:*)
+        CFG_HOST_ARCH=`uname -p`
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    SGI ($CFG_HOST_ARCH)"
+        fi
+        ;;
+    SunOS:5*:*)
+        case "$UNAME_MACHINE" in
+	sun4u*|sun4v*)
+            if [ "$OPT_VERBOSE" = "yes" ]; then
+                echo "    Sun SPARC (sparc)"
+            fi
+            CFG_HOST_ARCH=sparc
+            ;;
+        i86pc)
+	    case "$PLATFORM" in
+	    *-64)
+                if [ "$OPT_VERBOSE" = "yes" ]; then
+	            echo "    64-bit AMD 80x86 (x86_64)"
+                fi
+                CFG_HOST_ARCH=x86_64
+                ;;
+	    *)
+                if [ "$OPT_VERBOSE" = "yes" ]; then
+	            echo "    32-bit Intel 80x86 (i386)"
+                fi
+                CFG_HOST_ARCH=i386
+                ;;
+            esac
+        esac
+        ;;
+    Darwin:*:*)
+        case "$UNAME_MACHINE" in
+            Power?Macintosh)
+                if [ "$OPT_VERBOSE" = "yes" ]; then
+                    echo "    32-bit Apple PowerPC (powerpc)"
+                fi
+                ;;
+            x86)
+                if [ "$OPT_VERBOSE" = "yes" ]; then
+                    echo "    32-bit Intel 80x86 (i386)"
+                fi
+                ;;
+        esac
+        CFG_HOST_ARCH=macosx
+        ;;
+    AIX:*:00????????00)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+        echo "    64-bit IBM PowerPC (powerpc)"
+        fi
+        CFG_HOST_ARCH=powerpc
+        ;;
+    HP-UX:*:9000*)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    HP PA-RISC (parisc)"
+        fi
+        CFG_HOST_ARCH=parisc
+        ;;
+    *:*:i?86)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    32-bit Intel 80x86 (i386)"
+        fi
+        CFG_HOST_ARCH=i386
+        ;;
+    *:*:x86_64|*:*:amd64)
+        if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then
+            if [ "$OPT_VERBOSE" = "yes" ]; then
+                echo "    32 bit on 64-bit AMD 80x86 (i386)"
+            fi
+            CFG_HOST_ARCH=i386
+        else
+            if [ "$OPT_VERBOSE" = "yes" ]; then
+                echo "    64-bit AMD 80x86 (x86_64)"
+            fi
+            CFG_HOST_ARCH=x86_64
+        fi
+        ;;
+    *:*:ppc)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    32-bit PowerPC (powerpc)"
+        fi
+        CFG_HOST_ARCH=powerpc
+        ;;
+    *:*:ppc64)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    64-bit PowerPC (powerpc)"
+        fi
+        CFG_HOST_ARCH=powerpc
+        ;;
+    *:*:s390*)
+    	if [ "$OPT_VERBOSE" = "yes" ]; then
+    	    echo "    IBM S/390 (s390)"
+    	fi
+    	CFG_HOST_ARCH=s390
+    	;;
+    *:*:arm*)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    ARM (arm)"
+        fi
+        CFG_HOST_ARCH=arm
+        ;;
+    Linux:*:sparc*)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    Linux on SPARC"
+        fi
+        CFG_HOST_ARCH=sparc
+        ;;
+    *:*:*)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    Trying '$UNAME_MACHINE'..."
+        fi
+        CFG_HOST_ARCH="$UNAME_MACHINE"
+        ;;
+    esac
+fi
+
+if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then
+    if [ -n "$CFG_ARCH" ]; then
+        CFG_EMBEDDED=$CFG_ARCH
+    fi
+
+    case "$CFG_EMBEDDED" in
+    x86)
+        CFG_ARCH=i386
+        ;;
+    x86_64)
+        CFG_ARCH=x86_64
+        ;;
+    ipaq|sharp)
+        CFG_ARCH=arm
+        ;;
+    dm7000)
+        CFG_ARCH=powerpc
+        ;;
+    dm800)
+        CFG_ARCH=mips
+        ;;
+    sh4al)
+        CFG_ARCH=sh4a
+        ;;
+    *)
+        CFG_ARCH="$CFG_EMBEDDED"
+        ;;
+    esac
+elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
+    CFG_ARCH=$CFG_HOST_ARCH
+fi
+
+if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
+    if [ "$OPT_VERBOSE" = "yes" ]; then
+        echo "    '$CFG_ARCH' is supported"
+    fi
+else
+    if [ "$OPT_VERBOSE" = "yes" ]; then
+        echo "    '$CFG_ARCH' is unsupported, using 'generic'"
+    fi
+    CFG_ARCH=generic
+fi
+if [ "$CFG_HOST_ARCH" != "$CFG_ARCH" ]; then
+    if [ -d "$relpath/src/corelib/arch/$CFG_HOST_ARCH" ]; then
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    '$CFG_HOST_ARCH' is supported"
+        fi
+    else
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    '$CFG_HOST_ARCH' is unsupported, using 'generic'"
+        fi
+        CFG_HOST_ARCH=generic
+    fi
+fi
+
+if [ "$OPT_VERBOSE" = "yes" ]; then
+    echo "System architecture: '$CFG_ARCH'"
+    if [ "$PLATFORM_QWS" = "yes" ]; then
+	echo "Host architecture: '$CFG_HOST_ARCH'"
+    fi
+fi
+
+#-------------------------------------------------------------------------------
+# tests that don't need qmake (must be run before displaying help)
+#-------------------------------------------------------------------------------
+
+if [ -z "$PKG_CONFIG" ]; then
+    # See if PKG_CONFIG is set in the mkspec:
+    PKG_CONFIG=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%PKG_CONFIG[^_].*=%%p' | tr '\n' ' '`
+fi
+if [ -z "$PKG_CONFIG" ]; then
+    PKG_CONFIG=`$WHICH pkg-config 2>/dev/null`
+fi
+
+# Work out if we can use pkg-config
+if [ "$QT_CROSS_COMPILE" = "yes" ]; then
+    if [ "$QT_FORCE_PKGCONFIG" = "yes" ]; then
+        echo >&2 ""
+        echo >&2 "You have asked to use pkg-config and are cross-compiling."
+        echo >&2 "Please make sure you have a correctly set-up pkg-config"
+        echo >&2 "environment!"
+        echo >&2 ""
+        if [ -z "$PKG_CONFIG_PATH" ]; then
+            echo >&2 ""
+            echo >&2 "Warning: PKG_CONFIG_PATH has not been set.  This could mean"
+            echo >&2 "the host compiler's .pc files will be used. This is probably"
+            echo >&2 "not what you want."
+            echo >&2 ""
+        elif [ -z "$PKG_CONFIG_SYSROOT" ] && [ -z "$PKG_CONFIG_SYSROOT_DIR" ]; then
+            echo >&2 ""
+            echo >&2 "Warning: PKG_CONFIG_SYSROOT/PKG_CONFIG_SYSROOT_DIR has not"
+            echo >&2 "been set. This means your toolchain's .pc files must contain"
+            echo >&2 "the paths to the toolchain's libraries & headers. If configure"
+            echo >&2 "tests are failing, please check these files."
+            echo >&2 ""
+        fi
+    else
+        PKG_CONFIG=""
+    fi
+fi
+
+# find the default framework value
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$PLATFORM" != "macx-xlc" ]; then
+    if [ "$CFG_FRAMEWORK" = "auto" ]; then
+        CFG_FRAMEWORK="$CFG_SHARED"
+    elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then
+	echo
+	echo "WARNING: Using static linking will disable the use of Mac frameworks."
+	echo
+        CFG_FRAMEWORK="no"
+    fi
+else
+    CFG_FRAMEWORK=no
+fi
+
+QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
+TEST_COMPILER="$CC"
+[ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
+
+# auto-detect precompiled header support
+if [ "$CFG_PRECOMPILE" = "auto" ]; then
+    if [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; then
+       CFG_PRECOMPILE=no
+    elif "$unixtests/precomp.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then
+       CFG_PRECOMPILE=no
+    else
+       CFG_PRECOMPILE=yes
+    fi
+elif [ "$CFG_PRECOMPILE" = "yes" ] && [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; then
+    echo
+    echo "WARNING: Using universal binaries disables precompiled headers."
+    echo
+    CFG_PRECOMPILE=no
+fi
+
+#auto-detect DWARF2 on the mac
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "auto" ]; then
+    if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
+        CFG_MAC_DWARF2=no
+    else
+        CFG_MAC_DWARF2=yes
+    fi
+fi
+
+# auto-detect support for -Xarch on the mac
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" == "auto" ]; then
+    if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
+        CFG_MAC_XARCH=no
+    else
+        CFG_MAC_XARCH=yes
+    fi
+fi
+
+# don't autodetect support for separate debug info on objcopy when
+# cross-compiling as lots of toolchains seems to have problems with this
+if [ "$QT_CROSS_COMPILE" = "yes" ] && [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then
+    CFG_SEPARATE_DEBUG_INFO="no"
+fi
+
+# auto-detect support for separate debug info in objcopy
+if [ "$CFG_SEPARATE_DEBUG_INFO" != "no" ] && [ "$CFG_SHARED" = "yes" ]; then
+    TEST_COMPILER_CFLAGS=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%QMAKE_CFLAGS[^_].*=%%p' | tr '\n' ' '`
+    TEST_COMPILER_CXXFLAGS=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%QMAKE_CXXFLAGS[^_].*=%%p' | tr '\n' ' '`
+    TEST_OBJCOPY=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_OBJCOPY" | sed "s%.* *= *\(.*\)$%\1%" | tail -1`
+    COMPILER_WITH_FLAGS="$TEST_COMPILER $TEST_COMPILER_CXXFLAGS"
+    COMPILER_WITH_FLAGS=`echo "$COMPILER_WITH_FLAGS" | sed -e "s%\\$\\$QMAKE_CFLAGS%$TEST_COMPILER_CFLAGS%g"`
+    if "$unixtests/objcopy.test" "$COMPILER_WITH_FLAGS" "$TEST_OBJCOPY" "$OPT_VERBOSE"; then
+       CFG_SEPARATE_DEBUG_INFO=no
+    else
+       case "$PLATFORM" in
+       hpux-*)
+           # binutils on HP-UX is buggy; default to no.
+           CFG_SEPARATE_DEBUG_INFO=no
+           ;;
+       *)
+           CFG_SEPARATE_DEBUG_INFO=yes
+           ;;
+       esac
+    fi
+fi
+
+# auto-detect -fvisibility support
+if [ "$CFG_REDUCE_EXPORTS" = "auto" ]; then
+    if "$unixtests/fvisibility.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then
+       CFG_REDUCE_EXPORTS=no
+    else
+       CFG_REDUCE_EXPORTS=yes
+    fi
+fi
+
+# detect the availability of the -Bsymbolic-functions linker optimization
+if [ "$CFG_REDUCE_RELOCATIONS" != "no" ]; then
+    if "$unixtests/bsymbolic_functions.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then
+        CFG_REDUCE_RELOCATIONS=no
+    else
+        CFG_REDUCE_RELOCATIONS=yes
+    fi
+fi
+
+# auto-detect GNU make support
+if [ "$CFG_USE_GNUMAKE" = "auto" ] && "$MAKE" -v | grep "GNU Make" >/dev/null 2>&1; then
+   CFG_USE_GNUMAKE=yes
+fi
+
+# If -opengl wasn't specified, don't try to auto-detect
+if [ "$PLATFORM_QWS" = "yes" ] && [ "$CFG_OPENGL" = "auto" ]; then
+        CFG_OPENGL=no
+fi
+
+# mac
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+        CFG_OPENGL=desktop
+    fi
+fi
+
+# find the default framework value
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$PLATFORM" != "macx-xlc" ]; then
+    if [ "$CFG_FRAMEWORK" = "auto" ]; then
+        CFG_FRAMEWORK="$CFG_SHARED"
+    elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then
+	echo
+	echo "WARNING: Using static linking will disable the use of Mac frameworks."
+	echo
+        CFG_FRAMEWORK="no"
+    fi
+else
+    CFG_FRAMEWORK=no
+fi
+
+# x11 tests are done after qmake is built
+
+
+#setup the build parts
+if [ -z "$CFG_BUILD_PARTS" ]; then
+    CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS"
+
+    # don't build tools by default when cross-compiling
+    if [ "$PLATFORM" != "$XPLATFORM" ]; then
+	CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
+    fi
+fi
+for nobuild in $CFG_NOBUILD_PARTS; do
+    CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
+done
+if echo $CFG_BUILD_PARTS | grep -v libs >/dev/null 2>&1; then
+#    echo
+#    echo "WARNING: libs is a required part of the build."
+#    echo
+    CFG_BUILD_PARTS="$CFG_BUILD_PARTS libs"
+fi
+
+#-------------------------------------------------------------------------------
+# post process QT_INSTALL_* variables
+#-------------------------------------------------------------------------------
+
+#prefix
+if [ -z "$QT_INSTALL_PREFIX" ]; then
+    if [ "$CFG_DEV" = "yes" ]; then
+	QT_INSTALL_PREFIX="$outpath" # At Trolltech, we use sandboxed builds by default
+    elif [ "$PLATFORM_QWS" = "yes" ]; then
+        QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}"
+        if [ "$PLATFORM" != "$XPLATFORM" ]; then
+            QT_INSTALL_PREFIX="${QT_INSTALL_PREFIX}-${CFG_ARCH}"
+        fi
+    else
+        QT_INSTALL_PREFIX="/usr/local/Trolltech/Qt-${QT_VERSION}" # the default install prefix is /usr/local/Trolltech/Qt-$QT_VERSION
+    fi
+fi
+QT_INSTALL_PREFIX=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PREFIX"`
+
+#docs
+if [ -z "$QT_INSTALL_DOCS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    QT_INSTALL_DOCS="/Developer/Documentation/Qt"
+        fi
+    fi
+    [ -z "$QT_INSTALL_DOCS" ] && QT_INSTALL_DOCS="$QT_INSTALL_PREFIX/doc" #fallback
+
+fi
+QT_INSTALL_DOCS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DOCS"`
+
+#headers
+if [ -z "$QT_INSTALL_HEADERS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    if [ "$CFG_FRAMEWORK" = "yes" ]; then
+		QT_INSTALL_HEADERS=
+            fi
+        fi
+    fi
+    [ -z "$QT_INSTALL_HEADERS" ] && QT_INSTALL_HEADERS="$QT_INSTALL_PREFIX/include"
+
+fi
+QT_INSTALL_HEADERS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_HEADERS"`
+
+#libs
+if [ -z "$QT_INSTALL_LIBS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    if [ "$CFG_FRAMEWORK" = "yes" ]; then
+		QT_INSTALL_LIBS="/Libraries/Frameworks"
+            fi
+        fi
+    fi
+    [ -z "$QT_INSTALL_LIBS" ] && QT_INSTALL_LIBS="$QT_INSTALL_PREFIX/lib" #fallback
+fi
+QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
+
+#bins
+if [ -z "$QT_INSTALL_BINS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    QT_INSTALL_BINS="/Developer/Applications/Qt"
+        fi
+    fi
+    [ -z "$QT_INSTALL_BINS" ] && QT_INSTALL_BINS="$QT_INSTALL_PREFIX/bin" #fallback
+
+fi
+QT_INSTALL_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_BINS"`
+
+#plugins
+if [ -z "$QT_INSTALL_PLUGINS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    QT_INSTALL_PLUGINS="/Developer/Applications/Qt/plugins"
+        fi
+    fi
+    [ -z "$QT_INSTALL_PLUGINS" ] && QT_INSTALL_PLUGINS="$QT_INSTALL_PREFIX/plugins" #fallback
+fi
+QT_INSTALL_PLUGINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PLUGINS"`
+
+#data
+if [ -z "$QT_INSTALL_DATA" ]; then #default
+    QT_INSTALL_DATA="$QT_INSTALL_PREFIX"
+fi
+QT_INSTALL_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DATA"`
+
+#translations
+if [ -z "$QT_INSTALL_TRANSLATIONS" ]; then #default
+    QT_INSTALL_TRANSLATIONS="$QT_INSTALL_PREFIX/translations"
+fi
+QT_INSTALL_TRANSLATIONS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_TRANSLATIONS"`
+
+#settings
+if [ -z "$QT_INSTALL_SETTINGS" ]; then #default
+    if [ "$PLATFORM_MAC" = "yes" ]; then
+	QT_INSTALL_SETTINGS=/Library/Preferences/Qt
+    else
+	QT_INSTALL_SETTINGS=/etc/xdg
+    fi
+fi
+QT_INSTALL_SETTINGS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_SETTINGS"`
+
+#examples
+if [ -z "$QT_INSTALL_EXAMPLES" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    QT_INSTALL_EXAMPLES="/Developer/Examples/Qt"
+        fi
+    fi
+    [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES="$QT_INSTALL_PREFIX/examples" #fallback
+fi
+QT_INSTALL_EXAMPLES=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_EXAMPLES"`
+
+#demos
+if [ -z "$QT_INSTALL_DEMOS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    QT_INSTALL_DEMOS="/Developer/Examples/Qt/Demos"
+        fi
+    fi
+    [ -z "$QT_INSTALL_DEMOS" ] && QT_INSTALL_DEMOS="$QT_INSTALL_PREFIX/demos"
+fi
+QT_INSTALL_DEMOS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DEMOS"`
+
+#-------------------------------------------------------------------------------
+# help - interactive parts of the script _after_ this section please
+#-------------------------------------------------------------------------------
+
+# next, emit a usage message if something failed.
+if [ "$OPT_HELP" = "yes" ]; then
+    [ "x$ERROR" = "xyes" ] && echo
+    if [ "$CFG_NIS" = "no" ]; then
+        NSY=" "
+        NSN="*"
+    else
+        NSY="*"
+        NSN=" "
+    fi
+    if [ "$CFG_CUPS" = "no" ]; then
+        CUY=" "
+        CUN="*"
+    else
+        CUY="*"
+        CUN=" "
+    fi
+    if [ "$CFG_ICONV" = "no" ]; then
+        CIY=" "
+        CIN="*"
+    else
+        CIY="*"
+        CIN=" "
+    fi
+    if [ "$CFG_LARGEFILE" = "no" ]; then
+        LFSY=" "
+        LFSN="*"
+    else
+        LFSY="*"
+        LFSN=" "
+    fi
+    if [ "$CFG_STL" = "auto" ] || [ "$CFG_STL" = "yes" ]; then
+        SHY="*"
+        SHN=" "
+    else
+        SHY=" "
+        SHN="*"
+    fi
+    if [ "$CFG_IPV6" = "auto" ]; then
+        I6Y="*"
+        I6N=" "
+    fi
+    if [ "$CFG_PRECOMPILE" = "auto" ] || [ "$CFG_PRECOMPILE" = "no" ]; then
+        PHY=" "
+        PHN="*"
+    else
+        PHY="*"
+        PHN=" "
+    fi
+
+    cat <<EOF
+Usage:  $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir <dir>]
+        [-docdir <dir>] [-headerdir <dir>] [-plugindir <dir> ] [-datadir <dir>]
+        [-translationdir <dir>] [-sysconfdir <dir>] [-examplesdir <dir>]
+        [-demosdir <dir>] [-buildkey <key>] [-release] [-debug]
+        [-debug-and-release] [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile]
+        [-largefile] [-no-exceptions] [-exceptions] [-no-accessibility]
+        [-accessibility] [-no-stl] [-stl] [-no-sql-<driver>] [-sql-<driver>]
+        [-plugin-sql-<driver>] [-system-sqlite] [-no-qt3support] [-qt3support]
+        [-platform] [-D <string>] [-I <string>] [-L <string>] [-help]
+        [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff]
+        [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng]
+        [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make <part>]
+        [-no-make <part>] [-R <string>]  [-l <string>] [-no-rpath]  [-rpath] [-continue]
+        [-verbose] [-v] [-silent] [-no-nis] [-nis] [-no-cups] [-cups] [-no-iconv]
+        [-iconv] [-no-pch] [-pch] [-no-dbus] [-dbus] [-dbus-linked]
+        [-no-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2]
+        [-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa]
+        [-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns]
+        [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend]
+        [-no-openssl] [-openssl] [-openssl-linked]
+        [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit]
+        [-no-scripttools] [-scripttools]
+
+        [additional platform specific options (see below)]
+
+
+Installation options:
+
+ These are optional, but you may specify install directories.
+
+    -prefix <dir> ...... This will install everything relative to <dir>
+                         (default $QT_INSTALL_PREFIX)
+EOF
+if [ "$PLATFORM_QWS" = "yes" ]; then
+cat <<EOF
+
+    -hostprefix [dir] .. Tools and libraries needed when developing
+                         applications are installed in [dir]. If [dir] is
+                         not given, the current build directory will be used.
+EOF
+fi
+cat <<EOF
+
+  * -prefix-install .... Force a sandboxed "local" installation of
+                         Qt. This will install into
+                         $QT_INSTALL_PREFIX, if this option is
+                         disabled then some platforms will attempt a
+                         "system" install by placing default values to
+                         be placed in a system location other than
+                         PREFIX.
+
+ You may use these to separate different parts of the install:
+
+    -bindir <dir> ......... Executables will be installed to <dir>
+                            (default PREFIX/bin)
+    -libdir <dir> ......... Libraries will be installed to <dir>
+                            (default PREFIX/lib)
+    -docdir <dir> ......... Documentation will be installed to <dir>
+                            (default PREFIX/doc)
+    -headerdir <dir> ...... Headers will be installed to <dir>
+                            (default PREFIX/include)
+    -plugindir <dir> ...... Plugins will be installed to <dir>
+                            (default PREFIX/plugins)
+    -datadir <dir> ........ Data used by Qt programs will be installed to <dir>
+                            (default PREFIX)
+    -translationdir <dir> . Translations of Qt programs will be installed to <dir>
+                            (default PREFIX/translations)
+    -sysconfdir <dir> ..... Settings used by Qt programs will be looked for in <dir>
+                            (default PREFIX/etc/settings)
+    -examplesdir <dir> .... Examples will be installed to <dir>
+                            (default PREFIX/examples)
+    -demosdir <dir> ....... Demos will be installed to <dir>
+                            (default PREFIX/demos)
+
+ You may use these options to turn on strict plugin loading.
+
+    -buildkey <key> .... Build the Qt library and plugins using the specified
+                         <key>.  When the library loads plugins, it will only
+                         load those that have a matching key.
+
+Configure options:
+
+ The defaults (*) are usually acceptable. A plus (+) denotes a default value
+ that needs to be evaluated. If the evaluation succeeds, the feature is
+ included. Here is a short explanation of each option:
+
+ *  -release ........... Compile and link Qt with debugging turned off.
+    -debug ............. Compile and link Qt with debugging turned on.
+    -debug-and-release . Compile and link two versions of Qt, with and without
+                         debugging turned on (Mac only).
+
+    -developer-build.... Compile and link Qt with Qt developer options (including auto-tests exporting)
+
+    -opensource......... Compile and link the Open-Source Edition of Qt.
+    -commercial......... Compile and link the Commercial Edition of Qt.
+
+
+ *  -shared ............ Create and use shared Qt libraries.
+    -static ............ Create and use static Qt libraries.
+
+ *  -no-fast ........... Configure Qt normally by generating Makefiles for all
+                         project files.
+    -fast .............. Configure Qt quickly by generating Makefiles only for
+                         library and subdirectory targets.  All other Makefiles
+                         are created as wrappers, which will in turn run qmake.
+
+    -no-largefile ...... Disables large file support.
+ +  -largefile ......... Enables Qt to access files larger than 4 GB.
+
+EOF
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    EXCN="*"
+    EXCY=" "
+else
+    EXCN=" "
+    EXCY="*"
+fi
+if [ "$CFG_DBUS" = "no" ]; then
+    DBY=" "
+    DBN="+"
+else
+    DBY="+"
+    DBN=" "
+fi
+
+    cat << EOF
+ $EXCN  -no-exceptions ..... Disable exceptions on compilers that support it.
+ $EXCY  -exceptions ........ Enable exceptions on compilers that support it.
+
+    -no-accessibility .. Do not compile Accessibility support.
+ *  -accessibility ..... Compile Accessibility support.
+
+ $SHN  -no-stl ............ Do not compile STL support.
+ $SHY  -stl ............... Compile STL support.
+
+    -no-sql-<driver> ... Disable SQL <driver> entirely.
+    -qt-sql-<driver> ... Enable a SQL <driver> in the QtSql library, by default
+                         none are turned on.
+    -plugin-sql-<driver> Enable SQL <driver> as a plugin to be linked to
+                         at run time.
+
+                         Possible values for <driver>:
+                         [ $CFG_SQL_AVAILABLE ]
+
+    -system-sqlite ..... Use sqlite from the operating system.
+
+    -no-qt3support ..... Disables the Qt 3 support functionality.
+ *  -qt3support ........ Enables the Qt 3 support functionality.
+
+    -no-xmlpatterns .... Do not build the QtXmlPatterns module.
+ +  -xmlpatterns ....... Build the QtXmlPatterns module.
+                         QtXmlPatterns is built if a decent C++ compiler
+                         is used and exceptions are enabled.
+
+    -no-phonon ......... Do not build the Phonon module.
+ +  -phonon ............ Build the Phonon module.
+                         Phonon is built if a decent C++ compiler is used.
+    -no-phonon-backend.. Do not build the platform phonon plugin.
+ +  -phonon-backend..... Build the platform phonon plugin.
+
+    -no-svg ............ Do not build the SVG module.
+ +  -svg ............... Build the SVG module.
+
+    -no-webkit ......... Do not build the WebKit module.
+ +  -webkit ............ Build the WebKit module.
+                         WebKit is built if a decent C++ compiler is used.
+
+    -no-scripttools .... Do not build the QtScriptTools module.
+ +  -scripttools ....... Build the QtScriptTools module.
+
+    -platform target ... The operating system and compiler you are building
+                         on ($PLATFORM).
+
+                         See the README file for a list of supported
+                         operating systems and compilers.
+EOF
+if [ "${PLATFORM_QWS}" != "yes" ]; then
+cat << EOF
+    -graphicssystem <sys> Sets an alternate graphics system. Available options are:
+                           raster - Software rasterizer
+                           opengl - Rendering via OpenGL, Experimental!
+EOF
+fi
+cat << EOF
+
+    -no-mmx ............ Do not compile with use of MMX instructions.
+    -no-3dnow .......... Do not compile with use of 3DNOW instructions.
+    -no-sse ............ Do not compile with use of SSE instructions.
+    -no-sse2 ........... Do not compile with use of SSE2 instructions.
+
+    -qtnamespace <name>  Wraps all Qt library code in 'namespace <name> {...}'.
+    -qtlibinfix <infix>  Renames all libQt*.so to libQt*<infix>.so.
+
+    -D <string> ........ Add an explicit define to the preprocessor.
+    -I <string> ........ Add an explicit include path.
+    -L <string> ........ Add an explicit library path.
+
+    -help, -h .......... Display this information.
+
+Third Party Libraries:
+
+    -qt-zlib ........... Use the zlib bundled with Qt.
+ +  -system-zlib ....... Use zlib from the operating system.
+                         See http://www.gzip.org/zlib
+
+    -no-gif ............ Do not compile the plugin for GIF reading support.
+ *  -qt-gif ............ Compile the plugin for GIF reading support.
+                         See also src/plugins/imageformats/gif/qgifhandler.h
+
+    -no-libtiff ........ Do not compile the plugin for TIFF support.
+    -qt-libtiff ........ Use the libtiff bundled with Qt.
+ +  -system-libtiff .... Use libtiff from the operating system.
+                         See http://www.libtiff.org
+
+    -no-libpng ......... Do not compile in PNG support.
+    -qt-libpng ......... Use the libpng bundled with Qt.
+ +  -system-libpng ..... Use libpng from the operating system.
+                         See http://www.libpng.org/pub/png
+
+    -no-libmng ......... Do not compile the plugin for MNG support.
+    -qt-libmng ......... Use the libmng bundled with Qt.
+ +  -system-libmng ..... Use libmng from the operating system.
+                         See http://www.libmng.com
+
+    -no-libjpeg ........ Do not compile the plugin for JPEG support.
+    -qt-libjpeg ........ Use the libjpeg bundled with Qt.
+ +  -system-libjpeg .... Use libjpeg from the operating system.
+                         See http://www.ijg.org
+
+    -no-openssl ........ Do not compile support for OpenSSL.
+ +  -openssl ........... Enable run-time OpenSSL support.
+    -openssl-linked .... Enabled linked OpenSSL support.
+
+    -ptmalloc .......... Override the system memory allocator with ptmalloc.
+                         (Experimental.)
+
+Additional options:
+
+    -make <part> ....... Add part to the list of parts to be built at make time.
+                         ($QT_DEFAULT_BUILD_PARTS)
+    -nomake <part> ..... Exclude part from the list of parts to be built.
+
+    -R <string> ........ Add an explicit runtime library path to the Qt
+                         libraries.
+    -l <string> ........ Add an explicit library.
+
+    -no-rpath .......... Do not use the library install path as a runtime
+                         library path.
+ +  -rpath ............. Link Qt libraries and executables using the library
+                         install path as a runtime library path. Equivalent
+                         to -R install_libpath
+
+    -continue .......... Continue as far as possible if an error occurs.
+
+    -verbose, -v ....... Print verbose information about each step of the
+                         configure process.
+
+    -silent ............ Reduce the build output so that warnings and errors
+                         can be seen more easily.
+
+ *  -no-optimized-qmake ... Do not build qmake optimized.
+    -optimized-qmake ...... Build qmake optimized.
+
+ $NSN  -no-nis ............ Do not compile NIS support.
+ $NSY  -nis ............... Compile NIS support.
+
+ $CUN  -no-cups ........... Do not compile CUPS support.
+ $CUY  -cups .............. Compile CUPS support.
+                         Requires cups/cups.h and libcups.so.2.
+
+ $CIN  -no-iconv .......... Do not compile support for iconv(3).
+ $CIY  -iconv ............. Compile support for iconv(3).
+
+ $PHN  -no-pch ............ Do not use precompiled header support.
+ $PHY  -pch ............... Use precompiled header support.
+
+ $DBN  -no-dbus ........... Do not compile the QtDBus module.
+ $DBY  -dbus .............. Compile the QtDBus module and dynamically load libdbus-1.
+    -dbus-linked ....... Compile the QtDBus module and link to libdbus-1.
+
+    -reduce-relocations ..... Reduce relocations in the libraries through extra
+                              linker optimizations (Qt/X11 and Qt for Embedded Linux only;
+                              experimental; needs GNU ld >= 2.18).
+EOF
+
+if [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then
+    if [ "$QT_CROSS_COMPILE" = "yes" ]; then
+        SBY=""
+        SBN="*"
+    else
+        SBY="*"
+        SBN=" "
+    fi
+elif [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
+    SBY="*"
+    SBN=" "
+else
+    SBY=" "
+    SBN="*"
+fi
+
+if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
+
+    cat << EOF
+
+ $SBN  -no-separate-debug-info . Do not store debug information in a separate file.
+ $SBY  -separate-debug-info .... Strip debug information into a separate .debug file.
+
+EOF
+
+fi # X11/QWS
+
+if [ "$PLATFORM_X11" = "yes" ]; then
+    if [ "$CFG_SM" = "no" ]; then
+        SMY=" "
+        SMN="*"
+    else
+        SMY="*"
+        SMN=" "
+    fi
+    if [ "$CFG_XSHAPE" = "no" ]; then
+        SHY=" "
+        SHN="*"
+    else
+        SHY="*"
+        SHN=" "
+    fi
+    if [ "$CFG_XINERAMA" = "no" ]; then
+        XAY=" "
+        XAN="*"
+    else
+        XAY="*"
+        XAN=" "
+    fi
+    if [ "$CFG_FONTCONFIG" = "no" ]; then
+        FCGY=" "
+        FCGN="*"
+    else
+        FCGY="*"
+        FCGN=" "
+    fi
+    if [ "$CFG_XCURSOR" = "no" ]; then
+        XCY=" "
+        XCN="*"
+    else
+        XCY="*"
+        XCN=" "
+    fi
+    if [ "$CFG_XFIXES" = "no" ]; then
+        XFY=" "
+        XFN="*"
+    else
+        XFY="*"
+        XFN=" "
+    fi
+    if [ "$CFG_XRANDR" = "no" ]; then
+        XZY=" "
+        XZN="*"
+    else
+        XZY="*"
+        XZN=" "
+    fi
+    if [ "$CFG_XRENDER" = "no" ]; then
+        XRY=" "
+        XRN="*"
+    else
+        XRY="*"
+        XRN=" "
+    fi
+    if [ "$CFG_MITSHM" = "no" ]; then
+        XMY=" "
+        XMN="*"
+    else
+        XMY="*"
+        XMN=" "
+    fi
+    if [ "$CFG_XINPUT" = "no" ]; then
+        XIY=" "
+        XIN="*"
+    else
+        XIY="*"
+        XIN=" "
+    fi
+    if [ "$CFG_XKB" = "no" ]; then
+        XKY=" "
+        XKN="*"
+    else
+        XKY="*"
+        XKN=" "
+    fi
+    if [ "$CFG_IM" = "no" ]; then
+        IMY=" "
+        IMN="*"
+    else
+        IMY="*"
+        IMN=" "
+    fi
+    cat << EOF
+
+Qt/X11 only:
+
+    -no-gtkstyle ....... Do not build the GTK theme integration.
+ +  -gtkstyle .......... Build the GTK theme integration.
+
+ *  -no-nas-sound ...... Do not compile in NAS sound support.
+    -system-nas-sound .. Use NAS libaudio from the operating system.
+                         See http://radscan.com/nas.html
+
+    -no-opengl ......... Do not support OpenGL.
+ +  -opengl <api> ...... Enable OpenGL support.
+                         With no parameter, this will auto-detect the "best"
+                         OpenGL API to use. If desktop OpenGL is avaliable, it
+                         will be used. Use desktop, es1, es1cl or es2 for <api>
+                         to force the use of the Desktop (OpenGL 1.x or 2.x),
+                         OpenGL ES 1.x Common profile, 1.x Common Lite profile
+                         or 2.x APIs instead. On X11, the EGL API will be used
+                         to manage GL contexts in the case of OpenGL ES.
+
+ $SMN  -no-sm ............. Do not support X Session Management.
+ $SMY  -sm ................ Support X Session Management, links in -lSM -lICE.
+
+ $SHN  -no-xshape ......... Do not compile XShape support.
+ $SHY  -xshape ............ Compile XShape support.
+                         Requires X11/extensions/shape.h.
+
+ $XAN  -no-xinerama ....... Do not compile Xinerama (multihead) support.
+ $XAY  -xinerama .......... Compile Xinerama support.
+                         Requires X11/extensions/Xinerama.h and libXinerama.
+			 By default, Xinerama support will be compiled if
+                         available and the shared libraries are dynamically
+                         loaded at runtime.
+
+ $XCN  -no-xcursor ........ Do not compile Xcursor support.
+ $XCY  -xcursor ........... Compile Xcursor support.
+                         Requires X11/Xcursor/Xcursor.h and libXcursor.
+			 By default, Xcursor support will be compiled if
+                         available and the shared libraries are dynamically
+                         loaded at runtime.
+
+ $XFN  -no-xfixes ......... Do not compile Xfixes support.
+ $XFY  -xfixes ............ Compile Xfixes support.
+                         Requires X11/extensions/Xfixes.h and libXfixes.
+			 By default, Xfixes support will be compiled if
+                         available and the shared libraries are dynamically
+                         loaded at runtime.
+
+ $XZN  -no-xrandr ......... Do not compile Xrandr (resize and rotate) support.
+ $XZY  -xrandr ............ Compile Xrandr support.
+                         Requires X11/extensions/Xrandr.h and libXrandr.
+
+ $XRN  -no-xrender ........ Do not compile Xrender support.
+ $XRY  -xrender ........... Compile Xrender support.
+                         Requires X11/extensions/Xrender.h and libXrender.
+
+ $XMN  -no-mitshm ......... Do not compile MIT-SHM support.
+ $XMY  -mitshm ............ Compile MIT-SHM support.
+                         Requires sys/ipc.h, sys/shm.h and X11/extensions/XShm.h
+
+ $FCGN  -no-fontconfig ..... Do not compile FontConfig (anti-aliased font) support.
+ $FCGY  -fontconfig ........ Compile FontConfig support.
+                         Requires fontconfig/fontconfig.h, libfontconfig,
+                         freetype.h and libfreetype.
+
+ $XIN  -no-xinput.......... Do not compile Xinput support.
+ $XIY  -xinput ............ Compile Xinput support. This also enabled tablet support
+                         which requires IRIX with wacom.h and libXi or
+                         XFree86 with X11/extensions/XInput.h and libXi.
+
+ $XKN  -no-xkb ............ Do not compile XKB (X KeyBoard extension) support.
+ $XKY  -xkb ............... Compile XKB support.
+
+EOF
+fi
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    cat << EOF
+
+Qt/Mac only:
+
+    -Fstring ........... Add an explicit framework path.
+    -fw string ......... Add an explicit framework.
+
+    -cocoa ............. Build the Cocoa version of Qt. Note that -no-framework
+                         and -static is not supported with -cocoa. Specifying
+                         this option creates Qt binaries that requires Mac OS X
+                         10.5 or higher.
+
+ *  -framework ......... Build Qt as a series of frameworks and
+                         link tools against those frameworks.
+    -no-framework ...... Do not build Qt as a series of frameworks.
+
+ *  -dwarf2 ............ Enable dwarf2 debugging symbols.
+    -no-dwarf2 ......... Disable dwarf2 debugging symbols.
+
+    -universal ......... Equivalent to -arch "ppc x86"
+
+    -arch <arch> ....... Build Qt for <arch>
+                         Example values for <arch>: x86 ppc x86_64 ppc64
+                         Multiple -arch arguments can be specified, 64-bit archs
+                         will be built with the Cocoa framework.
+
+    -sdk <sdk> ......... Build Qt using Apple provided SDK <sdk>. This option requires gcc 4.
+                         To use a different SDK with gcc 3.3, set the SDKROOT environment variable.
+
+EOF
+fi
+
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    cat << EOF
+
+Qt for Embedded Linux only:
+
+    -xplatform target ... The target platform when cross-compiling.
+
+    -no-feature-<feature> Do not compile in <feature>.
+    -feature-<feature> .. Compile in <feature>. The available features
+                          are described in src/corelib/global/qfeatures.txt
+
+    -embedded <arch> .... This will enable the embedded build, you must have a
+                          proper license for this switch to work.
+                          Example values for <arch>: arm mips x86 generic
+
+    -armfpa ............. Target platform is uses the ARM-FPA floating point format.
+    -no-armfpa .......... Target platform does not use the ARM-FPA floating point format.
+
+                          The floating point format is usually autodetected by configure. Use this
+                          to override the detected value.
+
+    -little-endian ...... Target platform is little endian (LSB first).
+    -big-endian ......... Target platform is big endian (MSB first).
+
+    -host-little-endian . Host platform is little endian (LSB first).
+    -host-big-endian .... Host platform is big endian (MSB first).
+
+                          You only need to specify the endianness when
+                          cross-compiling, otherwise the host
+                          endianness will be used.
+
+    -no-freetype ........ Do not compile in Freetype2 support.
+    -qt-freetype ........ Use the libfreetype bundled with Qt.
+ *  -system-freetype .... Use libfreetype from the operating system.
+                          See http://www.freetype.org/
+
+    -qconfig local ...... Use src/corelib/global/qconfig-local.h rather than the
+                          default ($CFG_QCONFIG).
+
+    -depths <list> ...... Comma-separated list of supported bit-per-pixel
+                          depths, from: 1, 4, 8, 12, 15, 16, 18, 24, 32 and 'all'.
+
+    -qt-decoration-<style> ....Enable a decoration <style> in the QtGui library,
+                               by default all available decorations are on.
+			       Possible values for <style>: [ $CFG_DECORATION_AVAILABLE ]
+    -plugin-decoration-<style> Enable decoration <style> as a plugin to be
+                               linked to at run time.
+			       Possible values for <style>: [ $CFG_DECORATION_PLUGIN_AVAILABLE ]
+    -no-decoration-<style> ....Disable decoration <style> entirely.
+                               Possible values for <style>: [ $CFG_DECORATION_AVAILABLE ]
+
+    -no-opengl .......... Do not support OpenGL.
+    -opengl <api> ....... Enable OpenGL ES support
+                          With no parameter, this will attempt to auto-detect OpenGL ES 1.x
+                          or 2.x. Use es1, es1cl or es2 for <api> to override auto-detection.
+
+                          NOTE: A QGLScreen driver for the hardware is required to support
+                                OpenGL ES on Qt for Embedded Linux.
+
+    -qt-gfx-<driver> ... Enable a graphics <driver> in the QtGui library.
+                         Possible values for <driver>: [ $CFG_GFX_AVAILABLE ]
+    -plugin-gfx-<driver> Enable graphics <driver> as a plugin to be
+                         linked to at run time.
+                         Possible values for <driver>: [ $CFG_GFX_PLUGIN_AVAILABLE ]
+    -no-gfx-<driver> ... Disable graphics <driver> entirely.
+                         Possible values for <driver>: [ $CFG_GFX_AVAILABLE ]
+
+    -qt-kbd-<driver> ... Enable a keyboard <driver> in the QtGui library.
+                         Possible values for <driver>: [ $CFG_KBD_AVAILABLE ]
+
+    -plugin-kbd-<driver> Enable keyboard <driver> as a plugin to be linked to
+                         at runtime.
+                         Possible values for <driver>: [ $CFG_KBD_PLUGIN_AVAILABLE ]
+
+    -no-kbd-<driver> ... Disable keyboard <driver> entirely.
+                         Possible values for <driver>: [ $CFG_KBD_AVAILABLE ]
+
+    -qt-mouse-<driver> ... Enable a mouse <driver> in the QtGui library.
+                           Possible values for <driver>: [ $CFG_MOUSE_AVAILABLE ]
+    -plugin-mouse-<driver> Enable mouse <driver> as a plugin to be linked to
+                           at runtime.
+                           Possible values for <driver>: [ $CFG_MOUSE_PLUGIN_AVAILABLE ]
+    -no-mouse-<driver> ... Disable mouse <driver> entirely.
+                           Possible values for <driver>: [ $CFG_MOUSE_AVAILABLE ]
+
+    -iwmmxt ............ Compile using the iWMMXt instruction set
+                         (available on some XScale CPUs).
+
+EOF
+fi
+
+
+if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_X11" = "yes" ]; then
+    if [ "$CFG_GLIB" = "no" ]; then
+        GBY=" "
+        GBN="+"
+    else
+        GBY="+"
+        GBN=" "
+    fi
+    cat << EOF
+ $GBN  -no-glib ........... Do not compile Glib support.
+ $GBY  -glib .............. Compile Glib support.
+
+EOF
+fi
+
+   [ "x$ERROR" = "xyes" ] && exit 1
+   exit 0
+fi # Help
+
+
+# -----------------------------------------------------------------------------
+# LICENSING, INTERACTIVE PART
+# -----------------------------------------------------------------------------
+
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    Platform="Qt for Embedded Linux"
+elif [ "$PLATFORM_MAC" = "yes" ]; then
+    Platform="Qt/Mac"
+else
+    PLATFORM_X11=yes
+    Platform="Qt/X11"
+fi
+
+echo
+echo "This is the $Platform ${EditionString} Edition."
+echo
+
+if [ "$Edition" = "Qtopia" ]; then
+    TheLicense=`head -n 1 "$relpath/LICENSE.Qtopia"`
+    while true; do
+        if [ "$OPT_CONFIRM_LICENSE" = "yes" -o "$CFG_NOKIA" = "yes" ]; then
+            echo "You have already accepted the terms of the $TheLicense license."
+            acceptance=yes
+        else
+            echo "You are licensed to use this software under the terms of"
+            echo "the $TheLicense"
+            echo
+            echo "Type '?' to read the $TheLicense"
+            echo "Type 'yes' to accept this license offer."
+            echo "Type 'no' to decline this license offer."
+            echo
+            if echo '\c' | grep '\c' >/dev/null; then
+                echo -n "Do you accept the terms of the license? "
+            else
+                echo "Do you accept the terms of the license? \c"
+            fi
+            read acceptance
+        fi
+        echo
+        if [ "$acceptance" = "yes" ]; then
+            break
+        elif [ "$acceptance" = "no" ] ;then
+            echo "You are not licensed to use this software."
+            echo
+            exit 0
+        elif [ "$acceptance" = "?" ]; then
+            more "$relpath/LICENSE.Qtopia"
+        fi
+    done
+elif [ "$Edition" = "NokiaInternalBuild" ]; then
+    echo "Detected -nokia-developer option"
+    echo "Nokia employees and agents are allowed to use this software under"
+    echo "the authority of Nokia Corporation and/or its subsidiary(-ies)"
+elif [ "$Edition" = "OpenSource" ]; then
+    while true; do
+        echo "You are licensed to use this software under the terms of"
+        echo "the GNU General Public License (GPL) versions 3."
+        echo "You are also licensed to use this software under the terms of"
+        echo "the Lesser GNU General Public License (LGPL) versions 2.1."
+        echo
+        affix="either"
+        if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then
+	    echo "You have already accepted the terms of the $LicenseType license."
+            acceptance=yes
+        else
+	    echo "Type '3' to view the GNU General Public License version 3."
+            echo "Type 'L' to view the Lesser GNU General Public License version 2.1."
+            echo "Type 'yes' to accept this license offer."
+            echo "Type 'no' to decline this license offer."
+            echo
+            if echo '\c' | grep '\c' >/dev/null; then
+                echo -n "Do you accept the terms of $affix license? "
+            else
+                echo "Do you accept the terms of $affix license? \c"
+            fi
+            read acceptance
+        fi
+        echo
+        if [ "$acceptance" = "yes" ]; then
+            break
+        elif [ "$acceptance" = "no" ]; then
+            echo "You are not licensed to use this software."
+            echo
+            exit 1
+        elif [ "$acceptance" = "3" ]; then
+            more "$relpath/LICENSE.GPL3"
+        elif [ "$acceptance" = "L" ]; then
+            more "$relpath/LICENSE.LGPL"
+        fi
+    done
+elif [ "$Edition" = "Preview" ]; then
+    TheLicense=`head -n 1 "$relpath/LICENSE.PREVIEW.COMMERCIAL"`
+    while true; do
+
+        if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then
+            echo "You have already accepted the terms of the $LicenseType license."
+            acceptance=yes
+        else
+            echo "You are licensed to use this software under the terms of"
+            echo "the $TheLicense"
+            echo
+            echo "Type '?' to read the Preview License."
+            echo "Type 'yes' to accept this license offer."
+            echo "Type 'no' to decline this license offer."
+            echo
+            if echo '\c' | grep '\c' >/dev/null; then
+                echo -n "Do you accept the terms of the license? "
+            else
+                echo "Do you accept the terms of the license? \c"
+            fi
+            read acceptance
+        fi
+        echo
+        if [ "$acceptance" = "yes" ]; then
+            break
+        elif [ "$acceptance" = "no" ] ;then
+            echo "You are not licensed to use this software."
+            echo
+            exit 0
+        elif [ "$acceptance" = "?" ]; then
+            more "$relpath/LICENSE.PREVIEW.COMMERCIAL"
+        fi
+    done
+elif [ "$Edition" != "OpenSource" ]; then
+    if [ -n "$ExpiryDate" ]; then
+        ExpiryDate=`echo $ExpiryDate | sed -e "s,-,,g" | tr -d "\n\r"`
+        [ -z "$ExpiryDate" ] && ExpiryDate="0"
+        Today=`date +%Y%m%d`
+        if [ "$Today" -gt "$ExpiryDate" ]; then
+            case "$LicenseType" in
+            Commercial|Academic|Educational)
+                if [ "$QT_PACKAGEDATE" -gt "$ExpiryDate" ]; then
+                    echo
+                    echo "NOTICE  NOTICE  NOTICE  NOTICE"
+                    echo
+                    echo "  Your support and upgrade period has expired."
+                    echo
+                    echo "  You are no longer licensed to use this version of Qt."
+                    echo "  Please contact sales@trolltech.com to renew your support"
+                    echo "  and upgrades for this license."
+                    echo
+                    echo "NOTICE  NOTICE  NOTICE  NOTICE"
+                    echo
+                    exit 1
+                else
+                    echo
+                    echo "WARNING  WARNING  WARNING  WARNING"
+                    echo
+                    echo "  Your support and upgrade period has expired."
+                    echo
+                    echo "  You may continue to use your last licensed release"
+                    echo "  of Qt under the terms of your existing license"
+                    echo "  agreement. But you are not entitled to technical"
+                    echo "  support, nor are you entitled to use any more recent"
+                    echo "  Qt releases."
+                    echo
+                    echo "  Please contact sales@trolltech.com to renew your"
+                    echo "  support and upgrades for this license."
+                    echo
+                    echo "WARNING  WARNING  WARNING  WARNING"
+                    echo
+                    sleep 3
+                fi
+                ;;
+            Evaluation|*)
+                echo
+                echo "NOTICE  NOTICE  NOTICE  NOTICE"
+                echo
+                echo "  Your Evaluation license has expired."
+                echo
+                echo "  You are no longer licensed to use this software. Please"
+                echo "  contact sales@trolltech.com to purchase license, or install"
+                echo "  the Qt Open Source Edition if you intend to develop free"
+                echo "  software."
+                echo
+                echo "NOTICE  NOTICE  NOTICE  NOTICE"
+                echo
+                exit 1
+                ;;
+            esac
+        fi
+    fi
+    TheLicense=`head -n 1 "$outpath/LICENSE"`
+    while true; do
+        if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then
+	    echo "You have already accepted the terms of the $TheLicense."
+            acceptance=yes
+        else
+            echo "You are licensed to use this software under the terms of"
+            echo "the $TheLicense."
+            echo
+            echo "Type '?' to view the $TheLicense."
+            echo "Type 'yes' to accept this license offer."
+            echo "Type 'no' to decline this license offer."
+            echo
+            if echo '\c' | grep '\c' >/dev/null; then
+                echo -n "Do you accept the terms of the $TheLicense? "
+            else
+                echo "Do you accept the terms of the $TheLicense? \c"
+            fi
+            read acceptance
+        fi
+        echo
+        if [ "$acceptance" = "yes" ]; then
+            break
+        elif [ "$acceptance" = "no" ]; then
+            echo "You are not licensed to use this software."
+            echo
+            exit 1
+        else [ "$acceptance" = "?" ]
+            more "$outpath/LICENSE"
+        fi
+    done
+fi
+
+# this should be moved somewhere else
+case "$PLATFORM" in
+aix-*)
+    AIX_VERSION=`uname -v`
+    if [ "$AIX_VERSION" -lt "5" ]; then
+	QMakeVar add QMAKE_LIBS_X11 -lbind
+    fi
+    ;;
+*)
+    ;;
+esac
+
+#-------------------------------------------------------------------------------
+# generate qconfig.cpp
+#-------------------------------------------------------------------------------
+[ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
+
+LICENSE_USER_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_lcnsuser=$Licensee"`
+LICENSE_PRODUCTS_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_lcnsprod=$Edition"`
+PREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_INSTALL_PREFIX"`
+DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
+HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
+LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS"`
+BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS"`
+PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
+DATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_INSTALL_DATA"`
+TRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_INSTALL_TRANSLATIONS"`
+SETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
+EXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"`
+DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
+
+cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+/* License Info */
+static const char qt_configure_licensee_str          [256 + 12] = "$LICENSE_USER_STR";
+static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PRODUCTS_STR";
+EOF
+
+if [ ! -z "$QT_HOST_PREFIX" ]; then
+    HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"`
+    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
+    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
+    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
+    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
+    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
+    HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX"`
+    HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"`
+    HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
+    HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"`
+    HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
+
+    cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+
+#if defined(QT_BOOTSTRAPPED) || defined(QT_BUILD_QMAKE)
+/* Installation Info */
+static const char qt_configure_prefix_path_str       [256 + 12] = "$HOSTPREFIX_PATH_STR";
+static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
+static const char qt_configure_headers_path_str      [256 + 12] = "$HOSTHEADERS_PATH_STR";
+static const char qt_configure_libraries_path_str    [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
+static const char qt_configure_binaries_path_str     [256 + 12] = "$HOSTBINARIES_PATH_STR";
+static const char qt_configure_plugins_path_str      [256 + 12] = "$HOSTPLUGINS_PATH_STR";
+static const char qt_configure_data_path_str         [256 + 12] = "$HOSTDATA_PATH_STR";
+static const char qt_configure_translations_path_str [256 + 12] = "$HOSTTRANSLATIONS_PATH_STR";
+static const char qt_configure_settings_path_str     [256 + 12] = "$HOSTSETTINGS_PATH_STR";
+static const char qt_configure_examples_path_str     [256 + 12] = "$HOSTEXAMPLES_PATH_STR";
+static const char qt_configure_demos_path_str        [256 + 12] = "$HOSTDEMOS_PATH_STR";
+#else // QT_BOOTSTRAPPED
+EOF
+fi
+
+cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+/* Installation Info */
+static const char qt_configure_prefix_path_str       [256 + 12] = "$PREFIX_PATH_STR";
+static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
+static const char qt_configure_headers_path_str      [256 + 12] = "$HEADERS_PATH_STR";
+static const char qt_configure_libraries_path_str    [256 + 12] = "$LIBRARIES_PATH_STR";
+static const char qt_configure_binaries_path_str     [256 + 12] = "$BINARIES_PATH_STR";
+static const char qt_configure_plugins_path_str      [256 + 12] = "$PLUGINS_PATH_STR";
+static const char qt_configure_data_path_str         [256 + 12] = "$DATA_PATH_STR";
+static const char qt_configure_translations_path_str [256 + 12] = "$TRANSLATIONS_PATH_STR";
+static const char qt_configure_settings_path_str     [256 + 12] = "$SETTINGS_PATH_STR";
+static const char qt_configure_examples_path_str     [256 + 12] = "$EXAMPLES_PATH_STR";
+static const char qt_configure_demos_path_str        [256 + 12] = "$DEMOS_PATH_STR";
+EOF
+
+if [ ! -z "$QT_HOST_PREFIX" ]; then
+    cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+#endif // QT_BOOTSTRAPPED
+
+EOF
+fi
+
+cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+/* strlen( "qt_lcnsxxxx" ) == 12 */
+#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12;
+#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12;
+#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12;
+#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
+#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
+#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
+#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
+#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
+#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12;
+#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12;
+#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12;
+#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12;
+#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12;
+EOF
+
+# avoid unecessary rebuilds by copying only if qconfig.cpp has changed
+if cmp -s "$outpath/src/corelib/global/qconfig.cpp" "$outpath/src/corelib/global/qconfig.cpp.new"; then
+    rm -f "$outpath/src/corelib/global/qconfig.cpp.new"
+else
+    [ -f "$outpath/src/corelib/global/qconfig.cpp" ] && chmod +w "$outpath/src/corelib/global/qconfig.cpp"
+    mv "$outpath/src/corelib/global/qconfig.cpp.new" "$outpath/src/corelib/global/qconfig.cpp"
+    chmod -w "$outpath/src/corelib/global/qconfig.cpp"
+fi
+
+# -----------------------------------------------------------------------------
+# build qmake
+# -----------------------------------------------------------------------------
+
+# symlink includes
+if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then
+    SYNCQT_OPTS=
+    [ "$CFG_DEV" = "yes" ] && SYNCQT_OPTS="$SYNCQT_OPTS -check-includes"
+    if [ "$OPT_SHADOW" = "yes" ]; then
+        "$outpath/bin/syncqt" $SYNCQT_OPTS
+    elif [ "$CFG_DEV" = "yes" ]; then
+        QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS
+    fi
+fi
+
+# $1: variable name
+# $2: optional transformation
+# relies on $QMAKESPEC, $COMPILER_CONF and $mkfile being set correctly, as the latter
+# is where the resulting variable is written to
+setBootstrapVariable()
+{
+    variableRegExp="^$1[^_A-Z0-9]"
+    getQMakeConf | grep "$variableRegExp" | ( [ -n "$2" ] && sed "$2" ; [ -z "$2" ] && cat ) | $AWK '
+{
+    varLength = index($0, "=") - 1
+    valStart = varLength + 2
+    if (substr($0, varLength, 1) == "+") {
+        varLength = varLength - 1
+        valStart = valStart + 1
+    }
+    var = substr($0, 0, varLength)
+    gsub("[ \t]+", "", var)
+    val = substr($0, valStart)
+    printf "%s_%s = %s\n", var, NR, val
+}
+END {
+    if (length(var) > 0) {
+        printf "%s =", var
+        for (i = 1; i <= NR; ++i)
+            printf " $(%s_%s)", var, i
+        printf "\n"
+    }
+}' >> "$mkfile"
+}
+
+# build qmake
+if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+    echo "Creating qmake. Please wait..."
+
+    OLD_QCONFIG_H=
+    QCONFIG_H="$outpath/src/corelib/global/qconfig.h"
+    QMAKE_QCONFIG_H="${QCONFIG_H}.qmake"
+    if [ -f "$QCONFIG_H" ]; then
+         OLD_QCONFIG_H=$QCONFIG_H
+         mv -f "$OLD_QCONFIG_H" "${OLD_QCONFIG_H}.old"
+    fi
+
+    # create temporary qconfig.h for compiling qmake, if it doesn't exist
+    # when building qmake, we use #defines for the install paths,
+    # however they are real functions in the library
+    if [ '!' -f "$QMAKE_QCONFIG_H" ]; then
+        mkdir -p "$outpath/src/corelib/global"
+        [ -f "$QCONFIG_H" ] && chmod +w "$QCONFIG_H"
+        echo "/* All features enabled while building qmake */" >"$QMAKE_QCONFIG_H"
+    fi
+
+    mv -f "$QMAKE_QCONFIG_H" "$QCONFIG_H"
+    for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do
+        if [ '!' -f "$conf" ]; then
+            ln -s "$QCONFIG_H" "$conf"
+        fi
+    done
+
+    #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured
+    rm -f mkspecs/default
+    ln -s `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
+    # fix makefiles
+    for mkfile in GNUmakefile Makefile; do
+        EXTRA_LFLAGS=
+        EXTRA_CFLAGS=
+        in_mkfile="${mkfile}.in"
+        if [ "$mkfile" = "Makefile" ]; then
+#           if which qmake >/dev/null 2>&1 && [ -f qmake/qmake.pro ]; then
+#               (cd qmake && qmake) >/dev/null 2>&1 && continue
+#           fi
+            in_mkfile="${mkfile}.unix"
+        fi
+        in_mkfile="$relpath/qmake/$in_mkfile"
+        mkfile="$outpath/qmake/$mkfile"
+        if [ -f "$mkfile" ]; then
+            [ "$CFG_DEV" = "yes" ] && "$WHICH" chflags >/dev/null 2>&1 && chflags nouchg "$mkfile"
+            rm -f "$mkfile"
+        fi
+        [ -f "$in_mkfile" ] || continue
+
+        echo "########################################################################" >$mkfile
+        echo "## This file was autogenerated by configure, all changes will be lost ##" >>$mkfile
+        echo "########################################################################" >>$mkfile
+        EXTRA_OBJS=
+        EXTRA_SRCS=
+        EXTRA_CFLAGS="\$(QMAKE_CFLAGS)"
+        EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)"
+        EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
+
+        if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then
+	    EXTRA_LFLAGS="$EXTRA_LFLAGS -lm"
+        fi
+
+	[ -n "$CC" ] && echo "CC = $CC" >>$mkfile
+	[ -n "$CXX" ] && echo "CXX = $CXX" >>$mkfile
+        if [ "$CFG_SILENT" = "yes" ]; then
+            [ -z "$CC" ] && setBootstrapVariable QMAKE_CC 's,QMAKE_CC.*=,CC=\@,'
+            [ -z "$CXX" ] && setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX.*=,CXX=\@,'
+        else
+            [ -z "$CC" ] && setBootstrapVariable QMAKE_CC 's,QMAKE_CC,CC,'
+            [ -z "$CXX" ] && setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX,CXX,'
+        fi
+        setBootstrapVariable QMAKE_CFLAGS
+        setBootstrapVariable QMAKE_CXXFLAGS 's,\$\$QMAKE_CFLAGS,\$(QMAKE_CFLAGS),'
+        setBootstrapVariable QMAKE_LFLAGS
+
+        if [ $QT_EDITION = "QT_EDITION_OPENSOURCE" ]; then
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION"
+            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DQMAKE_OPENSOURCE_EDITION"
+        fi
+        if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
+            setBootstrapVariable QMAKE_CFLAGS_RELEASE
+            setBootstrapVariable QMAKE_CXXFLAGS_RELEASE 's,\$\$QMAKE_CFLAGS_RELEASE,\$(QMAKE_CFLAGS_RELEASE),'
+            EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)"
+            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)"
+        elif [ "$CFG_DEBUG" = "yes" ]; then
+            setBootstrapVariable QMAKE_CFLAGS_DEBUG
+            setBootstrapVariable QMAKE_CXXFLAGS_DEBUG 's,\$\$QMAKE_CFLAGS_DEBUG,\$(QMAKE_CFLAGS_DEBUG),'
+            EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
+            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
+        fi
+
+	if [ '!' -z "$RPATH_FLAGS" ] && [ '!' -z "`getQMakeConf \"$QMAKESPEC\" | grep QMAKE_RPATH | awk '{print $3;}'`" ]; then
+  	    setBootstrapVariable QMAKE_RPATH 's,\$\$LITERAL_WHITESPACE, ,'
+	    for rpath in $RPATH_FLAGS; do
+		EXTRA_LFLAGS="\$(QMAKE_RPATH)\"$rpath\" $EXTRA_LFLAGS"
+            done
+        fi
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            if [ "$PLATFORM" = "macx-icc" ]; then
+                echo "export MACOSX_DEPLOYMENT_TARGET = 10.4" >>"$mkfile"
+	    else
+                echo "export MACOSX_DEPLOYMENT_TARGET = 10.3" >>"$mkfile"
+	    fi
+            echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
+            echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
+            EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
+            EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS)"
+            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
+            EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
+            EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
+	    if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then
+		X86_CFLAGS="-arch i386"
+		X86_LFLAGS="-arch i386"
+		EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
+		EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
+                EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
+            fi
+	    if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then
+		PPC_CFLAGS="-arch ppc"
+		PPC_LFLAGS="-arch ppc"
+		EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS"
+		EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS"
+                EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS"
+            fi
+	    if [ '!' -z "$CFG_SDK" ]; then
+		echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
+		echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
+		EXTRA_CFLAGS="$EXTRA_CFLAGS \$(SDK_CFLAGS)"
+		EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(SDK_CFLAGS)"
+		EXTRA_LFLAGS="$EXTRA_LFLAGS \$(SDK_LFLAGS)"
+            fi
+        fi
+        [ "$CFG_EMBEDDED" != "no" ] && EXTRA_CFLAGS="$EXTRA_CFLAGS -DQWS"
+        if [ '!' -z "$D_FLAGS" ]; then
+            for DEF in $D_FLAGS; do
+                EXTRA_CFLAGS="$EXTRA_CFLAGS \"-D${DEF}\""
+            done
+        fi
+        QMAKE_BIN_DIR="$QT_INSTALL_BINS"
+        [ -z "$QMAKE_BIN_DIR" ] && QMAKE_BIN_DIR="${QT_INSTALL_PREFIX}/bin"
+        QMAKE_DATA_DIR="$QT_INSTALL_DATA"
+        [ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${QT_INSTALL_PREFIX}"
+        echo >>"$mkfile"
+	adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
+	adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'`
+        sed -e "s,@SOURCE_PATH@,$adjrelpath,g" -e "s,@BUILD_PATH@,$adjoutpath,g" \
+            -e "s,@QMAKE_CFLAGS@,$EXTRA_CFLAGS,g" -e "s,@QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \
+            -e "s,@QMAKE_CXXFLAGS@,$EXTRA_CXXFLAGS,g" \
+            -e "s,@QT_INSTALL_BINS@,\$(INSTALL_ROOT)$QMAKE_BIN_DIR,g" \
+            -e "s,@QT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \
+            -e "s,@QMAKE_QTOBJS@,$EXTRA_OBJS,g" -e "s,@QMAKE_QTSRCS@,$EXTRA_SRCS,g" \
+	    -e "s,@QMAKESPEC@,$QMAKESPEC,g" "$in_mkfile" >>"$mkfile"
+
+        if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then
+            (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1
+	    sed "s,^.*/\([^/]*.o\):,\1:,g" "$mkfile" >"${mkfile}.tmp"
+	    mv "${mkfile}.tmp" "${mkfile}"
+        fi
+    done
+
+    QMAKE_BUILD_ERROR=no
+    (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes
+    [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
+    [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
+    [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
+fi # Build qmake
+
+#-------------------------------------------------------------------------------
+# tests that need qmake
+#-------------------------------------------------------------------------------
+
+# detect availability of float math.h functions
+if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then
+    CFG_USE_FLOATMATH=yes
+else
+    CFG_USE_FLOATMATH=no
+fi
+
+# detect mmx support
+if [ "${CFG_MMX}" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mmx "mmx" $L_FLAGS $I_FLAGS $l_FLAGS "-mmmx"; then
+	CFG_MMX=yes
+    else
+	CFG_MMX=no
+    fi
+fi
+
+# detect 3dnow support
+if [ "${CFG_3DNOW}" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/3dnow "3dnow" $L_FLAGS $I_FLAGS $l_FLAGS "-m3dnow"; then
+	CFG_3DNOW=yes
+    else
+	CFG_3DNOW=no
+    fi
+fi
+
+# detect sse support
+if [ "${CFG_SSE}" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse "sse" $L_FLAGS $I_FLAGS $l_FLAGS "-msse"; then
+	CFG_SSE=yes
+    else
+	CFG_SSE=no
+    fi
+fi
+
+# detect sse2 support
+if [ "${CFG_SSE2}" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $l_FLAGS "-msse2"; then
+       CFG_SSE2=yes
+    else
+       CFG_SSE2=no
+    fi
+fi
+
+# check iWMMXt support
+if [ "$CFG_IWMMXT" = "yes" ]; then
+    if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"; then
+        echo "The iWMMXt functionality test failed!"
+	echo " Please make sure your compiler supports iWMMXt intrinsics!"
+	exit 1
+    fi
+fi
+
+# detect zlib
+if [ "$CFG_ZLIB" = "no" ]; then
+    # Note: Qt no longer support builds without zlib
+    # So we force a "no" to be "auto" here.
+    # If you REALLY really need no zlib support, you can still disable
+    # it by doing the following:
+    #   add "no-zlib" to mkspecs/qconfig.pri
+    #   #define QT_NO_COMPRESS (probably by adding to src/corelib/global/qconfig.h)
+    #
+    # There's no guarantee that Qt will build under those conditions
+
+    CFG_ZLIB=auto
+    ZLIB_FORCED=yes
+fi
+if [ "$CFG_ZLIB" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS; then
+       CFG_ZLIB=system
+    else
+       CFG_ZLIB=yes
+    fi
+fi
+
+# detect how jpeg should be built
+if [ "$CFG_JPEG" = "auto" ]; then
+    if [ "$CFG_SHARED" = "yes" ]; then
+        CFG_JPEG=plugin
+    else
+        CFG_JPEG=yes
+    fi
+fi
+# detect jpeg
+if [ "$CFG_LIBJPEG" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS; then
+       CFG_LIBJPEG=system
+    else
+       CFG_LIBJPEG=qt
+    fi
+fi
+
+# detect how gif should be built
+if [ "$CFG_GIF" = "auto" ]; then
+    if [ "$CFG_SHARED" = "yes" ]; then
+        CFG_GIF=plugin
+    else
+        CFG_GIF=yes
+    fi
+fi
+
+# detect how tiff should be built
+if [ "$CFG_TIFF" = "auto" ]; then
+    if [ "$CFG_SHARED" = "yes" ]; then
+        CFG_TIFF=plugin
+    else
+        CFG_TIFF=yes
+    fi
+fi
+
+# detect tiff
+if [ "$CFG_LIBTIFF" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_LIBTIFF=system
+    else
+        CFG_LIBTIFF=qt
+    fi
+fi
+
+# detect how mng should be built
+if [ "$CFG_MNG" = "auto" ]; then
+    if [ "$CFG_SHARED" = "yes" ]; then
+        CFG_MNG=plugin
+    else
+        CFG_MNG=yes
+    fi
+fi
+# detect mng
+if [ "$CFG_LIBMNG" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS; then
+       CFG_LIBMNG=system
+    else
+       CFG_LIBMNG=qt
+    fi
+fi
+
+# detect png
+if [ "$CFG_LIBPNG" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS; then
+       CFG_LIBPNG=system
+    else
+       CFG_LIBPNG=qt
+    fi
+fi
+
+# detect accessibility
+if [ "$CFG_ACCESSIBILITY" = "auto" ]; then
+    CFG_ACCESSIBILITY=yes
+fi
+
+# auto-detect SQL-modules support
+for _SQLDR in $CFG_SQL_AVAILABLE; do
+        case $_SQLDR in
+        mysql)
+            if [ "$CFG_SQL_mysql" != "no" ]; then
+		[ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`$WHICH mysql_config`
+                if [ -x "$CFG_MYSQL_CONFIG" ]; then
+                    QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
+                    QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null`
+                    QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null`
+		    QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null`
+                    QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1`
+                fi
+                if [ -n "$QT_MYSQL_VERSION" ] && [ "$QT_MYSQL_VERSION_MAJOR" -lt 4 ]; then
+                    if [ "$CFG_SQL_mysql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "This version of MySql is not supported ($QT_MYSQL_VERSION)."
+                        echo " You need MySql 4 or higher."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_mysql="no"
+			QT_LFLAGS_MYSQL=""
+			QT_LFLAGS_MYSQL_R=""
+			QT_CFLAGS_MYSQL=""
+                    fi
+                else
+                    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql_r "MySQL (thread-safe)" $QT_LFLAGS_MYSQL_R $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then
+                        QMakeVar add CONFIG use_libmysqlclient_r
+                        if [ "$CFG_SQL_mysql" = "auto" ]; then
+                            CFG_SQL_mysql=plugin
+                        fi
+                        QT_LFLAGS_MYSQL="$QT_LFLAGS_MYSQL_R"
+                    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql "MySQL (thread-unsafe)" $QT_LFLAGS_MYSQL $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then
+                        if [ "$CFG_SQL_mysql" = "auto" ]; then
+                            CFG_SQL_mysql=plugin
+                        fi
+                    else
+                        if [ "$CFG_SQL_mysql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                            echo "MySQL support cannot be enabled due to functionality tests!"
+                            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                            echo " If you believe this message is in error you may use the continue"
+                            echo " switch (-continue) to $0 to continue."
+                            exit 101
+                        else
+                            CFG_SQL_mysql=no
+			    QT_LFLAGS_MYSQL=""
+			    QT_LFLAGS_MYSQL_R=""
+			    QT_CFLAGS_MYSQL=""
+                        fi
+                    fi
+                fi
+            fi
+            ;;
+        psql)
+            if [ "$CFG_SQL_psql" != "no" ]; then
+                if "$WHICH" pg_config >/dev/null 2>&1; then
+                    QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
+                    QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
+                fi
+                [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
+                [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_psql" = "auto" ]; then
+                        CFG_SQL_psql=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_psql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "PostgreSQL support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_psql=no
+                        QT_CFLAGS_PSQL=""
+                        QT_LFLAGS_PSQL=""
+                    fi
+                fi
+            fi
+        ;;
+        odbc)
+            if [ "$CFG_SQL_odbc" != "no" ]; then
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_odbc" = "auto" ]; then
+                        CFG_SQL_odbc=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_odbc" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "ODBC support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_odbc=no
+                    fi
+                fi
+            fi
+            ;;
+        oci)
+            if [ "$CFG_SQL_oci" != "no" ]; then
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/oci "OCI" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_oci" = "auto" ]; then
+                        CFG_SQL_oci=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_oci" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "Oracle (OCI) support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_oci=no
+                    fi
+                fi
+            fi
+            ;;
+        tds)
+            if [ "$CFG_SQL_tds" != "no" ]; then
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_tds" = "auto" ]; then
+                        CFG_SQL_tds=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_tds" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "TDS support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_tds=no
+                    fi
+                fi
+            fi
+            ;;
+        db2)
+            if [ "$CFG_SQL_db2" != "no" ]; then
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/db2 "DB2" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_db2" = "auto" ]; then
+                        CFG_SQL_db2=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_db2" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "ODBC support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_db2=no
+                    fi
+                fi
+            fi
+            ;;
+        ibase)
+            if [ "$CFG_SQL_ibase" != "no" ]; then
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ibase "InterBase" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_ibase" = "auto" ]; then
+                        CFG_SQL_ibase=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_ibase" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "InterBase support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_ibase=no
+                    fi
+                fi
+            fi
+            ;;
+        sqlite2)
+            if [ "$CFG_SQL_sqlite2" != "no" ]; then
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite2 "SQLite2" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_sqlite2" = "auto" ]; then
+                        CFG_SQL_sqlite2=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_sqlite2" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "SQLite2 support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_sqlite2=no
+                    fi
+                fi
+            fi
+            ;;
+        sqlite)
+            if [ "$CFG_SQL_sqlite" != "no" ]; then
+                SQLITE_AUTODETECT_FAILED="no"
+                if [ "$CFG_SQLITE" = "system" ]; then
+                    if [ -n "$PKG_CONFIG" ]; then
+                        QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
+                        QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
+                    fi
+                    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS; then
+                        if [ "$CFG_SQL_sqlite" = "auto" ]; then
+                            CFG_SQL_sqlite=plugin
+                        fi
+                        QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
+                    else
+                        SQLITE_AUTODETECT_FAILED="yes"
+                        CFG_SQL_sqlite=no
+                    fi
+                elif [ -f "$relpath/src/3rdparty/sqlite/sqlite3.h" ]; then
+                    if [ "$CFG_SQL_sqlite" = "auto" ]; then
+                            CFG_SQL_sqlite=plugin
+                    fi
+                else
+                    SQLITE_AUTODETECT_FAILED="yes"
+                    CFG_SQL_sqlite=no
+                fi
+
+                if [ "$SQLITE_AUTODETECT_FAILED" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                    echo "SQLite support cannot be enabled due to functionality tests!"
+                    echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                    echo " If you believe this message is in error you may use the continue"
+                    echo " switch (-continue) to $0 to continue."
+                    exit 101
+                fi
+            fi
+            ;;
+        *)
+            if [ "$OPT_VERBOSE" = "yes" ]; then
+                echo "unknown SQL driver: $_SQLDR"
+            fi
+            ;;
+        esac
+done
+
+# auto-detect NIS support
+if [ "$CFG_NIS" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/nis "NIS" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_NIS=yes
+    else
+        if [ "$CFG_NIS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "NIS support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_NIS=no
+        fi
+    fi
+fi
+
+# auto-detect CUPS support
+if [ "$CFG_CUPS" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/cups "Cups" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_CUPS=yes
+    else
+        if [ "$CFG_CUPS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "Cups support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_CUPS=no
+        fi
+    fi
+fi
+
+# auto-detect iconv(3) support
+if [ "$CFG_ICONV" != "no" ]; then
+    if [ "$PLATFORM_QWS" = "yes" ]; then
+	CFG_ICONV=no
+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_ICONV=yes
+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/gnu-libiconv" "GNU libiconv" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_ICONV=gnu
+    else
+        if [ "$CFG_ICONV" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "Iconv support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_ICONV=no
+        fi
+    fi
+fi
+
+# auto-detect libdbus-1 support
+if [ "$CFG_DBUS" != "no" ]; then
+    if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then
+        QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null`
+        QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null`
+    fi
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/dbus "D-Bus" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DBUS $QT_LIBS_DBUS; then
+        [ "$CFG_DBUS" = "auto" ] && CFG_DBUS=yes
+        QMakeVar set QT_CFLAGS_DBUS "$QT_CFLAGS_DBUS"
+        QMakeVar set QT_LIBS_DBUS "$QT_LIBS_DBUS"
+    else
+        if [ "$CFG_DBUS" = "auto" ]; then
+            CFG_DBUS=no
+        elif [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            # CFG_DBUS is "yes" or "linked" here
+
+            echo "The QtDBus module cannot be enabled because libdbus-1 version $MIN_DBUS_1_VERSION was not found."
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        fi
+    fi
+fi
+
+# Generate a CRC of the namespace for using in constants for the Carbon port.
+# This should mean that you really *can* load two Qt's and have our custom
+# Carbon events work.
+if [ "$PLATFORM_MAC" = "yes" -a ! -z "$QT_NAMESPACE" ]; then
+    QT_NAMESPACE_MAC_CRC=`"$mactests/crc.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/crc $QT_NAMESPACE $L_FLAGS $I_FLAGS $l_FLAGS`
+fi
+
+if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
+    # auto-detect Glib support
+    if [ "$CFG_GLIB" != "no" ]; then
+        if [ -n "$PKG_CONFIG" ]; then
+            QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null`
+            QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null`
+        fi
+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS; then
+            CFG_GLIB=yes
+            QMakeVar set QT_CFLAGS_GLIB "$QT_CFLAGS_GLIB"
+            QMakeVar set QT_LIBS_GLIB "$QT_LIBS_GLIB"
+        else
+            if [ "$CFG_GLIB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                echo "Glib support cannot be enabled due to functionality tests!"
+                echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                echo " If you believe this message is in error you may use the continue"
+                echo " switch (-continue) to $0 to continue."
+                exit 101
+            else
+                CFG_GLIB=no
+            fi
+        fi
+    fi
+
+    if [ "$CFG_PHONON" != "no" ]; then
+        if [ "$CFG_PHONON_BACKEND" != "no" ]; then
+            if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then
+                if [ -n "$PKG_CONFIG" ]; then
+                    QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
+                    QT_LIBS_GSTREAMER=`$PKG_CONFIG --libs gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
+                fi
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/gstreamer "GStreamer" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GSTREAMER $QT_LIBS_GSTREAMER $X11TESTS_FLAGS; then
+                    CFG_GSTREAMER=yes
+                    QMakeVar set QT_CFLAGS_GSTREAMER "$QT_CFLAGS_GSTREAMER"
+                    QMakeVar set QT_LIBS_GSTREAMER "$QT_LIBS_GSTREAMER"
+                else
+                    if [ "$CFG_GSTREAMER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "Gstreamer support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_GSTREAMER=no
+                    fi
+                fi
+            elif [ "$CFG_GLIB" = "no" ]; then
+                CFG_GSTREAMER=no
+            fi
+
+            if [ "$CFG_GSTREAMER" = "yes" ]; then
+                CFG_PHONON=yes
+            else
+                if [ "$CFG_PHONON" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                    echo "Phonon support cannot be enabled due to functionality tests!"
+                    echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                    echo " If you believe this message is in error you may use the continue"
+                    echo " switch (-continue) to $0 to continue."
+                    exit 101
+                else
+                    CFG_PHONON=no
+                fi
+            fi
+        else
+            CFG_PHONON=yes
+        fi
+    fi
+fi # X11/QWS
+
+# x11
+if [ "$PLATFORM_X11" = "yes" ]; then
+    x11tests="$relpath/config.tests/x11"
+    X11TESTS_FLAGS=
+
+    # work around broken X11 headers when using GCC 2.95 or later
+    NOTYPE=no
+    "$x11tests/notype.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" && NOTYPE=yes
+    if [ $NOTYPE = "yes" ]; then
+	QMakeVar add QMAKE_CXXFLAGS -fpermissive
+        X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
+    fi
+
+    # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
+    if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+            CFG_OPENGL=desktop
+        elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_OPENGL=es2
+	elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_OPENGL=es1
+	elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1cl "OpenGL ES 1.x Lite" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_OPENGL=es1cl
+        else
+            if [ "$CFG_OPENGL" = "yes" ]; then
+                echo "All the OpenGL functionality tests failed!"
+                echo " You might need to modify the include and library search paths by editing"
+                echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+                echo " ${XQMAKESPEC}."
+                exit 1
+            fi
+            CFG_OPENGL=no
+        fi
+       case "$PLATFORM" in
+       hpux*)
+           # HP-UX have buggy glx headers; check if we really need to define the GLXFBConfig struct.
+           if [ "$CFG_OPENGL" = "desktop" ]; then
+               if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glxfbconfig "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+                   QMakeVar add DEFINES QT_DEFINE_GLXFBCONFIG_STRUCT
+               fi
+           fi
+	   ;;
+       *)
+           ;;
+       esac
+    elif [ "$CFG_OPENGL" = "es1cl" ]; then
+        # OpenGL ES 1.x common lite
+	if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1cl "OpenGL ES 1.x Lite" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	    echo "The OpenGL ES 1.x Common Lite Profile functionality test failed!"
+            echo " You might need to modify the include and library search paths by editing"
+	    echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+	    echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+    elif [ "$CFG_OPENGL" = "es1" ]; then
+        # OpenGL ES 1.x
+	if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	    echo "The OpenGL ES 1.x functionality test failed!"
+            echo " You might need to modify the include and library search paths by editing"
+	    echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+	    echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+    elif [ "$CFG_OPENGL" = "es2" ]; then
+        #OpenGL ES 2.x
+	if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	    echo "The OpenGL ES 2.0 functionality test failed!"
+            echo " You might need to modify the include and library search paths by editing"
+	    echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+	    echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+    elif [ "$CFG_OPENGL" = "desktop" ]; then
+        # Desktop OpenGL support
+        if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    echo "The OpenGL functionality test failed!"
+            echo " You might need to modify the include and library search paths by editing"
+	    echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+	    echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+        case "$PLATFORM" in
+        hpux*)
+            # HP-UX have buggy glx headers; check if we really need to define the GLXFBConfig struct.
+            if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glxfbconfig "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+                QMakeVar add DEFINES QT_DEFINE_GLXFBCONFIG_STRUCT
+            fi
+	    ;;
+        *)
+            ;;
+        esac
+    fi
+
+    # if opengl is disabled and the user specified graphicssystem gl, disable it...
+    if [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && [ "$CFG_OPENGL" = "no" ]; then
+	echo "OpenGL Graphics System is disabled due to missing OpenGL support..."
+	CFG_GRAPHICS_SYSTEM=default
+    fi
+
+    # auto-detect Xcursor support
+    if [ "$CFG_XCURSOR" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xcursor "Xcursor" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    if [ "$CFG_XCURSOR" != "runtime" ]; then
+		CFG_XCURSOR=yes;
+	    fi
+	else
+	    if [ "$CFG_XCURSOR" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "Xcursor support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_XCURSOR=no
+	    fi
+	fi
+    fi
+
+    # auto-detect Xfixes support
+    if [ "$CFG_XFIXES" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xfixes "Xfixes" $L_FLAGS $I_FLAGS $X11TESTS_FLAGS; then
+	    if [ "$CFG_XFIXES" != "runtime" ]; then
+		CFG_XFIXES=yes;
+	    fi
+	else
+	    if [ "$CFG_XFIXES" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "Xfixes support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_XFIXES=no
+	    fi
+	fi
+    fi
+
+    # auto-detect Xrandr support (resize and rotate extension)
+    if [ "$CFG_XRANDR" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrandr "Xrandr" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+            if [ "$CFG_XRANDR" != "runtime" ]; then
+	    CFG_XRANDR=yes
+            fi
+	else
+	    if [ "$CFG_XRANDR" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "Xrandr support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_XRANDR=no
+	    fi
+	fi
+    fi
+
+    # auto-detect Xrender support
+    if [ "$CFG_XRENDER" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrender "Xrender" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    CFG_XRENDER=yes
+	else
+	    if [ "$CFG_XRENDER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "Xrender support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_XRENDER=no
+	    fi
+	fi
+    fi
+
+    # auto-detect MIT-SHM support
+    if [ "$CFG_MITSHM" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/mitshm "mitshm" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    CFG_MITSHM=yes
+	else
+	    if [ "$CFG_MITSHM" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "MITSHM support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_MITSHM=no
+	    fi
+	fi
+    fi
+
+    # auto-detect FontConfig support
+    if [ "$CFG_FONTCONFIG" != "no" ]; then
+    if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig 2>/dev/null; then
+        QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig 2>/dev/null`
+        QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig 2>/dev/null`
+    else
+        QT_CFLAGS_FONTCONFIG=
+        QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig"
+    fi
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS $QT_CFLAGS_FONTCONFIG $QT_LIBS_FONTCONFIG; then
+	    CFG_FONTCONFIG=yes
+        QMakeVar set QMAKE_CFLAGS_X11 "$QT_CFLAGS_FONTCONFIG \$\$QMAKE_CFLAGS_X11"
+        QMakeVar set QMAKE_LIBS_X11 "$QT_LIBS_FONTCONFIG \$\$QMAKE_LIBS_X11"
+	    CFG_LIBFREETYPE=system
+	else
+	    if [ "$CFG_FONTCONFIG" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "FontConfig support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_FONTCONFIG=no
+	    fi
+	fi
+    fi
+
+    # auto-detect Session Management support
+    if [ "$CFG_SM" = "auto" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/sm "Session Management" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    CFG_SM=yes
+	else
+	    if [ "$CFG_SM" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "Session Management support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_SM=no
+	    fi
+	fi
+    fi
+
+    # auto-detect SHAPE support
+    if [ "$CFG_XSHAPE" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xshape "XShape" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    CFG_XSHAPE=yes
+	else
+	    if [ "$CFG_XSHAPE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "XShape support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_XSHAPE=no
+	    fi
+	fi
+    fi
+
+    # auto-detect Xinerama support
+    if [ "$CFG_XINERAMA" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinerama "Xinerama" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    if [ "$CFG_XINERAMA" != "runtime" ]; then
+		CFG_XINERAMA=yes
+	    fi
+	else
+	    if [ "$CFG_XINERAMA" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "Xinerama support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_XINERAMA=no
+	    fi
+	fi
+    fi
+
+    # auto-detect Xinput support
+    if [ "$CFG_XINPUT" != "no" ]; then
+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinput "XInput" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    if [ "$CFG_XINPUT" != "runtime" ]; then
+		CFG_XINPUT=yes
+	    fi
+        else
+            if [ "$CFG_XINPUT" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                echo "Tablet and Xinput support cannot be enabled due to functionality tests!"
+                echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                echo " If you believe this message is in error you may use the continue"
+                echo " switch (-continue) to $0 to continue."
+                exit 101
+            else
+                CFG_XINPUT=no
+            fi
+        fi
+    fi
+
+    # auto-detect XKB support
+    if [ "$CFG_XKB" != "no" ]; then
+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xkb "XKB" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+            CFG_XKB=yes
+        else
+            if [ "$CFG_XKB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                echo "XKB support cannot be enabled due to functionality tests!"
+                echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                echo " If you believe this message is in error you may use the continue"
+                echo " switch (-continue) to $0 to continue."
+                exit 101
+            else
+                CFG_XKB=no
+            fi
+        fi
+    fi
+
+    if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then
+        if [ -n "$PKG_CONFIG" ]; then
+            QT_CFLAGS_QGTKSTYLE=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.10 atk 2>/dev/null`
+            QT_LIBS_QGTKSTYLE=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null`
+        fi
+        if [ -n "$QT_CFLAGS_QGTKSTYLE" ] ; then
+            CFG_QGTKSTYLE=yes
+            QMakeVar set QT_CFLAGS_QGTKSTYLE "$QT_CFLAGS_QGTKSTYLE"
+            QMakeVar set QT_LIBS_QGTKSTYLE "$QT_LIBS_QGTKSTYLE"
+        else
+            if [ "$CFG_QGTKSTYLE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                echo "Gtk theme support cannot be enabled due to functionality tests!"
+                echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                echo " If you believe this message is in error you may use the continue"
+                echo " switch (-continue) to $0 to continue."
+                exit 101
+            else
+                CFG_QGTKSTYLE=no
+            fi
+        fi
+    elif [ "$CFG_GLIB" = "no" ]; then
+        CFG_QGTKSTYLE=no
+    fi
+fi # X11
+
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    if [ "$CFG_PHONON" != "no" ]; then
+        # Always enable Phonon (unless it was explicitly disabled)
+        CFG_PHONON=yes
+    fi
+fi
+
+# QWS
+if [ "$PLATFORM_QWS" = "yes" ]; then
+
+    # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
+    if [ "$CFG_OPENGL" = "yes" ]; then
+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_OPENGL=es2
+	elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_OPENGL=es1
+	elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1cl "OpenGL ES 1.x Lite" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_OPENGL=es1cl
+        else
+            echo "All the OpenGL ES functionality tests failed!"
+            echo " You might need to modify the include and library search paths by editing"
+            echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+            echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+    elif [ "$CFG_OPENGL" = "es1" ]; then
+        # OpenGL ES 1.x
+	if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	    echo "The OpenGL ES 1.x functionality test failed!"
+            echo " You might need to modify the include and library search paths by editing"
+	    echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+	    echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+    elif [ "$CFG_OPENGL" = "es2" ]; then
+        #OpenGL ES 2.x
+	if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	    echo "The OpenGL ES 2.0 functionality test failed!"
+            echo " You might need to modify the include and library search paths by editing"
+	    echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+	    echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+    elif [ "$CFG_OPENGL" = "desktop" ]; then
+        # Desktop OpenGL support
+        echo "Desktop OpenGL support is not avaliable on Qt for Embedded Linux"
+        exit 1
+    fi
+
+    # screen drivers
+    for screen in ${CFG_GFX_ON} ${CFG_GFX_PLUGIN}; do
+       if [ "${screen}" = "ahi" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
+           if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/ahi "Ahi" $L_FLAGS $I_FLAGS $l_FLAGS; then
+               echo "The Ahi screen driver functionality test failed!"
+               echo " You might need to modify the include and library search paths by editing"
+               echo " QMAKE_INCDIR and QMAKE_LIBDIR in"
+               echo " ${XQMAKESPEC}."
+               exit 1
+           fi
+       fi
+
+       if [ "${screen}" = "svgalib" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
+           if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/svgalib "SVGAlib" $L_FLAGS $I_FLAGS $l_FLAGS; then
+               echo "The SVGAlib screen driver functionality test failed!"
+               echo " You might need to modify the include and library search paths by editing"
+               echo " QMAKE_INCDIR and QMAKE_LIBDIR in"
+               echo " ${XQMAKESPEC}."
+               exit 1
+           fi
+       fi
+
+       if [ "${screen}" = "directfb" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
+           if [ -n "$PKG_CONFIG" ]; then
+               if $PKG_CONFIG --exists directfb 2>/dev/null; then
+                   QT_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null`
+                   QT_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null`
+               elif directfb-config --version >/dev/null 2>&1; then
+                   QT_CFLAGS_DIRECTFB=`directfb-config --cflags 2>/dev/null`
+                   QT_LIBS_DIRECTFB=`directfb-config --libs 2>/dev/null`
+               fi
+           fi
+
+           # QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero.
+           if [ -n "$QT_CFLAGS_DIRECTFB" ] || [ -n "$QT_LIBS_DIRECTFB" ]; then
+               QMakeVar set QT_CFLAGS_DIRECTFB "$QT_CFLAGS_DIRECTFB"
+               QMakeVar set QT_LIBS_DIRECTFB "$QT_LIBS_DIRECTFB"
+           fi
+
+           if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/directfb "DirectFB" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DIRECTFB $QT_LIBS_DIRECTFB; then
+               echo "The DirectFB screen driver functionality test failed!"
+               echo " You might need to modify the include and library search paths by editing"
+               echo " QT_CFLAGS_DIRECTFB and QT_LIBS_DIRECTFB in"
+               echo " ${XQMAKESPEC}."
+               exit 1
+           fi
+       fi
+
+    done
+
+    # mouse drivers
+    for mouse in ${CFG_MOUSE_ON} ${CFG_MOUSE_PLUGIN}; do
+	if [ "${mouse}" = "tslib" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
+	    if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tslib "tslib" $L_FLAGS $I_FLAGS $l_FLAGS; then
+               echo "The tslib functionality test failed!"
+               echo " You might need to modify the include and library search paths by editing"
+               echo " QMAKE_INCDIR and QMAKE_LIBDIR in"
+               echo " ${XQMAKESPEC}."
+		exit 1
+	    fi
+	fi
+    done
+
+    CFG_QGTKSTYLE=no
+
+    # sound
+    if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/sound "sound" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SOUND"
+    fi
+
+fi # QWS
+
+# freetype support
+[ "x$CFG_EMBEDDED" != "xno" ] && CFG_LIBFREETYPE="$CFG_QWS_FREETYPE"
+[ "x$PLATFORM_MAC" = "xyes" ] && CFG_LIBFREETYPE=no
+if [ "$CFG_LIBFREETYPE" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/freetype "FreeType" $L_FLAGS $I_FLAGS $l_FLAGS ; then
+        CFG_LIBFREETYPE=system
+    else
+        CFG_LIBFREETYPE=yes
+    fi
+fi
+
+if [ "$CFG_ENDIAN" = "auto" ]; then
+    if [ "$PLATFORM_MAC" = "yes" ]; then
+	true #leave as auto
+    else
+        "$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
+	F="$?"
+        if [ "$F" -eq 0 ]; then
+            CFG_ENDIAN="Q_LITTLE_ENDIAN"
+        elif [ "$F" -eq 1 ]; then
+            CFG_ENDIAN="Q_BIG_ENDIAN"
+        else
+            echo
+	    echo "The target system byte order could not be detected!"
+	    echo "Turn on verbose messaging (-v) to see the final report."
+	    echo "You can use the -little-endian or -big-endian switch to"
+	    echo "$0 to continue."
+            exit 101
+        fi
+    fi
+fi
+
+if [ "$CFG_HOST_ENDIAN" = "auto" ]; then
+    if [ "$PLATFORM_MAC" = "yes" ]; then
+	true #leave as auto
+    else
+        "$unixtests/endian.test" "$QMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
+	F="$?"
+        if [ "$F" -eq 0 ]; then
+            CFG_HOST_ENDIAN="Q_LITTLE_ENDIAN"
+        elif [ "$F" -eq 1 ]; then
+            CFG_HOST_ENDIAN="Q_BIG_ENDIAN"
+        else
+            echo
+	    echo "The host system byte order could not be detected!"
+	    echo "Turn on verbose messaging (-v) to see the final report."
+	    echo "You can use the -host-little-endian or -host-big-endian switch to"
+	    echo "$0 to continue."
+            exit 101
+        fi
+    fi
+fi
+
+if [ "$CFG_ARMFPA" != "auto" ]; then
+    if [ "$CFG_ARMFPA" = "yes" ]; then
+        if [ "$CFG_ENDIAN" = "Q_LITTLE_ENDIAN" ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE_SWAPPED"
+        else
+            CFG_DOUBLEFORMAT="Q_DOUBLE_BIG_SWAPPED"
+        fi
+    else
+        CFG_DOUBLEFORMAT="normal"
+    fi
+fi
+
+
+if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then
+    if [ "$PLATFORM_QWS" != "yes" ]; then
+        CFG_DOUBLEFORMAT=normal
+    else
+        "$unixtests/doubleformat.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
+	F="$?"
+        if [ "$F" -eq 10 ] && [ "$CFG_ENDIAN" = "Q_LITTLE_ENDIAN" ]; then
+            CFG_DOUBLEFORMAT=normal
+        elif [ "$F" -eq 11 ] && [ "$CFG_ENDIAN" = "Q_BIG_ENDIAN" ]; then
+            CFG_DOUBLEFORMAT=normal
+        elif [ "$F" -eq 10 ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE"
+        elif [ "$F" -eq 11 ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_BIG"
+        elif [ "$F" -eq 12 ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE_SWAPPED"
+            CFG_ARMFPA="yes"
+        elif [ "$F" -eq 13 ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_BIG_SWAPPED"
+            CFG_ARMFPA="yes"
+        else
+            echo
+	    echo "The system floating point format could not be detected."
+	    echo "This may cause data to be generated in a wrong format"
+	    echo "Turn on verbose messaging (-v) to see the final report."
+	    # we do not fail on this since this is a new test, and if it fails,
+	    # the old behavior should be correct in most cases
+            CFG_DOUBLEFORMAT=normal
+        fi
+    fi
+fi
+
+HAVE_STL=no
+if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
+    HAVE_STL=yes
+fi
+
+if [ "$CFG_STL" != "no" ]; then
+    if [ "$HAVE_STL" = "yes" ]; then
+        CFG_STL=yes
+    else
+        if [ "$CFG_STL" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "STL support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_STL=no
+        fi
+    fi
+fi
+
+# find if the platform supports IPv6
+if [ "$CFG_IPV6" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_IPV6=yes
+    else
+        if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "IPv6 support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_IPV6=no
+        fi
+    fi
+fi
+
+# detect POSIX clock_gettime()
+if [ "$CFG_CLOCK_GETTIME" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/clock-gettime "POSIX clock_gettime()" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	CFG_CLOCK_GETTIME=yes
+    else
+	CFG_CLOCK_GETTIME=no
+    fi
+fi
+
+# detect POSIX monotonic clocks
+if [ "$CFG_CLOCK_GETTIME" = "yes" ] && [ "$CFG_CLOCK_MONOTONIC" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/clock-monotonic "POSIX Monotonic Clock" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	CFG_CLOCK_MONOTONIC=yes
+    else
+	CFG_CLOCK_MONOTONIC=no
+    fi
+elif [ "$CFG_CLOCK_GETTIME" = "no" ]; then
+    CFG_CLOCK_MONOTONIC=no
+fi
+
+# detect mremap
+if [ "$CFG_MREMAP" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mremap "mremap" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	CFG_MREMAP=yes
+    else
+	CFG_MREMAP=no
+    fi
+fi
+
+# find if the platform provides getaddrinfo (ipv6 dns lookups)
+if [ "$CFG_GETADDRINFO" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/getaddrinfo "getaddrinfo" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_GETADDRINFO=yes
+    else
+	if [ "$CFG_GETADDRINFO" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "getaddrinfo support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+	else
+	    CFG_GETADDRINFO=no
+	fi
+    fi
+fi
+
+# find if the platform provides inotify
+if [ "$CFG_INOTIFY" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/inotify "inotify" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_INOTIFY=yes
+    else
+	if [ "$CFG_INOTIFY" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "inotify support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+	else
+	    CFG_INOTIFY=no
+	fi
+    fi
+fi
+
+# find if the platform provides if_nametoindex (ipv6 interface name support)
+if [ "$CFG_IPV6IFNAME" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6ifname "IPv6 interface name" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_IPV6IFNAME=yes
+    else
+        if [ "$CFG_IPV6IFNAME" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "IPv6 interface name support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+	    CFG_IPV6IFNAME=no
+	fi
+    fi
+fi
+
+# find if the platform provides getifaddrs (network interface enumeration)
+if [ "$CFG_GETIFADDRS" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/getifaddrs "getifaddrs" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_GETIFADDRS=yes
+    else
+        if [ "$CFG_GETIFADDRS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "getifaddrs support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+	    CFG_GETIFADDRS=no
+	fi
+    fi
+fi
+
+# find if the platform supports X/Open Large File compilation environment
+if [ "$CFG_LARGEFILE" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_LARGEFILE=yes
+    else
+        if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "X/Open Large File support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_LARGEFILE=no
+        fi
+    fi
+fi
+
+# detect OpenSSL
+if [ "$CFG_OPENSSL" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        if [ "$CFG_OPENSSL" = "auto" ]; then
+            CFG_OPENSSL=yes
+        fi
+    else
+        if ( [ "$CFG_OPENSSL" = "yes" ] || [ "$CFG_OPENSSL" = "linked" ] ) && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "OpenSSL support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_OPENSSL=no
+        fi
+    fi
+fi
+
+if [ "$CFG_PTMALLOC" != "no" ]; then
+    # build ptmalloc, copy .a file to lib/
+    echo "Building ptmalloc. Please wait..."
+    (cd "$relpath/src/3rdparty/ptmalloc/"; "$MAKE" "clean" ; "$MAKE" "posix"
+     mkdir "$outpath/lib/" ; cp "libptmalloc3.a" "$outpath/lib/")
+
+    QMakeVar add QMAKE_LFLAGS "$outpath/lib/libptmalloc3.a"
+fi
+
+#-------------------------------------------------------------------------------
+# ask for all that hasn't been auto-detected or specified in the arguments
+#-------------------------------------------------------------------------------
+
+### fix this: user input should be validated in a loop
+if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PLATFORM_QWS" = "yes" ]; then
+    echo
+    echo "Choose pixel-depths to support:"
+    echo
+    echo "   1. 1bpp, black/white"
+    echo "   4. 4bpp, grayscale"
+    echo "   8. 8bpp, paletted"
+    echo "  12. 12bpp, rgb 4-4-4"
+    echo "  15. 15bpp, rgb 5-5-5"
+    echo "  16. 16bpp, rgb 5-6-5"
+    echo "  18. 18bpp, rgb 6-6-6"
+    echo "  24. 24bpp, rgb 8-8-8"
+    echo "  32. 32bpp, argb 8-8-8-8 and rgb 8-8-8"
+    echo " all. All supported depths"
+    echo
+    echo "Your choices (default 8,16,32):"
+    read CFG_QWS_DEPTHS
+    if [ -z "$CFG_QWS_DEPTHS" ] || [ "$CFG_QWS_DEPTHS" = "yes" ]; then
+        CFG_QWS_DEPTHS=8,16,32
+    fi
+fi
+if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
+    if [ "$CFG_QWS_DEPTHS" = "all" ]; then
+        CFG_QWS_DEPTHS="1 4 8 12 15 16 18 24 32 generic"
+    fi
+    for D in `echo "$CFG_QWS_DEPTHS" | sed -e 's/,/ /g'`; do
+	case $D in
+	    1|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
+	    generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";;
+	esac
+    done
+fi
+
+# enable dwarf2 support on Mac
+if [ "$CFG_MAC_DWARF2" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG dwarf2"
+fi
+
+# enable cocoa and/or carbon on Mac
+if [ "$CFG_MAC_COCOA" = "yes" ]; then
+#   -cocoa on the command line disables carbon completely (i.e. use cocoa for 32-bit as well)
+    CFG_MAC_CARBON="no"
+else
+#   check which archs are in use, enable cocoa if we find a 64-bit one
+    if echo "$CFG_MAC_ARCHS" | grep 64 > /dev/null 2>&1; then
+        CFG_MAC_COCOA="yes";
+        CFG_MAC_CARBON="no";
+        if echo "$CFG_MAC_ARCHS" | grep -w ppc > /dev/null 2>&1; then
+            CFG_MAC_CARBON="yes";
+        fi
+        if echo "$CFG_MAC_ARCHS" | grep -w x86 > /dev/null 2>&1; then
+            CFG_MAC_CARBON="yes";
+        fi
+    else
+#       no 64-bit archs found.
+        CFG_MAC_COCOA="no"
+    fi
+fi;
+
+# set the global Mac deployment target. This is overridden on an arch-by-arch basis 
+# in some cases, see code further down
+case "$PLATFORM,$CFG_MAC_COCOA" in
+    macx*,yes)
+	# Cocoa
+	QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
+	CFG_QT3SUPPORT="no"
+	;;
+    macx-icc,*)
+	# Intel CC, Carbon
+	QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
+	;;
+    macx*,no)
+	# gcc, Carbon
+	QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.3
+	;;
+esac
+
+# enable Qt 3 support functionality
+if [ "$CFG_QT3SUPPORT" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG qt3support"
+fi
+
+# enable Phonon
+if [ "$CFG_PHONON" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG phonon"
+    if [ "$CFG_PHONON_BACKEND" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG phonon-backend"
+    fi
+else
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON"
+fi
+
+# disable accessibility
+if [ "$CFG_ACCESSIBILITY" = "no" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ACCESSIBILITY"
+else
+    QT_CONFIG="$QT_CONFIG accessibility"
+fi
+
+# enable opengl
+if [ "$CFG_OPENGL" = "no" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL"
+else
+    QT_CONFIG="$QT_CONFIG opengl"
+fi
+
+if [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es1cl" ] || [ "$CFG_OPENGL" = "es2" ]; then
+    if [ "$PLATFORM_QWS" = "yes" ]; then
+	QCONFIG_FLAGS="$QCONFIG_FLAGS Q_BACKINGSTORE_SUBSURFACES"
+	QCONFIG_FLAGS="$QCONFIG_FLAGS Q_USE_EGLWINDOWSURFACE"
+    fi
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES"
+fi
+
+if [ "$CFG_OPENGL" = "es1" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_1"
+    QT_CONFIG="$QT_CONFIG opengles1"
+fi
+
+if [ "$CFG_OPENGL" = "es1cl" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_1_CL"
+    QT_CONFIG="$QT_CONFIG opengles1cl"
+fi
+
+if [ "$CFG_OPENGL" = "es2" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_2"
+    QT_CONFIG="$QT_CONFIG opengles2"
+fi
+
+# safe execution environment
+if [ "$CFG_SXE" != "no" ]; then
+    QT_CONFIG="$QT_CONFIG sxe"
+fi
+
+# build up the variables for output
+if [ "$CFG_DEBUG" = "yes" ]; then
+    QMAKE_OUTDIR="${QMAKE_OUTDIR}debug"
+    QMAKE_CONFIG="$QMAKE_CONFIG debug"
+elif [ "$CFG_DEBUG" = "no" ]; then
+    QMAKE_OUTDIR="${QMAKE_OUTDIR}release"
+    QMAKE_CONFIG="$QMAKE_CONFIG release"
+fi
+if [ "$CFG_SHARED" = "yes" ]; then
+    QMAKE_OUTDIR="${QMAKE_OUTDIR}-shared"
+    QMAKE_CONFIG="$QMAKE_CONFIG shared dll"
+elif [ "$CFG_SHARED" = "no" ]; then
+    QMAKE_OUTDIR="${QMAKE_OUTDIR}-static"
+    QMAKE_CONFIG="$QMAKE_CONFIG static"
+fi
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    QMAKE_OUTDIR="${QMAKE_OUTDIR}-emb-$CFG_EMBEDDED"
+    QMAKE_CONFIG="$QMAKE_CONFIG embedded"
+    QT_CONFIG="$QT_CONFIG embedded"
+    rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes
+fi
+QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR"
+QMakeVar set OBJECTS_DIR ".obj/$QMAKE_OUTDIR"
+QMakeVar set MOC_DIR ".moc/$QMAKE_OUTDIR"
+QMakeVar set RCC_DIR ".rcc/$QMAKE_OUTDIR"
+QMakeVar set UI_DIR ".uic/$QMAKE_OUTDIR"
+if [ "$CFG_LARGEFILE" = "yes" ]; then
+    QMAKE_CONFIG="$QMAKE_CONFIG largefile"
+fi
+if [ "$CFG_STL" = "no" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STL"
+else
+    QMAKE_CONFIG="$QMAKE_CONFIG stl"
+fi
+if [ "$CFG_USE_GNUMAKE" = "yes" ]; then
+    QMAKE_CONFIG="$QMAKE_CONFIG GNUmake"
+fi
+[ "$CFG_REDUCE_EXPORTS" = "yes" ] && QT_CONFIG="$QT_CONFIG reduce_exports"
+[ "$CFG_REDUCE_RELOCATIONS" = "yes" ] && QT_CONFIG="$QT_CONFIG reduce_relocations"
+[ "$CFG_PRECOMPILE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG precompile_header"
+if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
+    QMakeVar add QMAKE_CFLAGS -g
+    QMakeVar add QMAKE_CXXFLAGS -g
+    QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info"
+fi
+[ "$CFG_MMX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG mmx"
+[ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
+[ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
+[ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
+[ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
+[ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
+if [ "$CFG_IPV6" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG ipv6"
+fi
+if [ "$CFG_CLOCK_GETTIME" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG clock-gettime"
+fi
+if [ "$CFG_CLOCK_MONOTONIC" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG clock-monotonic"
+fi
+if [ "$CFG_MREMAP" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG mremap"
+fi
+if [ "$CFG_GETADDRINFO" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG getaddrinfo"
+fi
+if [ "$CFG_IPV6IFNAME" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG ipv6ifname"
+fi
+if [ "$CFG_GETIFADDRS" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG getifaddrs"
+fi
+if [ "$CFG_INOTIFY" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG inotify"
+fi
+if [ "$CFG_LIBJPEG" = "system" ]; then
+    QT_CONFIG="$QT_CONFIG system-jpeg"
+fi
+if [ "$CFG_JPEG" = "no" ]; then
+    QT_CONFIG="$QT_CONFIG no-jpeg"
+elif [ "$CFG_JPEG" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG jpeg"
+fi
+if [ "$CFG_LIBMNG" = "system" ]; then
+    QT_CONFIG="$QT_CONFIG system-mng"
+fi
+if [ "$CFG_MNG" = "no" ]; then
+    QT_CONFIG="$QT_CONFIG no-mng"
+elif [ "$CFG_MNG" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG mng"
+fi
+if [ "$CFG_LIBPNG" = "no" ]; then
+    CFG_PNG="no"
+fi
+if [ "$CFG_LIBPNG" = "system" ]; then
+    QT_CONFIG="$QT_CONFIG system-png"
+fi
+if [ "$CFG_PNG" = "no" ]; then
+    QT_CONFIG="$QT_CONFIG no-png"
+elif [ "$CFG_PNG" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG png"
+fi
+if [ "$CFG_GIF" = "no" ]; then
+    QT_CONFIG="$QT_CONFIG no-gif"
+elif [ "$CFG_GIF" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG gif"
+fi
+if [ "$CFG_LIBTIFF" = "system" ]; then
+    QT_CONFIG="$QT_CONFIG system-tiff"
+fi
+if [ "$CFG_TIFF" = "no" ]; then
+    QT_CONFIG="$QT_CONFIG no-tiff"
+elif [ "$CFG_TIFF" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG tiff"
+fi
+if [ "$CFG_LIBFREETYPE" = "no" ]; then
+    QT_CONFIG="$QT_CONFIG no-freetype"
+elif [ "$CFG_LIBFREETYPE" = "system" ]; then
+    QT_CONFIG="$QT_CONFIG system-freetype"
+else
+    QT_CONFIG="$QT_CONFIG freetype"
+fi
+
+if [ "x$PLATFORM_MAC" = "xyes" ]; then
+    #On Mac we implicitly link against libz, so we
+    #never use the 3rdparty stuff.
+    [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
+fi
+if [ "$CFG_ZLIB" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG zlib"
+elif [ "$CFG_ZLIB" = "system" ]; then
+    QT_CONFIG="$QT_CONFIG system-zlib"
+fi
+
+[ "$CFG_NIS" = "yes" ] && QT_CONFIG="$QT_CONFIG nis"
+[ "$CFG_CUPS" = "yes" ] && QT_CONFIG="$QT_CONFIG cups"
+[ "$CFG_ICONV" = "yes" ] && QT_CONFIG="$QT_CONFIG iconv"
+[ "$CFG_ICONV" = "gnu" ] && QT_CONFIG="$QT_CONFIG gnu-libiconv"
+[ "$CFG_GLIB" = "yes" ] && QT_CONFIG="$QT_CONFIG glib"
+[ "$CFG_GSTREAMER" = "yes" ] && QT_CONFIG="$QT_CONFIG gstreamer"
+[ "$CFG_DBUS" = "yes" ] && QT_CONFIG="$QT_CONFIG dbus"
+[ "$CFG_DBUS" = "linked" ] && QT_CONFIG="$QT_CONFIG dbus dbus-linked"
+[ "$CFG_NAS" = "system" ] && QT_CONFIG="$QT_CONFIG nas"
+[ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG openssl"
+[ "$CFG_OPENSSL" = "linked" ] && QT_CONFIG="$QT_CONFIG openssl-linked"
+
+if [ "$PLATFORM_X11" = "yes" ]; then
+    [ "$CFG_SM" = "yes" ] && QT_CONFIG="$QT_CONFIG x11sm"
+
+    # for some reason, the following libraries are not always built shared,
+    # so *every* program/lib (including Qt) has to link against them
+    if [ "$CFG_XSHAPE" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xshape"
+    fi
+    if [ "$CFG_XINERAMA" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xinerama"
+	QMakeVar set QMAKE_LIBS_X11 '-lXinerama $$QMAKE_LIBS_X11'
+    fi
+    if [ "$CFG_XCURSOR" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xcursor"
+	QMakeVar set QMAKE_LIBS_X11 '-lXcursor $$QMAKE_LIBS_X11'
+    fi
+    if [ "$CFG_XFIXES" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xfixes"
+	QMakeVar set QMAKE_LIBS_X11 '-lXfixes $$QMAKE_LIBS_X11'
+    fi
+    if [ "$CFG_XRANDR" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xrandr"
+        if [ "$CFG_XRENDER" != "yes" ]; then
+            # libXrandr uses 1 function from libXrender, so we always have to have it :/
+	    QMakeVar set QMAKE_LIBS_X11 '-lXrandr -lXrender $$QMAKE_LIBS_X11'
+        else
+	    QMakeVar set QMAKE_LIBS_X11 '-lXrandr $$QMAKE_LIBS_X11'
+        fi
+    fi
+    if [ "$CFG_XRENDER" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xrender"
+	QMakeVar set QMAKE_LIBS_X11 '-lXrender $$QMAKE_LIBS_X11'
+    fi
+    if [ "$CFG_MITSHM" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG mitshm"
+    fi
+    if [ "$CFG_FONTCONFIG" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG fontconfig"
+    fi
+    if [ "$CFG_XINPUT" = "yes" ]; then
+	QMakeVar set QMAKE_LIBS_X11 '-lXi $$QMAKE_LIBS_X11'
+    fi
+    if [ "$CFG_XINPUT" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xinput tablet"
+    fi
+    if [ "$CFG_XKB" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xkb"
+    fi
+fi
+
+[ '!' -z "$D_FLAGS" ] && QMakeVar add DEFINES "$D_FLAGS"
+[ '!' -z "$L_FLAGS" ] && QMakeVar add QMAKE_LIBDIR_FLAGS "$L_FLAGS"
+[ '!' -z "$l_FLAGS" ] && QMakeVar add LIBS "$l_FLAGS"
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    if [ "$CFG_RPATH" = "yes" ]; then
+       QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname"
+    fi
+elif [ -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_RPATH | awk '{print $3;}'`" ]; then
+    if [ -n "$RPATH_FLAGS" ]; then
+        echo
+        echo "ERROR: -R cannot be used on this platform as \$QMAKE_RPATH is"
+        echo "       undefined."
+        echo
+        exit 1
+    elif [ "$CFG_RPATH" = "yes" ]; then
+        RPATH_MESSAGE="        NOTE: This platform does not support runtime library paths, using -no-rpath."
+        CFG_RPATH=no
+    fi
+else
+    if [ "$CFG_RPATH" = "yes" ]; then
+        # set the default rpath to the library installation directory
+        RPATH_FLAGS="\"$QT_INSTALL_LIBS\" $RPATH_FLAGS"
+    fi
+    if [ -n "$RPATH_FLAGS" ]; then
+        # add the user defined rpaths
+	QMakeVar add QMAKE_RPATHDIR "$RPATH_FLAGS"
+    fi
+fi
+
+if [ '!' -z "$I_FLAGS" ]; then
+    # add the user define include paths
+    QMakeVar add QMAKE_CFLAGS "$I_FLAGS"
+    QMakeVar add QMAKE_CXXFLAGS "$I_FLAGS"
+fi
+
+# turn off exceptions for the compilers that support it
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    COMPILER=`echo $XPLATFORM | cut -f 3- -d-`
+else
+    COMPILER=`echo $PLATFORM | cut -f 2- -d-`
+fi
+if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then
+    CFG_EXCEPTIONS=no
+fi
+
+if [ "$CFG_EXCEPTIONS" != "no" ]; then
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG exceptions"
+fi
+
+#
+# Some Qt modules are too advanced in C++ for some old compilers
+# Detect here the platforms where they are known to work.
+#
+# See Qt documentation for more information on which features are
+# supported and on which compilers.
+#
+canBuildQtXmlPatterns="yes"
+canBuildWebKit="$HAVE_STL"
+
+# WebKit requires stdint.h
+"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stdint "Stdint" $L_FLAGS $I_FLAGS $l_FLAGS
+if [ $? != "0" ]; then
+    canBuildWebKit="no"
+fi
+
+case "$XPLATFORM" in
+    hpux-g++*)
+	# PA-RISC's assembly is too limited
+	# gcc 3.4 on that platform can't build QtXmlPatterns
+	# the assembly it generates cannot be compiled
+
+	# Check gcc's version
+	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+	    4*)
+		;;
+	    3.4*)
+		canBuildQtXmlPatterns="no"
+		;;
+	    *)
+		canBuildWebKit="no"
+		canBuildQtXmlPatterns="no"
+		;;
+	esac
+	;;
+    *-g++*)
+	# Check gcc's version
+	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+	    4*|3.4*)
+		;;
+	    3.3*)
+		canBuildWebKit="no"
+		;;
+	    *)
+		canBuildWebKit="no"
+		canBuildQtXmlPatterns="no"
+		;;
+	esac
+	;;
+    solaris-cc*)
+	# Check the compiler version
+	case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in
+	    *)
+		canBuildWebKit="no"
+		canBuildQtXmlPatterns="no"
+		;;
+	esac
+	;;
+    hpux-acc*)
+	canBuildWebKit="no"
+	canBuildQtXmlPatterns="no"
+	;;
+    hpuxi-acc*)
+	canBuildWebKit="no"
+	;;
+    aix-xlc*)
+	canBuildWebKit="no"
+	canBuildQtXmlPatterns="no"
+	;;
+    irix-cc*)
+        canBuildWebKit="no"
+	;;
+esac
+
+if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then
+    echo "QtXmlPatterns was requested, but it can't be built due to exceptions being disabled."
+    exit 1
+fi
+if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then
+    CFG_XMLPATTERNS="$canBuildQtXmlPatterns"
+elif [ "$CFG_EXCEPTIONS" = "no" ]; then
+    CFG_XMLPATTERNS="no"
+fi
+if [ "$CFG_XMLPATTERNS" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG xmlpatterns"
+else
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS"
+fi
+
+if [ "$CFG_SVG" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG svg"
+else
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG"
+fi
+
+if [ "$CFG_WEBKIT" = "auto" ]; then
+    CFG_WEBKIT="$canBuildWebKit"
+fi
+
+if [ "$CFG_WEBKIT" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG webkit"
+    # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly.
+    CFG_WEBKIT="yes"
+else
+    CFG_WEBKIT="no"
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT"
+fi
+
+if [ "$CFG_SCRIPTTOOLS" = "auto" ]; then
+    CFG_SCRIPTTOOLS="yes"
+fi
+
+if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG scripttools"
+    CFG_SCRIPTTOOLS="yes"
+else
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS"
+fi
+
+if [ "$CFG_EXCEPTIONS" = "no" ]; then
+    case "$COMPILER" in
+    g++*)
+	QMakeVar add QMAKE_CFLAGS -fno-exceptions
+	QMakeVar add QMAKE_CXXFLAGS -fno-exceptions
+	QMakeVar add QMAKE_LFLAGS -fno-exceptions
+        ;;
+    cc*)
+        case "$PLATFORM" in
+        irix-cc*)
+	    QMakeVar add QMAKE_CFLAGS -LANG:exceptions=off
+	    QMakeVar add QMAKE_CXXFLAGS -LANG:exceptions=off
+	    QMakeVar add QMAKE_LFLAGS -LANG:exceptions=off
+            ;;
+        *) ;;
+        esac
+        ;;
+    *) ;;
+    esac
+    QMAKE_CONFIG="$QMAKE_CONFIG exceptions_off"
+fi
+
+# On Mac, set the minimum deployment target using Xarch when that is supported (10.5 and up).
+# On 10.4 the deployment version is set to 10.3 globally using the QMAKE_MACOSX_DEPLOYMENT_TARGET env. variable
+# "-cocoa" on the command line means Cocoa is used in 32-bit mode also, in this case fall back on 
+# QMAKE_MACOSX_DEPLOYMENT_TARGET which will be set to 10.5.
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] && [ "$COMMANDLINE_MAC_COCOA" != "yes" ]; then
+    if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
+        QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+        QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+        QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4"
+    fi
+    if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
+        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.3"
+        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.3"
+        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.3"
+        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.3"
+    fi
+    if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
+        QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+        QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+        QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5"
+    fi
+    if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then
+        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5"
+    fi
+fi
+
+#-------------------------------------------------------------------------------
+# generate QT_BUILD_KEY
+#-------------------------------------------------------------------------------
+
+# some compilers generate binary incompatible code between different versions,
+# so we need to generate a build key that is different between these compilers
+case "$COMPILER" in
+g++*)
+    # GNU C++
+    COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null`
+
+    case "$COMPILER_VERSION" in
+    *.*.*)
+        QT_GCC_MAJOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\1,'`
+        QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\2,'`
+        QT_GCC_PATCH_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\3,'`
+        ;;
+    *.*)
+        QT_GCC_MAJOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\1,'`
+        QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\2,'`
+        QT_GCC_PATCH_VERSION=0
+        ;;
+    esac
+
+    case "$COMPILER_VERSION" in
+    2.95.*)
+        COMPILER_VERSION="2.95.*"
+        ;;
+    3.*)
+        COMPILER_VERSION="3.*"
+        ;;
+    4.*)
+        COMPILER_VERSION="4"
+        ;;
+    *)
+        ;;
+    esac
+    [ '!' -z "$COMPILER_VERSION" ] && COMPILER="g++-${COMPILER_VERSION}"
+    ;;
+*)
+    #
+    ;;
+esac
+
+# QT_CONFIG can contain the following:
+#
+# Things that affect the Qt API/ABI:
+#
+#   Options:
+#     minimal-config small-config medium-config large-config full-config
+#
+#   Different edition modules:
+#     network canvas table xml opengl sql
+#
+#   Options:
+#     stl
+#
+# Things that do not affect the Qt API/ABI:
+#     system-jpeg no-jpeg jpeg
+#     system-mng no-mng mng
+#     system-png no-png png
+#     system-zlib no-zlib zlib
+#     system-libtiff no-libtiff
+#     no-gif gif
+#     debug release
+#     dll staticlib
+#
+#     internal
+#     nocrosscompiler
+#     GNUmake
+#     largefile
+#     nis
+#     nas
+#     tablet
+#     ipv6
+#
+#     X11     : x11sm xinerama xcursor xfixes xrandr xrender mitshm fontconfig xkb
+#     Embedded: embedded freetype
+#
+ALL_OPTIONS="stl"
+BUILD_CONFIG=
+BUILD_OPTIONS=
+
+# determine the build options
+for config_option in $QMAKE_CONFIG $QT_CONFIG; do
+    SKIP="yes"
+    case "$config_option" in
+    *-config)
+        # take the last *-config setting.  this is the highest config being used,
+        # and is the one that we will use for tagging plugins
+        BUILD_CONFIG="$config_option"
+        ;;
+
+    stl)
+        # these config options affect the Qt API/ABI. they should influence
+        # the generation of the buildkey, so we don't skip them
+        SKIP="no"
+        ;;
+
+    *) # skip all other options since they don't affect the Qt API/ABI.
+        ;;
+    esac
+
+    if [ "$SKIP" = "no" ]; then
+        BUILD_OPTIONS="$BUILD_OPTIONS $config_option"
+    fi
+done
+
+# put the options that we are missing into .options
+rm -f .options
+for opt in `echo $ALL_OPTIONS`; do
+    SKIP="no"
+    if echo $BUILD_OPTIONS | grep $opt >/dev/null 2>&1; then
+        SKIP="yes"
+    fi
+    if [ "$SKIP" = "no" ]; then
+        echo "$opt" >> .options
+    fi
+done
+
+# reconstruct BUILD_OPTIONS with a sorted negative feature list
+# (ie. only things that are missing are will be put into the build key)
+BUILD_OPTIONS=
+if [ -f .options ]; then
+    for opt in `sort -f .options | uniq`; do
+        BUILD_OPTIONS="$BUILD_OPTIONS no-$opt"
+    done
+fi
+rm -f .options
+
+# QT_NO* defines affect the Qt API (and binary compatibility).  they need
+# to be included in the build key
+for build_option in $D_FLAGS; do
+    build_option=`echo $build_option | cut -d \" -f 2 -`
+    case "$build_option" in
+    QT_NO*)
+        echo "$build_option" >> .options
+        ;;
+    *)
+        # skip all other compiler defines
+        ;;
+    esac
+done
+
+# sort the compile time defines (helps ensure that changes in this configure
+# script don't affect the QT_BUILD_KEY generation)
+if [ -f .options ]; then
+    for opt in `sort -f .options | uniq`; do
+        BUILD_OPTIONS="$BUILD_OPTIONS $opt"
+    done
+fi
+rm -f .options
+
+BUILD_OPTIONS="$BUILD_CONFIG $BUILD_OPTIONS"
+# extract the operating system from the XPLATFORM
+TARGET_OPERATING_SYSTEM=`echo $XPLATFORM | cut -f 2- -d/ | cut -f -1 -d-`
+# when cross-compiling, don't include build-host information (build key is target specific)
+QT_BUILD_KEY="$CFG_USER_BUILD_KEY $CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER $BUILD_OPTIONS"
+# don't break loading plugins build with an older version of Qt
+QT_BUILD_KEY_COMPAT=
+if [ "$QT_CROSS_COMPILE" = "no" ]; then
+    # previous versions of Qt used a build key built from the uname
+    QT_BUILD_KEY_COMPAT="$CFG_USER_BUILD_KEY $UNAME_MACHINE $UNAME_SYSTEM $COMPILER $BUILD_OPTIONS"
+fi
+# strip out leading/trailing/extra whitespace
+QT_BUILD_KEY=`echo $QT_BUILD_KEY | sed -e "s,  *, ,g" -e "s,^  *,," -e "s,  *$,,"`
+QT_BUILD_KEY_COMPAT=`echo $QT_BUILD_KEY_COMPAT | sed -e "s,  *, ,g" -e "s,^  *,," -e "s,  *$,,"`
+
+#-------------------------------------------------------------------------------
+# part of configuration information goes into qconfig.h
+#-------------------------------------------------------------------------------
+
+case "$CFG_QCONFIG" in
+full)
+    echo "/* Everything */" >"$outpath/src/corelib/global/qconfig.h.new"
+    ;;
+*)
+    tmpconfig="$outpath/src/corelib/global/qconfig.h.new"
+    echo "#ifndef QT_BOOTSTRAPPED" >"$tmpconfig"
+    cat "$relpath/src/corelib/global/qconfig-$CFG_QCONFIG.h" >>"$tmpconfig"
+    echo "#endif" >>"$tmpconfig"
+    ;;
+esac
+cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+
+/* Qt Edition */
+#ifndef QT_EDITION
+#  define QT_EDITION $QT_EDITION
+#endif
+
+/* Machine byte-order */
+#define Q_BIG_ENDIAN 4321
+#define Q_LITTLE_ENDIAN 1234
+
+#define QT_BUILD_KEY "$QT_BUILD_KEY"
+EOF
+if [ -n "$QT_BUILD_KEY_COMPAT" ]; then
+    echo "#define QT_BUILD_KEY_COMPAT \"$QT_BUILD_KEY_COMPAT\"" \
+        >> "$outpath/src/corelib/global/qconfig.h.new"
+fi
+echo "" >>"$outpath/src/corelib/global/qconfig.h.new"
+
+echo "#ifdef QT_BOOTSTRAPPED" >>"$outpath/src/corelib/global/qconfig.h.new"
+if [ "$CFG_HOST_ENDIAN" = "auto" ]; then
+    cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+#if defined(__BIG_ENDIAN__)
+# define Q_BYTE_ORDER Q_BIG_ENDIAN
+#elif defined(__LITTLE_ENDIAN__)
+# define Q_BYTE_ORDER Q_LITTLE_ENDIAN
+#else
+# error "Unable to determine byte order!"
+#endif
+EOF
+else
+    echo "#define Q_BYTE_ORDER $CFG_HOST_ENDIAN" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+echo "#else" >>"$outpath/src/corelib/global/qconfig.h.new"
+if [ "$CFG_ENDIAN" = "auto" ]; then
+    cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+#if defined(__BIG_ENDIAN__)
+# define Q_BYTE_ORDER Q_BIG_ENDIAN
+#elif defined(__LITTLE_ENDIAN__)
+# define Q_BYTE_ORDER Q_LITTLE_ENDIAN
+#else
+# error "Unable to determine byte order!"
+#endif
+EOF
+else
+    echo "#define Q_BYTE_ORDER $CFG_ENDIAN" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+echo "#endif" >>"$outpath/src/corelib/global/qconfig.h.new"
+
+if [ "$CFG_DOUBLEFORMAT" != "normal" ]; then
+    cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+/* Non-IEEE double format */
+#define Q_DOUBLE_LITTLE "01234567"
+#define Q_DOUBLE_BIG "76543210"
+#define Q_DOUBLE_LITTLE_SWAPPED "45670123"
+#define Q_DOUBLE_BIG_SWAPPED "32107654"
+#define Q_DOUBLE_FORMAT $CFG_DOUBLEFORMAT
+EOF
+fi
+if [ "$CFG_ARMFPA" = "yes" ]; then
+    if [ "$CFG_ARCH" != "$CFG_HOST_ARCH" ]; then
+	cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+#ifndef QT_BOOTSTRAPPED
+# define QT_ARMFPA
+#endif
+EOF
+    else
+	echo "#define QT_ARMFPA" >>"$outpath/src/corelib/global/qconfig.h.new"
+    fi
+fi
+
+CFG_ARCH_STR=`echo $CFG_ARCH | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+CFG_HOST_ARCH_STR=`echo $CFG_HOST_ARCH | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+/* Machine Architecture */
+#ifndef QT_BOOTSTRAPPED
+# define QT_ARCH_${CFG_ARCH_STR}
+#else
+# define QT_ARCH_${CFG_HOST_ARCH_STR}
+#endif
+EOF
+
+echo '/* Compile time features */' >>"$outpath/src/corelib/global/qconfig.h.new"
+[ '!' -z "$LicenseKeyExt" ] && echo "#define QT_PRODUCT_LICENSEKEY \"$LicenseKeyExt\"" >>"$outpath/src/corelib/global/qconfig.h.new"
+
+if [ "$CFG_LARGEFILE" = "yes" ]; then
+    echo "#define QT_LARGEFILE_SUPPORT 64" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+
+# if both carbon and cocoa are specified, enable the autodetection code.
+if [ "$CFG_MAC_COCOA" = "yes" -a "$CFG_MAC_CARBON" = "yes" ]; then
+    echo "#define AUTODETECT_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new"
+elif [ "$CFG_MAC_COCOA" = "yes" ]; then
+    echo "#define QT_MAC_USE_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+
+if [ "$CFG_FRAMEWORK" = "yes" ]; then
+    echo "#define QT_MAC_FRAMEWORK_BUILD" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+#if defined(__LP64__)
+# define QT_POINTER_SIZE 8
+#else
+# define QT_POINTER_SIZE 4
+#endif
+EOF
+else
+    "$unixtests/ptrsize.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
+    echo "#define QT_POINTER_SIZE $?" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+
+
+echo "" >>"$outpath/src/corelib/global/qconfig.h.new"
+
+if [ "$CFG_DEV" = "yes" ]; then
+    echo "#define QT_BUILD_INTERNAL" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+
+# Embedded compile time options
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    # Add QWS to config.h
+    QCONFIG_FLAGS="$QCONFIG_FLAGS Q_WS_QWS"
+
+    # Add excluded decorations to $QCONFIG_FLAGS
+    decors=`grep '^decorations -= ' "$QMAKE_VARS_FILE" | ${AWK} '{print $3}'`
+    for decor in $decors; do
+        NODECORATION=`echo $decor | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+        QCONFIG_FLAGS="${QCONFIG_FLAGS} QT_NO_QWS_DECORATION_${NODECORATION}"
+    done
+
+    # Figure which embedded drivers which are turned off
+    CFG_GFX_OFF="$CFG_GFX_AVAILABLE"
+    for ADRIVER in $CFG_GFX_ON; do
+        CFG_GFX_OFF=`echo "${CFG_GFX_OFF} " | sed "s,${ADRIVER} ,,g"`
+    done
+
+    CFG_KBD_OFF="$CFG_KBD_AVAILABLE"
+    # the um driver is currently not in the available list for external builds
+    if [ "$CFG_DEV" = "no" ]; then
+	CFG_KBD_OFF="$CFG_KBD_OFF um"
+    fi
+    for ADRIVER in $CFG_KBD_ON; do
+        CFG_KBD_OFF=`echo "${CFG_KBD_OFF} " | sed "s,${ADRIVER} ,,g"`
+    done
+
+    CFG_MOUSE_OFF="$CFG_MOUSE_AVAILABLE"
+    for ADRIVER in $CFG_MOUSE_ON; do
+        CFG_MOUSE_OFF=`echo "${CFG_MOUSE_OFF} " | sed "s,${ADRIVER} ,,g"`
+    done
+
+    for DRIVER in $CFG_GFX_OFF; do
+        NODRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_$NODRIVER"
+    done
+
+    for DRIVER in $CFG_KBD_OFF; do
+        NODRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_KBD_$NODRIVER"
+    done
+
+    for DRIVER in $CFG_MOUSE_OFF; do
+        NODRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_MOUSE_$NODRIVER"
+    done
+fi # QWS
+
+if [ "${CFG_USE_FLOATMATH}" = "yes" ]; then
+    QCONFIG_FLAGS="${QCONFIG_FLAGS} QT_USE_MATH_H_FLOATS"
+fi
+
+# Add turned on SQL drivers
+for DRIVER in $CFG_SQL_AVAILABLE; do
+    eval "VAL=\$CFG_SQL_$DRIVER"
+    case "$VAL" in
+    qt)
+        ONDRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_SQL_$ONDRIVER"
+        SQL_DRIVERS="$SQL_DRIVERS $DRIVER"
+    ;;
+    plugin)
+        SQL_PLUGINS="$SQL_PLUGINS $DRIVER"
+    ;;
+    esac
+done
+
+
+QMakeVar set sql-drivers "$SQL_DRIVERS"
+QMakeVar set sql-plugins "$SQL_PLUGINS"
+
+# Add other configuration options to the qconfig.h file
+[ "$CFG_GIF" = "yes" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_BUILTIN_GIF_READER=1"
+[ "$CFG_TIFF" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_TIFF"
+[ "$CFG_PNG" != "yes" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_PNG"
+[ "$CFG_JPEG" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG"
+[ "$CFG_MNG" != "yes" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG"
+[ "$CFG_ZLIB" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB"
+[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
+[ "$CFG_IPV6" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
+[ "$CFG_SXE" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
+[ "$CFG_DBUS" = "no" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
+
+if [ "$PLATFORM_QWS" != "yes" ]; then
+    [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
+    [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENGL"
+fi
+
+# X11/Unix/Mac only configs
+[ "$CFG_CUPS" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
+[ "$CFG_ICONV" = "no" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV"
+[ "$CFG_GLIB" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB"
+[ "$CFG_GSTREAMER" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GSTREAMER"
+[ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK"
+[ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC"
+[ "$CFG_MREMAP" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP"
+[ "$CFG_GETADDRINFO" = "no" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETADDRINFO"
+[ "$CFG_IPV6IFNAME" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6IFNAME"
+[ "$CFG_GETIFADDRS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETIFADDRS"
+[ "$CFG_INOTIFY" = "no" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_INOTIFY"
+[ "$CFG_NAS" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NAS"
+[ "$CFG_NIS" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NIS"
+[ "$CFG_OPENSSL" = "no" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENSSL"
+[ "$CFG_OPENSSL" = "linked" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_LINKED_OPENSSL"
+
+[ "$CFG_SM" = "no" ]         && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SESSIONMANAGER"
+[ "$CFG_XCURSOR" = "no" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XCURSOR"
+[ "$CFG_XFIXES" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XFIXES"
+[ "$CFG_FONTCONFIG" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FONTCONFIG"
+[ "$CFG_XINERAMA" = "no" ]   && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINERAMA"
+[ "$CFG_XKB" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XKB"
+[ "$CFG_XRANDR" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRANDR"
+[ "$CFG_XRENDER" = "no" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRENDER"
+[ "$CFG_MITSHM" = "no" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM"
+[ "$CFG_XSHAPE" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE"
+[ "$CFG_XINPUT" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINPUT QT_NO_TABLET"
+
+[ "$CFG_XCURSOR" = "runtime" ]   && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XCURSOR"
+[ "$CFG_XINERAMA" = "runtime" ]  && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINERAMA"
+[ "$CFG_XFIXES" = "runtime" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XFIXES"
+[ "$CFG_XRANDR" = "runtime" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XRANDR"
+[ "$CFG_XINPUT" = "runtime" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINPUT"
+
+# sort QCONFIG_FLAGS for neatness if we can
+[ '!' -z "$AWK" ] && QCONFIG_FLAGS=`echo $QCONFIG_FLAGS | $AWK '{ gsub(" ", "\n"); print }' | sort | uniq`
+QCONFIG_FLAGS=`echo $QCONFIG_FLAGS`
+
+if [ -n "$QCONFIG_FLAGS" ]; then
+    for cfg in $QCONFIG_FLAGS; do
+        cfgd=`echo $cfg | sed 's/=.*$//'` # trim pushed 'Foo=Bar' defines
+        cfg=`echo $cfg | sed 's/=/ /'`    # turn first '=' into a space
+        # figure out define logic, so we can output the correct
+        # ifdefs to override the global defines in a project
+        cfgdNeg=
+        if [ true ] && echo "$cfgd" | grep 'QT_NO_' >/dev/null 2>&1; then
+            # QT_NO_option can be forcefully turned on by QT_option
+            cfgdNeg=`echo $cfgd | sed "s,QT_NO_,QT_,"`
+        elif [ true ] && echo "$cfgd" | grep 'QT_' >/dev/null 2>&1; then
+            # QT_option can be forcefully turned off by QT_NO_option
+            cfgdNeg=`echo $cfgd | sed "s,QT_,QT_NO_,"`
+        fi
+
+        if [ -z $cfgdNeg ]; then
+cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
+#ifndef $cfgd
+# define $cfg
+#endif
+
+EOF
+        else
+cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
+#if defined($cfgd) && defined($cfgdNeg)
+# undef $cfgd
+#elif !defined($cfgd) && !defined($cfgdNeg)
+# define $cfg
+#endif
+
+EOF
+        fi
+    done
+fi
+
+if [ "$CFG_REDUCE_EXPORTS" = "yes" ]; then
+cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
+#define QT_VISIBILITY_AVAILABLE
+
+EOF
+fi
+
+# avoid unecessary rebuilds by copying only if qconfig.h has changed
+if cmp -s "$outpath/src/corelib/global/qconfig.h" "$outpath/src/corelib/global/qconfig.h.new"; then
+    rm -f "$outpath/src/corelib/global/qconfig.h.new"
+else
+    [ -f "$outpath/src/corelib/global/qconfig.h" ] && chmod +w "$outpath/src/corelib/global/qconfig.h"
+    mv "$outpath/src/corelib/global/qconfig.h.new" "$outpath/src/corelib/global/qconfig.h"
+    chmod -w "$outpath/src/corelib/global/qconfig.h"
+    for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do
+        if [ '!' -f "$conf" ]; then
+            ln -s "$outpath/src/corelib/global/qconfig.h" "$conf"
+        fi
+    done
+fi
+
+#-------------------------------------------------------------------------------
+# save configuration into qconfig.pri
+#-------------------------------------------------------------------------------
+
+QTCONFIG="$outpath/mkspecs/qconfig.pri"
+QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend"
+[ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp"
+if [ "$CFG_DEBUG" = "yes" ]; then
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG debug"
+    if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG release"
+    fi
+    QT_CONFIG="$QT_CONFIG debug"
+elif [ "$CFG_DEBUG" = "no" ]; then
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG release"
+    if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG debug"
+    fi
+    QT_CONFIG="$QT_CONFIG release"
+fi
+if [ "$CFG_STL" = "yes" ]; then
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG stl"
+fi
+if [ "$CFG_FRAMEWORK" = "no" ]; then
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG qt_no_framework"
+else
+    QT_CONFIG="$QT_CONFIG qt_framework"
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG qt_framework"
+fi
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG $CFG_MAC_ARCHS"
+fi
+
+# Make the application arch follow the Qt arch for single arch builds.
+# (for multiple-arch builds, set CONFIG manually in the application .pro file)
+if [ `echo "$CFG_MAC_ARCHS" | wc -w` -eq 1 ]; then
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG $CFG_MAC_ARCHS"
+fi
+
+cat >>"$QTCONFIG.tmp" <<EOF
+#configuration
+CONFIG += $QTCONFIG_CONFIG
+QT_ARCH = $CFG_ARCH
+QT_EDITION = $Edition
+QT_CONFIG += $QT_CONFIG
+
+#versioning
+QT_VERSION = $QT_VERSION
+QT_MAJOR_VERSION = $QT_MAJOR_VERSION
+QT_MINOR_VERSION = $QT_MINOR_VERSION
+QT_PATCH_VERSION = $QT_PATCH_VERSION
+
+#namespaces
+QT_LIBINFIX = $QT_LIBINFIX
+QT_NAMESPACE = $QT_NAMESPACE
+QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC
+
+EOF
+if [ "$CFG_RPATH" = "yes" ]; then
+    echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp"
+fi
+if [ -n "$QT_GCC_MAJOR_VERSION" ]; then
+    echo "QT_GCC_MAJOR_VERSION = $QT_GCC_MAJOR_VERSION" >> "$QTCONFIG.tmp"
+    echo "QT_GCC_MINOR_VERSION = $QT_GCC_MINOR_VERSION" >> "$QTCONFIG.tmp"
+    echo "QT_GCC_PATCH_VERSION = $QT_GCC_PATCH_VERSION" >> "$QTCONFIG.tmp"
+fi
+# replace qconfig.pri if it differs from the newly created temp file
+if cmp -s "$QTCONFIG.tmp" "$QTCONFIG"; then
+    rm -f "$QTCONFIG.tmp"
+else
+    mv -f "$QTCONFIG.tmp" "$QTCONFIG"
+fi
+
+#-------------------------------------------------------------------------------
+# save configuration into .qmake.cache
+#-------------------------------------------------------------------------------
+
+CACHEFILE="$outpath/.qmake.cache"
+[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp"
+cat >>"$CACHEFILE.tmp" <<EOF
+CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs QTDIR_build
+QT_SOURCE_TREE = \$\$quote($relpath)
+QT_BUILD_TREE = \$\$quote($outpath)
+QT_BUILD_PARTS = $CFG_BUILD_PARTS
+QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
+QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
+
+#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
+QMAKE_MOC        = \$\$QT_BUILD_TREE/bin/moc
+QMAKE_UIC        = \$\$QT_BUILD_TREE/bin/uic
+QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
+QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
+QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
+QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
+QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib
+
+EOF
+
+if [ -n "$QT_CFLAGS_PSQL" ]; then
+    echo "QT_CFLAGS_PSQL   = $QT_CFLAGS_PSQL" >> "$CACHEFILE.tmp"
+fi
+if [ -n "$QT_LFLAGS_PSQL" ]; then
+    echo "QT_LFLAGS_PSQL   = $QT_LFLAGS_PSQL" >> "$CACHEFILE.tmp"
+fi
+if [ -n "$QT_CFLAGS_MYSQL" ]; then
+    echo "QT_CFLAGS_MYSQL   = $QT_CFLAGS_MYSQL" >> "$CACHEFILE.tmp"
+fi
+if [ -n "$QT_LFLAGS_MYSQL" ]; then
+    echo "QT_LFLAGS_MYSQL   = $QT_LFLAGS_MYSQL" >> "$CACHEFILE.tmp"
+fi
+if [ -n "$QT_CFLAGS_SQLITE" ]; then
+    echo "QT_CFLAGS_SQLITE   = $QT_CFLAGS_SQLITE" >> "$CACHEFILE.tmp"
+fi
+if [ -n "$QT_LFLAGS_SQLITE" ]; then
+    echo "QT_LFLAGS_SQLITE   = $QT_LFLAGS_SQLITE" >> "$CACHEFILE.tmp"
+fi
+
+if [ "$QT_EDITION" != "QT_EDITION_OPENSOURCE" ]; then
+    echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp"
+fi
+
+#dump in the OPENSSL_LIBS info
+if [ '!' -z "$OPENSSL_LIBS" ]; then
+    echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
+elif [ "$CFG_OPENSSL" = "linked" ]; then
+    echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$CACHEFILE.tmp"
+fi
+
+#dump in the SDK info
+if [ '!' -z "$CFG_SDK" ]; then
+   echo "QMAKE_MAC_SDK = $CFG_SDK" >> "$CACHEFILE.tmp"
+fi
+
+# mac gcc -Xarch support
+if [ "$CFG_MAC_XARCH" = "no" ]; then
+   echo "QMAKE_MAC_XARCH = no" >> "$CACHEFILE.tmp"
+fi
+
+#dump the qmake spec
+if [ -d "$outpath/mkspecs/$XPLATFORM" ]; then
+   echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$CACHEFILE.tmp"
+else
+   echo "QMAKESPEC = $XPLATFORM" >> "$CACHEFILE.tmp"
+fi
+
+# cmdline args
+cat "$QMAKE_VARS_FILE" >> "$CACHEFILE.tmp"
+rm -f "$QMAKE_VARS_FILE" 2>/dev/null
+
+# incrementals
+INCREMENTAL=""
+[ "$CFG_INCREMENTAL" = "auto" ] && "$WHICH" p4 >/dev/null 2>&1 && [ "$CFG_DEV" = "yes" ] && CFG_INCREMENTAL="yes"
+if [ "$CFG_INCREMENTAL" = "yes" ]; then
+    find "$relpath" -perm u+w -mtime -3 | grep 'cpp$' | while read f; do
+        # don't need to worry about generated files
+        [ -r `echo $f | sed "s,cpp$,ui,"` ] && continue
+        basename "$f" | grep '^moc_' >/dev/null 2>&1 && continue
+        # done
+        INCREMENTAL="$INCREMENTAL `basename \"$f\" | sed 's,.cpp,.o,'`"
+    done
+    [ '!' -z "$INCREMENTAL" ] && echo "QMAKE_INCREMENTAL += $INCREMENTAL" >> "$CACHEFILE.tmp"
+    [ -r "$outpath/.qmake.incremental" ] && echo "include($outpath/.qmake.incremental)" >> "$CACHEFILE.tmp"
+fi
+
+# replace .qmake.cache if it differs from the newly created temp file
+if cmp -s "$CACHEFILE.tmp" "$CACHEFILE"; then
+    rm -f "$CACHEFILE.tmp"
+else
+    mv -f "$CACHEFILE.tmp" "$CACHEFILE"
+fi
+
+#-------------------------------------------------------------------------------
+# give feedback on configuration
+#-------------------------------------------------------------------------------
+
+case "$COMPILER" in
+g++*)
+    if [ "$CFG_EXCEPTIONS" != "no" ]; then
+        cat <<EOF
+
+        This target is using the GNU C++ compiler ($PLATFORM).
+
+        Recent versions of this compiler automatically include code for
+        exceptions, which increase both the size of the Qt libraries and
+        the amount of memory taken by your applications.
+
+        You may choose to re-run `basename $0` with the -no-exceptions
+        option to compile Qt without exceptions. This is completely binary
+        compatible, and existing applications will continue to work.
+
+EOF
+    fi
+    ;;
+cc*)
+    case "$PLATFORM" in
+    irix-cc*)
+        if [ "$CFG_EXCEPTIONS" != "no" ]; then
+            cat <<EOF
+
+        This target is using the MIPSpro C++ compiler ($PLATFORM).
+
+        You may choose to re-run `basename $0` with the -no-exceptions
+        option to compile Qt without exceptions. This will make the
+        size of the Qt library smaller and reduce the amount of memory
+        taken by your applications.
+
+EOF
+        fi
+        ;;
+    *) ;;
+    esac
+    ;;
+*) ;;
+esac
+
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "no" ]  && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" == "yes" ]; then
+    cat <<EOF
+        WARNING: DWARF2 debug symbols are not enabled. Linking webkit
+        in debug mode will run out of memory on systems with 2GB or less.
+        Install Xcode 2.4.1 or higher to enable DWARF2, or configure with
+         -no-webkit or -release to skip webkit debug.
+EOF
+fi
+
+echo
+if [ "$XPLATFORM" = "$PLATFORM" ]; then
+    echo "Build type:    $PLATFORM"
+else
+    echo "Building on:   $PLATFORM"
+    echo "Building for:  $XPLATFORM"
+fi
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    echo "Architecture:  $CFG_ARCH ($CFG_MAC_ARCHS )"
+else
+    echo "Architecture:  $CFG_ARCH"
+fi
+
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    echo "Host architecture: $CFG_HOST_ARCH"
+fi
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    if [ "$CFG_MAC_COCOA" = "yes" ]; then
+        if [ "$CFG_MAC_CARBON" = "yes" ]; then
+            echo "Using framework: Carbon for 32-bit, Cocoa for 64-bit"
+        else
+            echo "Using framework: Cocoa"
+        fi
+    else
+        echo "Using framework: Carbon"
+    fi
+fi
+
+if [ -n "$PLATFORM_NOTES" ]; then
+    echo "Platform notes:"
+    echo "$PLATFORM_NOTES"
+else
+    echo
+fi
+
+if [ "$OPT_VERBOSE" = "yes" ]; then
+    if echo '\c' | grep '\c' >/dev/null; then
+        echo -n "qmake vars .......... "
+    else
+        echo "qmake vars .......... \c"
+    fi
+    cat "$QMAKE_VARS_FILE" | tr '\n' ' '
+    echo "qmake switches ...... $QMAKE_SWITCHES"
+fi
+
+[ "$CFG_INCREMENTAL" = "yes" ] && [ '!' -z "$INCREMENTAL" ] && echo "Incremental ......... $INCREMENTAL"
+echo "Build ............... $CFG_BUILD_PARTS"
+echo "Configuration ....... $QMAKE_CONFIG $QT_CONFIG"
+if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+   echo "Debug ............... yes (combined)"
+   if [ "$CFG_DEBUG" = "yes" ]; then
+       echo "Default Link ........ debug"
+   else
+       echo "Default Link ........ release"
+   fi
+else
+   echo "Debug ............... $CFG_DEBUG"
+fi
+echo "Qt 3 compatibility .. $CFG_QT3SUPPORT"
+[ "$CFG_DBUS" = "no" ]     && echo "QtDBus module ....... no"
+[ "$CFG_DBUS" = "yes" ]    && echo "QtDBus module ....... yes (run-time)"
+[ "$CFG_DBUS" = "linked" ] && echo "QtDBus module ....... yes (linked)"
+echo "QtScriptTools module  $CFG_SCRIPTTOOLS"
+echo "QtXmlPatterns module  $CFG_XMLPATTERNS"
+echo "Phonon module ....... $CFG_PHONON"
+echo "SVG module .......... $CFG_SVG"
+echo "WebKit module ....... $CFG_WEBKIT"
+echo "STL support ......... $CFG_STL"
+echo "PCH support ......... $CFG_PRECOMPILE"
+echo "MMX/3DNOW/SSE/SSE2..  ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"
+if [ "${CFG_ARCH}" = "arm" ]; then
+    echo "iWMMXt support ...... ${CFG_IWMMXT}"
+fi
+[ "${PLATFORM_QWS}" != "yes" ] && echo "Graphics System ..... $CFG_GRAPHICS_SYSTEM"
+echo "IPv6 support ........ $CFG_IPV6"
+echo "IPv6 ifname support . $CFG_IPV6IFNAME"
+echo "getaddrinfo support . $CFG_GETADDRINFO"
+echo "getifaddrs support .. $CFG_GETIFADDRS"
+echo "Accessibility ....... $CFG_ACCESSIBILITY"
+echo "NIS support ......... $CFG_NIS"
+echo "CUPS support ........ $CFG_CUPS"
+echo "Iconv support ....... $CFG_ICONV"
+echo "Glib support ........ $CFG_GLIB"
+echo "GStreamer support ... $CFG_GSTREAMER"
+echo "Large File support .. $CFG_LARGEFILE"
+echo "GIF support ......... $CFG_GIF"
+if [ "$CFG_TIFF" = "no" ]; then
+    echo "TIFF support ........ $CFG_TIFF"
+else
+    echo "TIFF support ........ $CFG_TIFF ($CFG_LIBTIFF)"
+fi
+if [ "$CFG_JPEG" = "no" ]; then
+    echo "JPEG support ........ $CFG_JPEG"
+else
+    echo "JPEG support ........ $CFG_JPEG ($CFG_LIBJPEG)"
+fi
+if [ "$CFG_PNG" = "no" ]; then
+    echo "PNG support ......... $CFG_PNG"
+else
+    echo "PNG support ......... $CFG_PNG ($CFG_LIBPNG)"
+fi
+if [ "$CFG_MNG" = "no" ]; then
+    echo "MNG support ......... $CFG_MNG"
+else
+    echo "MNG support ......... $CFG_MNG ($CFG_LIBMNG)"
+fi
+echo "zlib support ........ $CFG_ZLIB"
+echo "Session management .. $CFG_SM"
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    echo "Embedded support .... $CFG_EMBEDDED"
+    if [ "$CFG_QWS_FREETYPE" = "auto" ]; then
+	echo "Freetype2 support ... $CFG_QWS_FREETYPE ($CFG_LIBFREETYPE)"
+    else
+	echo "Freetype2 support ... $CFG_QWS_FREETYPE"
+    fi
+    # Normalize the decoration output first
+    CFG_GFX_ON=`echo ${CFG_GFX_ON}`
+    CFG_GFX_PLUGIN=`echo ${CFG_GFX_PLUGIN}`
+    echo "Graphics (qt) ....... ${CFG_GFX_ON}"
+    echo "Graphics (plugin) ... ${CFG_GFX_PLUGIN}"
+    CFG_DECORATION_ON=`echo ${CFG_DECORATION_ON}`
+    CFG_DECORATION_PLUGIN=`echo ${CFG_DECORATION_PLUGIN}`
+    echo "Decorations (qt) .... $CFG_DECORATION_ON"
+    echo "Decorations (plugin)  $CFG_DECORATION_PLUGIN"
+    CFG_KBD_ON=`echo ${CFG_KBD_ON}`
+    CFG_KBD_PLUGIN=`echo ${CFG_KBD_PLUGIN}`
+    echo "Keyboard driver (qt). ${CFG_KBD_ON}"
+    echo "Keyboard driver (plugin) ${CFG_KBD_PLUGIN}"
+    CFG_MOUSE_ON=`echo ${CFG_MOUSE_ON}`
+    CFG_MOUSE_PLUGIN=`echo ${CFG_MOUSE_PLUGIN}`
+    echo "Mouse driver (qt) ... $CFG_MOUSE_ON"
+    echo "Mouse driver (plugin) $CFG_MOUSE_PLUGIN"
+fi
+if [ "$CFG_OPENGL" = "desktop" ]; then
+    echo "OpenGL support ...... yes (Desktop OpenGL)"
+elif [ "$CFG_OPENGL" = "es1" ]; then
+    echo "OpenGL support ...... yes (OpenGL ES 1.x Common profile)"
+elif [ "$CFG_OPENGL" = "es1cl" ]; then
+    echo "OpenGL support ...... yes (OpenGL ES 1.x Common Lite profile)"
+elif [ "$CFG_OPENGL" = "es2" ]; then
+    echo "OpenGL support ...... yes (OpenGL ES 2.x)"
+else
+    echo "OpenGL support ...... no"
+fi
+if [ "$PLATFORM_X11" = "yes" ]; then
+    echo "NAS sound support ... $CFG_NAS"
+    echo "XShape support ...... $CFG_XSHAPE"
+    echo "Xinerama support .... $CFG_XINERAMA"
+    echo "Xcursor support ..... $CFG_XCURSOR"
+    echo "Xfixes support ...... $CFG_XFIXES"
+    echo "Xrandr support ...... $CFG_XRANDR"
+    echo "Xrender support ..... $CFG_XRENDER"
+    echo "Xi support .......... $CFG_XINPUT"
+    echo "MIT-SHM support ..... $CFG_MITSHM"
+    echo "FontConfig support .. $CFG_FONTCONFIG"
+    echo "XKB Support ......... $CFG_XKB"
+    echo "immodule support .... $CFG_IM"
+    echo "GTK theme support ... $CFG_QGTKSTYLE"
+fi
+[ "$CFG_SQL_mysql" != "no" ] && echo "MySQL support ....... $CFG_SQL_mysql"
+[ "$CFG_SQL_psql" != "no" ] && echo "PostgreSQL support .. $CFG_SQL_psql"
+[ "$CFG_SQL_odbc" != "no" ] && echo "ODBC support ........ $CFG_SQL_odbc"
+[ "$CFG_SQL_oci" != "no" ] && echo "OCI support ......... $CFG_SQL_oci"
+[ "$CFG_SQL_tds" != "no" ] && echo "TDS support ......... $CFG_SQL_tds"
+[ "$CFG_SQL_db2" != "no" ] && echo "DB2 support ......... $CFG_SQL_db2"
+[ "$CFG_SQL_ibase" != "no" ] && echo "InterBase support ... $CFG_SQL_ibase"
+[ "$CFG_SQL_sqlite2" != "no" ] && echo "SQLite 2 support .... $CFG_SQL_sqlite2"
+[ "$CFG_SQL_sqlite" != "no" ] && echo "SQLite support ...... $CFG_SQL_sqlite ($CFG_SQLITE)"
+
+OPENSSL_LINKAGE=""
+if [ "$CFG_OPENSSL" = "yes" ]; then
+    OPENSSL_LINKAGE="(run-time)"
+elif [ "$CFG_OPENSSL" = "linked" ]; then
+    OPENSSL_LINKAGE="(linked)"
+fi
+echo "OpenSSL support ..... $CFG_OPENSSL $OPENSSL_LINKAGE"
+
+[ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........ $CFG_PTMALLOC"
+
+# complain about not being able to use dynamic plugins if we are using a static build
+if [ "$CFG_SHARED" = "no" ]; then
+    echo
+    echo "WARNING: Using static linking will disable the use of dynamically"
+    echo "loaded plugins. Make sure to import all needed static plugins,"
+    echo "or compile needed modules into the library."
+    echo
+fi
+if [ "$CFG_OPENSSL" = "linked" ] && [ "$OPENSSL_LIBS" = "" ]; then
+    echo
+    echo "NOTE: When linking against OpenSSL, you can override the default"
+    echo "library names through OPENSSL_LIBS."
+    echo "For example:"
+    echo "    ./configure -openssl-linked OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto'"
+    echo
+fi
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_DEBUG" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "no" ]; then
+    echo
+    echo "NOTE: Mac OS X frameworks implicitly build debug and release Qt libraries."
+    echo
+fi
+echo
+
+sepath=`echo "$relpath" | sed -e 's/\\./\\\\./g'`
+PROCS=1
+EXEC=""
+
+
+#-------------------------------------------------------------------------------
+# build makefiles based on the configuration
+#-------------------------------------------------------------------------------
+
+echo "Finding project files. Please wait..."
+"$outpath/bin/qmake" -prl -r "${relpath}/projects.pro"
+if [ -f "${relpath}/projects.pro" ]; then
+    mkfile="${outpath}/Makefile"
+    [ -f "$mkfile" ] && chmod +w "$mkfile"
+    QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
+fi
+
+# .projects      -> projects to process
+# .projects.1    -> qt and moc
+# .projects.2    -> subdirs and libs
+# .projects.3    -> the rest
+rm -f .projects .projects.1 .projects.2 .projects.3
+
+QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | sed 's-/\./-/-'`
+if [ -z "$AWK" ]; then
+    for p in `echo $QMAKE_PROJECTS`; do
+        echo "$p" >> .projects
+    done
+else
+    cat >projects.awk <<EOF
+BEGIN {
+    files = 0
+    target_file = ""
+    input_file = ""
+
+    first = "./.projects.1.tmp"
+    second = "./.projects.2.tmp"
+    third = "./.projects.3.tmp"
+}
+
+FNR == 1 {
+    if ( input_file ) {
+  if ( ! target_file )
+      target_file = third
+  print input_file >target_file
+    }
+
+    matched_target = 0
+    template_lib = 0
+    input_file = FILENAME
+    target_file = ""
+}
+
+/^(TARGET.*=)/ {
+    if ( \$3 == "moc" || \$3 ~ /^Qt/ ) {
+  target_file = first
+        matched_target = 1
+    }
+}
+
+matched_target == 0 && /^(TEMPLATE.*=)/ {
+    if ( \$3 == "subdirs" )
+  target_file = second
+    else if ( \$3 == "lib" )
+  template_lib = 1
+    else
+  target_file = third
+}
+
+matched_target == 0 && template_lib == 1 && /^(CONFIG.*=)/ {
+    if ( \$0 ~ /plugin/ )
+        target_file = third
+    else
+  target_file = second
+}
+
+END {
+    if ( input_file ) {
+  if ( ! target_file )
+      target_file = third
+  print input_file >>target_file
+    }
+}
+
+EOF
+
+    rm -f .projects.all
+    for p in `echo $QMAKE_PROJECTS`; do
+       echo "$p" >> .projects.all
+    done
+
+    # if you get errors about the length of the command line to awk, change the -l arg
+    # to split below
+    split -l 100 .projects.all .projects.all.
+    for p in .projects.all.*; do
+       "$AWK" -f projects.awk `cat $p`
+       [ -f .projects.1.tmp ] && cat .projects.1.tmp >> .projects.1
+       [ -f .projects.2.tmp ] && cat .projects.2.tmp >> .projects.2
+       [ -f .projects.3.tmp ] && cat .projects.3.tmp >> .projects.3
+       rm -f .projects.1.tmp .projects.2.tmp .projects.3.tmp $p
+    done
+    rm -f .projects.all* projects.awk
+
+    [ -f .projects.1 ] && cat .projects.1 >>.projects
+    [ -f .projects.2 ] && cat .projects.2 >>.projects
+    rm -f .projects.1 .projects.2
+    if [ -f .projects.3 ] && [ "$OPT_FAST" = "no" ]; then
+       cat .projects.3 >>.projects
+       rm -f .projects.3
+    fi
+fi
+# don't sort Qt and MOC in with the other project files
+# also work around a segfaulting uniq(1)
+if [ -f .sorted.projects.2 ]; then
+    sort .sorted.projects.2 > .sorted.projects.2.new
+    mv -f .sorted.projects.2.new .sorted.projects.2
+    cat .sorted.projects.2 >> .sorted.projects.1
+fi
+[ -f .sorted.projects.1 ] && sort .sorted.projects.1 >> .sorted.projects
+rm -f .sorted.projects.2 .sorted.projects.1
+
+NORM_PROJECTS=0
+FAST_PROJECTS=0
+if [ -f .projects ]; then
+   uniq .projects >.tmp
+   mv -f .tmp .projects
+   NORM_PROJECTS=`cat .projects | wc -l | sed -e "s, ,,g"`
+fi
+if [ -f .projects.3 ]; then
+   uniq .projects.3 >.tmp
+   mv -f .tmp .projects.3
+   FAST_PROJECTS=`cat .projects.3 | wc -l | sed -e "s, ,,g"`
+fi
+echo "  `expr $NORM_PROJECTS + $FAST_PROJECTS` projects found."
+echo
+
+PART_ROOTS=
+for part in $CFG_BUILD_PARTS; do
+    case "$part" in
+    tools) PART_ROOTS="$PART_ROOTS tools" ;;
+    libs) PART_ROOTS="$PART_ROOTS src" ;;
+    examples) PART_ROOTS="$PART_ROOTS examples demos" ;;
+    *) ;;
+    esac
+done
+
+if [ "$CFG_DEV" = "yes" ]; then
+    PART_ROOTS="$PART_ROOTS tests"
+fi
+
+echo "Creating makefiles. Please wait..."
+for file in .projects .projects.3; do
+    [ '!' -f "$file" ] && continue
+    for a in `cat $file`; do
+        IN_ROOT=no
+	for r in $PART_ROOTS; do
+	    if echo "$a" | grep "^$r" >/dev/null 2>&1 || echo "$a" | grep "^$relpath/$r" >/dev/null 2>&1; then
+		IN_ROOT=yes
+		break
+            fi
+	done
+        [ "$IN_ROOT" = "no" ] && continue
+
+        case $a in
+        *winmain/winmain.pro) continue ;;
+        */qmake/qmake.pro) continue ;;
+        *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;;
+        *) SPEC=$XQMAKESPEC ;;
+        esac
+        dir=`dirname $a | sed -e "s;$sepath;.;g"`
+        test -d "$dir" || mkdir -p "$dir"
+        OUTDIR="$outpath/$dir"
+        if [ -f "${OUTDIR}/Makefile" ] && [ "$OPT_FAST" = "yes" ]; then
+            # fast configure - the makefile exists, skip it
+            # since the makefile exists, it was generated by qmake, which means we
+            # can skip it, since qmake has a rule to regenerate the makefile if the .pro
+            # file changes...
+            [ "$OPT_VERBOSE" = "yes" ] && echo "  skipping $a"
+            continue;
+        fi
+        QMAKE_SPEC_ARGS="-spec $SPEC"
+        if echo '\c' | grep '\c' >/dev/null; then
+            echo -n "  for $a"
+        else
+            echo "  for $a\c"
+        fi
+
+        QMAKE="$outpath/bin/qmake"
+	QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS"
+        if [ "$file" = ".projects.3" ]; then
+            if echo '\c' | grep '\c' >/dev/null; then
+                echo -n " (fast)"
+            else
+                echo " (fast)\c"
+            fi
+            echo
+
+            cat >"${OUTDIR}/Makefile" <<EOF
+# ${OUTDIR}/Makefile: generated by configure
+#
+# WARNING: This makefile will be replaced with a real makefile.
+# All changes made to this file will be lost.
+EOF
+            [ "$CFG_DEBUG_RELEASE" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile
+
+            cat >>"${OUTDIR}/Makefile" <<EOF
+QMAKE = "$QMAKE"
+all clean install qmake first Makefile: FORCE
+	\$(QMAKE) $QMAKE_ARGS -o "$OUTDIR" "$a"
+	cd "$OUTDIR"
+	\$(MAKE) \$@
+
+FORCE:
+
+EOF
+        else
+            if [ "$OPT_VERBOSE" = "yes" ]; then
+                echo " (`basename $SPEC`)"
+                echo "$QMAKE" $QMAKE_ARGS -o "$OUTDIR" "$a"
+	    else
+		echo
+            fi
+
+            [ -f "${OUTDIR}/Makefile" ] && chmod +w "${OUTDIR}/Makefile"
+            QTDIR="$outpath" "$QMAKE" $QMAKE_ARGS -o "$OUTDIR" "$a"
+       fi
+    done
+done
+rm -f .projects .projects.3
+
+#-------------------------------------------------------------------------------
+# XShape is important, DnD in the Designer doens't work without it
+#-------------------------------------------------------------------------------
+if [ "$PLATFORM_X11" = "yes" ] && [ "$CFG_XSHAPE" = "no" ]; then
+    cat <<EOF
+
+	NOTICE: Qt will not be built with XShape support.
+
+	As a result, drag-and-drop in the Qt Designer will NOT
+	work. We recommend that you enable XShape support by passing
+	the -xshape switch to $0.
+EOF
+fi
+
+#-------------------------------------------------------------------------------
+# check for platforms that we don't yet know about
+#-------------------------------------------------------------------------------
+if [ "$CFG_ARCH" = "generic" ]; then
+cat <<EOF
+
+        NOTICE: Atomic operations are not yet supported for this
+        architecture.
+
+        Qt will use the 'generic' architecture instead, which uses a
+        single pthread_mutex_t to protect all atomic operations. This
+        implementation is the slow (but safe) fallback implementation
+        for architectures Qt does not yet support.
+EOF
+fi
+
+#-------------------------------------------------------------------------------
+# check if the user passed the -no-zlib option, which is no longer supported
+#-------------------------------------------------------------------------------
+if [ -n "$ZLIB_FORCED" ]; then
+    which_zlib="supplied"
+    if [ "$CFG_ZLIB" = "system" ]; then
+	which_zlib="system"
+    fi
+
+cat <<EOF
+
+        NOTICE: The -no-zlib option was supplied but is no longer
+        supported.
+
+        Qt now requires zlib support in all builds, so the -no-zlib
+        option was ignored. Qt will be built using the $which_zlib
+        zlib.
+EOF
+fi
+
+#-------------------------------------------------------------------------------
+# finally save the executed command to another script
+#-------------------------------------------------------------------------------
+if [ `basename $0` != "config.status" ]; then
+    CONFIG_STATUS="$relpath/$relconf $OPT_CMDLINE"
+
+    # add the system variables
+    for varname in $SYSTEM_VARIABLES; do
+        cmd=`echo \
+'if [ -n "\$'${varname}'" ]; then
+    CONFIG_STATUS="'${varname}'='"'\\\$${varname}'"' \$CONFIG_STATUS"
+fi'`
+	eval "$cmd"
+    done
+
+    echo "$CONFIG_STATUS" | grep '\-confirm\-license' >/dev/null 2>&1 || CONFIG_STATUS="$CONFIG_STATUS -confirm-license"
+
+    [ -f "$outpath/config.status" ] && rm -f "$outpath/config.status"
+    echo "#!/bin/sh" > "$outpath/config.status"
+    echo "if [ \"\$#\" -gt 0 ]; then" >> "$outpath/config.status"
+    echo "  $CONFIG_STATUS \"\$@\"" >> "$outpath/config.status"
+    echo "else" >> "$outpath/config.status"
+    echo "  $CONFIG_STATUS" >> "$outpath/config.status"
+    echo "fi" >> "$outpath/config.status"
+    chmod +x "$outpath/config.status"
+fi
+
+if [ -n "$RPATH_MESSAGE" ]; then
+    echo
+    echo "$RPATH_MESSAGE"
+fi
+
+MAKE=`basename $MAKE`
+echo
+echo Qt is now configured for building. Just run \'$MAKE\'.
+if [ "$relpath" = "$QT_INSTALL_PREFIX" ]; then
+    echo Once everything is built, Qt is installed.
+    echo You should not run \'$MAKE install\'.
+else
+    echo Once everything is built, you must run \'$MAKE install\'.
+    echo Qt will be installed into $QT_INSTALL_PREFIX
+fi
+echo
+echo To reconfigure, run \'$MAKE confclean\' and \'configure\'.
+echo
diff --git a/configure.exe b/configure.exe
new file mode 100644
index 0000000..54e8a60
--- /dev/null
+++ b/configure.exe
diff --git a/demos/README b/demos/README
new file mode 100644
index 0000000..b161990
--- /dev/null
+++ b/demos/README
@@ -0,0 +1,39 @@
+These demonstrations are intended to highlight Qt's capabilities in different
+application areas, and provide examples that are more advanced than those in
+the examples directory.
+
+Beginners to Qt may wish to try out the Qt tutorial and some of the examples
+before examining the demonstrations in detail.
+
+
+The example launcher can be used to explore the different categories
+available. It provides an overview of each example, lets you view the
+documentation in Qt Assistant, and is able to launch examples.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/demos/affine/affine.pro b/demos/affine/affine.pro
new file mode 100644
index 0000000..b928753
--- /dev/null
+++ b/demos/affine/affine.pro
@@ -0,0 +1,23 @@
+SOURCES += main.cpp xform.cpp
+HEADERS += xform.h
+
+contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+SHARED_FOLDER = ../shared
+
+include($$SHARED_FOLDER/shared.pri)
+
+RESOURCES += affine.qrc
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/affine
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg
+sources.path = $$[QT_INSTALL_DEMOS]/affine
+INSTALLS += target sources
+
+wince*: {
+    DEPLOYMENT_PLUGIN += qjpeg
+}
diff --git a/demos/affine/affine.qrc b/demos/affine/affine.qrc
new file mode 100644
index 0000000..d8a7ae4
--- /dev/null
+++ b/demos/affine/affine.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res/affine">
+   <file>xform.cpp</file>
+   <file>xform.html</file>
+   <file>bg1.jpg</file>
+</qresource>
+</RCC>
diff --git a/demos/affine/bg1.jpg b/demos/affine/bg1.jpg
new file mode 100644
index 0000000..dfc7cee
--- /dev/null
+++ b/demos/affine/bg1.jpg
diff --git a/demos/affine/main.cpp b/demos/affine/main.cpp
new file mode 100644
index 0000000..88cd864
--- /dev/null
+++ b/demos/affine/main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "xform.h"
+
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(affine);
+
+    QApplication app(argc, argv);
+
+    XFormWidget xformWidget(0);
+    QStyle *arthurStyle = new ArthurStyle();
+    xformWidget.setStyle(arthurStyle);
+
+    QList<QWidget *> widgets = qFindChildren<QWidget *>(&xformWidget);
+    foreach (QWidget *w, widgets)
+        w->setStyle(arthurStyle);
+
+    xformWidget.show();
+
+    return app.exec();
+}
diff --git a/demos/affine/xform.cpp b/demos/affine/xform.cpp
new file mode 100644
index 0000000..059e38e
--- /dev/null
+++ b/demos/affine/xform.cpp
@@ -0,0 +1,902 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "xform.h"
+#include "hoverpoints.h"
+
+#include <QLayout>
+#include <QPainter>
+#include <QPainterPath>
+
+const int alpha = 155;
+
+XFormView::XFormView(QWidget *parent)
+    : ArthurFrame(parent)
+{
+    setAttribute(Qt::WA_MouseTracking);
+    m_type = VectorType;
+    m_rotation = 0.0;
+    m_scale = 1.0;
+    m_shear = 0.0;
+
+    m_pixmap = QPixmap(":res/affine/bg1.jpg");
+    pts = new HoverPoints(this, HoverPoints::CircleShape);
+    pts->setConnectionType(HoverPoints::LineConnection);
+    pts->setEditable(false);
+    pts->setPointSize(QSize(15, 15));
+    pts->setShapeBrush(QBrush(QColor(151, 0, 0, alpha)));
+    pts->setShapePen(QPen(QColor(255, 100, 50, alpha)));
+    pts->setConnectionPen(QPen(QColor(151, 0, 0, 50)));
+    pts->setBoundingRect(QRectF(0, 0, 500, 500));
+    ctrlPoints << QPointF(250, 250) << QPointF(350, 250);
+    pts->setPoints(ctrlPoints);
+    connect(pts, SIGNAL(pointsChanged(const QPolygonF&)),
+            this, SLOT(updateCtrlPoints(const QPolygonF &)));
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+}
+
+XFormView::XFormType XFormView::type() const
+{
+    return m_type;
+}
+
+QPixmap XFormView::pixmap() const
+{
+    return m_pixmap;
+}
+
+QString XFormView::text() const
+{
+    return m_text;
+}
+
+void XFormView::setText(const QString &t)
+{
+    m_text = t;
+    update();
+}
+
+void XFormView::setPixmap(const QPixmap &p)
+{
+    m_pixmap = p;
+    update();
+}
+
+void XFormView::setType(XFormType t)
+{
+    m_type = t;
+    update();
+}
+
+void XFormView::mousePressEvent(QMouseEvent *)
+{
+    setDescriptionEnabled(false);
+}
+
+void XFormView::resizeEvent(QResizeEvent *e)
+{
+    pts->setBoundingRect(rect());
+    ArthurFrame::resizeEvent(e);
+}
+
+void XFormView::paint(QPainter *p)
+{
+    p->save();
+    p->setRenderHint(QPainter::Antialiasing);
+    p->setRenderHint(QPainter::SmoothPixmapTransform);
+    switch (m_type) {
+    case VectorType:
+        drawVectorType(p);
+        break;
+    case PixmapType:
+        drawPixmapType(p);
+        break;
+    case TextType:
+        drawTextType(p);
+        break;
+    }
+    p->restore();
+}
+
+void XFormView::updateCtrlPoints(const QPolygonF &points)
+{
+    QPointF trans = points.at(0) - ctrlPoints.at(0);
+
+    if (qAbs(points.at(0).x() - points.at(1).x()) < 10
+        && qAbs(points.at(0).y() - points.at(1).y()) < 10)
+        pts->setPoints(ctrlPoints);
+    if (!trans.isNull()) {
+        ctrlPoints[0] = points.at(0);
+        ctrlPoints[1] += trans;
+        pts->setPoints(ctrlPoints);
+    }
+    ctrlPoints = points;
+
+    QLineF line(ctrlPoints.at(0), ctrlPoints.at(1));
+    m_rotation = line.angle(QLineF(0, 0, 1, 0));
+    if (line.dy() < 0)
+        m_rotation = 360 - m_rotation;
+
+    if (trans.isNull())
+        emit rotationChanged(int(m_rotation*10));
+}
+
+void XFormView::setVectorType()
+{
+    m_type = VectorType;
+    update();
+}
+
+void XFormView::setPixmapType()
+{
+    m_type = PixmapType;
+    update();
+}
+
+void XFormView::setTextType()
+{
+    m_type = TextType;
+    update();
+}
+
+void XFormView::setAnimation(bool animate)
+{
+    timer.stop();
+    if (animate)
+        timer.start(25, this);
+}
+
+void XFormView::changeRotation(int r)
+{
+    setRotation(qreal(r) / 10);
+}
+
+void XFormView::changeScale(int s)
+{
+    setScale(qreal(s) / 1000);
+}
+
+void XFormView::changeShear(int s)
+{
+    setShear(qreal(s) / 1000);
+}
+
+void XFormView::setShear(qreal s)
+{
+    m_shear = s;
+    update();
+}
+
+void XFormView::setScale(qreal s)
+{
+    m_scale = s;
+    update();
+}
+
+void XFormView::setRotation(qreal r)
+{
+    qreal old_rot = m_rotation;
+    m_rotation = r;
+
+    QPointF center(pts->points().at(0));
+    QMatrix m;
+    m.translate(center.x(), center.y());
+    m.rotate(m_rotation - old_rot);
+    m.translate(-center.x(), -center.y());
+    pts->setPoints(pts->points() * m);
+
+    update();
+}
+
+void XFormView::timerEvent(QTimerEvent *e)
+{
+    if (e->timerId() == timer.timerId()) {
+        QPointF center(pts->points().at(0));
+        QMatrix m;
+        m.translate(center.x(), center.y());
+        m.rotate(0.2);
+        m.translate(-center.x(), -center.y());
+        pts->setPoints(pts->points() * m);
+
+        setUpdatesEnabled(false);
+        static qreal scale_inc = 0.003;
+        static qreal shear_inc = -0.001;
+        emit scaleChanged(int((m_scale + scale_inc) * 1000));
+        emit shearChanged(int((m_shear + shear_inc) * 1000));
+        if (m_scale >= 4.0 || m_scale <= 0.1)
+            scale_inc = -scale_inc;
+        if (m_shear >= 1.0 || m_shear <= -1.0)
+            shear_inc = -shear_inc;
+        setUpdatesEnabled(true);
+
+        pts->firePointChange();
+    }
+}
+
+void XFormView::wheelEvent(QWheelEvent *e)
+{
+    m_scale += e->delta() / qreal(600);
+    m_scale = qMax(qreal(0.1), qMin(qreal(4), m_scale));
+    emit scaleChanged(int(m_scale*1000));
+}
+
+void XFormView::reset()
+{
+    emit rotationChanged(0);
+    emit scaleChanged(1000);
+    emit shearChanged(0);
+    ctrlPoints = QPolygonF();
+    ctrlPoints << QPointF(250, 250) << QPointF(350, 250);
+    pts->setPoints(ctrlPoints);
+    pts->firePointChange();
+}
+
+void XFormView::drawPixmapType(QPainter *painter)
+{
+    QPointF center(m_pixmap.width() / qreal(2), m_pixmap.height() / qreal(2));
+    painter->translate(ctrlPoints.at(0) - center);
+
+    painter->translate(center);
+    painter->rotate(m_rotation);
+    painter->scale(m_scale, m_scale);
+    painter->shear(0, m_shear);
+    painter->translate(-center);
+
+    painter->drawPixmap(QPointF(0, 0), m_pixmap);
+    painter->setPen(QPen(QColor(255, 0, 0, alpha), 0.25, Qt::SolidLine, Qt::FlatCap, Qt::BevelJoin));
+    painter->setBrush(Qt::NoBrush);
+    painter->drawRect(QRectF(0, 0, m_pixmap.width(), m_pixmap.height()).adjusted(-2, -2, 2, 2));
+}
+
+void XFormView::drawTextType(QPainter *painter)
+{
+    QPainterPath path;
+    QFont f("times new roman,utopia");
+    f.setStyleStrategy(QFont::ForceOutline);
+    f.setPointSize(72);
+    f.setStyleHint(QFont::Times);
+    path.addText(0, 0, f, m_text);
+
+    QFontMetrics fm(f);
+    QRectF br(fm.boundingRect(m_text));
+    QPointF center(br.center());
+    painter->translate(ctrlPoints.at(0) - center);
+
+    painter->translate(center);
+    painter->rotate(m_rotation);
+    painter->scale(m_scale, m_scale);
+    painter->shear(0, m_shear);
+    painter->translate(-center);
+
+    painter->fillPath(path, Qt::black);
+
+    painter->setPen(QPen(QColor(255, 0, 0, alpha), 0.25, Qt::SolidLine, Qt::FlatCap, Qt::BevelJoin));
+    painter->setBrush(Qt::NoBrush);
+    painter->drawRect(br.adjusted(-1, -1, 1, 1));
+}
+
+void XFormView::drawVectorType(QPainter *painter)
+{
+    QPainterPath path;
+    painter->translate(ctrlPoints.at(0) - QPointF(250,250));
+
+    painter->scale(0.77, 0.77);
+    painter->translate(98.9154 + 30 , -217.691 - 20);
+
+    QRect br(-55, 275, 500, 590);
+    QPoint center = br.center();
+    painter->translate(center.x(), center.y());
+    painter->rotate(m_rotation);
+    painter->scale(m_scale, m_scale);
+    painter->shear(0, m_shear);
+    painter->translate(-center.x(), -center.y());
+
+    painter->setPen(Qt::NoPen);
+    path.moveTo(120, 470);
+    path.lineTo(60+245, 470);
+    path.lineTo(60+245, 470+350);
+    path.lineTo(60, 470+350);
+    path.lineTo(60, 470+80);
+
+    painter->setBrush(Qt::white);
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor( 193, 193, 191, 255));
+    path.moveTo(329.336, 727.552);
+    path.cubicTo(QPointF(315.224, 726.328), QPointF(304.136, 715.816), QPointF(303.128, 694.936));
+    path.cubicTo(QPointF(306.368, 639.496), QPointF(309.608, 582.112), QPointF(271.232, 545.104));
+    path.cubicTo(QPointF(265.256, 499.024), QPointF(244.016, 482.104), QPointF(234.008, 452.512));
+    path.lineTo(218.24, 441.208);
+    path.lineTo(237.104, 411.688);
+    path.lineTo(245.168, 411.904);
+    path.lineTo(323.936, 571.168);
+    path.lineTo(340.424, 651.448);
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(136.232, 439.696);
+    path.cubicTo(QPointF(133.856, 455.248), QPointF(132.56, 470.512), QPointF(134.792, 485.272));
+    path.cubicTo(QPointF(118.376, 507.592), QPointF(105.92, 530.128), QPointF(104.48, 553.312));
+    path.cubicTo(QPointF(92.024, 586.504), QPointF(62.432, 614.584), QPointF(67.544, 680.104));
+    path.cubicTo(QPointF(84.176, 697.456), QPointF(107.432, 713.584), QPointF(127.376, 730.36));
+    path.cubicTo(QPointF(152.432, 751.312), QPointF(137.528, 778.96), QPointF(102.248, 772.408));
+    path.cubicTo(QPointF(94.4, 763.768), QPointF(76.616, 709.624), QPointF(42.92, 676.288));
+    path.lineTo(49.544, 632.584);
+    path.lineTo(81.368, 547.408);
+    path.lineTo(120.968, 484.048);
+    path.lineTo(125.36, 456.688);
+    path.lineTo(119.816, 386.776);
+    path.lineTo(124.424, 361.216);
+    path.lineTo(136.232, 439.696);
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(115.64, 341.416);
+    path.cubicTo(QPointF(116.576, 336.376), QPointF(117.8, 331.624), QPointF(119.312, 327.16));
+    path.lineTo(121.688, 342.784);
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(120.968, 500.464);
+    path.cubicTo(QPointF(108.368, 523.792), QPointF(103.976, 546.256), QPointF(132.92, 550.216));
+    path.cubicTo(QPointF(117.008, 553.888), QPointF(97.208, 568.648), QPointF(77.192, 593.488));
+    path.lineTo(77.624, 543.016);
+    path.lineTo(101.456, 503.272);
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(-33.256, 818.488);
+    path.cubicTo(QPointF(10.52, 838.144), QPointF(41.408, 837.064), QPointF(69.272, 850.96));
+    path.cubicTo(QPointF(91.304, 862.552), QPointF(113.552, 861.184), QPointF(126.944, 847.144));
+    path.cubicTo(QPointF(138.32, 832.456), QPointF(146.744, 831.736), QPointF(163.52, 830.224));
+    path.cubicTo(QPointF(190.952, 828.568), QPointF(217.736, 828.28), QPointF(241.928, 830.8));
+    path.lineTo(269.576, 833.032);
+    path.cubicTo(QPointF(269.072, 864.064), QPointF(328.04, 867.88), QPointF(345.392, 844.336));
+    path.cubicTo(QPointF(366.344, 819.424), QPointF(395.144, 808.264), QPointF(419.84, 790.192));
+    path.lineTo(289.304, 725.536);
+    path.cubicTo(QPointF(255.824, 806.464), QPointF(131.048, 827.632), QPointF(113.768, 763.264));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(286.424, 711.568);
+    path.cubicTo(QPointF(273.824, 711.496), QPointF(260.936, 715.6), QPointF(261.944, 732.16));
+    path.lineTo(266.192, 776.44);
+    path.lineTo(304.424, 756.64);
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(0, 0, 0, 255));
+    path.moveTo(-37.36, 821.224);
+    path.cubicTo(QPointF(7.136, 840.88), QPointF(38.6, 839.728), QPointF(66.968, 853.696));
+    path.cubicTo(QPointF(89.36, 865.216), QPointF(111.968, 863.92), QPointF(125.648, 849.808));
+    path.cubicTo(QPointF(137.24, 835.192), QPointF(145.808, 834.472), QPointF(162.872, 832.96));
+    path.cubicTo(QPointF(190.736, 831.232), QPointF(218.024, 831.016), QPointF(242.648, 833.464));
+    path.lineTo(270.728, 835.768);
+    path.cubicTo(QPointF(270.224, 866.8), QPointF(330.272, 870.544), QPointF(347.912, 847));
+    path.cubicTo(QPointF(369.224, 822.088), QPointF(398.528, 811), QPointF(423.656, 792.856));
+    path.lineTo(290.816, 728.272);
+    path.cubicTo(QPointF(256.76, 809.128), QPointF(129.824, 830.296), QPointF(112.256, 766));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(183, 114, 0, 255));
+    path.moveTo(382.328, 691.984);
+    path.cubicTo(QPointF(403.64, 698.968), QPointF(389.888, 720.28), QPointF(400.76, 732.52));
+    path.cubicTo(QPointF(405.44, 742.888), QPointF(415.304, 752.032), QPointF(431.792, 760.528));
+    path.cubicTo(QPointF(459.368, 774.424), QPointF(426.248, 799.336), QPointF(392.768, 812.08));
+    path.cubicTo(QPointF(351.944, 825.616), QPointF(344.024, 862.912), QPointF(299.312, 851.896));
+    path.cubicTo(QPointF(283.112, 846.496), QPointF(278.36, 831.808), QPointF(278.864, 809.128));
+    path.cubicTo(QPointF(284.264, 762.76), QPointF(277.784, 730.432), QPointF(278.792, 698.824));
+    path.cubicTo(QPointF(278.72, 686.152), QPointF(283.544, 684.64), QPointF(307.232, 687.952));
+    path.cubicTo(QPointF(310.04, 726.328), QPointF(352.376, 727.336), QPointF(382.328, 691.984));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(242, 183, 0, 255));
+    path.moveTo(339.632, 826.624);
+    path.cubicTo(QPointF(371.6, 814.312), QPointF(403.856, 798.112), QPointF(429.848, 782.128));
+    path.cubicTo(QPointF(437.84, 777.448), QPointF(438.92, 765.928), QPointF(427.688, 762.328));
+    path.cubicTo(QPointF(403.352, 748.504), QPointF(390.104, 731.224), QPointF(392.912, 708.76));
+    path.cubicTo(QPointF(393.344, 700.912), QPointF(383.696, 692.56), QPointF(381.104, 700.048));
+    path.cubicTo(QPointF(359.864, 771.472), QPointF(291.32, 767.656), QPointF(300.752, 696.952));
+    path.cubicTo(QPointF(301.256, 694.864), QPointF(301.76, 692.776), QPointF(302.264, 690.76));
+    path.cubicTo(QPointF(289.952, 688.24), QPointF(285.2, 690.976), QPointF(285.776, 700.408));
+    path.lineTo(295.28, 806.608);
+    path.cubicTo(QPointF(297.656, 830.8), QPointF(317.312, 836.128), QPointF(339.632, 826.624));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(0, 0, 0, 255));
+    path.moveTo(354.464, 537.544);
+    path.cubicTo(QPointF(379.16, 569.8), QPointF(404.432, 651.088), QPointF(384.416, 691.552));
+    path.cubicTo(QPointF(360.944, 737.776), QPointF(307.808, 743.248), QPointF(305.504, 695.8));
+    path.cubicTo(QPointF(308.816, 639.64), QPointF(311.984, 581.536), QPointF(273.68, 544.096));
+    path.cubicTo(QPointF(267.704, 497.368), QPointF(246.392, 480.232), QPointF(236.384, 450.28));
+    path.lineTo(203.12, 426.088);
+    path.lineTo(133.568, 435.088);
+    path.cubicTo(QPointF(130.76, 452.152), QPointF(129.104, 468.784), QPointF(131.552, 484.912));
+    path.cubicTo(QPointF(115.064, 507.376), QPointF(102.608, 530.056), QPointF(101.168, 553.312));
+    path.cubicTo(QPointF(88.712, 586.648), QPointF(59.12, 614.944), QPointF(64.232, 680.752));
+    path.cubicTo(QPointF(80.864, 698.248), QPointF(104.12, 714.448), QPointF(124.064, 731.296));
+    path.cubicTo(QPointF(149.12, 752.392), QPointF(135.512, 776.296), QPointF(100.232, 769.672));
+    path.cubicTo(QPointF(78.848, 746.056), QPointF(56.744, 722.872), QPointF(35.288, 699.328));
+    path.cubicTo(QPointF(12.392, 683.056), QPointF(3.896, 662.176), QPointF(27.368, 630.496));
+    path.cubicTo(QPointF(43.424, 609.04), QPointF(47.96, 562.456), QPointF(62, 543.664));
+    path.cubicTo(QPointF(74.312, 525.16), QPointF(92.24, 508.6), QPointF(105.272, 490.096));
+    path.cubicTo(QPointF(112.184, 477.928), QPointF(114.344, 468.568), QPointF(113.264, 454.456));
+    path.lineTo(110.312, 369.136);
+    path.cubicTo(QPointF(108.368, 307.216), QPointF(142.424, 274.24), QPointF(189.8, 275.248));
+    path.cubicTo(QPointF(243.512, 275.752), QPointF(287.576, 312.472), QPointF(288.152, 378.28));
+    path.cubicTo(QPointF(292.688, 410.32), QPointF(283.256, 428.68), QPointF(308.672, 474.472));
+    path.cubicTo(QPointF(334.52, 522.712), QPointF(338.552, 520.12), QPointF(354.464, 537.544));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(261.296, 503.632);
+    path.lineTo(263.528, 512.2);
+    path.cubicTo(QPointF(257.696, 501.688), QPointF(250.712, 483.616), QPointF(241.928, 475.696));
+    path.cubicTo(QPointF(239.264, 473.536), QPointF(235.808, 473.608), QPointF(233.72, 475.624));
+    path.cubicTo(QPointF(222.056, 486.928), QPointF(193.112, 510.112), QPointF(169.928, 507.088));
+    path.cubicTo(QPointF(152.072, 505.288), QPointF(134.648, 493.264), QPointF(130.832, 480.232));
+    path.cubicTo(QPointF(128.816, 470.872), QPointF(129.752, 463.168), QPointF(130.976, 455.32));
+    path.lineTo(240.704, 453.52);
+    path.cubicTo(QPointF(238.472, 463.168), QPointF(253.088, 487), QPointF(261.296, 503.632));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(143.144, 363.232);
+    path.cubicTo(QPointF(154.088, 363.232), QPointF(163.88, 376.84), QPointF(163.808, 395.632));
+    path.cubicTo(QPointF(163.736, 408.232), QPointF(155.528, 411.472), QPointF(149.336, 417.016));
+    path.cubicTo(QPointF(146.6, 419.536), QPointF(145.952, 433.144), QPointF(142.568, 433.144));
+    path.cubicTo(QPointF(131.696, 433.144), QPointF(123.488, 413.776), QPointF(123.488, 395.632));
+    path.cubicTo(QPointF(123.488, 377.56), QPointF(132.272, 363.232), QPointF(143.144, 363.232));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(255, 255, 255, 255));
+    path.moveTo(144.368, 375.04);
+    path.cubicTo(QPointF(154.088, 375.04), QPointF(160.856, 379.936), QPointF(161.648, 391.312));
+    path.cubicTo(QPointF(162.224, 399.16), QPointF(160.136, 411.76), QPointF(154.664, 414.424));
+    path.cubicTo(QPointF(152.144, 415.648), QPointF(143.432, 426.664), QPointF(140.408, 426.52));
+    path.cubicTo(QPointF(128.096, 425.944), QPointF(125, 402.112), QPointF(125.936, 390.736));
+    path.cubicTo(QPointF(126.8, 379.36), QPointF(134.72, 375.04), QPointF(144.368, 375.04));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(0, 0, 0, 255));
+    path.moveTo(141.848, 382.672);
+    path.cubicTo(QPointF(148.544, 382.096), QPointF(154.736, 389.728), QPointF(155.6, 399.664));
+    path.cubicTo(QPointF(156.464, 409.6), QPointF(151.64, 418.24), QPointF(144.944, 418.816));
+    path.cubicTo(QPointF(138.248, 419.392), QPointF(132.056, 411.76), QPointF(131.192, 401.752));
+    path.cubicTo(QPointF(130.328, 391.816), QPointF(135.152, 383.248), QPointF(141.848, 382.672));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(151.064, 397.288);
+    path.cubicTo(QPointF(151.424, 399.088), QPointF(149.408, 400.024), QPointF(148.832, 398.224));
+    path.cubicTo(QPointF(148.256, 395.992), QPointF(146.888, 393.328), QPointF(145.088, 391.168));
+    path.cubicTo(QPointF(143.936, 389.872), QPointF(145.088, 388.432), QPointF(146.528, 389.44));
+    path.cubicTo(QPointF(149.048, 391.528), QPointF(150.488, 394.12), QPointF(151.064, 397.288));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(216.944, 360.712);
+    path.cubicTo(QPointF(232.712, 360.712), QPointF(245.6, 377.416), QPointF(245.6, 397.792));
+    path.cubicTo(QPointF(245.6, 418.24), QPointF(232.712, 434.872), QPointF(216.944, 434.872));
+    path.cubicTo(QPointF(201.176, 434.872), QPointF(188.432, 418.24), QPointF(188.432, 397.792));
+    path.cubicTo(QPointF(188.432, 377.416), QPointF(201.176, 360.712), QPointF(216.944, 360.712));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(255, 255, 255, 255));
+    path.moveTo(224.792, 374.968);
+    path.cubicTo(QPointF(235.664, 378.856), QPointF(241.928, 387.424), QPointF(242.72, 396.568));
+    path.cubicTo(QPointF(243.656, 407.08), QPointF(239.408, 418.96), QPointF(230.264, 425.944));
+    path.cubicTo(QPointF(227.672, 427.888), QPointF(197.72, 416.08), QPointF(195.992, 411.616));
+    path.cubicTo(QPointF(193.4, 405.208), QPointF(191.816, 392.896), QPointF(193.76, 385.624));
+    path.cubicTo(QPointF(194.552, 382.744), QPointF(197.216, 378.568), QPointF(201.176, 376.336));
+    path.cubicTo(QPointF(207.44, 372.808), QPointF(216.656, 372.088), QPointF(224.792, 374.968));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(0, 0, 0, 255));
+    path.moveTo(216.872, 380.944);
+    path.cubicTo(QPointF(225.584, 380.944), QPointF(232.712, 389.296), QPointF(232.712, 399.448));
+    path.cubicTo(QPointF(232.712, 409.672), QPointF(225.584, 418.024), QPointF(216.872, 418.024));
+    path.cubicTo(QPointF(208.16, 418.024), QPointF(201.032, 409.672), QPointF(201.032, 399.448));
+    path.cubicTo(QPointF(201.032, 389.296), QPointF(208.16, 380.944), QPointF(216.872, 380.944));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(227.096, 392.392);
+    path.cubicTo(QPointF(228.104, 394.048), QPointF(226.448, 395.776), QPointF(225.224, 394.12));
+    path.cubicTo(QPointF(223.784, 392.104), QPointF(221.408, 389.944), QPointF(218.888, 388.432));
+    path.cubicTo(QPointF(217.232, 387.568), QPointF(217.808, 385.624), QPointF(219.68, 386.2));
+    path.cubicTo(QPointF(222.92, 387.28), QPointF(225.368, 389.368), QPointF(227.096, 392.392));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(183, 114, 0, 255));
+    path.moveTo(164.96, 404.488);
+    path.cubicTo(QPointF(172.376, 402.328), QPointF(184.112, 403.048), QPointF(192.248, 404.632));
+    path.cubicTo(QPointF(200.384, 406.792), QPointF(222.056, 418.24), QPointF(245.024, 430.696));
+    path.cubicTo(QPointF(247.976, 432.208), QPointF(248.84, 437.104), QPointF(245.024, 438.688));
+    path.cubicTo(QPointF(239.12, 439.12), QPointF(249.272, 453.664), QPointF(238.904, 458.848));
+    path.cubicTo(QPointF(223.352, 462.88), QPointF(198.44, 485.992), QPointF(186.128, 487.864));
+    path.cubicTo(QPointF(179.288, 489.376), QPointF(172.232, 489.592), QPointF(164.6, 487.864));
+    path.cubicTo(QPointF(140.552, 482.968), QPointF(134.216, 455.608), QPointF(122.912, 450.064));
+    path.cubicTo(QPointF(119.816, 446.824), QPointF(121.4, 441.208), QPointF(122.408, 440.056));
+    path.cubicTo(QPointF(123.632, 434.224), QPointF(149.696, 406.216), QPointF(164.96, 404.488));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(242, 183, 0, 255));
+    path.moveTo(185.408, 405.856);
+    path.cubicTo(QPointF(198.44, 407.296), QPointF(226.088, 423.928), QPointF(239.408, 430.624));
+    path.cubicTo(QPointF(242.72, 432.424), QPointF(242.504, 437.824), QPointF(239.552, 438.688));
+    path.cubicTo(QPointF(236.384, 440.488), QPointF(235.448, 438.256), QPointF(232.928, 437.896));
+    path.cubicTo(QPointF(228.896, 435.736), QPointF(222.272, 440.92), QPointF(217.016, 444.88));
+    path.cubicTo(QPointF(186.704, 467.776), QPointF(180.656, 465.256), QPointF(156.176, 462.664));
+    path.cubicTo(QPointF(147.68, 460.576), QPointF(142.136, 457.984), QPointF(139.688, 455.968));
+    path.cubicTo(QPointF(141.488, 445.888), QPointF(160.496, 407.656), QPointF(166.76, 406.792));
+    path.cubicTo(QPointF(168.344, 404.704), QPointF(179.936, 404.632), QPointF(185.408, 405.856));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(183, 114, 0, 255));
+    path.moveTo(190.664, 412.048);
+    path.lineTo(193.76, 413.416);
+    path.cubicTo(QPointF(196.064, 414.712), QPointF(193.256, 418.168), QPointF(190.736, 417.088));
+    path.lineTo(186.2, 415.504);
+    path.cubicTo(QPointF(183.536, 413.272), QPointF(186.704, 410.104), QPointF(190.664, 412.048));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(268.568, 452.368);
+    path.cubicTo(QPointF(273.032, 454.384), QPointF(279.224, 457.192), QPointF(282.536, 460.144));
+    path.cubicTo(QPointF(285.488, 464.104), QPointF(286.784, 468.064), QPointF(286.424, 472.024));
+    path.cubicTo(QPointF(285.776, 474.544), QPointF(284.12, 476.344), QPointF(281.24, 477.424));
+    path.cubicTo(QPointF(277.856, 478.216), QPointF(273.68, 477.424), QPointF(271.376, 474.112));
+    path.cubicTo(QPointF(269.864, 471.448), QPointF(265.256, 462.16), QPointF(263.96, 460.576));
+    path.cubicTo(QPointF(262.232, 457.12), QPointF(261.944, 454.456), QPointF(262.88, 452.368));
+    path.cubicTo(QPointF(264.032, 451.288), QPointF(266.048, 451), QPointF(268.568, 452.368));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(255, 255, 255, 255));
+    path.moveTo(273.752, 461.584);
+    path.cubicTo(QPointF(275.48, 462.376), QPointF(277.928, 463.456), QPointF(279.224, 464.68));
+    path.cubicTo(QPointF(280.376, 466.264), QPointF(280.88, 467.776), QPointF(280.736, 469.36));
+    path.cubicTo(QPointF(280.52, 470.296), QPointF(279.8, 471.016), QPointF(278.72, 471.448));
+    path.cubicTo(QPointF(277.352, 471.808), QPointF(275.768, 471.448), QPointF(274.832, 470.152));
+    path.cubicTo(QPointF(274.256, 469.144), QPointF(272.456, 465.472), QPointF(271.952, 464.824));
+    path.cubicTo(QPointF(271.232, 463.456), QPointF(271.088, 462.448), QPointF(271.448, 461.584));
+    path.cubicTo(QPointF(271.952, 461.152), QPointF(272.744, 461.08), QPointF(273.752, 461.584));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(238.616, 358.552);
+    path.cubicTo(QPointF(239.048, 359.2), QPointF(238.976, 359.776), QPointF(238.4, 360.28));
+    path.cubicTo(QPointF(237.896, 360.784), QPointF(237.176, 360.712), QPointF(236.24, 360.208));
+    path.lineTo(231.632, 356.248);
+    path.cubicTo(QPointF(231.056, 355.744), QPointF(230.912, 354.952), QPointF(231.272, 354.088));
+    path.cubicTo(QPointF(232.28, 353.44), QPointF(233.144, 353.44), QPointF(233.936, 354.088));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(235.592, 305.992);
+    path.cubicTo(QPointF(239.624, 308.224), QPointF(240.848, 313.912), QPointF(238.184, 318.592));
+    path.cubicTo(QPointF(235.592, 323.2), QPointF(230.12, 325.144), QPointF(226.016, 322.84));
+    path.cubicTo(QPointF(221.984, 320.536), QPointF(220.76, 314.92), QPointF(223.424, 310.24));
+    path.cubicTo(QPointF(226.016, 305.56), QPointF(231.488, 303.688), QPointF(235.592, 305.992));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(374.912, 680.536);
+    path.cubicTo(QPointF(378.296, 683.128), QPointF(373.256, 687.376), QPointF(371.024, 686.296));
+    path.cubicTo(QPointF(369.152, 685.648), QPointF(367.784, 683.488), QPointF(366.92, 682.408));
+    path.cubicTo(QPointF(366.128, 681.184), QPointF(366.2, 679.168), QPointF(366.92, 678.448));
+    path.cubicTo(QPointF(367.712, 677.44), QPointF(369.728, 677.656), QPointF(371.024, 678.52));
+    path.cubicTo(QPointF(372.32, 679.168), QPointF(373.616, 679.888), QPointF(374.912, 680.536));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(297.44, 551.512);
+    path.cubicTo(QPointF(338.984, 572.896), QPointF(350, 611.56), QPointF(332.072, 664.192));
+    path.cubicTo(QPointF(330.992, 666.64), QPointF(334.16, 668.368), QPointF(335.24, 666.064));
+    path.cubicTo(QPointF(354.824, 610.336), QPointF(341.432, 571.312), QPointF(299.024, 548.56));
+    path.cubicTo(QPointF(296.864, 547.552), QPointF(295.28, 550.432), QPointF(297.44, 551.512));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(72.008, 569.512);
+    path.cubicTo(QPointF(38.312, 627.256), QPointF(38.096, 662.68), QPointF(62.504, 681.328));
+    path.cubicTo(QPointF(63.728, 682.264), QPointF(64.448, 680.032), QPointF(63.296, 679.168));
+    path.cubicTo(QPointF(36.296, 655.48), QPointF(48.896, 615.52), QPointF(74.168, 570.88));
+    path.cubicTo(QPointF(74.888, 569.584), QPointF(72.512, 568.432), QPointF(72.008, 569.512));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(289.376, 586.864);
+    path.cubicTo(QPointF(289.232, 589.168), QPointF(288.368, 589.528), QPointF(286.424, 587.368));
+    path.cubicTo(QPointF(279.8, 575.848), QPointF(235.088, 551.44), QPointF(213.344, 548.704));
+    path.cubicTo(QPointF(209.24, 547.264), QPointF(209.456, 545.392), QPointF(213.488, 544.816));
+    path.cubicTo(QPointF(229.184, 544.816), QPointF(241.28, 537.904), QPointF(254.96, 537.904));
+    path.cubicTo(QPointF(258.704, 538.048), QPointF(262.304, 539.488), QPointF(264.392, 541.648));
+    path.cubicTo(QPointF(269.504, 544.96), QPointF(288.08, 570.592), QPointF(289.376, 586.864));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(180.152, 546.832);
+    path.cubicTo(QPointF(180.872, 550.792), QPointF(163.808, 545.68), QPointF(164.744, 556.696));
+    path.cubicTo(QPointF(165.032, 559.72), QPointF(160.496, 561.376), QPointF(160.64, 556.696));
+    path.cubicTo(QPointF(160.64, 548.272), QPointF(161.072, 548.416), QPointF(152.72, 546.832));
+    path.cubicTo(QPointF(151.208, 546.76), QPointF(151.352, 544.528), QPointF(152.72, 544.816));
+    path.lineTo(152.72, 544.816);
+    path.cubicTo(QPointF(158.696, 546.472), QPointF(166.76, 542.872), QPointF(166.4, 538.84));
+    path.cubicTo(QPointF(166.256, 537.472), QPointF(168.56, 537.688), QPointF(168.488, 538.84));
+    path.cubicTo(QPointF(167.984, 545.248), QPointF(181.664, 542.152), QPointF(180.152, 546.832));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(151.568, 705.376);
+    path.cubicTo(QPointF(151.64, 708.328), QPointF(148.76, 707.68), QPointF(148.544, 705.592));
+    path.cubicTo(QPointF(140.192, 680.536), QPointF(143.72, 618.832), QPointF(151.856, 598.96));
+    path.cubicTo(QPointF(152.432, 596.08), QPointF(156.248, 596.944), QPointF(155.744, 598.96));
+    path.cubicTo(QPointF(147.104, 635.464), QPointF(147.248, 673.048), QPointF(151.568, 705.376));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(183, 114, 0, 255));
+    path.moveTo(51.704, 684.424);
+    path.cubicTo(QPointF(75.68, 707.824), QPointF(91.376, 743.248), QPointF(114.632, 775.288));
+    path.cubicTo(QPointF(148.472, 816.04), QPointF(121.472, 858.304), QPointF(66.464, 845.56));
+    path.cubicTo(QPointF(38.888, 835.192), QPointF(-0.784, 836.344), QPointF(-32.68, 825.832));
+    path.cubicTo(QPointF(-55.072, 820.36), QPointF(-55.864, 809.272), QPointF(-44.416, 787.6));
+    path.cubicTo(QPointF(-40.384, 773.776), QPointF(-40.024, 751.312), QPointF(-43.768, 732.592));
+    path.cubicTo(QPointF(-45.784, 718.408), QPointF(-39.232, 710.488), QPointF(-24.112, 708.832));
+    path.lineTo(-24.112, 708.832);
+    path.cubicTo(QPointF(-11.296, 708.688), QPointF(6.56, 713.872), QPointF(16.28, 686.44));
+    path.cubicTo(QPointF(23.552, 673.336), QPointF(40.976, 672.976), QPointF(51.704, 684.424));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(242, 183, 0, 255));
+    path.moveTo(24.632, 699.04);
+    path.cubicTo(QPointF(23.84, 680.968), QPointF(39.32, 677.296), QPointF(49.688, 688.312));
+    path.cubicTo(QPointF(68.192, 710.992), QPointF(85.112, 736.048), QPointF(100.376, 764.992));
+    path.cubicTo(QPointF(124.712, 804.16), QPointF(104.624, 842.68), QPointF(67.904, 828.064));
+    path.cubicTo(QPointF(49.688, 817.84), QPointF(6.128, 813.304), QPointF(-17.344, 809.128));
+    path.cubicTo(QPointF(-33.04, 807.832), QPointF(-35.128, 797.608), QPointF(-29.152, 791.848));
+    path.cubicTo(QPointF(-20.944, 782.416), QPointF(-20.08, 759.808), QPointF(-27.856, 740.512));
+    path.cubicTo(QPointF(-35.56, 728.56), QPointF(-21.088, 715.384), QPointF(-9.712, 720.856));
+    path.cubicTo(QPointF(0.8, 727.048), QPointF(25.64, 713.08), QPointF(24.632, 699.04));
+    path.closeSubpath();
+    painter->drawPath(path);
+
+    painter->setPen(QPen(QColor(255, 0, 0, alpha), 0.25, Qt::SolidLine, Qt::FlatCap, Qt::BevelJoin));
+    painter->setBrush(Qt::NoBrush);
+    painter->drawRect(br.adjusted(-1, -1, 1, 1));
+}
+
+
+XFormWidget::XFormWidget(QWidget *parent)
+    : QWidget(parent), textEditor(new QLineEdit)
+{
+    setWindowTitle(tr("Affine Transformations"));
+
+    view = new XFormView(this);
+    view->setMinimumSize(200, 200);
+
+    QGroupBox *mainGroup = new QGroupBox(this);
+    mainGroup->setFixedWidth(180);
+    mainGroup->setTitle(tr("Affine Transformations"));
+
+    QGroupBox *rotateGroup = new QGroupBox(mainGroup);
+    rotateGroup->setTitle(tr("Rotate"));
+    QSlider *rotateSlider = new QSlider(Qt::Horizontal, rotateGroup);
+    rotateSlider->setRange(0, 3600);
+    rotateSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    QGroupBox *scaleGroup = new QGroupBox(mainGroup);
+    scaleGroup->setTitle(tr("Scale"));
+    QSlider *scaleSlider = new QSlider(Qt::Horizontal, scaleGroup);
+    scaleSlider->setRange(1, 4000);
+    scaleSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    QGroupBox *shearGroup = new QGroupBox(mainGroup);
+    shearGroup->setTitle(tr("Shear"));
+    QSlider *shearSlider = new QSlider(Qt::Horizontal, shearGroup);
+    shearSlider->setRange(-990, 990);
+    shearSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    QGroupBox *typeGroup = new QGroupBox(mainGroup);
+    typeGroup->setTitle(tr("Type"));
+    QRadioButton *vectorType = new QRadioButton(typeGroup);
+    QRadioButton *pixmapType = new QRadioButton(typeGroup);
+    QRadioButton *textType= new QRadioButton(typeGroup);
+    vectorType->setText(tr("Vector Image"));
+    pixmapType->setText(tr("Pixmap"));
+    textType->setText(tr("Text"));
+
+    QPushButton *resetButton = new QPushButton(mainGroup);
+    resetButton->setText(tr("Reset Transform"));
+
+    QPushButton *animateButton = new QPushButton(mainGroup);
+    animateButton->setText(tr("Animate"));
+    animateButton->setCheckable(true);
+
+    QPushButton *showSourceButton = new QPushButton(mainGroup);
+    showSourceButton->setText(tr("Show Source"));
+#ifdef QT_OPENGL_SUPPORT
+    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(true);
+    enableOpenGLButton->setChecked(view->usesOpenGL());
+    if (!QGLFormat::hasOpenGL())
+        enableOpenGLButton->hide();
+#endif
+    QPushButton *whatsThisButton = new QPushButton(mainGroup);
+    whatsThisButton->setText(tr("What's This?"));
+    whatsThisButton->setCheckable(true);
+
+    QHBoxLayout *viewLayout = new QHBoxLayout(this);
+    viewLayout->addWidget(view);
+    viewLayout->addWidget(mainGroup);
+
+    QVBoxLayout *rotateGroupLayout = new QVBoxLayout(rotateGroup);
+    rotateGroupLayout->addWidget(rotateSlider);
+
+    QVBoxLayout *scaleGroupLayout = new QVBoxLayout(scaleGroup);
+    scaleGroupLayout->addWidget(scaleSlider);
+
+    QVBoxLayout *shearGroupLayout = new QVBoxLayout(shearGroup);
+    shearGroupLayout->addWidget(shearSlider);
+
+    QVBoxLayout *typeGroupLayout = new QVBoxLayout(typeGroup);
+    typeGroupLayout->addWidget(vectorType);
+    typeGroupLayout->addWidget(pixmapType);
+    typeGroupLayout->addWidget(textType);
+    typeGroupLayout->addSpacing(4);
+    typeGroupLayout->addWidget(textEditor);
+
+    QVBoxLayout *mainGroupLayout = new QVBoxLayout(mainGroup);
+    mainGroupLayout->addWidget(rotateGroup);
+    mainGroupLayout->addWidget(scaleGroup);
+    mainGroupLayout->addWidget(shearGroup);
+    mainGroupLayout->addWidget(typeGroup);
+    mainGroupLayout->addStretch(1);
+    mainGroupLayout->addWidget(resetButton);
+    mainGroupLayout->addWidget(animateButton);
+    mainGroupLayout->addWidget(showSourceButton);
+#ifdef QT_OPENGL_SUPPORT
+    mainGroupLayout->addWidget(enableOpenGLButton);
+#endif
+    mainGroupLayout->addWidget(whatsThisButton);
+
+    connect(rotateSlider, SIGNAL(valueChanged(int)), view, SLOT(changeRotation(int)));
+    connect(shearSlider, SIGNAL(valueChanged(int)), view, SLOT(changeShear(int)));
+    connect(scaleSlider, SIGNAL(valueChanged(int)), view, SLOT(changeScale(int)));
+
+    connect(vectorType, SIGNAL(clicked()), view, SLOT(setVectorType()));
+    connect(pixmapType, SIGNAL(clicked()), view, SLOT(setPixmapType()));
+    connect(textType, SIGNAL(clicked()), view, SLOT(setTextType()));
+    connect(textType, SIGNAL(toggled(bool)), textEditor, SLOT(setEnabled(bool)));
+    connect(textEditor, SIGNAL(textChanged(QString)), view, SLOT(setText(QString)));
+
+    connect(view, SIGNAL(rotationChanged(int)), rotateSlider, SLOT(setValue(int)));
+    connect(view, SIGNAL(scaleChanged(int)), scaleSlider, SLOT(setValue(int)));
+    connect(view, SIGNAL(shearChanged(int)), shearSlider, SLOT(setValue(int)));
+
+    connect(resetButton, SIGNAL(clicked()), view, SLOT(reset()));
+    connect(animateButton, SIGNAL(clicked(bool)), view, SLOT(setAnimation(bool)));
+    connect(whatsThisButton, SIGNAL(clicked(bool)), view, SLOT(setDescriptionEnabled(bool)));
+    connect(whatsThisButton, SIGNAL(clicked(bool)), view->hoverPoints(), SLOT(setDisabled(bool)));
+    connect(view, SIGNAL(descriptionEnabledChanged(bool)), view->hoverPoints(), SLOT(setDisabled(bool)));
+    connect(view, SIGNAL(descriptionEnabledChanged(bool)), whatsThisButton, SLOT(setChecked(bool)));
+    connect(showSourceButton, SIGNAL(clicked()), view, SLOT(showSource()));
+#ifdef QT_OPENGL_SUPPORT
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), view, SLOT(enableOpenGL(bool)));
+#endif
+    view->loadSourceFile(":res/affine/xform.cpp");
+    view->loadDescription(":res/affine/xform.html");
+
+    // defaults
+    view->reset();
+    vectorType->setChecked(true);
+    textEditor->setText("Qt Software");
+    textEditor->setEnabled(false);
+
+    animateButton->animateClick();
+}
diff --git a/demos/affine/xform.h b/demos/affine/xform.h
new file mode 100644
index 0000000..f33e63d
--- /dev/null
+++ b/demos/affine/xform.h
@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef XFORM_H
+#define XFORM_H
+
+#include "arthurwidgets.h"
+
+#include <QBasicTimer>
+#include <QPolygonF>
+
+class HoverPoints;
+QT_FORWARD_DECLARE_CLASS(QLineEdit)
+
+class XFormView : public ArthurFrame
+{
+public:
+    Q_OBJECT
+
+    Q_PROPERTY(XFormType type READ type WRITE setType)
+    Q_PROPERTY(bool animation READ animation WRITE setAnimation)
+    Q_PROPERTY(qreal shear READ shear WRITE setShear)
+    Q_PROPERTY(qreal rotation READ rotation WRITE setRotation)
+    Q_PROPERTY(qreal scale READ scale WRITE setScale)
+    Q_PROPERTY(QString text READ text WRITE setText)
+    Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap)
+    Q_ENUMS(XFormType)
+
+public:
+    enum XFormType { VectorType, PixmapType, TextType };
+
+    XFormView(QWidget *parent);
+    void paint(QPainter *);
+    void drawVectorType(QPainter *painter);
+    void drawPixmapType(QPainter *painter);
+    void drawTextType(QPainter *painter);
+    QSize sizeHint() const { return QSize(500, 500); }
+
+    void mousePressEvent(QMouseEvent *e);
+    void resizeEvent(QResizeEvent *e);
+    HoverPoints *hoverPoints() { return pts; }
+
+    bool animation() const { return timer.isActive(); }
+    qreal shear() const { return m_shear; }
+    qreal scale() const { return m_scale; }
+    qreal rotation() const { return m_rotation; }
+    void setShear(qreal s);
+    void setScale(qreal s);
+    void setRotation(qreal r);
+
+    XFormType type() const;
+    QPixmap pixmap() const;
+    QString text() const;
+
+public slots:
+    void setAnimation(bool animate);
+    void updateCtrlPoints(const QPolygonF &);
+    void changeRotation(int rotation);
+    void changeScale(int scale);
+    void changeShear(int shear);
+
+    void setText(const QString &);
+    void setPixmap(const QPixmap &);
+    void setType(XFormType t);
+
+    void setVectorType();
+    void setPixmapType();
+    void setTextType();
+    void reset();
+
+signals:
+    void rotationChanged(int rotation);
+    void scaleChanged(int scale);
+    void shearChanged(int shear);
+
+protected:
+    void timerEvent(QTimerEvent *e);
+    void wheelEvent(QWheelEvent *);
+
+private:
+    QPolygonF ctrlPoints;
+    HoverPoints *pts;
+    qreal m_rotation;
+    qreal m_scale;
+    qreal m_shear;
+    XFormType m_type;
+    QPixmap m_pixmap;
+    QString m_text;
+    QBasicTimer timer;
+};
+
+class XFormWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    XFormWidget(QWidget *parent);
+
+private:
+    XFormView *view;
+    QLineEdit *textEditor;
+};
+
+#endif // XFORM_H
diff --git a/demos/affine/xform.html b/demos/affine/xform.html
new file mode 100644
index 0000000..17325ac
--- /dev/null
+++ b/demos/affine/xform.html
@@ -0,0 +1,23 @@
+<html>
+<center>
+<h2>Affine Transformations</h2>
+</center>
+
+<p>In this demo we demonstrate Qt's ability to perform affine transformations
+on painting operations.</p>
+
+<p>Transformations can be performed on any kind of graphics drawn using
+QPainter. The transformations used to display the vector graphics, images,
+and text can be adjusted in the following ways:</p>
+
+<ul>
+  <li>Dragging the red circle in the centre of each drawing moves it to a new
+      position.</li>
+  <li>Dragging the displaced red circle causes the current drawing to be
+      rotated about the central circle. Rotation can also be controlled with
+      the <b>Rotate</b> slider.</li>
+  <li>Scaling is controlled with the <b>Scale</b> slider.</li>
+  <li>Each drawing can be sheared with the <b>Shear</b> slider.</li>
+</ul>
+
+</html>
diff --git a/demos/arthurplugin/arthur_plugin.qrc b/demos/arthurplugin/arthur_plugin.qrc
new file mode 100644
index 0000000..e5170e6
--- /dev/null
+++ b/demos/arthurplugin/arthur_plugin.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/trolltech/arthurplugin">
+   <file>bg1.jpg</file>
+   <file>flower.jpg</file>
+   <file>flower_alpha.jpg</file>
+</qresource>
+</RCC>
diff --git a/demos/arthurplugin/arthurplugin.pro b/demos/arthurplugin/arthurplugin.pro
new file mode 100644
index 0000000..e9eb1f3
--- /dev/null
+++ b/demos/arthurplugin/arthurplugin.pro
@@ -0,0 +1,51 @@
+
+QTDIR       = $$QT_SOURCE_TREE
+
+CONFIG      += designer plugin
+TEMPLATE    = lib
+QTDIR_build:DESTDIR     = $$QT_BUILD_TREE/plugins/designer
+
+contains(QT_CONFIG, opengl) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+SHARED_FOLDER = ../shared
+include(../shared/shared.pri)
+
+DEMO_DEFORM_DIR = ../deform
+DEMO_AFFINE_DIR = ../affine
+DEMO_GRADIENT_DIR = ../gradients
+DEMO_STROKE_DIR = ../pathstroke
+DEMO_COMPOSITION_DIR = ../composition
+
+INCLUDEPATH += $$DEMO_DEFORM_DIR $$DEMO_AFFINE_DIR $$DEMO_GRADIENT_DIR $$DEMO_STROKE_DIR $$DEMO_COMPOSITION_DIR
+
+SOURCES = plugin.cpp \
+	$$DEMO_COMPOSITION_DIR/composition.cpp \
+        $$DEMO_AFFINE_DIR/xform.cpp \
+        $$DEMO_DEFORM_DIR/pathdeform.cpp \
+        $$DEMO_GRADIENT_DIR/gradients.cpp \
+        $$DEMO_STROKE_DIR/pathstroke.cpp \
+
+
+HEADERS = \
+	$$DEMO_COMPOSITION_DIR/composition.h \
+        $$DEMO_AFFINE_DIR/xform.h \
+        $$DEMO_DEFORM_DIR/pathdeform.h \
+        $$DEMO_GRADIENT_DIR/gradients.h \
+        $$DEMO_STROKE_DIR/pathstroke.h \
+
+RESOURCES += arthur_plugin.qrc
+
+# install
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg *.png
+sources.path = $$[QT_INSTALL_DEMOS]/arthurplugin
+INSTALLS += target sources
+
+win32-msvc* {
+	QMAKE_CFLAGS += /Zm500
+	QMAKE_CXXFLAGS += /Zm500
+}
+
diff --git a/demos/arthurplugin/bg1.jpg b/demos/arthurplugin/bg1.jpg
new file mode 100644
index 0000000..dfc7cee
--- /dev/null
+++ b/demos/arthurplugin/bg1.jpg
diff --git a/demos/arthurplugin/flower.jpg b/demos/arthurplugin/flower.jpg
new file mode 100644
index 0000000..f8e022c
--- /dev/null
+++ b/demos/arthurplugin/flower.jpg
diff --git a/demos/arthurplugin/flower_alpha.jpg b/demos/arthurplugin/flower_alpha.jpg
new file mode 100644
index 0000000..6a3c2a0
--- /dev/null
+++ b/demos/arthurplugin/flower_alpha.jpg
diff --git a/demos/arthurplugin/plugin.cpp b/demos/arthurplugin/plugin.cpp
new file mode 100644
index 0000000..e2bf54e
--- /dev/null
+++ b/demos/arthurplugin/plugin.cpp
@@ -0,0 +1,262 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtDesigner/QDesignerContainerExtension>
+#include <QtDesigner/QDesignerCustomWidgetInterface>
+
+#include <QtCore/qplugin.h>
+#include <QtGui/QIcon>
+#include <QtGui/QPixmap>
+
+#include "xform.h"
+#include "pathdeform.h"
+#include "gradients.h"
+#include "pathstroke.h"
+#include "hoverpoints.h"
+#include "composition.h"
+
+QT_FORWARD_DECLARE_CLASS(QDesignerFormEditorInterface)
+
+static inline QString customWidgetDomXml(const QString &className)
+{
+    QString rc = QLatin1String("<ui language=\"c++\"><widget class=\"");
+    rc += className;
+    rc += QLatin1String("\" name=\"");
+    QString objectName = className;
+    objectName[0] = objectName.at(0).toLower();
+    rc += objectName;
+    rc += QLatin1String("\"/></ui>");
+    return rc;
+}
+
+class PathDeformRendererEx : public PathDeformRenderer
+{
+    Q_OBJECT
+public:
+    PathDeformRendererEx(QWidget *parent) : PathDeformRenderer(parent) { }
+    QSize sizeHint() const { return QSize(300, 200); }
+};
+
+class DemoPlugin : public QDesignerCustomWidgetInterface
+{
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
+
+protected:
+    DemoPlugin(const QString &className);
+
+public:
+    QString name() const { return m_className; }
+    bool isContainer() const { return false; }
+    bool isInitialized() const { return m_initialized; }
+    QIcon icon() const { return QIcon(); }
+    QString codeTemplate() const { return QString(); }
+    QString whatsThis() const { return QString(); }
+    QString toolTip() const { return QString(); }
+    QString group() const { return "Arthur Widgets [Demo]"; }
+    void initialize(QDesignerFormEditorInterface *)
+    {
+        if (m_initialized)
+            return;
+        m_initialized = true;
+    }
+    QString domXml() const { return m_domXml; }
+
+private:
+    const QString m_className;
+    const QString m_domXml;
+    bool m_initialized;
+};
+
+DemoPlugin::DemoPlugin(const QString &className) :
+    m_className(className),
+    m_domXml(customWidgetDomXml(className)),
+    m_initialized(false)
+{
+}
+
+class DeformPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+
+public:
+    DeformPlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("PathDeformRendererEx")) { }
+    QString includeFile() const { return "deform.h"; }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        PathDeformRenderer *deform = new PathDeformRendererEx(parent);
+        deform->setRadius(70);
+        deform->setAnimated(false);
+        deform->setFontSize(20);
+        deform->setText("Arthur Widgets Demo");
+
+        return deform;
+    }
+};
+
+class XFormRendererEx : public XFormView
+{
+    Q_OBJECT
+public:
+    XFormRendererEx(QWidget *parent) : XFormView(parent) {}
+    QSize sizeHint() const { return QSize(300, 200); }
+};
+
+class XFormPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    XFormPlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("XFormRendererEx")) { }
+    QString includeFile() const { return "xform.h"; }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        XFormRendererEx *xform = new XFormRendererEx(parent);
+        xform->setText("Qt - Hello World!!");
+        xform->setPixmap(QPixmap(":/trolltech/arthurplugin/bg1.jpg"));
+        return xform;
+    }
+};
+
+
+class GradientEditorPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    GradientEditorPlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("GradientEditor")) { }
+    QString includeFile() const { return "gradients.h"; }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        GradientEditor *editor = new GradientEditor(parent);
+        return editor;
+    }
+};
+
+class GradientRendererEx : public GradientRenderer
+{
+    Q_OBJECT
+public:
+    GradientRendererEx(QWidget *p) : GradientRenderer(p) { }
+    QSize sizeHint() const { return QSize(300, 200); }
+};
+
+class GradientRendererPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    GradientRendererPlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("GradientRendererEx")) { }
+    QString includeFile() const { return "gradients.h"; }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        GradientRenderer *renderer = new GradientRendererEx(parent);
+        renderer->setConicalGradient();
+        return renderer;
+    }
+};
+
+class PathStrokeRendererEx : public PathStrokeRenderer
+{
+    Q_OBJECT
+public:
+    PathStrokeRendererEx(QWidget *p) : PathStrokeRenderer(p) { }
+    QSize sizeHint() const { return QSize(300, 200); }
+};
+
+class StrokeRenderPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    StrokeRenderPlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("PathStrokeRendererEx")) { }
+    QString includeFile() const { return "pathstroke.h"; }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        PathStrokeRenderer *stroke = new PathStrokeRendererEx(parent);
+        return stroke;
+    }
+};
+
+
+class CompositionModePlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    CompositionModePlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("CompositionRenderer")) { }
+    QString includeFile() const { return "composition.h"; }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        CompositionRenderer *renderer = new CompositionRenderer(parent);
+        renderer->setAnimationEnabled(false);
+        return renderer;
+    }
+};
+
+
+class ArthurPlugins : public QObject, public QDesignerCustomWidgetCollectionInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
+
+public:
+    ArthurPlugins(QObject *parent = 0);
+    QList<QDesignerCustomWidgetInterface*> customWidgets() const { return m_plugins; }
+
+private:
+    QList<QDesignerCustomWidgetInterface *> m_plugins;
+};
+
+ArthurPlugins::ArthurPlugins(QObject *parent) :
+    QObject(parent)
+{
+    m_plugins << new DeformPlugin(this)
+              << new XFormPlugin(this)
+              << new GradientEditorPlugin(this)
+              << new GradientRendererPlugin(this)
+              << new StrokeRenderPlugin(this)
+              << new CompositionModePlugin(this);
+}
+
+#include "plugin.moc"
+
+Q_EXPORT_PLUGIN2(ArthurPlugins, ArthurPlugins)
diff --git a/demos/books/bookdelegate.cpp b/demos/books/bookdelegate.cpp
new file mode 100644
index 0000000..1322fd6
--- /dev/null
+++ b/demos/books/bookdelegate.cpp
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "bookdelegate.h"
+
+#include <QtGui>
+
+BookDelegate::BookDelegate(QObject *parent)
+    : QSqlRelationalDelegate(parent), star(QPixmap(":images/star.png"))
+{
+}
+
+void BookDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
+                           const QModelIndex &index) const
+{
+    if (index.column() != 5) {
+        QStyleOptionViewItemV3 opt = option;
+        opt.rect.adjust(0, 0, -1, -1); // since we draw the grid ourselves
+        QSqlRelationalDelegate::paint(painter, opt, index);
+    } else {
+        const QAbstractItemModel *model = index.model();
+        QPalette::ColorGroup cg = (option.state & QStyle::State_Enabled) ?
+            (option.state & QStyle::State_Active) ? QPalette::Normal : QPalette::Inactive : QPalette::Disabled;
+
+        if (option.state & QStyle::State_Selected)
+            painter->fillRect(option.rect, option.palette.color(cg, QPalette::Highlight));
+
+        int rating = model->data(index, Qt::DisplayRole).toInt();
+        int width = star.width();
+        int height = star.height();
+        int x = option.rect.x();
+        int y = option.rect.y() + (option.rect.height() / 2) - (height / 2);
+        for (int i = 0; i < rating; ++i) {
+            painter->drawPixmap(x, y, star);
+            x += width;
+        }
+        drawFocus(painter, option, option.rect.adjusted(0, 0, -1, -1)); // since we draw the grid ourselves
+    }
+
+    QPen pen = painter->pen();
+    painter->setPen(option.palette.color(QPalette::Mid));
+    painter->drawLine(option.rect.bottomLeft(), option.rect.bottomRight());
+    painter->drawLine(option.rect.topRight(), option.rect.bottomRight());
+    painter->setPen(pen);
+}
+
+QSize BookDelegate::sizeHint(const QStyleOptionViewItem &option,
+                                 const QModelIndex &index) const
+{
+    if (index.column() == 5)
+        return QSize(5 * star.width(), star.height()) + QSize(1, 1);
+
+    return QSqlRelationalDelegate::sizeHint(option, index) + QSize(1, 1); // since we draw the grid ourselves
+}
+
+bool BookDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
+                               const QStyleOptionViewItem &option,
+                               const QModelIndex &index)
+{
+    if (index.column() != 5)
+        return QSqlRelationalDelegate::editorEvent(event, model, option, index);
+
+    if (event->type() == QEvent::MouseButtonPress) {
+        QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
+        int stars = qBound(0, int(0.7 + qreal(mouseEvent->pos().x()
+            - option.rect.x()) / star.width()), 5);
+        model->setData(index, QVariant(stars));
+        return false; //so that the selection can change
+    }
+
+    return true;
+}
+
+QWidget *BookDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option,
+                                    const QModelIndex &index) const
+{
+    if (index.column() != 4)
+        return QSqlRelationalDelegate::createEditor(parent, option, index);
+
+    // for editing the year, return a spinbox with a range from -1000 to 2100.
+    QSpinBox *sb = new QSpinBox(parent);
+    sb->setFrame(false);
+    sb->setMaximum(2100);
+    sb->setMinimum(-1000);
+
+    return sb;
+}
+
diff --git a/demos/books/bookdelegate.h b/demos/books/bookdelegate.h
new file mode 100644
index 0000000..fb32335
--- /dev/null
+++ b/demos/books/bookdelegate.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BOOKDELEGATE_H
+#define BOOKDELEGATE_H
+
+#include <QModelIndex>
+#include <QPixmap>
+#include <QSize>
+#include <QSqlRelationalDelegate>
+
+QT_FORWARD_DECLARE_CLASS(QPainter)
+
+class BookDelegate : public QSqlRelationalDelegate
+{
+public:
+    BookDelegate(QObject *parent);
+
+    void paint(QPainter *painter, const QStyleOptionViewItem &option,
+               const QModelIndex &index) const;
+
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+
+    bool editorEvent(QEvent *event, QAbstractItemModel *model,
+                     const QStyleOptionViewItem &option,
+                     const QModelIndex &index);
+
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
+                                        const QModelIndex &index) const;
+
+private:
+    QPixmap star;
+};
+
+#endif
diff --git a/demos/books/books.pro b/demos/books/books.pro
new file mode 100644
index 0000000..a2cd33f
--- /dev/null
+++ b/demos/books/books.pro
@@ -0,0 +1,21 @@
+TEMPLATE = app
+INCLUDEPATH += .
+
+HEADERS     = bookdelegate.h bookwindow.h initdb.h
+RESOURCES   = books.qrc
+SOURCES     = bookdelegate.cpp main.cpp bookwindow.cpp
+FORMS       = bookwindow.ui
+
+QT += sql
+
+target.path = $$[QT_INSTALL_DEMOS]/books
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images
+sources.path = $$[QT_INSTALL_DEMOS]/books
+INSTALLS += target sources
+
+wince*: {
+    CONFIG(debug, debug|release):sqlPlugins.sources = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll
+    CONFIG(release, debug|release):sqlPlugins.sources = $$QT_BUILD_TREE/plugins/sqldrivers/*[^d]4.dll
+    sqlPlugins.path = sqldrivers
+    DEPLOYMENT += sqlPlugins
+}
+\ No newline at end of file
diff --git a/demos/books/books.qrc b/demos/books/books.qrc
new file mode 100644
index 0000000..342638e
--- /dev/null
+++ b/demos/books/books.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+  <file>images/star.png</file>
+</qresource>
+</RCC>
diff --git a/demos/books/bookwindow.cpp b/demos/books/bookwindow.cpp
new file mode 100644
index 0000000..e73f727
--- /dev/null
+++ b/demos/books/bookwindow.cpp
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "bookwindow.h"
+#include "bookdelegate.h"
+#include "initdb.h"
+
+#include <QtSql>
+
+BookWindow::BookWindow()
+{
+    ui.setupUi(this);
+
+    if (!QSqlDatabase::drivers().contains("QSQLITE"))
+        QMessageBox::critical(this, "Unable to load database", "This demo needs the SQLITE driver");
+
+    // initialize the database
+    QSqlError err = initDb();
+    if (err.type() != QSqlError::NoError) {
+        showError(err);
+        return;
+    }
+
+    // Create the data model
+    model = new QSqlRelationalTableModel(ui.bookTable);
+    model->setEditStrategy(QSqlTableModel::OnManualSubmit);
+    model->setTable("books");
+
+    // Remeber the indexes of the columns
+    authorIdx = model->fieldIndex("author");
+    genreIdx = model->fieldIndex("genre");
+
+    // Set the relations to the other database tables
+    model->setRelation(authorIdx, QSqlRelation("authors", "id", "name"));
+    model->setRelation(genreIdx, QSqlRelation("genres", "id", "name"));
+
+    // Set the localized header captions
+    model->setHeaderData(authorIdx, Qt::Horizontal, tr("Author Name"));
+    model->setHeaderData(genreIdx, Qt::Horizontal, tr("Genre"));
+    model->setHeaderData(model->fieldIndex("title"), Qt::Horizontal, tr("Title"));
+    model->setHeaderData(model->fieldIndex("year"), Qt::Horizontal, tr("Year"));
+    model->setHeaderData(model->fieldIndex("rating"), Qt::Horizontal, tr("Rating"));
+
+    // Populate the model
+    if (!model->select()) {
+        showError(model->lastError());
+        return;
+    }
+
+    // Set the model and hide the ID column
+    ui.bookTable->setModel(model);
+    ui.bookTable->setItemDelegate(new BookDelegate(ui.bookTable));
+    ui.bookTable->setColumnHidden(model->fieldIndex("id"), true);
+    ui.bookTable->setSelectionMode(QAbstractItemView::SingleSelection);
+
+    // Initialize the Author combo box
+    ui.authorEdit->setModel(model->relationModel(authorIdx));
+    ui.authorEdit->setModelColumn(model->relationModel(authorIdx)->fieldIndex("name"));
+
+    ui.genreEdit->setModel(model->relationModel(genreIdx));
+    ui.genreEdit->setModelColumn(model->relationModel(genreIdx)->fieldIndex("name"));
+
+    QDataWidgetMapper *mapper = new QDataWidgetMapper(this);
+    mapper->setModel(model);
+    mapper->setItemDelegate(new BookDelegate(this));
+    mapper->addMapping(ui.titleEdit, model->fieldIndex("title"));
+    mapper->addMapping(ui.yearEdit, model->fieldIndex("year"));
+    mapper->addMapping(ui.authorEdit, authorIdx);
+    mapper->addMapping(ui.genreEdit, genreIdx);
+    mapper->addMapping(ui.ratingEdit, model->fieldIndex("rating"));
+
+    connect(ui.bookTable->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
+            mapper, SLOT(setCurrentModelIndex(QModelIndex)));
+
+    ui.bookTable->setCurrentIndex(model->index(0, 0));
+}
+
+void BookWindow::showError(const QSqlError &err)
+{
+    QMessageBox::critical(this, "Unable to initialize Database",
+                "Error initializing database: " + err.text());
+}
+
diff --git a/demos/books/bookwindow.h b/demos/books/bookwindow.h
new file mode 100644
index 0000000..3cc69d0
--- /dev/null
+++ b/demos/books/bookwindow.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BOOKWINDOW_H
+#define BOOKWINDOW_H
+
+#include <QtGui>
+#include <QtSql>
+
+#include "ui_bookwindow.h"
+
+
+class BookWindow: public QMainWindow
+{
+    Q_OBJECT
+public:
+    BookWindow();
+
+private:
+    void showError(const QSqlError &err);
+    Ui::BookWindow ui;
+    QSqlRelationalTableModel *model;
+    int authorIdx, genreIdx;
+};
+
+#endif
diff --git a/demos/books/bookwindow.ui b/demos/books/bookwindow.ui
new file mode 100644
index 0000000..659d324
--- /dev/null
+++ b/demos/books/bookwindow.ui
@@ -0,0 +1,149 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>BookWindow</class>
+ <widget class="QMainWindow" name="BookWindow" >
+ <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>601</width>
+    <height>420</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Books</string>
+  </property>
+  <widget class="QWidget" name="centralWidget" >
+   <layout class="QVBoxLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item>
+     <widget class="QGroupBox" name="groupBox" >
+      <property name="title" >
+       <string>Books</string>
+      </property>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QTableView" name="bookTable" >
+         <property name="selectionBehavior" >
+          <enum>QAbstractItemView::SelectRows</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_2" >
+         <property name="title" >
+          <string>Details</string>
+         </property>
+         <layout class="QFormLayout" >
+	   <item row="0" column="0" >
+           <widget class="QLabel" name="label_5" >
+            <property name="text" >
+             <string>&lt;b>Title:&lt;/b></string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QLineEdit" name="titleEdit" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label_2_2_2_2" >
+            <property name="text" >
+             <string>&lt;b>Author: &lt;/b></string>
+            </property>
+           </widget>
+	    </item>
+	     <item row="1" column="1" >
+           <widget class="QComboBox" name="authorEdit" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>	   
+	  <item row="2" column="0" >
+           <widget class="QLabel" name="label_3" >
+            <property name="text" >
+             <string>&lt;b>Genre:&lt;/b></string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1" >
+           <widget class="QComboBox" name="genreEdit" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0" >
+           <widget class="QLabel" name="label_4" >
+            <property name="text" >
+             <string>&lt;b>Year:&lt;/b></string>
+            </property>
+           </widget>
+          </item>       
+          <item row="3" column="1" >
+           <widget class="QSpinBox" name="yearEdit" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+            <property name="prefix" >
+             <string/>
+            </property>
+            <property name="maximum" >
+             <number>2100</number>
+            </property>
+            <property name="minimum" >
+             <number>-1000</number>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0" >
+           <widget class="QLabel" name="label" >
+            <property name="text" >
+             <string>&lt;b>Rating:&lt;/b></string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1" >
+           <widget class="QSpinBox" name="ratingEdit" >
+            <property name="maximum" >
+             <number>5</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>bookTable</tabstop>
+  <tabstop>titleEdit</tabstop>
+  <tabstop>authorEdit</tabstop>
+  <tabstop>genreEdit</tabstop>
+  <tabstop>yearEdit</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/demos/books/images/star.png b/demos/books/images/star.png
new file mode 100644
index 0000000..87f4464
--- /dev/null
+++ b/demos/books/images/star.png
diff --git a/demos/books/initdb.h b/demos/books/initdb.h
new file mode 100644
index 0000000..f9a94b7
--- /dev/null
+++ b/demos/books/initdb.h
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef INITDB_H
+#define INITDB_H
+
+#include <QtSql>
+
+void addBook(QSqlQuery &q, const QString &title, int year, const QVariant &authorId,
+             const QVariant &genreId, int rating)
+{
+    q.addBindValue(title);
+    q.addBindValue(year);
+    q.addBindValue(authorId);
+    q.addBindValue(genreId);
+    q.addBindValue(rating);
+    q.exec();
+}
+
+QVariant addGenre(QSqlQuery &q, const QString &name)
+{
+    q.addBindValue(name);
+    q.exec();
+    return q.lastInsertId();
+}
+
+QVariant addAuthor(QSqlQuery &q, const QString &name, const QDate &birthdate)
+{
+    q.addBindValue(name);
+    q.addBindValue(birthdate);
+    q.exec();
+    return q.lastInsertId();
+}
+
+QSqlError initDb()
+{
+    QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
+    db.setDatabaseName(":memory:");
+
+    if (!db.open())
+        return db.lastError();
+
+    QStringList tables = db.tables();
+    if (tables.contains("books", Qt::CaseInsensitive)
+        && tables.contains("authors", Qt::CaseInsensitive))
+        return QSqlError();
+
+    QSqlQuery q;
+    if (!q.exec(QLatin1String("create table books(id integer primary key, title varchar, author integer, genre integer, year integer, rating integer)")))
+        return q.lastError();
+    if (!q.exec(QLatin1String("create table authors(id integer primary key, name varchar, birthdate date)")))
+        return q.lastError();
+    if (!q.exec(QLatin1String("create table genres(id integer primary key, name varchar)")))
+        return q.lastError();
+
+    if (!q.prepare(QLatin1String("insert into authors(name, birthdate) values(?, ?)")))
+        return q.lastError();
+    QVariant asimovId = addAuthor(q, QLatin1String("Isaac Asimov"), QDate(1920, 2, 1));
+    QVariant greeneId = addAuthor(q, QLatin1String("Graham Greene"), QDate(1904, 10, 2));
+    QVariant pratchettId = addAuthor(q, QLatin1String("Terry Pratchett"), QDate(1948, 4, 28));
+
+    if (!q.prepare(QLatin1String("insert into genres(name) values(?)")))
+        return q.lastError();
+    QVariant sfiction = addGenre(q, QLatin1String("Science Fiction"));
+    QVariant fiction = addGenre(q, QLatin1String("Fiction"));
+    QVariant fantasy = addGenre(q, QLatin1String("Fantasy"));
+
+    if (!q.prepare(QLatin1String("insert into books(title, year, author, genre, rating) values(?, ?, ?, ?, ?)")))
+        return q.lastError();
+    addBook(q, QLatin1String("Foundation"), 1951, asimovId, sfiction, 3);
+    addBook(q, QLatin1String("Foundation and Empire"), 1952, asimovId, sfiction, 4);
+    addBook(q, QLatin1String("Second Foundation"), 1953, asimovId, sfiction, 3);
+    addBook(q, QLatin1String("Foundation's Edge"), 1982, asimovId, sfiction, 3);
+    addBook(q, QLatin1String("Foundation and Earth"), 1986, asimovId, sfiction, 4);
+    addBook(q, QLatin1String("Prelude to Foundation"), 1988, asimovId, sfiction, 3);
+    addBook(q, QLatin1String("Forward the Foundation"), 1993, asimovId, sfiction, 3);
+    addBook(q, QLatin1String("The Power and the Glory"), 1940, greeneId, fiction, 4);
+    addBook(q, QLatin1String("The Third Man"), 1950, greeneId, fiction, 5);
+    addBook(q, QLatin1String("Our Man in Havana"), 1958, greeneId, fiction, 4);
+    addBook(q, QLatin1String("Guards! Guards!"), 1989, pratchettId, fantasy, 3);
+    addBook(q, QLatin1String("Night Watch"), 2002, pratchettId, fantasy, 3);
+    addBook(q, QLatin1String("Going Postal"), 2004, pratchettId, fantasy, 3);
+
+    return QSqlError();
+}
+
+#endif
diff --git a/demos/books/main.cpp b/demos/books/main.cpp
new file mode 100644
index 0000000..f3ae325
--- /dev/null
+++ b/demos/books/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "bookwindow.h"
+
+#include <QtGui>
+
+int main(int argc, char * argv[])
+{
+    Q_INIT_RESOURCE(books);
+
+    QApplication app(argc, argv);
+
+    BookWindow win;
+    win.show();
+
+    return app.exec();
+}
diff --git a/demos/boxes/3rdparty/fbm.c b/demos/boxes/3rdparty/fbm.c
new file mode 100644
index 0000000..98eb87a
--- /dev/null
+++ b/demos/boxes/3rdparty/fbm.c
@@ -0,0 +1,207 @@
+/*****************************************************************
+
+  Implementation of the fractional Brownian motion algorithm. These
+  functions were originally the work of F. Kenton Musgrave.
+  For documentation of the different functions please refer to the
+  book: 
+  "Texturing and modeling: a procedural approach"
+  by David S. Ebert et. al.
+
+******************************************************************/
+
+#if defined (_MSC_VER)
+#include <qglobal.h>
+#endif
+
+#include <time.h>
+#include <stdlib.h>
+#include "fbm.h"
+
+#if defined(Q_CC_MSVC)
+#pragma warning(disable:4244)
+#endif
+
+/* Definitions used by the noise2() functions */
+
+//#define B 0x100
+//#define BM 0xff
+#define B 0x20
+#define BM 0x1f
+
+#define N 0x1000
+#define NP 12   /* 2^N */
+#define NM 0xfff
+
+static int   p[B + B + 2];
+static float g3[B + B + 2][3];
+static float g2[B + B + 2][2];
+static float g1[B + B + 2];
+static int   start = 1;
+
+static void init(void);
+
+#define s_curve(t) ( t * t * (3. - 2. * t) )
+
+#define lerp(t, a, b) ( a + t * (b - a) )
+
+#define setup(i,b0,b1,r0,r1)\
+	t = vec[i] + N;\
+	b0 = ((int)t) & BM;\
+	b1 = (b0+1) & BM;\
+	r0 = t - (int)t;\
+	r1 = r0 - 1.;
+#define at3(rx,ry,rz) ( rx * q[0] + ry * q[1] + rz * q[2] )
+
+/* Fractional Brownian Motion function */
+
+double fBm( Vector point, double H, double lacunarity, double octaves,
+	    int init )
+{
+
+    double            value, frequency, remainder;
+    int               i;
+    static double     exponent_array[10];
+    float             vec[3];
+
+    /* precompute and store spectral weights */
+    if ( init ) {
+	start = 1;
+	srand( time(0) );
+	/* seize required memory for exponent_array */
+	frequency = 1.0;
+	for (i=0; i<=octaves; i++) {
+	    /* compute weight for each frequency */
+	    exponent_array[i] = pow( frequency, -H );
+	    frequency *= lacunarity;
+	}
+    }
+
+    value = 0.0;            /* initialize vars to proper values */
+    frequency = 1.0;
+    vec[0]=point.x;
+    vec[1]=point.y;
+    vec[2]=point.z;
+
+
+    /* inner loop of spectral construction */
+    for (i=0; i<octaves; i++) {
+	/* value += noise3( vec ) * exponent_array[i];*/
+	value += noise3( vec ) * exponent_array[i];
+	vec[0] *= lacunarity;
+	vec[1] *= lacunarity;
+	vec[2] *= lacunarity;
+    } /* for */
+
+    remainder = octaves - (int)octaves;
+    if ( remainder )      /* add in ``octaves''  remainder */
+	/* ``i''  and spatial freq. are preset in loop above */
+	value += remainder * noise3( vec ) * exponent_array[i];
+
+    return( value );
+
+} /* fBm() */
+
+
+float noise3(float vec[3])
+{
+    int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
+    float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v;
+    register int i, j;
+
+    if (start) {
+	start = 0;
+	init();
+    }
+
+    setup(0, bx0,bx1, rx0,rx1);
+    setup(1, by0,by1, ry0,ry1);
+    setup(2, bz0,bz1, rz0,rz1);
+
+    i = p[ bx0 ];
+    j = p[ bx1 ];
+
+    b00 = p[ i + by0 ];
+    b10 = p[ j + by0 ];
+    b01 = p[ i + by1 ];
+    b11 = p[ j + by1 ];
+
+    t  = s_curve(rx0);
+    sy = s_curve(ry0);
+    sz = s_curve(rz0);
+
+
+    q = g3[ b00 + bz0 ] ; u = at3(rx0,ry0,rz0);
+    q = g3[ b10 + bz0 ] ; v = at3(rx1,ry0,rz0);
+    a = lerp(t, u, v);
+
+    q = g3[ b01 + bz0 ] ; u = at3(rx0,ry1,rz0);
+    q = g3[ b11 + bz0 ] ; v = at3(rx1,ry1,rz0);
+    b = lerp(t, u, v);
+
+    c = lerp(sy, a, b);
+
+    q = g3[ b00 + bz1 ] ; u = at3(rx0,ry0,rz1);
+    q = g3[ b10 + bz1 ] ; v = at3(rx1,ry0,rz1);
+    a = lerp(t, u, v);
+
+    q = g3[ b01 + bz1 ] ; u = at3(rx0,ry1,rz1);
+    q = g3[ b11 + bz1 ] ; v = at3(rx1,ry1,rz1);
+    b = lerp(t, u, v);
+
+    d = lerp(sy, a, b);
+
+    return lerp(sz, c, d);
+}
+
+static void normalize2(float v[2])
+{
+    float s;
+
+    s = sqrt(v[0] * v[0] + v[1] * v[1]);
+    v[0] = v[0] / s;
+    v[1] = v[1] / s;
+}
+
+static void normalize3(float v[3])
+{
+    float s;
+
+    s = sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
+    v[0] = v[0] / s;
+    v[1] = v[1] / s;
+    v[2] = v[2] / s;
+}
+
+static void init(void)
+{
+    int i, j, k;
+    
+    for (i = 0 ; i < B ; i++) {
+	p[i] = i;
+
+	g1[i] = (float)((rand() % (B + B)) - B) / B;
+
+	for (j = 0 ; j < 2 ; j++)
+	    g2[i][j] = (float)((rand() % (B + B)) - B) / B;
+	normalize2(g2[i]);
+
+	for (j = 0 ; j < 3 ; j++)
+	    g3[i][j] = (float)((rand() % (B + B)) - B) / B;
+	normalize3(g3[i]);
+    }
+
+    while (--i) {
+	k = p[i];
+	p[i] = p[j = rand() % B];
+	p[j] = k;
+    }
+
+    for (i = 0 ; i < B + 2 ; i++) {
+	p[B + i] = p[i];
+	g1[B + i] = g1[i];
+	for (j = 0 ; j < 2 ; j++)
+	    g2[B + i][j] = g2[i][j];
+	for (j = 0 ; j < 3 ; j++)
+	    g3[B + i][j] = g3[i][j];
+    }
+}
diff --git a/demos/boxes/3rdparty/fbm.h b/demos/boxes/3rdparty/fbm.h
new file mode 100644
index 0000000..b8a4a99
--- /dev/null
+++ b/demos/boxes/3rdparty/fbm.h
@@ -0,0 +1,40 @@
+/*****************************************************************
+
+  Prototypes for the fractional Brownian motion algorithm. These
+  functions were originally the work of F. Kenton Musgrave.  For
+  documentation of the different functions please refer to the book:
+  "Texturing and modeling: a procedural approach"
+  by David S. Ebert et. al.
+  
+******************************************************************/
+
+#ifndef _fbm_h
+#define _fbm_h
+
+#include  <math.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//#define TRUE    1
+//#define FALSE   0
+
+typedef struct {
+    double x;
+    double y;
+    double z;
+} Vector;
+    
+float noise3(float vec[]);
+double fBm( Vector point, double H, double lacunarity, double octaves, 
+	    int init );
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+
diff --git a/demos/boxes/basic.fsh b/demos/boxes/basic.fsh
new file mode 100644
index 0000000..06ef24a
--- /dev/null
+++ b/demos/boxes/basic.fsh
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform vec4 basicColor;
+
+void main()
+{
+    vec3 N = normalize(normal);
+    // assume directional light
+
+    gl_MaterialParameters M = gl_FrontMaterial;
+
+    float NdotL = dot(N, lightDirection.xyz);
+    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
+
+    vec3 absN = abs(gl_TexCoord[1].xyz);
+    vec3 texCoord;
+    if (absN.x > absN.y && absN.x > absN.z)
+        texCoord = gl_TexCoord[1].yzx;
+    else if (absN.y > absN.z)
+        texCoord = gl_TexCoord[1].zxy;
+    else
+        texCoord = gl_TexCoord[1].xyz;
+    texCoord.y *= -sign(texCoord.z);
+    texCoord += 0.5;
+
+    vec4 texColor = texture2D(tex, texCoord.xy);
+    vec4 unlitColor = gl_Color * mix(basicColor, vec4(texColor.xyz, 1.0), texColor.w);
+    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
+                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
+}
diff --git a/demos/boxes/basic.vsh b/demos/boxes/basic.vsh
new file mode 100644
index 0000000..5a02df2
--- /dev/null
+++ b/demos/boxes/basic.vsh
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform mat4 view;
+
+void main()
+{	
+    gl_TexCoord[0] = gl_MultiTexCoord0;
+    gl_TexCoord[1] = gl_Vertex;
+    specular = gl_LightSource[0].specular;
+    ambient = gl_LightSource[0].ambient;
+    diffuse = gl_LightSource[0].diffuse;
+    lightDirection = view * gl_LightSource[0].position;
+
+    normal = gl_NormalMatrix * gl_Normal;
+    position = (gl_ModelViewMatrix * gl_Vertex).xyz;
+
+    gl_FrontColor = gl_Color;
+    gl_Position = ftransform();
+}
diff --git a/demos/boxes/boxes.pro b/demos/boxes/boxes.pro
new file mode 100644
index 0000000..6c1a331
--- /dev/null
+++ b/demos/boxes/boxes.pro
@@ -0,0 +1,50 @@
+######################################################################
+# Automatically generated by qmake (2.01a) ma 3. nov 17:33:30 2008
+######################################################################
+
+TEMPLATE = app
+TARGET =
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+HEADERS += 3rdparty/fbm.h \
+           glbuffers.h \
+           glextensions.h \
+           glshaders.h \
+           gltrianglemesh.h \
+           qtbox.h \
+           roundedbox.h \
+           scene.h \
+           trackball.h \
+           vector.h
+SOURCES += 3rdparty/fbm.c \
+           glbuffers.cpp \
+           glextensions.cpp \
+           glshaders.cpp \
+           main.cpp \
+           qtbox.cpp \
+           roundedbox.cpp \
+           scene.cpp \
+           trackball.cpp
+
+RESOURCES += boxes.qrc
+
+QT += opengl
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/boxes
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg *.png *.fsh *.vsh *.par
+sources.files -= 3rdparty/fbm.h 3rdparty/fbm.c
+sources.files += 3rdparty
+sources.path = $$[QT_INSTALL_DEMOS]/boxes
+INSTALLS += target sources
+
+wince*: {
+    DEPLOYMENT_PLUGIN += qjpeg
+}
+
+win32-msvc* {
+    QMAKE_CXXFLAGS += /Zm1200
+    QMAKE_CFLAGS += /Zm1200
+}
diff --git a/demos/boxes/boxes.qrc b/demos/boxes/boxes.qrc
new file mode 100644
index 0000000..d27506d
--- /dev/null
+++ b/demos/boxes/boxes.qrc
@@ -0,0 +1,25 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res/boxes">
+    <file>cubemap_negx.jpg</file>
+    <file>cubemap_negy.jpg</file>
+    <file>cubemap_negz.jpg</file>
+    <file>cubemap_posx.jpg</file>
+    <file>cubemap_posy.jpg</file>
+    <file>cubemap_posz.jpg</file>
+    <file>square.jpg</file>
+    <file>basic.vsh</file>
+    <file>basic.fsh</file>
+    <file>dotted.fsh</file>
+    <file>fresnel.fsh</file>
+    <file>glass.fsh</file>
+    <file>granite.fsh</file>
+    <file>marble.fsh</file>
+    <file>reflection.fsh</file>
+    <file>refraction.fsh</file>
+    <file>wood.fsh</file>
+    <file>parameters.par</file>
+    <file>qt-logo.png</file>
+    <file>smiley.png</file>
+    <file>qt-logo.jpg</file>
+</qresource>
+</RCC>
diff --git a/demos/boxes/cubemap_negx.jpg b/demos/boxes/cubemap_negx.jpg
new file mode 100644
index 0000000..07c282e
--- /dev/null
+++ b/demos/boxes/cubemap_negx.jpg
diff --git a/demos/boxes/cubemap_negy.jpg b/demos/boxes/cubemap_negy.jpg
new file mode 100644
index 0000000..46cd2f9
--- /dev/null
+++ b/demos/boxes/cubemap_negy.jpg
diff --git a/demos/boxes/cubemap_negz.jpg b/demos/boxes/cubemap_negz.jpg
new file mode 100644
index 0000000..40c01dd
--- /dev/null
+++ b/demos/boxes/cubemap_negz.jpg
diff --git a/demos/boxes/cubemap_posx.jpg b/demos/boxes/cubemap_posx.jpg
new file mode 100644
index 0000000..0b42e8a
--- /dev/null
+++ b/demos/boxes/cubemap_posx.jpg
diff --git a/demos/boxes/cubemap_posy.jpg b/demos/boxes/cubemap_posy.jpg
new file mode 100644
index 0000000..2aca9b1
--- /dev/null
+++ b/demos/boxes/cubemap_posy.jpg
diff --git a/demos/boxes/cubemap_posz.jpg b/demos/boxes/cubemap_posz.jpg
new file mode 100644
index 0000000..2e49173
--- /dev/null
+++ b/demos/boxes/cubemap_posz.jpg
diff --git a/demos/boxes/dotted.fsh b/demos/boxes/dotted.fsh
new file mode 100644
index 0000000..26425f6
--- /dev/null
+++ b/demos/boxes/dotted.fsh
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+
+void main()
+{
+    vec3 N = normalize(normal);
+
+    gl_MaterialParameters M = gl_FrontMaterial;
+
+    // assume directional light
+    float NdotL = dot(N, lightDirection.xyz);
+    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
+
+    float r1 = length(fract(7.0 * gl_TexCoord[1].xyz) - 0.5);
+    float r2 = length(fract(5.0 * gl_TexCoord[1].xyz + 0.2) - 0.5);
+    float r3 = length(fract(11.0 * gl_TexCoord[1].xyz + 0.7) - 0.5);
+    vec4 rs = vec4(r1, r2, r3, 0.0);
+
+    vec4 unlitColor = gl_Color * (0.8 - clamp(10.0 * (0.4 - rs), 0.0, 0.2));
+    unlitColor.w = 1.0;
+    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
+                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
+}
diff --git a/demos/boxes/fresnel.fsh b/demos/boxes/fresnel.fsh
new file mode 100644
index 0000000..dd98061
--- /dev/null
+++ b/demos/boxes/fresnel.fsh
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform samplerCube env;
+uniform mat4 view;
+uniform vec4 basicColor;
+
+void main()
+{
+    vec3 N = normalize(normal);
+    // assume directional light
+
+    gl_MaterialParameters M = gl_FrontMaterial;
+
+    float NdotL = dot(N, lightDirection.xyz);
+    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
+
+    vec3 absN = abs(gl_TexCoord[1].xyz);
+    vec3 texCoord;
+    if (absN.x > absN.y && absN.x > absN.z)
+        texCoord = gl_TexCoord[1].yzx;
+    else if (absN.y > absN.z)
+        texCoord = gl_TexCoord[1].zxy;
+    else
+        texCoord = gl_TexCoord[1].xyz;
+    texCoord.y *= -sign(texCoord.z);
+    texCoord += 0.5;
+
+    vec4 texColor = texture2D(tex, texCoord.xy);
+    vec4 unlitColor = gl_Color * mix(basicColor, vec4(texColor.xyz, 1.0), texColor.w);
+    vec4 litColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
+                     M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
+
+    vec3 R = 2.0 * dot(-position, N) * N + position;
+    vec4 reflectedColor = textureCube(env, R * mat3(view[0].xyz, view[1].xyz, view[2].xyz));
+    gl_FragColor = mix(litColor, reflectedColor, 0.2 + 0.8 * pow(1.0 + dot(N, normalize(position)), 2.0));
+}
diff --git a/demos/boxes/glass.fsh b/demos/boxes/glass.fsh
new file mode 100644
index 0000000..2b59a0a
--- /dev/null
+++ b/demos/boxes/glass.fsh
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform samplerCube env;
+uniform mat4 view;
+
+// Some arbitrary values
+// Arrays don't work here on glsl < 120, apparently.
+//const float coeffs[6] = float[6](1.0/4.0, 1.0/4.1, 1.0/4.2, 1.0/4.3, 1.0/4.4, 1.0/4.5);
+float coeffs(int i)
+{
+	return 1.0 / (3.0 + 0.1 * float(i));
+}
+
+void main()
+{
+    vec3 N = normalize(normal);
+    vec3 I = -normalize(position);
+    mat3 V = mat3(view[0].xyz, view[1].xyz, view[2].xyz);
+    float IdotN = dot(I, N);
+    float scales[6];
+    vec3 C[6];
+    for (int i = 0; i < 6; ++i) {
+        scales[i] = (IdotN - sqrt(1.0 - coeffs(i) + coeffs(i) * (IdotN * IdotN)));
+        C[i] = textureCube(env, (-I + coeffs(i) * N) * V).xyz;
+    }
+    vec4 refractedColor = 0.25 * vec4(C[5].x + 2.0*C[0].x + C[1].x, C[1].y + 2.0*C[2].y + C[3].y,
+                          C[3].z + 2.0*C[4].z + C[5].z, 4.0);
+
+    vec3 R = 2.0 * dot(-position, N) * N + position;
+    vec4 reflectedColor = textureCube(env, R * V);
+
+    gl_FragColor = mix(refractedColor, reflectedColor, 0.4 + 0.6 * pow(1.0 - IdotN, 2.0));
+}
diff --git a/demos/boxes/glbuffers.cpp b/demos/boxes/glbuffers.cpp
new file mode 100644
index 0000000..b2a594e
--- /dev/null
+++ b/demos/boxes/glbuffers.cpp
@@ -0,0 +1,390 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "glbuffers.h"
+
+//============================================================================//
+//                                  GLTexture                                 //
+//============================================================================//
+
+GLTexture::GLTexture() : m_texture(0), m_failed(false)
+{
+    glGenTextures(1, &m_texture);
+}
+
+GLTexture::~GLTexture()
+{
+    glDeleteTextures(1, &m_texture);
+}
+
+//============================================================================//
+//                                 GLTexture2D                                //
+//============================================================================//
+
+GLTexture2D::GLTexture2D(int width, int height)
+{
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+    glTexImage2D(GL_TEXTURE_2D, 0, 4, width, height, 0,
+        GL_BGRA, GL_UNSIGNED_BYTE, 0);
+
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    //glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+    glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+
+GLTexture2D::GLTexture2D(const QString& fileName, int width, int height)
+{
+    // TODO: Add error handling.
+    QImage image(fileName);
+
+    if (image.isNull()) {
+        m_failed = true;
+        return;
+    }
+
+    image = image.convertToFormat(QImage::Format_ARGB32);
+
+    //qDebug() << "Image size:" << image.width() << "x" << image.height();
+    if (width <= 0)
+        width = image.width();
+    if (height <= 0)
+        height = image.height();
+    if (width != image.width() || height != image.height())
+        image = image.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+
+    // Works on x86, so probably works on all little-endian systems.
+    // Does it work on big-endian systems?
+    glTexImage2D(GL_TEXTURE_2D, 0, 4, image.width(), image.height(), 0,
+        GL_BGRA, GL_UNSIGNED_BYTE, image.bits());
+
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    //glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+    glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+void GLTexture2D::load(int width, int height, QRgb *data)
+{
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+    glTexImage2D(GL_TEXTURE_2D, 0, 4, width, height, 0,
+        GL_BGRA, GL_UNSIGNED_BYTE, data);
+    glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+void GLTexture2D::bind()
+{
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+    glEnable(GL_TEXTURE_2D);
+}
+
+void GLTexture2D::unbind()
+{
+    glBindTexture(GL_TEXTURE_2D, 0);
+    glDisable(GL_TEXTURE_2D);
+}
+
+
+//============================================================================//
+//                                 GLTexture3D                                //
+//============================================================================//
+
+GLTexture3D::GLTexture3D(int width, int height, int depth)
+{
+    GLBUFFERS_ASSERT_OPENGL("GLTexture3D::GLTexture3D", glTexImage3D, return)
+
+    glBindTexture(GL_TEXTURE_3D, m_texture);
+    glTexImage3D(GL_TEXTURE_3D, 0, 4, width, height, depth, 0,
+        GL_BGRA, GL_UNSIGNED_BYTE, 0);
+
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    //glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    //glTexParameteri(GL_TEXTURE_3D, GL_GENERATE_MIPMAP, GL_TRUE);
+    glBindTexture(GL_TEXTURE_3D, 0);
+}
+
+void GLTexture3D::load(int width, int height, int depth, QRgb *data)
+{
+    GLBUFFERS_ASSERT_OPENGL("GLTexture3D::load", glTexImage3D, return)
+
+    glBindTexture(GL_TEXTURE_3D, m_texture);
+    glTexImage3D(GL_TEXTURE_3D, 0, 4, width, height, depth, 0,
+        GL_BGRA, GL_UNSIGNED_BYTE, data);
+    glBindTexture(GL_TEXTURE_3D, 0);
+}
+
+void GLTexture3D::bind()
+{
+    glBindTexture(GL_TEXTURE_3D, m_texture);
+    glEnable(GL_TEXTURE_3D);
+}
+
+void GLTexture3D::unbind()
+{
+    glBindTexture(GL_TEXTURE_3D, 0);
+    glDisable(GL_TEXTURE_3D);
+}
+
+//============================================================================//
+//                                GLTextureCube                               //
+//============================================================================//
+
+GLTextureCube::GLTextureCube(int size)
+{
+    glBindTexture(GL_TEXTURE_CUBE_MAP, m_texture);
+
+    for (int i = 0; i < 6; ++i)
+        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, 4, size, size, 0,
+            GL_BGRA, GL_UNSIGNED_BYTE, 0);
+
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    //glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    //glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_GENERATE_MIPMAP, GL_TRUE);
+    glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
+}
+
+GLTextureCube::GLTextureCube(const QStringList& fileNames, int size)
+{
+    // TODO: Add error handling.
+
+    glBindTexture(GL_TEXTURE_CUBE_MAP, m_texture);
+
+    int index = 0;
+    foreach (QString file, fileNames) {
+        QImage image(file);
+        if (image.isNull()) {
+            m_failed = true;
+            break;
+        }
+
+        image = image.convertToFormat(QImage::Format_ARGB32);
+
+        //qDebug() << "Image size:" << image.width() << "x" << image.height();
+        if (size <= 0)
+            size = image.width();
+        if (size != image.width() || size != image.height())
+            image = image.scaled(size, size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+
+        // Works on x86, so probably works on all little-endian systems.
+        // Does it work on big-endian systems?
+        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + index, 0, 4, image.width(), image.height(), 0,
+            GL_BGRA, GL_UNSIGNED_BYTE, image.bits());
+
+        if (++index == 6)
+            break;
+    }
+
+    // Clear remaining faces.
+    while (index < 6) {
+        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + index, 0, 4, size, size, 0,
+            GL_BGRA, GL_UNSIGNED_BYTE, 0);
+        ++index;
+    }
+
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    //glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    //glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_GENERATE_MIPMAP, GL_TRUE);
+    glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
+}
+
+void GLTextureCube::load(int size, int face, QRgb *data)
+{
+    glBindTexture(GL_TEXTURE_CUBE_MAP, m_texture);
+        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, 0, 4, size, size, 0,
+            GL_BGRA, GL_UNSIGNED_BYTE, data);
+    glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
+}
+
+void GLTextureCube::bind()
+{
+    glBindTexture(GL_TEXTURE_CUBE_MAP, m_texture);
+    glEnable(GL_TEXTURE_CUBE_MAP);
+}
+
+void GLTextureCube::unbind()
+{
+    glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
+    glDisable(GL_TEXTURE_CUBE_MAP);
+}
+
+//============================================================================//
+//                            GLFrameBufferObject                             //
+//============================================================================//
+
+GLFrameBufferObject::GLFrameBufferObject(int width, int height)
+    : m_fbo(0)
+    , m_depthBuffer(0)
+    , m_width(width)
+    , m_height(height)
+    , m_failed(false)
+{
+    GLBUFFERS_ASSERT_OPENGL("GLFrameBufferObject::GLFrameBufferObject",
+        glGenFramebuffersEXT && glGenRenderbuffersEXT && glBindRenderbufferEXT && glRenderbufferStorageEXT, return)
+
+    // TODO: share depth buffers of same size
+    glGenFramebuffersEXT(1, &m_fbo);
+    //glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
+    glGenRenderbuffersEXT(1, &m_depthBuffer);
+    glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, m_depthBuffer);
+    glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, m_width, m_height);
+    //glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, m_depthBuffer);
+    //glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+}
+
+GLFrameBufferObject::~GLFrameBufferObject()
+{
+    GLBUFFERS_ASSERT_OPENGL("GLFrameBufferObject::~GLFrameBufferObject",
+        glDeleteFramebuffersEXT && glDeleteRenderbuffersEXT, return)
+
+    glDeleteFramebuffersEXT(1, &m_fbo);
+    glDeleteRenderbuffersEXT(1, &m_depthBuffer);
+}
+
+void GLFrameBufferObject::setAsRenderTarget(bool state)
+{
+    GLBUFFERS_ASSERT_OPENGL("GLFrameBufferObject::setAsRenderTarget", glBindFramebufferEXT, return)
+
+    if (state) {
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
+        glPushAttrib(GL_VIEWPORT_BIT);
+        glViewport(0, 0, m_width, m_height);
+    } else {
+        glPopAttrib();
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+    }
+}
+
+bool GLFrameBufferObject::isComplete()
+{
+    GLBUFFERS_ASSERT_OPENGL("GLFrameBufferObject::isComplete", glCheckFramebufferStatusEXT, return false)
+
+    return GL_FRAMEBUFFER_COMPLETE_EXT == glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+}
+
+//============================================================================//
+//                             GLRenderTargetCube                             //
+//============================================================================//
+
+GLRenderTargetCube::GLRenderTargetCube(int size)
+    : GLTextureCube(size)
+    , m_fbo(size, size)
+{
+}
+
+void GLRenderTargetCube::begin(int face)
+{
+    GLBUFFERS_ASSERT_OPENGL("GLRenderTargetCube::begin",
+        glFramebufferTexture2DEXT && glFramebufferRenderbufferEXT, return)
+
+    m_fbo.setAsRenderTarget(true);
+    glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+        GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, m_texture, 0);
+    glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, m_fbo.m_depthBuffer);
+}
+
+void GLRenderTargetCube::end()
+{
+    m_fbo.setAsRenderTarget(false);
+}
+
+void GLRenderTargetCube::getViewMatrix(gfx::Matrix4x4f& mat, int face)
+{
+    if (face < 0 || face >= 6) {
+        qWarning("GLRenderTargetCube::getViewMatrix: 'face' must be in the range [0, 6). (face == %d)", face);
+        return;
+    }
+
+    static int perm[6][3] = {
+        {2, 1, 0},
+        {2, 1, 0},
+        {0, 2, 1},
+        {0, 2, 1},
+        {0, 1, 2},
+        {0, 1, 2},
+    };
+
+    static float signs[6][3] = {
+        {-1.0f, -1.0f, -1.0f},
+        {+1.0f, -1.0f, +1.0f},
+        {+1.0f, +1.0f, -1.0f},
+        {+1.0f, -1.0f, +1.0f},
+        {+1.0f, -1.0f, -1.0f},
+        {-1.0f, -1.0f, +1.0f},
+    };
+
+    memset(mat.bits(), 0, sizeof(float) * 16);
+    for (int i = 0; i < 3; ++i)
+        mat(perm[face][i], i) = signs[face][i];
+    mat(3, 3) = 1.0f;
+}
+
+void GLRenderTargetCube::getProjectionMatrix(gfx::Matrix4x4f& mat, float nearZ, float farZ)
+{
+    float proj[] = {
+        1.0f, 0.0f, 0.0f, 0.0f,
+        0.0f, 1.0f, 0.0f, 0.0f,
+        0.0f, 0.0f, (nearZ+farZ)/(nearZ-farZ), -1.0f,
+        0.0f, 0.0f, 2.0f*nearZ*farZ/(nearZ-farZ), 0.0f,
+    };
+
+    memcpy(mat.bits(), proj, sizeof(float) * 16);
+}
diff --git a/demos/boxes/glbuffers.h b/demos/boxes/glbuffers.h
new file mode 100644
index 0000000..88de4e8
--- /dev/null
+++ b/demos/boxes/glbuffers.h
@@ -0,0 +1,362 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLBUFFERS_H
+#define GLBUFFERS_H
+
+//#include <GL/glew.h>
+#include "glextensions.h"
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include "vector.h"
+
+#define BUFFER_OFFSET(i) ((char*)0 + (i))
+#define SIZE_OF_MEMBER(cls, member) sizeof(static_cast<cls *>(0)->member)
+
+#define GLBUFFERS_ASSERT_OPENGL(prefix, assertion, returnStatement)                         \
+if (m_failed || !(assertion)) {                                                             \
+    if (!m_failed) qCritical(prefix ": The necessary OpenGL functions are not available."); \
+    m_failed = true;                                                                        \
+    returnStatement;                                                                        \
+}
+
+class GLTexture
+{
+public:
+    GLTexture();
+    virtual ~GLTexture();
+    virtual void bind() = 0;
+    virtual void unbind() = 0;
+    virtual bool failed() const {return m_failed;}
+protected:
+    GLuint m_texture;
+    bool m_failed;
+};
+
+class GLFrameBufferObject
+{
+public:
+    friend class GLRenderTargetCube;
+    // friend class GLRenderTarget2D;
+
+    GLFrameBufferObject(int width, int height);
+    virtual ~GLFrameBufferObject();
+    bool isComplete();
+    virtual bool failed() const {return m_failed;}
+protected:
+    void setAsRenderTarget(bool state = true);
+    GLuint m_fbo;
+    GLuint m_depthBuffer;
+    int m_width, m_height;
+    bool m_failed;
+};
+
+class GLTexture2D : public GLTexture
+{
+public:
+    GLTexture2D(int width, int height);
+    GLTexture2D(const QString& fileName, int width = 0, int height = 0);
+    void load(int width, int height, QRgb *data);
+    virtual void bind();
+    virtual void unbind();
+};
+
+class GLTexture3D : public GLTexture
+{
+public:
+    GLTexture3D(int width, int height, int depth);
+    // TODO: Implement function below
+    //GLTexture3D(const QString& fileName, int width = 0, int height = 0);
+    void load(int width, int height, int depth, QRgb *data);
+    virtual void bind();
+    virtual void unbind();
+};
+
+class GLTextureCube : public GLTexture
+{
+public:
+    GLTextureCube(int size);
+    GLTextureCube(const QStringList& fileNames, int size = 0);
+    void load(int size, int face, QRgb *data);
+    virtual void bind();
+    virtual void unbind();
+};
+
+// TODO: Define and implement class below
+//class GLRenderTarget2D : public GLTexture2D
+
+class GLRenderTargetCube : public GLTextureCube
+{
+public:
+    GLRenderTargetCube(int size);
+    // begin rendering to one of the cube's faces. 0 <= face < 6
+    void begin(int face);
+    // end rendering
+    void end();
+    virtual bool failed() {return m_failed || m_fbo.failed();}
+
+    static void getViewMatrix(gfx::Matrix4x4f& mat, int face);
+    static void getProjectionMatrix(gfx::Matrix4x4f& mat, float nearZ, float farZ);
+private:
+    GLFrameBufferObject m_fbo;
+};
+
+struct VertexDescription
+{
+    enum
+    {
+        Null = 0, // Terminates a VertexDescription array
+        Position,
+        TexCoord,
+        Normal,
+        Color,
+    };
+    int field; // Position, TexCoord, Normal, Color
+    int type; // GL_FLOAT, GL_UNSIGNED_BYTE
+    int count; // number of elements
+    int offset; // field's offset into vertex struct
+    int index; // 0 (unused at the moment)
+};
+
+// Implementation of interleaved buffers.
+// 'T' is a struct which must include a null-terminated static array
+// 'VertexDescription* description'.
+// Example:
+/*
+struct Vertex
+{
+    GLfloat position[3];
+    GLfloat texCoord[2];
+    GLfloat normal[3];
+    GLbyte color[4];
+    static VertexDescription description[];
+};
+
+VertexDescription Vertex::description[] = {
+    {VertexDescription::Position, GL_FLOAT, SIZE_OF_MEMBER(Vertex, position) / sizeof(GLfloat), offsetof(Vertex, position), 0},
+    {VertexDescription::TexCoord, GL_FLOAT, SIZE_OF_MEMBER(Vertex, texCoord) / sizeof(GLfloat), offsetof(Vertex, texCoord), 0},
+    {VertexDescription::Normal, GL_FLOAT, SIZE_OF_MEMBER(Vertex, normal) / sizeof(GLfloat), offsetof(Vertex, normal), 0},
+    {VertexDescription::Color, GL_BYTE, SIZE_OF_MEMBER(Vertex, color) / sizeof(GLbyte), offsetof(Vertex, color), 0},
+    {VertexDescription::Null, 0, 0, 0, 0},
+};
+*/
+template<class T>
+class GLVertexBuffer
+{
+public:
+    GLVertexBuffer(int length, const T *data = 0, int mode = GL_STATIC_DRAW)
+        : m_length(0)
+        , m_mode(mode)
+        , m_buffer(0)
+        , m_failed(false)
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::GLVertexBuffer", glGenBuffers && glBindBuffer && glBufferData, return)
+
+		glGenBuffers(1, &m_buffer);
+		glBindBuffer(GL_ARRAY_BUFFER, m_buffer);
+		glBufferData(GL_ARRAY_BUFFER, (m_length = length) * sizeof(T), data, mode);
+    }
+
+    ~GLVertexBuffer()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::~GLVertexBuffer", glDeleteBuffers, return)
+
+        glDeleteBuffers(1, &m_buffer);
+    }
+
+    void bind()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::bind", glBindBuffer, return)
+
+        glBindBuffer(GL_ARRAY_BUFFER, m_buffer);
+        for (VertexDescription *desc = T::description; desc->field != VertexDescription::Null; ++desc) {
+            switch (desc->field) {
+            case VertexDescription::Position:
+                glVertexPointer(desc->count, desc->type, sizeof(T), BUFFER_OFFSET(desc->offset));
+                glEnableClientState(GL_VERTEX_ARRAY);
+                break;
+            case VertexDescription::TexCoord:
+                glTexCoordPointer(desc->count, desc->type, sizeof(T), BUFFER_OFFSET(desc->offset));
+                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+                break;
+            case VertexDescription::Normal:
+                glNormalPointer(desc->type, sizeof(T), BUFFER_OFFSET(desc->offset));
+                glEnableClientState(GL_NORMAL_ARRAY);
+                break;
+            case VertexDescription::Color:
+                glColorPointer(desc->count, desc->type, sizeof(T), BUFFER_OFFSET(desc->offset));
+                glEnableClientState(GL_COLOR_ARRAY);
+                break;
+            default:
+                break;
+            }
+        }
+    }
+
+    void unbind()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::unbind", glBindBuffer, return)
+
+        glBindBuffer(GL_ARRAY_BUFFER, 0);
+        for (VertexDescription *desc = T::description; desc->field != VertexDescription::Null; ++desc) {
+            switch (desc->field) {
+            case VertexDescription::Position:
+                glDisableClientState(GL_VERTEX_ARRAY);
+                break;
+            case VertexDescription::TexCoord:
+                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+                break;
+            case VertexDescription::Normal:
+                glDisableClientState(GL_NORMAL_ARRAY);
+                break;
+            case VertexDescription::Color:
+                glDisableClientState(GL_COLOR_ARRAY);
+                break;
+            default:
+                break;
+            }
+        }
+    }
+
+    int length() const {return m_length;}
+
+    T *lock()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::lock", glBindBuffer && glMapBuffer, return 0)
+
+        glBindBuffer(GL_ARRAY_BUFFER, m_buffer);
+        //glBufferData(GL_ARRAY_BUFFER, m_length, NULL, m_mode);
+        GLvoid* buffer = glMapBuffer(GL_ARRAY_BUFFER, GL_READ_WRITE);
+        m_failed = (buffer == 0);
+        return reinterpret_cast<T *>(buffer);
+    }
+
+    void unlock()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::unlock", glBindBuffer && glUnmapBuffer, return)
+
+        glBindBuffer(GL_ARRAY_BUFFER, m_buffer);
+        glUnmapBuffer(GL_ARRAY_BUFFER);
+    }
+
+    bool failed()
+    {
+        return m_failed;
+    }
+
+private:
+    int m_length, m_mode;
+    GLuint m_buffer;
+    bool m_failed;
+};
+
+template<class T>
+class GLIndexBuffer
+{
+public:
+    GLIndexBuffer(int length, const T *data = 0, int mode = GL_STATIC_DRAW)
+        : m_length(0)
+        , m_mode(mode)
+        , m_buffer(0)
+        , m_failed(false)
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::GLIndexBuffer", glGenBuffers && glBindBuffer && glBufferData, return)
+
+        glGenBuffers(1, &m_buffer);
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_buffer);
+        glBufferData(GL_ELEMENT_ARRAY_BUFFER, (m_length = length) * sizeof(T), data, mode);
+    }
+
+    ~GLIndexBuffer()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::~GLIndexBuffer", glDeleteBuffers, return)
+
+        glDeleteBuffers(1, &m_buffer);
+    }
+
+    void bind()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::bind", glBindBuffer, return)
+
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_buffer);
+    }
+
+    void unbind()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::unbind", glBindBuffer, return)
+
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+    }
+
+    int length() const {return m_length;}
+
+    T *lock()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::lock", glBindBuffer && glMapBuffer, return 0)
+
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_buffer);
+        GLvoid* buffer = glMapBuffer(GL_ELEMENT_ARRAY_BUFFER, GL_READ_WRITE);
+        m_failed = (buffer == 0);
+        return reinterpret_cast<T *>(buffer);
+    }
+
+    void unlock()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::unlock", glBindBuffer && glUnmapBuffer, return)
+
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_buffer);
+        glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER);
+    }
+
+    bool failed()
+    {
+        return m_failed;
+    }
+
+private:
+    int m_length, m_mode;
+    GLuint m_buffer;
+    bool m_failed;
+};
+
+#endif
diff --git a/demos/boxes/glextensions.cpp b/demos/boxes/glextensions.cpp
new file mode 100644
index 0000000..59256a8
--- /dev/null
+++ b/demos/boxes/glextensions.cpp
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "glextensions.h"
+
+#define RESOLVE_GL_FUNC(f) ok &= bool((f = (_gl##f) context->getProcAddress(QLatin1String("gl" #f))));
+
+bool GLExtensionFunctions::resolve(const QGLContext *context)
+{
+	bool ok = true;
+
+	RESOLVE_GL_FUNC(CreateShaderObjectARB)
+	RESOLVE_GL_FUNC(ShaderSourceARB)
+	RESOLVE_GL_FUNC(CompileShaderARB)
+	RESOLVE_GL_FUNC(GetObjectParameterivARB)
+	RESOLVE_GL_FUNC(DeleteObjectARB)
+	RESOLVE_GL_FUNC(GetInfoLogARB)
+	RESOLVE_GL_FUNC(CreateProgramObjectARB)
+	RESOLVE_GL_FUNC(AttachObjectARB)
+	RESOLVE_GL_FUNC(DetachObjectARB)
+	RESOLVE_GL_FUNC(LinkProgramARB)
+	RESOLVE_GL_FUNC(UseProgramObjectARB)
+	RESOLVE_GL_FUNC(GetUniformLocationARB)
+	RESOLVE_GL_FUNC(Uniform1iARB)
+	RESOLVE_GL_FUNC(Uniform1fARB)
+	RESOLVE_GL_FUNC(Uniform4fARB)
+	RESOLVE_GL_FUNC(UniformMatrix4fvARB)
+
+	RESOLVE_GL_FUNC(GenFramebuffersEXT)
+	RESOLVE_GL_FUNC(GenRenderbuffersEXT)
+	RESOLVE_GL_FUNC(BindRenderbufferEXT)
+	RESOLVE_GL_FUNC(RenderbufferStorageEXT)
+	RESOLVE_GL_FUNC(DeleteFramebuffersEXT)
+	RESOLVE_GL_FUNC(DeleteRenderbuffersEXT)
+	RESOLVE_GL_FUNC(BindFramebufferEXT)
+	RESOLVE_GL_FUNC(FramebufferTexture2DEXT)
+	RESOLVE_GL_FUNC(FramebufferRenderbufferEXT)
+	RESOLVE_GL_FUNC(CheckFramebufferStatusEXT)
+
+        RESOLVE_GL_FUNC(ActiveTexture)
+	RESOLVE_GL_FUNC(TexImage3D)
+
+        RESOLVE_GL_FUNC(GenBuffers)
+	RESOLVE_GL_FUNC(BindBuffer)
+	RESOLVE_GL_FUNC(BufferData)
+	RESOLVE_GL_FUNC(DeleteBuffers)
+	RESOLVE_GL_FUNC(MapBuffer)
+	RESOLVE_GL_FUNC(UnmapBuffer)
+
+	return ok;
+}
+
+bool GLExtensionFunctions::glslSupported() {
+    return CreateShaderObjectARB
+	    && CreateShaderObjectARB
+	    && ShaderSourceARB
+	    && CompileShaderARB
+	    && GetObjectParameterivARB
+	    && DeleteObjectARB
+	    && GetInfoLogARB
+	    && CreateProgramObjectARB
+	    && AttachObjectARB
+	    && DetachObjectARB
+	    && LinkProgramARB
+	    && UseProgramObjectARB
+	    && GetUniformLocationARB
+	    && Uniform1iARB
+	    && Uniform1fARB
+	    && Uniform4fARB
+            && UniformMatrix4fvARB;
+}
+
+bool GLExtensionFunctions::fboSupported() {
+    return GenFramebuffersEXT
+	    && GenRenderbuffersEXT
+	    && BindRenderbufferEXT
+	    && RenderbufferStorageEXT
+	    && DeleteFramebuffersEXT
+	    && DeleteRenderbuffersEXT
+	    && BindFramebufferEXT
+	    && FramebufferTexture2DEXT
+	    && FramebufferRenderbufferEXT
+	    && CheckFramebufferStatusEXT;
+}
+
+bool GLExtensionFunctions::openGL15Supported() {
+    return ActiveTexture
+	    && TexImage3D
+            && GenBuffers
+	    && BindBuffer
+	    && BufferData
+	    && DeleteBuffers
+	    && MapBuffer
+	    && UnmapBuffer;
+}
+
+#undef RESOLVE_GL_FUNC
diff --git a/demos/boxes/glextensions.h b/demos/boxes/glextensions.h
new file mode 100644
index 0000000..74617d6
--- /dev/null
+++ b/demos/boxes/glextensions.h
@@ -0,0 +1,284 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLEXTENSIONS_H
+#define GLEXTENSIONS_H
+
+#include <QtOpenGL>
+
+/*
+Functions resolved:
+
+glCreateShaderObjectARB
+glShaderSourceARB
+glCompileShaderARB
+glGetObjectParameterivARB
+glDeleteObjectARB
+glGetInfoLogARB
+glCreateProgramObjectARB
+glAttachObjectARB
+glDetachObjectARB
+glLinkProgramARB
+glUseProgramObjectARB
+glGetUniformLocationARB
+glUniform1iARB
+glUniform1fARB
+glUniform4fARB
+glUniformMatrix4fvARB
+
+glGenFramebuffersEXT
+glGenRenderbuffersEXT
+glBindRenderbufferEXT
+glRenderbufferStorageEXT
+glDeleteFramebuffersEXT
+glDeleteRenderbuffersEXT
+glBindFramebufferEXT
+glFramebufferTexture2DEXT
+glFramebufferRenderbufferEXT
+glCheckFramebufferStatusEXT
+
+glActiveTexture
+glTexImage3D
+
+glGenBuffers
+glBindBuffer
+glBufferData
+glDeleteBuffers
+glMapBuffer
+glUnmapBuffer
+*/
+
+#ifndef Q_WS_MAC
+# ifndef APIENTRYP
+#   ifdef APIENTRY
+#     define APIENTRYP APIENTRY *
+#   else
+#     define APIENTRY
+#     define APIENTRYP *
+#   endif
+# endif
+#else
+# define APIENTRY
+# define APIENTRYP *
+#endif
+
+#ifndef GL_VERSION_1_2
+#define GL_TEXTURE_3D 0x806F
+#define GL_TEXTURE_WRAP_R 0x8072
+#define GL_CLAMP_TO_EDGE 0x812F
+#define GL_BGRA 0x80E1
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0 0x84C0
+#define GL_TEXTURE1 0x84C1
+#define GL_TEXTURE2 0x84C2
+#define GL_TEXTURE_CUBE_MAP 0x8513
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
+//#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
+//#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
+//#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
+//#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
+//#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
+#endif
+
+#ifndef GL_VERSION_1_5
+typedef ptrdiff_t GLsizeiptr;
+#define GL_ARRAY_BUFFER 0x8892
+#define GL_ELEMENT_ARRAY_BUFFER 0x8893
+#define GL_READ_WRITE 0x88BA
+#define GL_STATIC_DRAW 0x88E4
+#endif
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_RENDERBUFFER_EXT 0x8D41
+#define GL_FRAMEBUFFER_EXT 0x8D40
+#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5
+#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
+#define GL_DEPTH_ATTACHMENT_EXT 0x8D00
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_VERTEX_SHADER_ARB 0x8B31
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_FRAGMENT_SHADER_ARB 0x8B30
+#endif
+
+#ifndef GL_ARB_shader_objects
+typedef char GLcharARB;
+typedef unsigned int GLhandleARB;
+#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB 0x8B82
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84
+#endif
+
+typedef GLhandleARB (APIENTRY *_glCreateShaderObjectARB) (GLenum);
+typedef void (APIENTRY *_glShaderSourceARB) (GLhandleARB, GLuint, const GLcharARB**, GLint *);
+typedef void (APIENTRY *_glCompileShaderARB) (GLhandleARB);
+typedef void (APIENTRY *_glGetObjectParameterivARB) (GLhandleARB, GLenum, int *);
+typedef void (APIENTRY *_glDeleteObjectARB) (GLhandleARB);
+typedef void (APIENTRY *_glGetInfoLogARB) (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+typedef GLhandleARB (APIENTRY *_glCreateProgramObjectARB) ();
+typedef void (APIENTRY *_glAttachObjectARB) (GLhandleARB, GLhandleARB);
+typedef void (APIENTRY *_glDetachObjectARB) (GLhandleARB, GLhandleARB);
+typedef void (APIENTRY *_glLinkProgramARB) (GLhandleARB);
+typedef void (APIENTRY *_glUseProgramObjectARB) (GLhandleARB);
+typedef GLint (APIENTRY *_glGetUniformLocationARB) (GLhandleARB, const GLcharARB *);
+typedef void (APIENTRY *_glUniform1iARB) (GLint, GLint);
+typedef void (APIENTRY *_glUniform1fARB) (GLint, GLfloat);
+typedef void (APIENTRY *_glUniform4fARB) (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY *_glUniformMatrix4fvARB) (GLint, GLuint, GLboolean, const GLfloat *);
+
+typedef void (APIENTRY *_glGenFramebuffersEXT) (GLsizei, GLuint *);
+typedef void (APIENTRY *_glGenRenderbuffersEXT) (GLsizei, GLuint *);
+typedef void (APIENTRY *_glBindRenderbufferEXT) (GLenum, GLuint);
+typedef void (APIENTRY *_glRenderbufferStorageEXT) (GLenum, GLenum, GLsizei, GLsizei);
+typedef void (APIENTRY *_glDeleteFramebuffersEXT) (GLsizei, const GLuint*);
+typedef void (APIENTRY *_glDeleteRenderbuffersEXT) (GLsizei, const GLuint*);
+typedef void (APIENTRY *_glBindFramebufferEXT) (GLenum, GLuint);
+typedef void (APIENTRY *_glFramebufferTexture2DEXT) (GLenum, GLenum, GLenum, GLuint, GLint);
+typedef void (APIENTRY *_glFramebufferRenderbufferEXT) (GLenum, GLenum, GLenum, GLuint);
+typedef GLenum (APIENTRY *_glCheckFramebufferStatusEXT) (GLenum);
+
+typedef void (APIENTRY *_glActiveTexture) (GLenum);
+typedef void (APIENTRY *_glTexImage3D) (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+
+typedef void (APIENTRY *_glGenBuffers) (GLsizei, GLuint *);
+typedef void (APIENTRY *_glBindBuffer) (GLenum, GLuint);
+typedef void (APIENTRY *_glBufferData) (GLenum, GLsizeiptr, const GLvoid *, GLenum);
+typedef void (APIENTRY *_glDeleteBuffers) (GLsizei, const GLuint *);
+typedef void *(APIENTRY *_glMapBuffer) (GLenum, GLenum);
+typedef GLboolean (APIENTRY *_glUnmapBuffer) (GLenum);
+
+struct GLExtensionFunctions
+{
+	bool resolve(const QGLContext *context);
+
+    bool glslSupported();
+    bool fboSupported();
+    bool openGL15Supported(); // the rest: multi-texture, 3D-texture, vertex buffer objects
+
+	_glCreateShaderObjectARB CreateShaderObjectARB;
+	_glShaderSourceARB ShaderSourceARB;
+	_glCompileShaderARB CompileShaderARB;
+	_glGetObjectParameterivARB GetObjectParameterivARB;
+	_glDeleteObjectARB DeleteObjectARB;
+	_glGetInfoLogARB GetInfoLogARB;
+	_glCreateProgramObjectARB CreateProgramObjectARB;
+	_glAttachObjectARB AttachObjectARB;
+	_glDetachObjectARB DetachObjectARB;
+	_glLinkProgramARB LinkProgramARB;
+	_glUseProgramObjectARB UseProgramObjectARB;
+	_glGetUniformLocationARB GetUniformLocationARB;
+	_glUniform1iARB Uniform1iARB;
+	_glUniform1fARB Uniform1fARB;
+	_glUniform4fARB Uniform4fARB;
+	_glUniformMatrix4fvARB UniformMatrix4fvARB;
+
+	_glGenFramebuffersEXT GenFramebuffersEXT;
+	_glGenRenderbuffersEXT GenRenderbuffersEXT;
+	_glBindRenderbufferEXT BindRenderbufferEXT;
+	_glRenderbufferStorageEXT RenderbufferStorageEXT;
+	_glDeleteFramebuffersEXT DeleteFramebuffersEXT;
+	_glDeleteRenderbuffersEXT DeleteRenderbuffersEXT;
+	_glBindFramebufferEXT BindFramebufferEXT;
+	_glFramebufferTexture2DEXT FramebufferTexture2DEXT;
+	_glFramebufferRenderbufferEXT FramebufferRenderbufferEXT;
+	_glCheckFramebufferStatusEXT CheckFramebufferStatusEXT;
+
+	_glActiveTexture ActiveTexture;
+	_glTexImage3D TexImage3D;
+
+	_glGenBuffers GenBuffers;
+	_glBindBuffer BindBuffer;
+	_glBufferData BufferData;
+	_glDeleteBuffers DeleteBuffers;
+	_glMapBuffer MapBuffer;
+	_glUnmapBuffer UnmapBuffer;
+};
+
+inline GLExtensionFunctions &getGLExtensionFunctions()
+{
+	static GLExtensionFunctions funcs;
+	return funcs;
+}
+
+#define glCreateShaderObjectARB getGLExtensionFunctions().CreateShaderObjectARB
+#define glShaderSourceARB getGLExtensionFunctions().ShaderSourceARB
+#define glCompileShaderARB getGLExtensionFunctions().CompileShaderARB
+#define glGetObjectParameterivARB getGLExtensionFunctions().GetObjectParameterivARB
+#define glDeleteObjectARB getGLExtensionFunctions().DeleteObjectARB
+#define glGetInfoLogARB getGLExtensionFunctions().GetInfoLogARB
+#define glCreateProgramObjectARB getGLExtensionFunctions().CreateProgramObjectARB
+#define glAttachObjectARB getGLExtensionFunctions().AttachObjectARB
+#define glDetachObjectARB getGLExtensionFunctions().DetachObjectARB
+#define glLinkProgramARB getGLExtensionFunctions().LinkProgramARB
+#define glUseProgramObjectARB getGLExtensionFunctions().UseProgramObjectARB
+#define glGetUniformLocationARB getGLExtensionFunctions().GetUniformLocationARB
+#define glUniform1iARB getGLExtensionFunctions().Uniform1iARB
+#define glUniform1fARB getGLExtensionFunctions().Uniform1fARB
+#define glUniform4fARB getGLExtensionFunctions().Uniform4fARB
+#define glUniformMatrix4fvARB getGLExtensionFunctions().UniformMatrix4fvARB
+
+#define glGenFramebuffersEXT getGLExtensionFunctions().GenFramebuffersEXT
+#define glGenRenderbuffersEXT getGLExtensionFunctions().GenRenderbuffersEXT
+#define glBindRenderbufferEXT getGLExtensionFunctions().BindRenderbufferEXT
+#define glRenderbufferStorageEXT getGLExtensionFunctions().RenderbufferStorageEXT
+#define glDeleteFramebuffersEXT getGLExtensionFunctions().DeleteFramebuffersEXT
+#define glDeleteRenderbuffersEXT getGLExtensionFunctions().DeleteRenderbuffersEXT
+#define glBindFramebufferEXT getGLExtensionFunctions().BindFramebufferEXT
+#define glFramebufferTexture2DEXT getGLExtensionFunctions().FramebufferTexture2DEXT
+#define glFramebufferRenderbufferEXT getGLExtensionFunctions().FramebufferRenderbufferEXT
+#define glCheckFramebufferStatusEXT getGLExtensionFunctions().CheckFramebufferStatusEXT
+
+#define glActiveTexture getGLExtensionFunctions().ActiveTexture
+#define glTexImage3D getGLExtensionFunctions().TexImage3D
+
+#define glGenBuffers getGLExtensionFunctions().GenBuffers
+#define glBindBuffer getGLExtensionFunctions().BindBuffer
+#define glBufferData getGLExtensionFunctions().BufferData
+#define glDeleteBuffers getGLExtensionFunctions().DeleteBuffers
+#define glMapBuffer getGLExtensionFunctions().MapBuffer
+#define glUnmapBuffer getGLExtensionFunctions().UnmapBuffer
+
+#endif
diff --git a/demos/boxes/glshaders.cpp b/demos/boxes/glshaders.cpp
new file mode 100644
index 0000000..b6999a8
--- /dev/null
+++ b/demos/boxes/glshaders.cpp
@@ -0,0 +1,266 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "glshaders.h"
+
+#define GLSHADERS_ASSERT_OPENGL(prefix, assertion, returnStatement)                         \
+if (m_failed || !(assertion)) {                                                             \
+    if (!m_failed) qCritical(prefix ": The necessary OpenGL functions are not available."); \
+    m_failed = true;                                                                        \
+    returnStatement;                                                                        \
+}
+
+
+GLShader::GLShader(const char *data, int size, GLenum shaderType)
+: m_compileError(false), m_failed(false)
+{
+    GLSHADERS_ASSERT_OPENGL("GLShader::GLShader",
+        glCreateShaderObjectARB && glShaderSourceARB && glCompileShaderARB && glGetObjectParameterivARB, return)
+
+    m_shader = glCreateShaderObjectARB(shaderType);
+
+    GLint glSize = size;
+    glShaderSourceARB(m_shader, 1, &data, &glSize);
+    glCompileShaderARB(m_shader);
+    int status;
+    glGetObjectParameterivARB(m_shader, GL_OBJECT_COMPILE_STATUS_ARB, &status);
+    m_compileError = (status != 1);
+}
+
+GLShader::GLShader(const QString& fileName, GLenum shaderType)
+    : m_compileError(false), m_failed(false)
+{
+    GLSHADERS_ASSERT_OPENGL("GLShader::GLShader",
+        glCreateShaderObjectARB && glShaderSourceARB && glCompileShaderARB && glGetObjectParameterivARB, return)
+
+    m_shader = glCreateShaderObjectARB(shaderType);
+
+    QFile file(fileName);
+    if (file.open(QIODevice::ReadOnly)) {
+        QByteArray bytes = file.readAll();
+        GLint size = file.size();
+        const char *p = bytes.data();
+        file.close();
+        glShaderSourceARB(m_shader, 1, &p, &size);
+        glCompileShaderARB(m_shader);
+        int status;
+        glGetObjectParameterivARB(m_shader, GL_OBJECT_COMPILE_STATUS_ARB, &status);
+        m_compileError = (status != 1);
+    } else {
+        m_compileError = true;
+    }
+}
+
+GLShader::~GLShader()
+{
+    GLSHADERS_ASSERT_OPENGL("GLShader::~GLShader", glDeleteObjectARB, return)
+
+    glDeleteObjectARB(m_shader);
+}
+
+QString GLShader::log()
+{
+    GLSHADERS_ASSERT_OPENGL("GLShader::log", glGetObjectParameterivARB
+        && glGetInfoLogARB, return QLatin1String("GLSL not supported."))
+
+    int length;
+    glGetObjectParameterivARB(m_shader, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
+    char *log = new char[length + 1];
+    GLsizei glLength = length;
+    glGetInfoLogARB(m_shader, glLength, &glLength, log);
+    log[glLength] = '\0';
+    QString result(log);
+    delete log;
+    return result;
+}
+
+GLVertexShader::GLVertexShader(const char *data, int size) : GLShader(data, size, GL_VERTEX_SHADER_ARB)
+{
+}
+
+GLVertexShader::GLVertexShader(const QString& fileName) : GLShader(fileName, GL_VERTEX_SHADER_ARB)
+{
+}
+
+GLFragmentShader::GLFragmentShader(const char *data, int size) : GLShader(data, size, GL_FRAGMENT_SHADER_ARB)
+{
+}
+
+GLFragmentShader::GLFragmentShader(const QString& fileName) : GLShader(fileName, GL_FRAGMENT_SHADER_ARB)
+{
+}
+
+GLProgram::GLProgram() : m_linked(false), m_linkError(false), m_failed(false)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::GLProgram", glCreateProgramObjectARB, return)
+
+    m_program = glCreateProgramObjectARB();
+}
+
+GLProgram::~GLProgram()
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::~GLProgram", glDeleteObjectARB, return)
+
+    glDeleteObjectARB(m_program);
+}
+
+void GLProgram::attach(const GLShader &shader)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::attach", glAttachObjectARB, return)
+
+    glAttachObjectARB(m_program, shader.m_shader);
+    m_linked = m_linkError = false;
+}
+
+void GLProgram::detach(const GLShader &shader)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::detach", glDetachObjectARB, return)
+
+    glDetachObjectARB(m_program, shader.m_shader);
+    m_linked = m_linkError = false;
+}
+
+bool GLProgram::failed()
+{
+    if (m_failed || m_linkError)
+        return true;
+
+    if (m_linked)
+        return false;
+
+    GLSHADERS_ASSERT_OPENGL("GLProgram::failed", glLinkProgramARB && glGetObjectParameterivARB, return true)
+
+    glLinkProgramARB(m_program);
+    int status;
+    glGetObjectParameterivARB(m_program, GL_OBJECT_LINK_STATUS_ARB, &status);
+    m_linkError = !(m_linked = (status == 1));
+    return m_linkError;
+}
+
+QString GLProgram::log()
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::log", glGetObjectParameterivARB && glGetInfoLogARB,
+        return QLatin1String("Failed."))
+
+    int length;
+    glGetObjectParameterivARB(m_program, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
+    char *log = new char[length + 1];
+    GLsizei glLength = length;
+    glGetInfoLogARB(m_program, glLength, &glLength, log);
+    log[glLength] = '\0';
+    QString result(log);
+    delete log;
+    return result;
+}
+
+void GLProgram::bind()
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::bind", glUseProgramObjectARB, return)
+
+    if (!failed())
+        glUseProgramObjectARB(m_program);
+}
+
+void GLProgram::unbind()
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::bind", glUseProgramObjectARB, return)
+
+    glUseProgramObjectARB(0);
+}
+
+bool GLProgram::hasParameter(const QString& name)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::hasParameter", glGetUniformLocationARB, return false)
+
+    if (!failed()) {
+        QByteArray asciiName = name.toAscii();
+        return -1 != glGetUniformLocationARB(m_program, asciiName.data());
+    }
+    return false;
+}
+
+void GLProgram::setInt(const QString& name, int value)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::setInt", glGetUniformLocationARB && glUniform1iARB, return)
+
+    if (!failed()) {
+        QByteArray asciiName = name.toAscii();
+        int loc = glGetUniformLocationARB(m_program, asciiName.data());
+	    glUniform1iARB(loc, value);
+    }
+}
+
+void GLProgram::setFloat(const QString& name, float value)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::setFloat", glGetUniformLocationARB && glUniform1fARB, return)
+
+    if (!failed()) {
+        QByteArray asciiName = name.toAscii();
+        int loc = glGetUniformLocationARB(m_program, asciiName.data());
+	    glUniform1fARB(loc, value);
+    }
+}
+
+void GLProgram::setColor(const QString& name, QRgb value)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::setColor", glGetUniformLocationARB && glUniform4fARB, return)
+
+    //qDebug() << "Setting color" << name;
+    if (!failed()) {
+        QByteArray asciiName = name.toAscii();
+        int loc = glGetUniformLocationARB(m_program, asciiName.data());
+        //qDebug() << "Location of" << name << "is" << loc;
+        QColor color(value);
+	    glUniform4fARB(loc, color.redF(), color.greenF(), color.blueF(), color.alphaF());
+    }
+}
+
+void GLProgram::setMatrix(const QString& name, const gfx::Matrix4x4f &mat)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::setMatrix", glGetUniformLocationARB && glUniformMatrix4fvARB, return)
+
+    if (!failed()) {
+        QByteArray asciiName = name.toAscii();
+        int loc = glGetUniformLocationARB(m_program, asciiName.data());
+        //qDebug() << "Location of" << name << "is" << loc;
+	    glUniformMatrix4fvARB(loc, 1, GL_FALSE, mat.bits());
+    }
+}
+\ No newline at end of file
diff --git a/demos/boxes/glshaders.h b/demos/boxes/glshaders.h
new file mode 100644
index 0000000..2b6209a
--- /dev/null
+++ b/demos/boxes/glshaders.h
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLSHADERS_H
+#define GLSHADERS_H
+
+//#include <GL/glew.h>
+#include "glextensions.h"
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include "vector.h"
+
+class GLShader
+{
+public:
+    friend class GLProgram;
+    virtual ~GLShader();
+    bool failed() const {return m_failed;}
+    QString log();
+protected:
+    GLShader(const char *data, int size, GLenum shaderType);
+    GLShader(const QString& fileName, GLenum shaderType);
+
+    GLhandleARB m_shader;
+    bool m_compileError;
+    bool m_failed;
+};
+
+class GLVertexShader : public GLShader
+{
+public:
+    GLVertexShader(const char *data, int size);
+    GLVertexShader(const QString& fileName);
+};
+
+class GLFragmentShader : public GLShader
+{
+public:
+    GLFragmentShader(const char *data, int size);
+    GLFragmentShader(const QString& fileName);
+};
+
+class GLProgram
+{
+public:
+    GLProgram();
+    ~GLProgram();
+    void attach(const GLShader &shader);
+    void detach(const GLShader &shader);
+    void bind();
+    void unbind();
+    bool failed();
+    QString log();
+    bool hasParameter(const QString& name);
+    // use program before setting values
+    void setInt(const QString& name, int value);
+    void setFloat(const QString& name, float value);
+    void setColor(const QString& name, QRgb value);
+    void setMatrix(const QString& name, const gfx::Matrix4x4f &mat);
+    // TODO: add a bunch of set-functions for different types.
+private:
+    GLhandleARB m_program;
+    bool m_linked;
+    bool m_linkError;
+    bool m_failed;
+};
+
+#endif
diff --git a/demos/boxes/gltrianglemesh.h b/demos/boxes/gltrianglemesh.h
new file mode 100644
index 0000000..c06ce90
--- /dev/null
+++ b/demos/boxes/gltrianglemesh.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLTRIANGLEMESH_H
+#define GLTRIANGLEMESH_H
+
+//#include <GL/glew.h>
+#include "glextensions.h"
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include "glbuffers.h"
+
+template<class TVertex, class TIndex>
+class GLTriangleMesh
+{
+public:
+    GLTriangleMesh(int vertexCount, int indexCount) : m_vb(vertexCount), m_ib(indexCount)
+    {
+    }
+
+    virtual ~GLTriangleMesh()
+    {
+    }
+
+    virtual void draw()
+    {
+        if (failed())
+            return;
+
+        int type = GL_UNSIGNED_INT;
+        if (sizeof(TIndex) == sizeof(char)) type = GL_UNSIGNED_BYTE;
+        if (sizeof(TIndex) == sizeof(short)) type = GL_UNSIGNED_SHORT;
+
+        m_vb.bind();
+        m_ib.bind();
+        glDrawElements(GL_TRIANGLES, m_ib.length(), type, BUFFER_OFFSET(0));
+        m_vb.unbind();
+        m_ib.unbind();
+    }
+
+    bool failed()
+    {
+        return m_vb.failed() || m_ib.failed();
+    }
+protected:
+    GLVertexBuffer<TVertex> m_vb;
+    GLIndexBuffer<TIndex> m_ib;
+};
+
+
+#endif
diff --git a/demos/boxes/granite.fsh b/demos/boxes/granite.fsh
new file mode 100644
index 0000000..9b75d1d
--- /dev/null
+++ b/demos/boxes/granite.fsh
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform sampler3D noise;
+
+//const vec4 graniteColors[3] = {vec4(0.0, 0.0, 0.0, 1), vec4(0.30, 0.15, 0.10, 1), vec4(0.80, 0.70, 0.75, 1)};
+uniform vec4 graniteColors[3];
+
+float steep(float x)
+{
+    return clamp(5.0 * x - 2.0, 0.0, 1.0);
+}
+
+void main()
+{
+    vec2 turbulence = vec2(0, 0);
+    float scale = 1.0;
+    for (int i = 0; i < 4; ++i) {
+        turbulence += scale * (texture3D(noise, gl_TexCoord[1].xyz / scale).xy - 0.5);
+        scale *= 0.5;
+    }
+
+    vec3 N = normalize(normal);
+    // assume directional light
+
+    gl_MaterialParameters M = gl_FrontMaterial;
+
+    float NdotL = dot(N, lightDirection.xyz);
+    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
+
+    vec4 unlitColor = mix(graniteColors[1], mix(graniteColors[0], graniteColors[2], steep(0.5 + turbulence.y)), 4.0 * abs(turbulence.x));
+    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
+                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
+}
diff --git a/demos/boxes/main.cpp b/demos/boxes/main.cpp
new file mode 100644
index 0000000..10bbde1
--- /dev/null
+++ b/demos/boxes/main.cpp
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//#include <GL/glew.h>
+#include "glextensions.h"
+
+#include "scene.h"
+
+#include <QtGui>
+#include <QGLWidget>
+
+class GraphicsView : public QGraphicsView
+{
+public:
+    GraphicsView()
+    {
+        setWindowTitle(tr("Boxes"));
+        setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+        //setRenderHints(QPainter::SmoothPixmapTransform);
+    }
+
+protected:
+    void resizeEvent(QResizeEvent *event) {
+        if (scene())
+            scene()->setSceneRect(QRect(QPoint(0, 0), event->size()));
+        QGraphicsView::resizeEvent(event);
+    }
+};
+
+inline bool matchString(const char *extensionString, const char *subString)
+{
+    int subStringLength = strlen(subString);
+    return (strncmp(extensionString, subString, subStringLength) == 0) 
+        && ((extensionString[subStringLength] == ' ') || (extensionString[subStringLength] == '\0'));
+}
+
+bool necessaryExtensionsSupported()
+{
+    const char *extensionString = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS));
+    const char *p = extensionString;
+
+    const int GL_EXT_FBO = 1;
+    const int GL_ARB_VS = 2;
+    const int GL_ARB_FS = 4;
+    const int GL_ARB_SO = 8;
+    int extensions = 0;
+
+    while (*p) {
+        if (matchString(p, "GL_EXT_framebuffer_object"))
+            extensions |= GL_EXT_FBO;
+        else if (matchString(p, "GL_ARB_vertex_shader"))
+            extensions |= GL_ARB_VS;
+        else if (matchString(p, "GL_ARB_fragment_shader"))
+            extensions |= GL_ARB_FS;
+        else if (matchString(p, "GL_ARB_shader_objects"))
+            extensions |= GL_ARB_SO;
+        while ((*p != ' ') && (*p != '\0'))
+            ++p;
+        if (*p == ' ')
+            ++p;
+    }
+    return (extensions == 15);
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    if ((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_5) == 0) {
+        QMessageBox::critical(0, "OpenGL features missing",
+            "OpenGL version 1.5 or higher is required to run this demo.\n"
+            "The program will now exit.");
+        return -1;
+    }
+
+    int maxTextureSize = 1024;
+    QGLWidget *widget = new QGLWidget(QGLFormat(QGL::SampleBuffers));
+    widget->makeCurrent();
+
+    if (!necessaryExtensionsSupported()) {
+        QMessageBox::critical(0, "OpenGL features missing",
+            "The OpenGL extensions required to run this demo are missing.\n"
+            "The program will now exit.");
+        delete widget;
+        return -2;
+    }
+
+    // Check if all the necessary functions are resolved.
+    if (!getGLExtensionFunctions().resolve(widget->context())) {
+        QMessageBox::critical(0, "OpenGL features missing",
+            "Failed to resolve OpenGL functions required to run this demo.\n"
+            "The program will now exit.");
+        delete widget;
+        return -3;
+    }
+
+    // TODO: Make conditional for final release
+    QMessageBox::information(0, "For your information",
+        "This demo can be GPU and CPU intensive and may\n"
+        "work poorly or not at all on your system.");
+
+    GraphicsView view;
+    view.setViewport(widget);
+    view.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    widget->makeCurrent(); // The current context must be set before calling Scene's constructor
+    view.setScene(new Scene(1024, 768, maxTextureSize));
+    view.show();
+
+    return app.exec();
+}
+
diff --git a/demos/boxes/marble.fsh b/demos/boxes/marble.fsh
new file mode 100644
index 0000000..62d3c9f
--- /dev/null
+++ b/demos/boxes/marble.fsh
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform sampler3D noise;
+
+//const vec4 marbleColors[2] = {vec4(0.9, 0.9, 0.9, 1), vec4(0.6, 0.5, 0.5, 1)};
+uniform vec4 marbleColors[2];
+
+void main()
+{
+    float turbulence = 0.0;
+    float scale = 1.0;
+    for (int i = 0; i < 4; ++i) {
+        turbulence += scale * (texture3D(noise, 0.125 * gl_TexCoord[1].xyz / scale).x - 0.5);
+        scale *= 0.5;
+    }
+
+    vec3 N = normalize(normal);
+    // assume directional light
+
+    gl_MaterialParameters M = gl_FrontMaterial;
+
+    float NdotL = dot(N, lightDirection.xyz);
+    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
+
+    vec4 unlitColor = mix(marbleColors[0], marbleColors[1], exp(-4.0 * abs(turbulence)));
+    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
+                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
+}
diff --git a/demos/boxes/parameters.par b/demos/boxes/parameters.par
new file mode 100644
index 0000000..50e2073
--- /dev/null
+++ b/demos/boxes/parameters.par
@@ -0,0 +1,5 @@
+color basicColor ff0e3d0e
+color woodColors ff5e3d33 ffcc9966
+float woodTubulence 0.1
+color graniteColors ff000000 ff4d261a ffccb3bf
+color marbleColors ffe6e6e6 ff998080
diff --git a/demos/boxes/qt-logo.jpg b/demos/boxes/qt-logo.jpg
new file mode 100644
index 0000000..4014b46
--- /dev/null
+++ b/demos/boxes/qt-logo.jpg
diff --git a/demos/boxes/qt-logo.png b/demos/boxes/qt-logo.png
new file mode 100644
index 0000000..7d3e97e
--- /dev/null
+++ b/demos/boxes/qt-logo.png
diff --git a/demos/boxes/qtbox.cpp b/demos/boxes/qtbox.cpp
new file mode 100644
index 0000000..0607698
--- /dev/null
+++ b/demos/boxes/qtbox.cpp
@@ -0,0 +1,469 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtbox.h"
+
+const qreal ROTATE_SPEED_X = 30.0 / 1000.0;
+const qreal ROTATE_SPEED_Y = 20.0 / 1000.0;
+const qreal ROTATE_SPEED_Z = 40.0 / 1000.0;
+const int MAX_ITEM_SIZE = 512;
+const int MIN_ITEM_SIZE = 16;
+
+//============================================================================//
+//                                  ItemBase                                  //
+//============================================================================//
+
+ItemBase::ItemBase(int size, int x, int y) : m_size(size), m_isResizing(false)
+{
+    setFlag(QGraphicsItem::ItemIsMovable, true);
+    setFlag(QGraphicsItem::ItemIsSelectable, true);
+    setFlag(QGraphicsItem::ItemIsFocusable, true);
+    setAcceptHoverEvents(true);
+    setPos(x, y);
+    m_startTime = QTime::currentTime();
+}
+
+ItemBase::~ItemBase()
+{
+}
+
+QRectF ItemBase::boundingRect() const
+{
+    return QRectF(-m_size / 2, -m_size / 2, m_size, m_size);
+}
+
+void ItemBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *)
+{
+    if (option->state & QStyle::State_Selected) {
+        painter->setRenderHint(QPainter::Antialiasing, true);
+        if (option->state & QStyle::State_HasFocus)
+            painter->setPen(Qt::yellow);
+        else
+            painter->setPen(Qt::white);
+        painter->drawRect(boundingRect());
+
+        painter->drawLine(m_size / 2 - 9, m_size / 2, m_size / 2, m_size / 2 - 9);
+        painter->drawLine(m_size / 2 - 6, m_size / 2, m_size / 2, m_size / 2 - 6);
+        painter->drawLine(m_size / 2 - 3, m_size / 2, m_size / 2, m_size / 2 - 3);
+
+        painter->setRenderHint(QPainter::Antialiasing, false);
+    }
+}
+
+void ItemBase::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
+{
+    if (!isSelected() && scene()) {
+        scene()->clearSelection();
+        setSelected(true);
+    }
+
+    QMenu menu;
+    QAction *delAction = menu.addAction("Delete");
+    QAction *newAction = menu.addAction("New");
+    QAction *growAction = menu.addAction("Grow");
+    QAction *shrinkAction = menu.addAction("Shrink");
+
+    QAction *selectedAction = menu.exec(event->screenPos());
+
+    if (selectedAction == delAction)
+        deleteSelectedItems(scene());
+    else if (selectedAction == newAction)
+        duplicateSelectedItems(scene());
+    else if (selectedAction == growAction)
+        growSelectedItems(scene());
+    else if (selectedAction == shrinkAction)
+        shrinkSelectedItems(scene());
+}
+
+void ItemBase::duplicateSelectedItems(QGraphicsScene *scene)
+{
+    if (!scene)
+        return;
+
+    QList<QGraphicsItem *> selected;
+    selected = scene->selectedItems();
+
+    foreach (QGraphicsItem *item, selected) {
+        ItemBase *itemBase = dynamic_cast<ItemBase *>(item);
+        if (itemBase)
+            scene->addItem(itemBase->createNew(itemBase->m_size, itemBase->pos().x() + itemBase->m_size, itemBase->pos().y()));
+    }
+}
+
+void ItemBase::deleteSelectedItems(QGraphicsScene *scene)
+{
+    if (!scene)
+        return;
+
+    QList<QGraphicsItem *> selected;
+    selected = scene->selectedItems();
+
+    foreach (QGraphicsItem *item, selected) {
+        ItemBase *itemBase = dynamic_cast<ItemBase *>(item);
+        if (itemBase)
+            delete itemBase;
+    }
+}
+
+void ItemBase::growSelectedItems(QGraphicsScene *scene)
+{
+    if (!scene)
+        return;
+
+    QList<QGraphicsItem *> selected;
+    selected = scene->selectedItems();
+
+    foreach (QGraphicsItem *item, selected) {
+        ItemBase *itemBase = dynamic_cast<ItemBase *>(item);
+        if (itemBase) {
+            itemBase->prepareGeometryChange();
+            itemBase->m_size *= 2;
+            if (itemBase->m_size > MAX_ITEM_SIZE)
+                itemBase->m_size = MAX_ITEM_SIZE;
+        }
+    }
+}
+
+void ItemBase::shrinkSelectedItems(QGraphicsScene *scene)
+{
+    if (!scene)
+        return;
+
+    QList<QGraphicsItem *> selected;
+    selected = scene->selectedItems();
+
+    foreach (QGraphicsItem *item, selected) {
+        ItemBase *itemBase = dynamic_cast<ItemBase *>(item);
+        if (itemBase) {
+            itemBase->prepareGeometryChange();
+            itemBase->m_size /= 2;
+            if (itemBase->m_size < MIN_ITEM_SIZE)
+                itemBase->m_size = MIN_ITEM_SIZE;
+        }
+    }
+}
+
+void ItemBase::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (m_isResizing) {
+        int dx = int(2.0 * event->pos().x());
+        int dy = int(2.0 * event->pos().y());
+        prepareGeometryChange();
+        m_size = (dx > dy ? dx : dy);
+        if (m_size < MIN_ITEM_SIZE)
+            m_size = MIN_ITEM_SIZE;
+        else if (m_size > MAX_ITEM_SIZE)
+            m_size = MAX_ITEM_SIZE;
+    } else {
+        QGraphicsItem::mouseMoveEvent(event);
+    }
+}
+
+void ItemBase::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
+{
+    if (m_isResizing || (isInResizeArea(event->pos()) && isSelected()))
+        setCursor(Qt::SizeFDiagCursor);
+    else
+        setCursor(Qt::ArrowCursor);
+    QGraphicsItem::hoverMoveEvent(event);
+}
+
+void ItemBase::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    static qreal z = 0.0;
+    setZValue(z += 1.0);
+    if (event->button() == Qt::LeftButton && isInResizeArea(event->pos())) {
+        m_isResizing = true;
+    } else {
+        QGraphicsItem::mousePressEvent(event);
+    }
+}
+
+void ItemBase::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton && m_isResizing) {
+        m_isResizing = false;
+    } else {
+        QGraphicsItem::mouseReleaseEvent(event);
+    }
+}
+
+void ItemBase::keyPressEvent(QKeyEvent *event)
+{
+    switch (event->key()) {
+    case Qt::Key_Delete:
+        deleteSelectedItems(scene());
+        break;
+    case Qt::Key_Insert:
+        duplicateSelectedItems(scene());
+        break;
+    case Qt::Key_Plus:
+        growSelectedItems(scene());
+        break;
+    case Qt::Key_Minus:
+        shrinkSelectedItems(scene());
+        break;
+    default:
+        QGraphicsItem::keyPressEvent(event);
+        break;
+    }
+}
+
+void ItemBase::wheelEvent(QGraphicsSceneWheelEvent *event)
+{
+    prepareGeometryChange();
+    m_size = int(m_size * exp(-event->delta() / 600.0));
+    if (m_size > MAX_ITEM_SIZE)
+        m_size = MAX_ITEM_SIZE;
+    else if (m_size < MIN_ITEM_SIZE)
+        m_size = MIN_ITEM_SIZE;
+}
+
+bool ItemBase::isInResizeArea(const QPointF &pos)
+{
+    return (-pos.y() < pos.x() - m_size + 9);
+}
+
+//============================================================================//
+//                                    QtBox                                   //
+//============================================================================//
+
+QtBox::QtBox(int size, int x, int y) : ItemBase(size, x, y), m_texture(0)
+{
+    for (int i = 0; i < 8; ++i) {
+        m_vertices[i][0] = (i & 1 ? 0.5f : -0.5f);
+        m_vertices[i][1] = (i & 2 ? 0.5f : -0.5f);
+        m_vertices[i][2] = (i & 4 ? 0.5f : -0.5f);
+    }
+    for (int i = 0; i < 4; ++i) {
+        m_texCoords[i][0] = (i & 1 ? 1.0f : 0.0f);
+        m_texCoords[i][1] = (i & 2 ? 1.0f : 0.0f);
+    }
+    memset(m_normals, 0, sizeof(m_normals));
+    for (int i = 0; i < 3; ++i) {
+        m_normals[2 * i + 0][i] = -1.0f;
+        m_normals[2 * i + 1][i] = 1.0f;
+    }
+}
+
+QtBox::~QtBox()
+{
+    if (m_texture)
+        delete m_texture;
+}
+
+ItemBase *QtBox::createNew(int size, int x, int y)
+{
+    return new QtBox(size, x, y);
+}
+
+void QtBox::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    QRectF rect = boundingRect().translated(pos());
+    float width = float(painter->device()->width());
+    float height = float(painter->device()->height());
+
+    float left = 2.0f * float(rect.left()) / width - 1.0f;
+    float right = 2.0f * float(rect.right()) / width - 1.0f;
+    float top = 1.0f - 2.0f * float(rect.top()) / height;
+    float bottom = 1.0f - 2.0f * float(rect.bottom()) / height;
+    float moveToRectMatrix[] = {
+        0.5f * (right - left), 0.0f, 0.0f, 0.0f,
+        0.0f, 0.5f * (bottom - top), 0.0f, 0.0f,
+        0.0f, 0.0f, 1.0f, 0.0f,
+        0.5f * (right + left), 0.5f * (bottom + top), 0.0f, 1.0f
+    };
+
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadMatrixf(moveToRectMatrix);
+    gluPerspective(60.0, 1.0, 0.01, 10.0);
+
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glLoadIdentity();
+
+    //glEnable(GL_DEPTH_TEST);
+    glEnable(GL_CULL_FACE);
+    glEnable(GL_LIGHTING);
+    glEnable(GL_COLOR_MATERIAL);
+    glEnable(GL_NORMALIZE);
+
+    if(m_texture == 0)
+        m_texture = new GLTexture2D(":/res/boxes/qt-logo.jpg", 64, 64);
+    m_texture->bind();
+    glEnable(GL_TEXTURE_2D);
+
+    glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+    float lightColour[] = {1.0f, 1.0f, 1.0f, 1.0f};
+    float lightDir[] = {0.0f, 0.0f, 1.0f, 0.0f};
+    glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColour);
+    glLightfv(GL_LIGHT0, GL_POSITION, lightDir);
+    glEnable(GL_LIGHT0);
+
+    glTranslatef(0.0f, 0.0f, -1.5f);
+    glRotatef(ROTATE_SPEED_X * m_startTime.msecsTo(QTime::currentTime()), 1.0f, 0.0f, 0.0f);
+    glRotatef(ROTATE_SPEED_Y * m_startTime.msecsTo(QTime::currentTime()), 0.0f, 1.0f, 0.0f);
+    glRotatef(ROTATE_SPEED_Z * m_startTime.msecsTo(QTime::currentTime()), 0.0f, 0.0f, 1.0f);
+    int dt = m_startTime.msecsTo(QTime::currentTime());
+    if (dt < 500)
+        glScalef(dt / 500.0f, dt / 500.0f, dt / 500.0f);
+
+    for (int dir = 0; dir < 3; ++dir) {
+        glColor4f(1.0f, 1.0f, 1.0f, 1.0);
+
+        glBegin(GL_TRIANGLE_STRIP);
+        glNormal3fv(m_normals[2 * dir + 0].bits());
+        for (int i = 0; i < 2; ++i) {
+            for (int j = 0; j < 2; ++j) {
+                glTexCoord2fv(m_texCoords[(j << 1) | i].bits());
+                glVertex3fv(m_vertices[(i << ((dir + 2) % 3)) | (j << ((dir + 1) % 3))].bits());
+            }
+        }
+        glEnd();
+
+        glBegin(GL_TRIANGLE_STRIP);
+        glNormal3fv(m_normals[2 * dir + 1].bits());
+        for (int i = 0; i < 2; ++i) {
+            for (int j = 0; j < 2; ++j) {
+                glTexCoord2fv(m_texCoords[(j << 1) | i].bits());
+                glVertex3fv(m_vertices[(1 << dir) | (i << ((dir + 1) % 3)) | (j << ((dir + 2) % 3))].bits());
+            }
+        }
+        glEnd();
+    }
+    m_texture->unbind();
+
+    //glDisable(GL_DEPTH_TEST);
+    glDisable(GL_CULL_FACE);
+    glDisable(GL_LIGHTING);
+    glDisable(GL_COLOR_MATERIAL);
+    glDisable(GL_TEXTURE_2D);
+    glDisable(GL_LIGHT0);
+    glDisable(GL_NORMALIZE);
+
+    glPopMatrix();
+
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+
+    ItemBase::paint(painter, option, widget);
+}
+
+//============================================================================//
+//                                 CircleItem                                 //
+//============================================================================//
+
+CircleItem::CircleItem(int size, int x, int y) : ItemBase(size, x, y)
+{
+     m_color = QColor::fromHsv(rand() % 360, 255, 255);
+}
+
+void CircleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    int dt = m_startTime.msecsTo(QTime::currentTime());
+
+    qreal r0 = 0.5 * m_size * (1.0 - exp(-0.001 * ((dt + 3800) % 4000)));
+    qreal r1 = 0.5 * m_size * (1.0 - exp(-0.001 * ((dt + 0) % 4000)));
+    qreal r2 = 0.5 * m_size * (1.0 - exp(-0.001 * ((dt + 1800) % 4000)));
+    qreal r3 = 0.5 * m_size * (1.0 - exp(-0.001 * ((dt + 2000) % 4000)));
+
+    if (r0 > r1)
+        r0 = 0.0;
+    if (r2 > r3)
+        r2 = 0.0;
+
+    QPainterPath path;
+    path.moveTo(r1, 0.0);
+    path.arcTo(-r1, -r1, 2 * r1, 2 * r1, 0.0, 360.0);
+    path.lineTo(r0, 0.0);
+    path.arcTo(-r0, -r0, 2 * r0, 2 * r0, 0.0, -360.0);
+    path.closeSubpath();
+    path.moveTo(r3, 0.0);
+    path.arcTo(-r3, -r3, 2 * r3, 2 * r3, 0.0, 360.0);
+    path.lineTo(r0, 0.0);
+    path.arcTo(-r2, -r2, 2 * r2, 2 * r2, 0.0, -360.0);
+    path.closeSubpath();
+    painter->setRenderHint(QPainter::Antialiasing, true);
+    painter->setBrush(QBrush(m_color));
+    painter->setPen(Qt::NoPen);
+    painter->drawPath(path);
+    painter->setBrush(Qt::NoBrush);
+    painter->setPen(Qt::SolidLine);
+    painter->setRenderHint(QPainter::Antialiasing, false);
+
+    ItemBase::paint(painter, option, widget);
+}
+
+ItemBase *CircleItem::createNew(int size, int x, int y)
+{
+    return new CircleItem(size, x, y);
+}
+
+//============================================================================//
+//                                 SquareItem                                 //
+//============================================================================//
+
+SquareItem::SquareItem(int size, int x, int y) : ItemBase(size, x, y)
+{
+    m_image = QPixmap(":/res/boxes/square.jpg");
+}
+
+void SquareItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    int dt = m_startTime.msecsTo(QTime::currentTime());
+    QTransform oldTransform = painter->worldTransform();
+    int dtMod = dt % 2000;
+    qreal amp = 0.002 * (dtMod < 1000 ? dtMod : 2000 - dtMod) - 1.0;
+
+    qreal scale = 0.6 + 0.2 * amp * amp;
+    painter->setWorldTransform(QTransform().rotate(15.0 * amp).scale(scale, scale), true);
+
+    painter->drawPixmap(-m_size / 2, -m_size / 2, m_size, m_size, m_image);
+
+    painter->setWorldTransform(oldTransform, false);
+    ItemBase::paint(painter, option, widget);
+}
+
+ItemBase *SquareItem::createNew(int size, int x, int y)
+{
+    return new SquareItem(size, x, y);
+}
diff --git a/demos/boxes/qtbox.h b/demos/boxes/qtbox.h
new file mode 100644
index 0000000..aae8256
--- /dev/null
+++ b/demos/boxes/qtbox.h
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTBOX_H
+#define QTBOX_H
+
+#include <QtGui>
+
+#include "vector.h"
+#include "glbuffers.h"
+
+class ItemBase : public QObject, public QGraphicsItem
+{
+    Q_OBJECT
+public:
+    ItemBase(int size, int x, int y);
+    virtual ~ItemBase();
+    virtual QRectF boundingRect() const;
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+protected:
+    virtual ItemBase *createNew(int size, int x, int y) = 0;
+    virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
+    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    virtual void keyPressEvent(QKeyEvent *event);
+    virtual void wheelEvent(QGraphicsSceneWheelEvent *event);
+    bool isInResizeArea(const QPointF &pos);
+
+    static void duplicateSelectedItems(QGraphicsScene *scene);
+    static void deleteSelectedItems(QGraphicsScene *scene);
+    static void growSelectedItems(QGraphicsScene *scene);
+    static void shrinkSelectedItems(QGraphicsScene *scene);
+
+    int m_size;
+    QTime m_startTime;
+    bool m_isResizing;
+};
+
+class QtBox : public ItemBase
+{
+public:
+    QtBox(int size, int x, int y);
+    virtual ~QtBox();
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+protected:
+    virtual ItemBase *createNew(int size, int x, int y);
+private:
+    gfx::Vector3f m_vertices[8];
+    gfx::Vector2f m_texCoords[4];
+    gfx::Vector3f m_normals[6];
+    GLTexture *m_texture;
+};
+
+class CircleItem : public ItemBase
+{
+public:
+    CircleItem(int size, int x, int y);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+protected:
+    virtual ItemBase *createNew(int size, int x, int y);
+
+    QColor m_color;
+};
+
+class SquareItem : public ItemBase
+{
+public:
+    SquareItem(int size, int x, int y);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+protected:
+    virtual ItemBase *createNew(int size, int x, int y);
+
+    QPixmap m_image;
+};
+
+#endif
diff --git a/demos/boxes/reflection.fsh b/demos/boxes/reflection.fsh
new file mode 100644
index 0000000..d5807ee
--- /dev/null
+++ b/demos/boxes/reflection.fsh
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform samplerCube env;
+uniform mat4 view;
+
+void main()
+{
+    vec3 N = normalize(normal);
+    vec3 R = 2.0 * dot(-position, N) * N + position;
+    gl_FragColor = textureCube(env, R * mat3(view[0].xyz, view[1].xyz, view[2].xyz));
+}
diff --git a/demos/boxes/refraction.fsh b/demos/boxes/refraction.fsh
new file mode 100644
index 0000000..f91c24d
--- /dev/null
+++ b/demos/boxes/refraction.fsh
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform samplerCube env;
+uniform mat4 view;
+
+// Arrays don't work here on glsl < 120, apparently.
+//const float coeffs[6] = float[6](1.0/2.0, 1.0/2.1, 1.0/2.2, 1.0/2.3, 1.0/2.4, 1.0/2.5);
+float coeffs(int i)
+{
+	return 1.0 / (2.0 + 0.1 * float(i));
+}
+
+void main()
+{
+    vec3 N = normalize(normal);
+    vec3 I = -normalize(position);
+    float IdotN = dot(I, N);
+    float scales[6];
+    vec3 C[6];
+    for (int i = 0; i < 6; ++i) {
+        scales[i] = (IdotN - sqrt(1.0 - coeffs(i) + coeffs(i) * (IdotN * IdotN)));
+        C[i] = textureCube(env, (-I + coeffs(i) * N) * mat3(view[0].xyz, view[1].xyz, view[2].xyz)).xyz;
+    }
+
+    gl_FragColor = 0.25 * vec4(C[5].x + 2.0*C[0].x + C[1].x, C[1].y + 2.0*C[2].y + C[3].y,
+                   C[3].z + 2.0*C[4].z + C[5].z, 4.0);
+}
diff --git a/demos/boxes/roundedbox.cpp b/demos/boxes/roundedbox.cpp
new file mode 100644
index 0000000..f238da2
--- /dev/null
+++ b/demos/boxes/roundedbox.cpp
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "roundedbox.h"
+
+//============================================================================//
+//                                P3T2N3Vertex                                //
+//============================================================================//
+
+VertexDescription P3T2N3Vertex::description[] = {
+    {VertexDescription::Position, GL_FLOAT, SIZE_OF_MEMBER(P3T2N3Vertex, position) / sizeof(float), offsetof(P3T2N3Vertex, position), 0},
+    {VertexDescription::TexCoord, GL_FLOAT, SIZE_OF_MEMBER(P3T2N3Vertex, texCoord) / sizeof(float), offsetof(P3T2N3Vertex, texCoord), 0},
+    {VertexDescription::Normal, GL_FLOAT, SIZE_OF_MEMBER(P3T2N3Vertex, normal) / sizeof(float), offsetof(P3T2N3Vertex, normal), 0},
+    {VertexDescription::Null, 0, 0, 0, 0},
+};
+
+//============================================================================//
+//                                GLRoundedBox                                //
+//============================================================================//
+
+float lerp(float a, float b, float t)
+{
+    return a * (1.0f - t) + b * t;
+}
+
+GLRoundedBox::GLRoundedBox(float r, float scale, int n)
+    : GLTriangleMesh<P3T2N3Vertex, unsigned short>((n+2)*(n+3)*4, (n+1)*(n+1)*24+36+72*(n+1))
+{
+    int vidx = 0, iidx = 0;
+    int vertexCountPerCorner = (n + 2) * (n + 3) / 2;
+
+    P3T2N3Vertex *vp = m_vb.lock();
+    unsigned short *ip = m_ib.lock();
+
+    if (!vp || !ip) {
+        qWarning("GLRoundedBox::GLRoundedBox: Failed to lock vertex buffer and/or index buffer.");
+        m_ib.unlock();
+        m_vb.unlock();
+        return;
+    }
+
+    for (int corner = 0; corner < 8; ++corner) {
+        gfx::Vector3f centre;
+        centre[0] = (corner & 1 ? 1.0f : -1.0f);
+        centre[1] = (corner & 2 ? 1.0f : -1.0f);
+        centre[2] = (corner & 4 ? 1.0f : -1.0f);
+        int winding = (corner & 1) ^ ((corner >> 1) & 1) ^ (corner >> 2);
+        int offsX = ((corner ^ 1) - corner) * vertexCountPerCorner;
+        int offsY = ((corner ^ 2) - corner) * vertexCountPerCorner;
+        int offsZ = ((corner ^ 4) - corner) * vertexCountPerCorner;
+
+        // Face polygons
+        if (winding) {
+            ip[iidx++] = vidx;
+            ip[iidx++] = vidx + offsX;
+            ip[iidx++] = vidx + offsY;
+
+            ip[iidx++] = vidx + vertexCountPerCorner - n - 2;
+            ip[iidx++] = vidx + vertexCountPerCorner - n - 2 + offsY;
+            ip[iidx++] = vidx + vertexCountPerCorner - n - 2 + offsZ;
+
+            ip[iidx++] = vidx + vertexCountPerCorner - 1;
+            ip[iidx++] = vidx + vertexCountPerCorner - 1 + offsZ;
+            ip[iidx++] = vidx + vertexCountPerCorner - 1 + offsX;
+        }
+
+        for (int i = 0; i < n + 2; ++i) {
+
+            // Edge polygons
+            if (winding && i < n + 1) {
+                ip[iidx++] = vidx + i + 1;
+                ip[iidx++] = vidx;
+                ip[iidx++] = vidx + offsY + i + 1;
+                ip[iidx++] = vidx + offsY;
+                ip[iidx++] = vidx + offsY + i + 1;
+                ip[iidx++] = vidx;
+
+                ip[iidx++] = vidx + i;
+                ip[iidx++] = vidx + 2 * i + 2;
+                ip[iidx++] = vidx + i + offsX;
+                ip[iidx++] = vidx + 2 * i + offsX + 2;
+                ip[iidx++] = vidx + i + offsX;
+                ip[iidx++] = vidx + 2 * i + 2;
+
+                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 1 - i;
+                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 2 - i;
+                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 1 - i + offsZ;
+                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 2 - i + offsZ;
+                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 1 - i + offsZ;
+                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 2 - i;
+            }
+
+            for (int j = 0; j <= i; ++j) {
+                gfx::Vector3f normal = gfx::Vector3f::vector(i - j, j, n + 1 - i).normalized();
+                gfx::Vector3f pos = centre * (0.5f - r + r * normal);
+
+                vp[vidx].position = scale * pos;
+                vp[vidx].normal = centre * normal;
+                vp[vidx].texCoord = gfx::Vector2f::vector(pos[0], pos[1]) + 0.5f;
+
+                // Corner polygons
+                if (i < n + 1) {
+                    ip[iidx++] = vidx;
+                    ip[iidx++] = vidx + i + 2 - winding;
+                    ip[iidx++] = vidx + i + 1 + winding;
+                }
+                if (i < n) {
+                    ip[iidx++] = vidx + i + 1 + winding;
+                    ip[iidx++] = vidx + i + 2 - winding;
+                    ip[iidx++] = vidx + 2 * i + 4;
+                }
+
+                ++vidx;
+            }
+        }
+
+    }
+
+    m_ib.unlock();
+    m_vb.unlock();
+}
+
diff --git a/demos/boxes/roundedbox.h b/demos/boxes/roundedbox.h
new file mode 100644
index 0000000..b934ade
--- /dev/null
+++ b/demos/boxes/roundedbox.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ROUNDEDBOX_H
+#define ROUNDEDBOX_H
+
+//#include <GL/glew.h>
+#include "glextensions.h"
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include "gltrianglemesh.h"
+#include "vector.h"
+#include "glbuffers.h"
+
+struct P3T2N3Vertex
+{
+    gfx::Vector3f position;
+    gfx::Vector2f texCoord;
+    gfx::Vector3f normal;
+    static VertexDescription description[];
+};
+
+class GLRoundedBox : public GLTriangleMesh<P3T2N3Vertex, unsigned short>
+{
+public:
+    // 0 < r < 0.5, 0 <= n <= 125
+    GLRoundedBox(float r = 0.25f, float scale = 1.0f, int n = 10);
+};
+
+
+#endif
diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp
new file mode 100644
index 0000000..1040e17
--- /dev/null
+++ b/demos/boxes/scene.cpp
@@ -0,0 +1,1057 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "scene.h"
+
+#include "3rdparty/fbm.h"
+
+void checkGLErrors(const QString& prefix)
+{
+    switch (glGetError()) {
+    case GL_NO_ERROR:
+        //qDebug() << prefix << tr("No error.");
+        break;
+    case GL_INVALID_ENUM:
+        qDebug() << prefix << QObject::tr("Invalid enum.");
+        break;
+    case GL_INVALID_VALUE:
+        qDebug() << prefix << QObject::tr("Invalid value.");
+        break;
+    case GL_INVALID_OPERATION:
+        qDebug() << prefix << QObject::tr("Invalid operation.");
+        break;
+    case GL_STACK_OVERFLOW:
+        qDebug() << prefix << QObject::tr("Stack overflow.");
+        break;
+    case GL_STACK_UNDERFLOW:
+        qDebug() << prefix << QObject::tr("Stack underflow.");
+        break;
+    case GL_OUT_OF_MEMORY:
+        qDebug() << prefix << QObject::tr("Out of memory.");
+        break;
+    default:
+        qDebug() << prefix << QObject::tr("Unknown error.");
+        break;
+    }
+}
+
+//============================================================================//
+//                                  ColorEdit                                 //
+//============================================================================//
+
+ColorEdit::ColorEdit(QRgb initialColor, int id)
+    : m_color(initialColor), m_id(id)
+{
+    QHBoxLayout *layout = new QHBoxLayout;
+    setLayout(layout);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    m_lineEdit = new QLineEdit(QString::number(m_color, 16));
+    layout->addWidget(m_lineEdit);
+
+    m_button = new QFrame;
+    QPalette palette = m_button->palette();
+    palette.setColor(QPalette::Window, QColor(m_color));
+    m_button->setPalette(palette);
+    m_button->setAutoFillBackground(true);
+    m_button->setMinimumSize(32, 0);
+    m_button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
+    m_button->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
+    layout->addWidget(m_button);
+
+    connect(m_lineEdit, SIGNAL(editingFinished()), this, SLOT(editDone()));
+}
+
+void ColorEdit::editDone()
+{
+    bool ok;
+    QRgb newColor = m_lineEdit->text().toUInt(&ok, 16);
+    if (ok)
+        setColor(newColor);
+}
+
+void ColorEdit::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton) {
+        QColor color(m_color);
+        QColorDialog dialog(color, 0);
+        dialog.setOption(QColorDialog::ShowAlphaChannel, true);
+// The ifdef block is a workaround for the beta, TODO: remove when bug 238525 is fixed
+#ifdef Q_WS_MAC
+        dialog.setOption(QColorDialog::DontUseNativeDialog, true);
+#endif
+        dialog.move(280, 120);
+        if (dialog.exec() == QDialog::Rejected)
+            return;
+        QRgb newColor = dialog.selectedColor().rgba();
+        if (newColor == m_color)
+            return;
+        setColor(newColor);
+    }
+}
+
+void ColorEdit::setColor(QRgb color)
+{
+    m_color = color;
+    m_lineEdit->setText(QString::number(m_color, 16)); // "Clean up" text
+    QPalette palette = m_button->palette();
+    palette.setColor(QPalette::Window, QColor(m_color));
+    m_button->setPalette(palette);
+    emit colorChanged(m_color, m_id);
+}
+
+//============================================================================//
+//                                  FloatEdit                                 //
+//============================================================================//
+
+FloatEdit::FloatEdit(float initialValue, int id)
+    : m_value(initialValue), m_id(id)
+{
+    QHBoxLayout *layout = new QHBoxLayout;
+    setLayout(layout);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    m_lineEdit = new QLineEdit(QString::number(m_value));
+    layout->addWidget(m_lineEdit);
+
+    connect(m_lineEdit, SIGNAL(editingFinished()), this, SLOT(editDone()));
+}
+
+void FloatEdit::editDone()
+{
+    bool ok;
+    float newValue = m_lineEdit->text().toFloat(&ok);
+    if (ok) {
+        m_value = newValue;
+        m_lineEdit->setText(QString::number(m_value)); // "Clean up" text
+        emit valueChanged(m_value, m_id);
+    }
+}
+
+//============================================================================//
+//                           TwoSidedGraphicsWidget                           //
+//============================================================================//
+
+TwoSidedGraphicsWidget::TwoSidedGraphicsWidget(QGraphicsScene *scene)
+    : QObject(scene)
+    , m_current(0)
+    , m_angle(0)
+    , m_delta(0)
+{
+    for (int i = 0; i < 2; ++i)
+        m_proxyWidgets[i] = 0;
+}
+
+void TwoSidedGraphicsWidget::setWidget(int index, QWidget *widget)
+{
+    if (index < 0 || index >= 2)
+	{
+		qWarning("TwoSidedGraphicsWidget::setWidget: Index out of bounds, index == %d", index);
+		return;
+	}
+
+    GraphicsWidget *proxy = new GraphicsWidget;
+    proxy->setWidget(widget);
+
+    if (m_proxyWidgets[index])
+        delete m_proxyWidgets[index];
+    m_proxyWidgets[index] = proxy;
+
+    proxy->setCacheMode(QGraphicsItem::ItemCoordinateCache);
+    proxy->setZValue(1e30); // Make sure the dialog is drawn on top of all other (OpenGL) items
+
+    if (index != m_current)
+        proxy->setVisible(false);
+
+    qobject_cast<QGraphicsScene *>(parent())->addItem(proxy);
+}
+
+QWidget *TwoSidedGraphicsWidget::widget(int index)
+{
+    if (index < 0 || index >= 2)
+	{
+		qWarning("TwoSidedGraphicsWidget::widget: Index out of bounds, index == %d", index);
+		return 0;
+	}
+    return m_proxyWidgets[index]->widget();
+}
+
+void TwoSidedGraphicsWidget::flip()
+{
+    m_delta = (m_current == 0 ? 9 : -9);
+    animateFlip();
+}
+
+void TwoSidedGraphicsWidget::animateFlip()
+{
+    m_angle += m_delta;
+    if (m_angle == 90) {
+        int old = m_current;
+        m_current ^= 1;
+        m_proxyWidgets[old]->setVisible(false);
+        m_proxyWidgets[m_current]->setVisible(true);
+        m_proxyWidgets[m_current]->setGeometry(m_proxyWidgets[old]->geometry());
+    }
+
+    QRectF r = m_proxyWidgets[m_current]->boundingRect();
+    m_proxyWidgets[m_current]->setTransform(QTransform()
+        .translate(r.width() / 2, r.height() / 2)
+        .rotate(m_angle - 180 * m_current, Qt::YAxis)
+        .translate(-r.width() / 2, -r.height() / 2));
+
+    if ((m_current == 0 && m_angle > 0) || (m_current == 1 && m_angle < 180))
+        QTimer::singleShot(25, this, SLOT(animateFlip()));
+}
+
+QVariant GraphicsWidget::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    if (change == ItemPositionChange && scene()) {
+        QRectF rect = boundingRect();
+        QPointF pos = value.toPointF();
+        QRectF sceneRect = scene()->sceneRect();
+        if (pos.x() + rect.left() < sceneRect.left())
+            pos.setX(sceneRect.left() - rect.left());
+        else if (pos.x() + rect.right() >= sceneRect.right())
+            pos.setX(sceneRect.right() - rect.right());
+        if (pos.y() + rect.top() < sceneRect.top())
+            pos.setY(sceneRect.top() - rect.top());
+        else if (pos.y() + rect.bottom() >= sceneRect.bottom())
+            pos.setY(sceneRect.bottom() - rect.bottom());
+        return pos;
+    }
+    return QGraphicsProxyWidget::itemChange(change, value);
+}
+
+void GraphicsWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
+{
+    setCacheMode(QGraphicsItem::NoCache);
+    setCacheMode(QGraphicsItem::ItemCoordinateCache);
+    QGraphicsProxyWidget::resizeEvent(event);
+}
+
+void GraphicsWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    painter->setRenderHint(QPainter::Antialiasing, false);
+    QGraphicsProxyWidget::paint(painter, option, widget);
+    //painter->setRenderHint(QPainter::Antialiasing, true);
+}
+
+//============================================================================//
+//                             RenderOptionsDialog                            //
+//============================================================================//
+
+RenderOptionsDialog::RenderOptionsDialog()
+    : QDialog(0, Qt::CustomizeWindowHint | Qt::WindowTitleHint)
+{
+    setWindowOpacity(0.75);
+    setWindowTitle(tr("Options (double click to flip)"));
+    QGridLayout *layout = new QGridLayout;
+    setLayout(layout);
+    layout->setColumnStretch(1, 1);
+
+    int row = 0;
+
+    QCheckBox *check = new QCheckBox(tr("Dynamic cube map"));
+    check->setCheckState(Qt::Unchecked);
+    // Dynamic cube maps are only enabled when multi-texturing and render to texture are available.
+    check->setEnabled(glActiveTexture && glGenFramebuffersEXT);
+    connect(check, SIGNAL(stateChanged(int)), this, SIGNAL(dynamicCubemapToggled(int)));
+    layout->addWidget(check, 0, 0, 1, 2);
+    ++row;
+
+    QPalette palette;
+
+    // Load all .par files
+    // .par files have a simple syntax for specifying user adjustable uniform variables.
+    QSet<QByteArray> uniforms;
+    QList<QString> filter = QStringList("*.par");
+    QList<QFileInfo> files = QDir(":/res/boxes/").entryInfoList(filter, QDir::Files | QDir::Readable);
+
+    foreach (QFileInfo fileInfo, files) {
+        QFile file(fileInfo.absoluteFilePath());
+        if (file.open(QIODevice::ReadOnly)) {
+            while (!file.atEnd()) {
+                QList<QByteArray> tokens = file.readLine().simplified().split(' ');
+                QList<QByteArray>::const_iterator it = tokens.begin();
+                if (it == tokens.end())
+                    continue;
+                QByteArray type = *it;
+                if (++it == tokens.end())
+                    continue;
+                QByteArray name = *it;
+                bool singleElement = (tokens.size() == 3); // type, name and one value
+                char counter[10] = "000000000";
+                int counterPos = 8; // position of last digit
+                while (++it != tokens.end()) {
+                    m_parameterNames << name;
+                    if (!singleElement) {
+                        m_parameterNames.back() += "[";
+                        m_parameterNames.back() += counter + counterPos;
+                        m_parameterNames.back() += "]";
+                        int j = 8; // position of last digit
+                        ++counter[j];
+                        while (j > 0 && counter[j] > '9') {
+                            counter[j] = '0';
+                            ++counter[--j];
+                        }
+                        if (j < counterPos)
+                            counterPos = j;
+                    }
+
+                    if (type == "color") {
+                        layout->addWidget(new QLabel(m_parameterNames.back()));
+                        bool ok;
+                        ColorEdit *colorEdit = new ColorEdit(it->toUInt(&ok, 16), m_parameterNames.size() - 1);
+                        m_parameterEdits << colorEdit;
+                        layout->addWidget(colorEdit);
+                        connect(colorEdit, SIGNAL(colorChanged(QRgb, int)), this, SLOT(setColorParameter(QRgb, int)));
+                        ++row;
+                    } else if (type == "float") {
+                        layout->addWidget(new QLabel(m_parameterNames.back()));
+                        bool ok;
+                        FloatEdit *floatEdit = new FloatEdit(it->toFloat(&ok), m_parameterNames.size() - 1);
+                        m_parameterEdits << floatEdit;
+                        layout->addWidget(floatEdit);
+                        connect(floatEdit, SIGNAL(valueChanged(float, int)), this, SLOT(setFloatParameter(float, int)));
+                        ++row;
+                    }
+                }
+            }
+            file.close();
+        }
+    }
+
+    layout->addWidget(new QLabel(tr("Texture:")));
+    m_textureCombo = new QComboBox;
+    connect(m_textureCombo, SIGNAL(currentIndexChanged(int)), this, SIGNAL(textureChanged(int)));
+    layout->addWidget(m_textureCombo);
+    ++row;
+
+    layout->addWidget(new QLabel(tr("Shader:")));
+    m_shaderCombo = new QComboBox;
+    connect(m_shaderCombo, SIGNAL(currentIndexChanged(int)), this, SIGNAL(shaderChanged(int)));
+    layout->addWidget(m_shaderCombo);
+    ++row;
+
+    layout->setRowStretch(row, 1);
+}
+
+int RenderOptionsDialog::addTexture(const QString &name)
+{
+    m_textureCombo->addItem(name);
+    return m_textureCombo->count() - 1;
+}
+
+int RenderOptionsDialog::addShader(const QString &name)
+{
+    m_shaderCombo->addItem(name);
+    return m_shaderCombo->count() - 1;
+}
+
+void RenderOptionsDialog::emitParameterChanged()
+{
+    foreach (ParameterEdit *edit, m_parameterEdits)
+        edit->emitChange();
+}
+
+void RenderOptionsDialog::setColorParameter(QRgb color, int id)
+{
+    emit colorParameterChanged(m_parameterNames[id], color);
+}
+
+void RenderOptionsDialog::setFloatParameter(float value, int id)
+{
+    emit floatParameterChanged(m_parameterNames[id], value);
+}
+
+void RenderOptionsDialog::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+        emit doubleClicked();
+}
+
+//============================================================================//
+//                                 ItemDialog                                 //
+//============================================================================//
+
+ItemDialog::ItemDialog()
+    : QDialog(0, Qt::CustomizeWindowHint | Qt::WindowTitleHint)
+{
+    setWindowTitle(tr("Items (double click to flip)"));
+    setWindowOpacity(0.75);
+    resize(160, 100);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    setLayout(layout);
+    QPushButton *button;
+
+    button = new QPushButton(tr("Add Qt box"));
+    layout->addWidget(button);
+    connect(button, SIGNAL(clicked()), this, SLOT(triggerNewQtBox()));
+
+    button = new QPushButton(tr("Add circle"));
+    layout->addWidget(button);
+    connect(button, SIGNAL(clicked()), this, SLOT(triggerNewCircleItem()));
+
+    button = new QPushButton(tr("Add square"));
+    layout->addWidget(button);
+    connect(button, SIGNAL(clicked()), this, SLOT(triggerNewSquareItem()));
+
+    layout->addStretch(1);
+}
+
+void ItemDialog::triggerNewQtBox()
+{
+    emit newItemTriggered(QtBoxItem);
+}
+
+void ItemDialog::triggerNewCircleItem()
+{
+    emit newItemTriggered(CircleItem);
+}
+
+void ItemDialog::triggerNewSquareItem()
+{
+    emit newItemTriggered(SquareItem);
+}
+
+void ItemDialog::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+        emit doubleClicked();
+}
+
+//============================================================================//
+//                                    Scene                                   //
+//============================================================================//
+
+const static char environmentShaderText[] =
+    "uniform samplerCube env;"
+    "void main() {"
+        "gl_FragColor = textureCube(env, gl_TexCoord[1].xyz);"
+    "}";
+
+Scene::Scene(int width, int height, int maxTextureSize)
+    : m_distExp(600)
+    , m_frame(0)
+    , m_maxTextureSize(maxTextureSize)
+    , m_currentShader(0)
+    , m_currentTexture(0)
+    , m_dynamicCubemap(false)
+    , m_updateAllCubemaps(true)
+    , m_box(0)
+    , m_vertexShader(0)
+    , m_environmentShader(0)
+    , m_environmentProgram(0)
+{
+    setSceneRect(0, 0, width, height);
+
+    m_trackBalls[0] = TrackBall(0.0005f, gfx::Vector3f::vector(0, 1, 0), TrackBall::Sphere);
+    m_trackBalls[1] = TrackBall(0.0001f, gfx::Vector3f::vector(0, 0, 1), TrackBall::Sphere);
+    m_trackBalls[2] = TrackBall(0.0f, gfx::Vector3f::vector(0, 1, 0), TrackBall::Plane);
+
+    m_renderOptions = new RenderOptionsDialog;
+    m_renderOptions->move(20, 120);
+    m_renderOptions->resize(m_renderOptions->sizeHint());
+
+    connect(m_renderOptions, SIGNAL(dynamicCubemapToggled(int)), this, SLOT(toggleDynamicCubemap(int)));
+    connect(m_renderOptions, SIGNAL(colorParameterChanged(const QString &, QRgb)), this, SLOT(setColorParameter(const QString &, QRgb)));
+    connect(m_renderOptions, SIGNAL(floatParameterChanged(const QString &, float)), this, SLOT(setFloatParameter(const QString &, float)));
+    connect(m_renderOptions, SIGNAL(textureChanged(int)), this, SLOT(setTexture(int)));
+    connect(m_renderOptions, SIGNAL(shaderChanged(int)), this, SLOT(setShader(int)));
+
+    m_itemDialog = new ItemDialog;
+    connect(m_itemDialog, SIGNAL(newItemTriggered(ItemDialog::ItemType)), this, SLOT(newItem(ItemDialog::ItemType)));
+
+    TwoSidedGraphicsWidget *twoSided = new TwoSidedGraphicsWidget(this);
+    twoSided->setWidget(0, m_renderOptions);
+    twoSided->setWidget(1, m_itemDialog);
+
+    connect(m_renderOptions, SIGNAL(doubleClicked()), twoSided, SLOT(flip()));
+    connect(m_itemDialog, SIGNAL(doubleClicked()), twoSided, SLOT(flip()));
+
+    addItem(new QtBox(64, width - 64, height - 64));
+    addItem(new QtBox(64, width - 64, 64));
+    addItem(new QtBox(64, 64, height - 64));
+    addItem(new QtBox(64, 64, 64));
+
+    initGL();
+
+    m_timer = new QTimer(this);
+    m_timer->setInterval(20);
+    connect(m_timer, SIGNAL(timeout()), this, SLOT(update()));
+    m_timer->start();
+
+    m_time.start();
+}
+
+Scene::~Scene()
+{
+    if (m_box)
+        delete m_box;
+    foreach (GLTexture *texture, m_textures)
+        if (texture) delete texture;
+    if (m_mainCubemap)
+        delete m_mainCubemap;
+    foreach (GLProgram *program, m_programs)
+        if (program) delete program;
+    if (m_vertexShader)
+        delete m_vertexShader;
+    foreach (GLFragmentShader *shader, m_fragmentShaders)
+        if (shader) delete shader;
+    foreach (GLRenderTargetCube *rt, m_cubemaps)
+        if (rt) delete rt;
+    if (m_environmentShader)
+        delete m_environmentShader;
+    if (m_environmentProgram)
+        delete m_environmentProgram;
+}
+
+void Scene::initGL()
+{
+    m_box = new GLRoundedBox(0.25f, 1.0f, 10);
+
+    m_vertexShader = new GLVertexShader(":/res/boxes/basic.vsh");
+
+    QStringList list;
+    list << ":/res/boxes/cubemap_posx.jpg" << ":/res/boxes/cubemap_negx.jpg" << ":/res/boxes/cubemap_posy.jpg"
+         << ":/res/boxes/cubemap_negy.jpg" << ":/res/boxes/cubemap_posz.jpg" << ":/res/boxes/cubemap_negz.jpg";
+    m_environment = new GLTextureCube(list, qMin(1024, m_maxTextureSize));
+    m_environmentShader = new GLFragmentShader(environmentShaderText, strlen(environmentShaderText));
+    m_environmentProgram = new GLProgram;
+    m_environmentProgram->attach(*m_vertexShader);
+    m_environmentProgram->attach(*m_environmentShader);
+
+    const int NOISE_SIZE = 128; // for a different size, B and BM in fbm.c must also be changed
+    m_noise = new GLTexture3D(NOISE_SIZE, NOISE_SIZE, NOISE_SIZE); 
+    QRgb *data = new QRgb[NOISE_SIZE * NOISE_SIZE * NOISE_SIZE];
+    memset(data, 0, NOISE_SIZE * NOISE_SIZE * NOISE_SIZE * sizeof(QRgb));
+    QRgb *p = data;
+    float pos[3];
+    for (int k = 0; k < NOISE_SIZE; ++k) {
+        pos[2] = k * (0x20 / (float)NOISE_SIZE);
+        for (int j = 0; j < NOISE_SIZE; ++j) {
+            for (int i = 0; i < NOISE_SIZE; ++i) {
+                for (int byte = 0; byte < 4; ++byte) {
+                    pos[0] = (i + (byte & 1) * 16) * (0x20 / (float)NOISE_SIZE);
+                    pos[1] = (j + (byte & 2) * 8) * (0x20 / (float)NOISE_SIZE);
+                    *p |= (int)(128.0f * (noise3(pos) + 1.0f)) << (byte * 8);
+                }
+                ++p;
+            }
+        }
+    }
+    m_noise->load(NOISE_SIZE, NOISE_SIZE, NOISE_SIZE, data);
+    delete[] data;
+
+    m_mainCubemap = new GLRenderTargetCube(512);
+
+    QStringList filter;
+    QList<QFileInfo> files;
+
+    // Load all .png files as textures
+    m_currentTexture = 0;
+    filter = QStringList("*.png");
+    files = QDir(":/res/boxes/").entryInfoList(filter, QDir::Files | QDir::Readable);
+
+    foreach (QFileInfo file, files) {
+        GLTexture *texture = new GLTexture2D(file.absoluteFilePath(), qMin(256, m_maxTextureSize), qMin(256, m_maxTextureSize));
+        if (texture->failed()) {
+            delete texture;
+            continue;
+        }
+        m_textures << texture;
+        m_renderOptions->addTexture(file.baseName());
+    }
+
+    if (m_textures.size() == 0)
+        m_textures << new GLTexture2D(qMin(64, m_maxTextureSize), qMin(64, m_maxTextureSize));
+
+    // Load all .fsh files as fragment shaders
+    m_currentShader = 0;
+    filter = QStringList("*.fsh");
+    files = QDir(":/res/boxes/").entryInfoList(filter, QDir::Files | QDir::Readable);
+    foreach (QFileInfo file, files) {
+        GLProgram *program = new GLProgram;
+        GLFragmentShader* shader = new GLFragmentShader(file.absoluteFilePath());
+        // The program does not take ownership over the shaders, so store them in a vector so they can be deleted afterwards.
+        program->attach(*m_vertexShader);
+        program->attach(*shader);
+        if (program->failed()) {
+            qWarning("Failed to compile and link shader program");
+            qWarning("Vertex shader log:");
+            qWarning() << m_vertexShader->log();
+            qWarning() << "Fragment shader log ( file =" << file.absoluteFilePath() << "):";
+            qWarning() << shader->log();
+            qWarning("Shader program log:");
+            qWarning() << program->log();
+
+            delete shader;
+            delete program;
+            continue;
+        }
+
+        m_fragmentShaders << shader;
+        m_programs << program;
+        m_renderOptions->addShader(file.baseName());
+
+        program->bind();
+        m_cubemaps << (program->hasParameter("env") ? new GLRenderTargetCube(qMin(256, m_maxTextureSize)) : 0);
+        program->unbind();
+    }
+
+    if (m_programs.size() == 0)
+        m_programs << new GLProgram;
+
+    m_renderOptions->emitParameterChanged();
+}
+
+// If one of the boxes should not be rendered, set excludeBox to its index.
+// If the main box should not be rendered, set excludeBox to -1.
+void Scene::renderBoxes(const gfx::Matrix4x4f &view, int excludeBox)
+{
+    gfx::Matrix4x4f invView = view.inverse();
+
+    // If multi-texturing is supported, use three saplers.
+    if (glActiveTexture) {
+        glActiveTexture(GL_TEXTURE0);
+        m_textures[m_currentTexture]->bind();
+        glActiveTexture(GL_TEXTURE2);
+        m_noise->bind();
+        glActiveTexture(GL_TEXTURE1);
+    } else {
+        m_textures[m_currentTexture]->bind();
+    }
+
+    glDisable(GL_LIGHTING);
+    glDisable(GL_CULL_FACE);
+
+    gfx::Matrix4x4f viewRotation(view);
+    viewRotation(3, 0) = viewRotation(3, 1) = viewRotation(3, 2) = 0.0f;
+    viewRotation(0, 3) = viewRotation(1, 3) = viewRotation(2, 3) = 0.0f;
+    viewRotation(3, 3) = 1.0f;
+    glLoadMatrixf(viewRotation.bits());
+    glScalef(20.0f, 20.0f, 20.0f);
+
+    // Don't render the environment if the environment texture can't be set for the correct sampler.
+    if (glActiveTexture) {
+        m_environment->bind();
+        m_environmentProgram->bind();
+        m_environmentProgram->setInt("tex", 0);
+        m_environmentProgram->setInt("env", 1);
+        m_environmentProgram->setInt("noise", 2);
+        m_box->draw();
+        m_environmentProgram->unbind();
+        m_environment->unbind();
+    }
+
+    glLoadMatrixf(view.bits());
+
+    glEnable(GL_CULL_FACE);
+    glEnable(GL_LIGHTING);
+
+    for (int i = 0; i < m_programs.size(); ++i) {
+        if (i == excludeBox)
+            continue;
+
+        glPushMatrix();
+        gfx::Matrix4x4f m;
+        m_trackBalls[1].rotation().matrix(m);
+        glMultMatrixf(m.bits());
+
+        glRotatef(360.0f * i / m_programs.size(), 0.0f, 0.0f, 1.0f);
+        glTranslatef(2.0f, 0.0f, 0.0f);
+        glScalef(0.3f, 0.6f, 0.6f);
+
+        if (glActiveTexture) {
+            if (m_dynamicCubemap && m_cubemaps[i])
+                m_cubemaps[i]->bind();
+            else
+                m_environment->bind();
+        }
+        m_programs[i]->bind();
+        m_programs[i]->setInt("tex", 0);
+        m_programs[i]->setInt("env", 1);
+        m_programs[i]->setInt("noise", 2);
+        m_programs[i]->setMatrix("view", view);
+        m_programs[i]->setMatrix("invView", invView);
+        m_box->draw();
+        m_programs[i]->unbind();
+
+        if (glActiveTexture) {
+            if (m_dynamicCubemap && m_cubemaps[i])
+                m_cubemaps[i]->unbind();
+            else
+                m_environment->unbind();
+        }
+        glPopMatrix();
+    }
+
+    if (-1 != excludeBox) {
+        gfx::Matrix4x4f m;
+        m_trackBalls[0].rotation().matrix(m);
+        glMultMatrixf(m.bits());
+
+        if (glActiveTexture) {
+            if (m_dynamicCubemap)
+                m_mainCubemap->bind();
+            else
+                m_environment->bind();
+        }
+
+        m_programs[m_currentShader]->bind();
+        m_programs[m_currentShader]->setInt("tex", 0);
+        m_programs[m_currentShader]->setInt("env", 1);
+        m_programs[m_currentShader]->setInt("noise", 2);
+        m_programs[m_currentShader]->setMatrix("view", view);
+        m_programs[m_currentShader]->setMatrix("invView", invView);
+        m_box->draw();
+        m_programs[m_currentShader]->unbind();
+
+        if (glActiveTexture) {
+            if (m_dynamicCubemap)
+                m_mainCubemap->unbind();
+            else
+                m_environment->unbind();
+        }
+    }
+
+    if (glActiveTexture) {
+        glActiveTexture(GL_TEXTURE2);
+        m_noise->unbind();
+        glActiveTexture(GL_TEXTURE0);
+    }
+    m_textures[m_currentTexture]->unbind();
+}
+
+void Scene::setStates()
+{
+    //glClearColor(0.25f, 0.25f, 0.5f, 1.0f);
+
+    glEnable(GL_DEPTH_TEST);
+    glEnable(GL_CULL_FACE);
+    glEnable(GL_LIGHTING);
+    //glEnable(GL_COLOR_MATERIAL);
+    glEnable(GL_TEXTURE_2D);
+    glEnable(GL_NORMALIZE);
+
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadIdentity();
+
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glLoadIdentity();
+
+    setLights();
+
+    float materialSpecular[] = {0.5f, 0.5f, 0.5f, 1.0f};
+    glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, materialSpecular);
+    glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 32.0f);
+}
+
+void Scene::setLights()
+{
+    glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+    //float lightColour[] = {1.0f, 1.0f, 1.0f, 1.0f};
+    float lightDir[] = {0.0f, 0.0f, 1.0f, 0.0f};
+    //glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColour);
+    //glLightfv(GL_LIGHT0, GL_SPECULAR, lightColour);
+    glLightfv(GL_LIGHT0, GL_POSITION, lightDir);
+    glLightModelf(GL_LIGHT_MODEL_LOCAL_VIEWER, 1.0f);
+    glEnable(GL_LIGHT0);
+}
+
+void Scene::defaultStates()
+{
+    //glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_CULL_FACE);
+    glDisable(GL_LIGHTING);
+    //glDisable(GL_COLOR_MATERIAL);
+    glDisable(GL_TEXTURE_2D);
+    glDisable(GL_LIGHT0);
+    glDisable(GL_NORMALIZE);
+
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+
+    glLightModelf(GL_LIGHT_MODEL_LOCAL_VIEWER, 0.0f);
+    float defaultMaterialSpecular[] = {0.0f, 0.0f, 0.0f, 1.0f};
+    glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, defaultMaterialSpecular);
+    glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 0.0f);
+}
+
+void Scene::renderCubemaps()
+{
+    // To speed things up, only update the cubemaps for the small cubes every N frames.
+    const int N = (m_updateAllCubemaps ? 1 : 3);
+
+    gfx::Matrix4x4f mat;
+    GLRenderTargetCube::getProjectionMatrix(mat, 0.1f, 100.0f);
+
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadMatrixf(mat.bits());
+
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+
+    gfx::Vector3f center;
+
+    for (int i = m_frame % N; i < m_cubemaps.size(); i += N) {
+        if (0 == m_cubemaps[i])
+            continue;
+
+        float angle = 2.0f * PI * i / m_cubemaps.size();
+        center = m_trackBalls[1].rotation().transform(gfx::Vector3f::vector(cos(angle), sin(angle), 0));
+
+        for (int face = 0; face < 6; ++face) {
+            m_cubemaps[i]->begin(face);
+
+            GLRenderTargetCube::getViewMatrix(mat, face);
+            gfx::Vector4f v = gfx::Vector4f::vector(-center[0], -center[1], -center[2], 1.0);
+            mat[3] = v * mat;
+
+            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+            renderBoxes(mat, i);
+
+            m_cubemaps[i]->end();
+        }
+    }
+
+    for (int face = 0; face < 6; ++face) {
+        m_mainCubemap->begin(face);
+        GLRenderTargetCube::getViewMatrix(mat, face);
+
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        renderBoxes(mat, -1);
+
+        m_mainCubemap->end();
+    }
+
+    glPopMatrix();
+
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+
+    m_updateAllCubemaps = false;
+}
+
+void Scene::drawBackground(QPainter *painter, const QRectF &)
+{
+    float width = float(painter->device()->width());
+    float height = float(painter->device()->height());
+
+    setStates();
+
+    if (m_dynamicCubemap)
+        renderCubemaps();
+
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    glMatrixMode(GL_PROJECTION);
+    gluPerspective(60.0, width / height, 0.01, 15.0);
+
+    glMatrixMode(GL_MODELVIEW);
+
+    //gfx::Matrix4x4f view = gfx::Matrix4x4f::identity();
+    //view(3, 2) -= 2.0f * exp(m_distExp / 1200.0f);
+
+    gfx::Matrix4x4f view;
+    m_trackBalls[2].rotation().matrix(view);
+    view(3, 2) -= 2.0f * exp(m_distExp / 1200.0f);
+    renderBoxes(view);
+
+    defaultStates();
+    ++m_frame;
+}
+
+QPointF Scene::pixelPosToViewPos(const QPointF& p)
+{
+    return QPointF(2.0 * float(p.x()) / width() - 1.0,
+                   1.0 - 2.0 * float(p.y()) / height());
+}
+
+void Scene::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsScene::mouseMoveEvent(event);
+    if (event->isAccepted())
+        return;
+
+    if (event->buttons() & Qt::LeftButton) {
+        m_trackBalls[0].move(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+        event->accept();
+    } else {
+        m_trackBalls[0].release(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+    }
+
+    if (event->buttons() & Qt::RightButton) {
+        m_trackBalls[1].move(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+        event->accept();
+    } else {
+        m_trackBalls[1].release(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+    }
+
+    if (event->buttons() & Qt::MidButton) {
+        m_trackBalls[2].move(pixelPosToViewPos(event->scenePos()), gfx::Quaternionf::identity());
+        event->accept();
+    } else {
+        m_trackBalls[2].release(pixelPosToViewPos(event->scenePos()), gfx::Quaternionf::identity());
+    }
+}
+
+void Scene::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsScene::mousePressEvent(event);
+    if (event->isAccepted())
+        return;
+
+    if (event->buttons() & Qt::LeftButton) {
+        m_trackBalls[0].push(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+        event->accept();
+    }
+
+    if (event->buttons() & Qt::RightButton) {
+        m_trackBalls[1].push(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+        event->accept();
+    }
+
+    if (event->buttons() & Qt::MidButton) {
+        m_trackBalls[2].push(pixelPosToViewPos(event->scenePos()), gfx::Quaternionf::identity());
+        event->accept();
+    }
+}
+
+void Scene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsScene::mouseReleaseEvent(event);
+    if (event->isAccepted())
+        return;
+
+    if (event->button() == Qt::LeftButton) {
+        m_trackBalls[0].release(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+        event->accept();
+    }
+
+    if (event->button() == Qt::RightButton) {
+        m_trackBalls[1].release(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+        event->accept();
+    }
+
+    if (event->button() == Qt::MidButton) {
+        m_trackBalls[2].release(pixelPosToViewPos(event->scenePos()), gfx::Quaternionf::identity());
+        event->accept();
+    }
+}
+
+void Scene::wheelEvent(QGraphicsSceneWheelEvent * event)
+{
+    QGraphicsScene::wheelEvent(event);
+    if (!event->isAccepted()) {
+        m_distExp += event->delta();
+        if (m_distExp < -8 * 120)
+            m_distExp = -8 * 120;
+        if (m_distExp > 10 * 120)
+            m_distExp = 10 * 120;
+        event->accept();
+    }
+}
+
+void Scene::setShader(int index)
+{
+    if (index >= 0 && index < m_fragmentShaders.size())
+        m_currentShader = index;
+}
+
+void Scene::setTexture(int index)
+{
+    if (index >= 0 && index < m_textures.size())
+        m_currentTexture = index;
+}
+
+void Scene::toggleDynamicCubemap(int state)
+{
+    if ((m_dynamicCubemap = (state == Qt::Checked)))
+        m_updateAllCubemaps = true;
+}
+
+void Scene::setColorParameter(const QString &name, QRgb color)
+{
+    // set the color in all programs
+    foreach (GLProgram *program, m_programs) {
+        program->bind();
+        program->setColor(name, color);
+        program->unbind();
+    }
+}
+
+void Scene::setFloatParameter(const QString &name, float value)
+{
+    // set the color in all programs
+    foreach (GLProgram *program, m_programs) {
+        program->bind();
+        program->setFloat(name, value);
+        program->unbind();
+    }
+}
+
+void Scene::newItem(ItemDialog::ItemType type)
+{
+    QSize size = sceneRect().size().toSize();
+    switch (type) {
+    case ItemDialog::QtBoxItem:
+        addItem(new QtBox(64, rand() % (size.width() - 64) + 32, rand() % (size.height() - 64) + 32));
+        break;
+    case ItemDialog::CircleItem:
+        addItem(new CircleItem(64, rand() % (size.width() - 64) + 32, rand() % (size.height() - 64) + 32));
+        break;
+    case ItemDialog::SquareItem:
+        addItem(new SquareItem(64, rand() % (size.width() - 64) + 32, rand() % (size.height() - 64) + 32));
+        break;
+    default:
+        break;
+    }
+}
diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h
new file mode 100644
index 0000000..2db9317
--- /dev/null
+++ b/demos/boxes/scene.h
@@ -0,0 +1,243 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SCENE_H
+#define SCENE_H
+
+//#include <GL/glew.h>
+#include "glextensions.h"
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include "roundedbox.h"
+#include "gltrianglemesh.h"
+#include "vector.h"
+#include "trackball.h"
+#include "glbuffers.h"
+#include "glshaders.h"
+#include "qtbox.h"
+
+#define PI 3.14159265358979
+
+class ParameterEdit : public QWidget
+{
+public:
+    virtual void emitChange() = 0;
+};
+
+class ColorEdit : public ParameterEdit
+{
+    Q_OBJECT
+public:
+    ColorEdit(QRgb initialColor, int id);
+    QRgb color() const {return m_color;}
+    virtual void emitChange() {emit colorChanged(m_color, m_id);}
+public slots:
+    void editDone();
+signals:
+    void colorChanged(QRgb color, int id);
+protected:
+    virtual void mousePressEvent(QMouseEvent *event);
+    void setColor(QRgb color); // also emits colorChanged()
+private:
+    QGraphicsScene *m_dialogParentScene;
+    QLineEdit *m_lineEdit;
+    QFrame *m_button;
+    QRgb m_color;
+    int m_id;
+};
+
+class FloatEdit : public ParameterEdit
+{
+    Q_OBJECT
+public:
+    FloatEdit(float initialValue, int id);
+    float value() const {return m_value;}
+    virtual void emitChange() {emit valueChanged(m_value, m_id);}
+public slots:
+    void editDone();
+signals:
+    void valueChanged(float value, int id);
+private:
+    QGraphicsScene *m_dialogParentScene;
+    QLineEdit *m_lineEdit;
+    float m_value;
+    int m_id;
+};
+
+class GraphicsWidget : public QGraphicsProxyWidget
+{
+protected:
+    virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    virtual void resizeEvent(QGraphicsSceneResizeEvent *event);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+};
+
+class TwoSidedGraphicsWidget : public QObject
+{
+    Q_OBJECT
+public:
+    TwoSidedGraphicsWidget(QGraphicsScene *scene);
+    void setWidget(int index, QWidget *widget);
+    QWidget *widget(int index);
+public slots:
+    void flip();
+protected slots:
+    void animateFlip();
+private:
+    GraphicsWidget *m_proxyWidgets[2];
+    int m_current;
+    int m_angle; // angle in degrees
+    int m_delta;
+};
+
+class RenderOptionsDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    RenderOptionsDialog();
+    int addTexture(const QString &name);
+    int addShader(const QString &name);
+    void emitParameterChanged();
+protected slots:
+    void setColorParameter(QRgb color, int id);
+    void setFloatParameter(float value, int id);
+signals:
+    void dynamicCubemapToggled(int);
+    void colorParameterChanged(const QString &, QRgb);
+    void floatParameterChanged(const QString &, float);
+    void textureChanged(int);
+    void shaderChanged(int);
+    void doubleClicked();
+protected:
+    virtual void mouseDoubleClickEvent(QMouseEvent *event);
+
+    QVector<QByteArray> m_parameterNames;
+    QComboBox *m_textureCombo;
+    QComboBox *m_shaderCombo;
+    QVector<ParameterEdit *> m_parameterEdits;
+};
+
+class ItemDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    enum ItemType {
+        QtBoxItem,
+        CircleItem,
+        SquareItem,
+    };
+
+    ItemDialog();
+public slots:
+    void triggerNewQtBox();
+    void triggerNewCircleItem();
+    void triggerNewSquareItem();
+signals:
+    void doubleClicked();
+    void newItemTriggered(ItemDialog::ItemType type);
+protected:
+    virtual void mouseDoubleClickEvent(QMouseEvent *event);
+};
+
+class Scene : public QGraphicsScene
+{
+    Q_OBJECT
+public:
+    Scene(int width, int height, int maxTextureSize);
+    ~Scene();
+    virtual void drawBackground(QPainter *painter, const QRectF &rect);
+
+public slots:
+    void setShader(int index);
+    void setTexture(int index);
+    void toggleDynamicCubemap(int state);
+    void setColorParameter(const QString &name, QRgb color);
+    void setFloatParameter(const QString &name, float value);
+    void newItem(ItemDialog::ItemType type);
+protected:
+    void renderBoxes(const gfx::Matrix4x4f &view, int excludeBox = -2);
+    void setStates();
+    void setLights();
+    void defaultStates();
+    void renderCubemaps();
+
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    virtual void wheelEvent(QGraphicsSceneWheelEvent * event);
+private:
+    void initGL();
+    QPointF pixelPosToViewPos(const QPointF& p);
+
+    QTime m_time;
+    int m_lastTime;
+    int m_mouseEventTime;
+    int m_distExp;
+    int m_frame;
+    int m_maxTextureSize;
+
+    int m_currentShader;
+    int m_currentTexture;
+    bool m_dynamicCubemap;
+    bool m_updateAllCubemaps;
+
+    RenderOptionsDialog *m_renderOptions;
+    ItemDialog *m_itemDialog;
+    QTimer *m_timer;
+    GLRoundedBox *m_box;
+    TrackBall m_trackBalls[3];
+    QVector<GLTexture *> m_textures;
+    GLTextureCube *m_environment;
+    GLTexture3D *m_noise;
+    GLRenderTargetCube *m_mainCubemap;
+    QVector<GLRenderTargetCube *> m_cubemaps;
+    QVector<GLProgram *> m_programs;
+    GLVertexShader *m_vertexShader;
+    QVector<GLFragmentShader *> m_fragmentShaders;
+    GLFragmentShader *m_environmentShader;
+    GLProgram *m_environmentProgram;
+};
+
+
+
+#endif
diff --git a/demos/boxes/smiley.png b/demos/boxes/smiley.png
new file mode 100644
index 0000000..41cfda6
--- /dev/null
+++ b/demos/boxes/smiley.png
diff --git a/demos/boxes/square.jpg b/demos/boxes/square.jpg
new file mode 100644
index 0000000..03f53bd
--- /dev/null
+++ b/demos/boxes/square.jpg
diff --git a/demos/boxes/trackball.cpp b/demos/boxes/trackball.cpp
new file mode 100644
index 0000000..980f6ed
--- /dev/null
+++ b/demos/boxes/trackball.cpp
@@ -0,0 +1,158 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "trackball.h"
+
+//============================================================================//
+//                                  TrackBall                                 //
+//============================================================================//
+
+TrackBall::TrackBall(TrackMode mode)
+    : m_angularVelocity(0)
+    , m_paused(false)
+    , m_pressed(false)
+    , m_mode(mode)
+{
+    m_axis = gfx::Vector3f::vector(0, 1, 0);
+    m_rotation = gfx::Quaternionf::quaternion(1.0f, 0.0f, 0.0f, 0.0f);
+    m_lastTime = QTime::currentTime();
+}
+
+TrackBall::TrackBall(float angularVelocity, const gfx::Vector3f& axis, TrackMode mode)
+    : m_axis(axis)
+    , m_angularVelocity(angularVelocity)
+    , m_paused(false)
+    , m_pressed(false)
+    , m_mode(mode)
+{
+    m_rotation = gfx::Quaternionf::quaternion(1.0f, 0.0f, 0.0f, 0.0f);
+    m_lastTime = QTime::currentTime();
+}
+
+void TrackBall::push(const QPointF& p, const gfx::Quaternionf &)
+{
+    m_rotation = rotation();
+    m_pressed = true;
+    m_lastTime = QTime::currentTime();
+    m_lastPos = p;
+    m_angularVelocity = 0.0f;
+}
+
+void TrackBall::move(const QPointF& p, const gfx::Quaternionf &transformation)
+{
+    if (!m_pressed)
+        return;
+
+    QTime currentTime = QTime::currentTime();
+    int msecs = m_lastTime.msecsTo(currentTime);
+    if (msecs <= 20)
+        return;
+
+    switch (m_mode) {
+    case Plane:
+        {
+            QLineF delta(m_lastPos, p);
+            m_angularVelocity = delta.length() / msecs;
+            m_axis = gfx::Vector3f::vector(delta.dy(), -delta.dx(), 0.0f).normalized();
+            m_axis = transformation.transform(m_axis);
+            m_rotation *= gfx::Quaternionf::rotation(delta.length(), m_axis);
+        }
+        break;
+    case Sphere:
+        {
+            gfx::Vector3f lastPos3D = gfx::Vector3f::vector(m_lastPos.x(), m_lastPos.y(), 0);
+            float sqrZ = 1 - lastPos3D.sqrNorm();
+            if (sqrZ > 0)
+                lastPos3D[2] = sqrt(sqrZ);
+            else
+                lastPos3D.normalize();
+
+            gfx::Vector3f currentPos3D = gfx::Vector3f::vector(p.x(), p.y(), 0);
+            sqrZ = 1 - currentPos3D.sqrNorm();
+            if (sqrZ > 0)
+                currentPos3D[2] = sqrt(sqrZ);
+            else
+                currentPos3D.normalize();
+
+            m_axis = gfx::Vector3f::cross(currentPos3D, lastPos3D);
+            float angle = asin(sqrt(m_axis.sqrNorm()));
+
+            m_angularVelocity = angle / msecs;
+            m_axis.normalize();
+            m_axis = transformation.transform(m_axis);
+            m_rotation *= gfx::Quaternionf::rotation(angle, m_axis);
+        }
+        break;
+    }
+
+    m_lastPos = p;
+    m_lastTime = currentTime;
+}
+
+void TrackBall::release(const QPointF& p, const gfx::Quaternionf &transformation)
+{
+    // Calling move() caused the rotation to stop if the framerate was too low.
+    move(p, transformation);
+    m_pressed = false;
+}
+
+void TrackBall::start()
+{
+    m_lastTime = QTime::currentTime();
+    m_paused = false;
+}
+
+void TrackBall::stop()
+{
+    m_rotation = rotation();
+    m_paused = true;
+}
+
+gfx::Quaternionf TrackBall::rotation() const
+{
+    if (m_paused || m_pressed)
+        return m_rotation;
+
+    QTime currentTime = QTime::currentTime();
+    float angle = m_angularVelocity * m_lastTime.msecsTo(currentTime);
+    return m_rotation * gfx::Quaternionf::rotation(angle, m_axis);
+}
+
diff --git a/demos/boxes/trackball.h b/demos/boxes/trackball.h
new file mode 100644
index 0000000..5e3f40c
--- /dev/null
+++ b/demos/boxes/trackball.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TRACKBALL_H
+#define TRACKBALL_H
+
+#include <QtGui>
+
+#include "vector.h"
+
+class TrackBall
+{
+public:
+    enum TrackMode
+    {
+        Plane,
+        Sphere,
+    };
+    TrackBall(TrackMode mode = Sphere);
+    TrackBall(float angularVelocity, const gfx::Vector3f& axis, TrackMode mode = Sphere);
+    // coordinates in [-1,1]x[-1,1]
+    void push(const QPointF& p, const gfx::Quaternionf &transformation);
+    void move(const QPointF& p, const gfx::Quaternionf &transformation);
+    void release(const QPointF& p, const gfx::Quaternionf &transformation);
+    void start(); // starts clock
+    void stop(); // stops clock
+    gfx::Quaternionf rotation() const;
+private:
+    gfx::Quaternionf m_rotation;
+    gfx::Vector3f m_axis;
+    float m_angularVelocity;
+
+    QPointF m_lastPos;
+    QTime m_lastTime;
+    bool m_paused;
+    bool m_pressed;
+    TrackMode m_mode;
+};
+
+#endif
diff --git a/demos/boxes/vector.h b/demos/boxes/vector.h
new file mode 100644
index 0000000..bb24531
--- /dev/null
+++ b/demos/boxes/vector.h
@@ -0,0 +1,602 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef VECTOR_H
+#define VECTOR_H
+
+#include <cassert>
+#include <cmath>
+#include <iostream>
+
+namespace gfx
+{
+
+template<class T, int n>
+struct Vector
+{
+    // Keep the Vector struct a plain old data (POD) struct by avoiding constructors
+
+    static Vector vector(T x)
+    {
+        Vector result;
+        for (int i = 0; i < n; ++i)
+            result.v[i] = x;
+        return result;
+    }
+
+    // Use only for 2D vectors
+    static Vector vector(T x, T y)
+    {
+        assert(n == 2);
+        Vector result;
+        result.v[0] = x;
+        result.v[1] = y;
+        return result;
+    }
+
+    // Use only for 3D vectors
+    static Vector vector(T x, T y, T z)
+    {
+        assert(n == 3);
+        Vector result;
+        result.v[0] = x;
+        result.v[1] = y;
+        result.v[2] = z;
+        return result;
+    }
+
+    // Use only for 4D vectors
+    static Vector vector(T x, T y, T z, T w)
+    {
+        assert(n == 4);
+        Vector result;
+        result.v[0] = x;
+        result.v[1] = y;
+        result.v[2] = z;
+        result.v[3] = w;
+        return result;
+    }
+
+    // Pass 'n' arguments to this function.
+    static Vector vector(T *v)
+    {
+        Vector result;
+        for (int i = 0; i < n; ++i)
+            result.v[i] = v[i];
+        return result;
+    }
+
+    T &operator [] (int i) {return v[i];}
+    T operator [] (int i) const {return v[i];}
+
+#define VECTOR_BINARY_OP(op, arg, rhs)      \
+    Vector operator op (arg) const          \
+    {                                       \
+        Vector result;                      \
+        for (int i = 0; i < n; ++i)         \
+            result.v[i] = v[i] op rhs;      \
+        return result;                      \
+    }
+
+    VECTOR_BINARY_OP(+, const Vector &u, u.v[i])
+    VECTOR_BINARY_OP(-, const Vector &u, u.v[i])
+    VECTOR_BINARY_OP(*, const Vector &u, u.v[i])
+    VECTOR_BINARY_OP(/, const Vector &u, u.v[i])
+    VECTOR_BINARY_OP(+, T s, s)
+    VECTOR_BINARY_OP(-, T s, s)
+    VECTOR_BINARY_OP(*, T s, s)
+    VECTOR_BINARY_OP(/, T s, s)
+#undef VECTOR_BINARY_OP
+
+    Vector operator - () const
+    {
+        Vector result;
+        for (int i = 0; i < n; ++i)
+            result.v[i] = -v[i];
+        return result;
+    }
+
+#define VECTOR_ASSIGN_OP(op, arg, rhs)      \
+    Vector &operator op (arg)               \
+    {                                       \
+        for (int i = 0; i < n; ++i)         \
+            v[i] op rhs;                    \
+        return *this;                       \
+    }
+
+    VECTOR_ASSIGN_OP(+=, const Vector &u, u.v[i])
+    VECTOR_ASSIGN_OP(-=, const Vector &u, u.v[i])
+    VECTOR_ASSIGN_OP(=, T s, s)
+    VECTOR_ASSIGN_OP(*=, T s, s)
+    VECTOR_ASSIGN_OP(/=, T s, s)
+#undef VECTOR_ASSIGN_OP
+
+    static T dot(const Vector &u, const Vector &v)
+    {
+        T sum(0);
+        for (int i = 0; i < n; ++i)
+            sum += u.v[i] * v.v[i];
+        return sum;
+    }
+
+    static Vector cross(const Vector &u, const Vector &v)
+    {
+        assert(n == 3);
+        return vector(u.v[1] * v.v[2] - u.v[2] * v.v[1],
+                      u.v[2] * v.v[0] - u.v[0] * v.v[2],
+                      u.v[0] * v.v[1] - u.v[1] * v.v[0]);
+    }
+
+    T sqrNorm() const
+    {
+        return dot(*this, *this);
+    }
+
+    // requires floating point type T
+    void normalize()
+    {
+        T s = sqrNorm();
+        if (s != 0)
+            *this /= sqrt(s);
+    }
+
+    // requires floating point type T
+    Vector normalized() const
+    {
+        T s = sqrNorm();
+        if (s == 0)
+            return *this;
+        return *this / sqrt(s);
+    }
+
+    T *bits() {return v;}
+    const T *bits() const {return v;}
+
+    T v[n];
+};
+
+#define SCALAR_VECTOR_BINARY_OP(op)                     \
+template<class T, int n>                                \
+Vector<T, n> operator op (T s, const Vector<T, n>& u)   \
+{                                                       \
+    Vector<T, n> result;                                \
+    for (int i = 0; i < n; ++i)                         \
+        result[i] = s op u[i];                          \
+    return result;                                      \
+}
+
+SCALAR_VECTOR_BINARY_OP(+)
+SCALAR_VECTOR_BINARY_OP(-)
+SCALAR_VECTOR_BINARY_OP(*)
+SCALAR_VECTOR_BINARY_OP(/)
+#undef SCALAR_VECTOR_BINARY_OP
+
+template<class T, int n>
+std::ostream &operator << (std::ostream &os, const Vector<T, n> &v)
+{
+    assert(n > 0);
+    os << "[" << v[0];
+    for (int i = 1; i < n; ++i)
+        os << ", " << v[i];
+    os << "]";
+    return os;
+}
+
+typedef Vector<float, 2> Vector2f;
+typedef Vector<float, 3> Vector3f;
+typedef Vector<float, 4> Vector4f;
+
+template<class T, int rows, int cols>
+struct Matrix
+{
+    // Keep the Matrix struct a plain old data (POD) struct by avoiding constructors
+
+    static Matrix matrix(T x)
+    {
+        Matrix result;
+        for (int i = 0; i < rows; ++i) {
+            for (int j = 0; j < cols; ++j)
+                result.v[i][j] = x;
+        }
+        return result;
+    }
+
+    static Matrix matrix(T *m)
+    {
+        Matrix result;
+        for (int i = 0; i < rows; ++i) {
+            for (int j = 0; j < cols; ++j) {
+                result.v[i][j] = *m;
+                ++m;
+            }
+        }
+        return result;
+    }
+
+    T &operator () (int i, int j) {return v[i][j];}
+    T operator () (int i, int j) const {return v[i][j];}
+    Vector<T, cols> &operator [] (int i) {return v[i];}
+    const Vector<T, cols> &operator [] (int i) const {return v[i];}
+
+    // TODO: operators, methods
+
+    Vector<T, rows> operator * (const Vector<T, cols> &u) const
+    {
+        Vector<T, rows> result;
+        for (int i = 0; i < rows; ++i)
+            result[i] = Vector<T, cols>::dot(v[i], u);
+        return result;
+    }
+
+    template<int k>
+    Matrix<T, rows, k> operator * (const Matrix<T, cols, k> &m)
+    {
+        Matrix<T, rows, k> result;
+        for (int i = 0; i < rows; ++i)
+            result[i] = v[i] * m;
+        return result;
+    }
+
+    T* bits() {return reinterpret_cast<T *>(this);}
+    const T* bits() const {return reinterpret_cast<const T *>(this);}
+
+    // Simple Gauss elimination.
+    // TODO: Optimize and improve stability.
+    Matrix inverse(bool *ok = 0) const
+    {
+        assert(rows == cols);
+        Matrix rhs = identity();
+        Matrix lhs(*this);
+        T temp;
+        // Down
+        for (int i = 0; i < rows; ++i) {
+            // Pivoting
+            int pivot = i;
+            for (int j = i; j < rows; ++j) {
+                if (qAbs(lhs(j, i)) > lhs(pivot, i))
+                    pivot = j;
+            }
+			// TODO: fuzzy compare.
+            if (lhs(pivot, i) == T(0)) {
+                if (ok)
+                    *ok = false;
+                return rhs;
+            }
+            if (pivot != i) {
+                for (int j = i; j < cols; ++j) {
+                    temp = lhs(pivot, j);
+                    lhs(pivot, j) = lhs(i, j);
+                    lhs(i, j) = temp;
+                }
+                for (int j = 0; j < cols; ++j) {
+                    temp = rhs(pivot, j);
+                    rhs(pivot, j) = rhs(i, j);
+                    rhs(i, j) = temp;
+                }
+            }
+
+            // Normalize i-th row
+            rhs[i] /= lhs(i, i);
+            for (int j = cols - 1; j > i; --j)
+                lhs(i, j) /= lhs(i, i);
+
+			// Eliminate non-zeros in i-th column below the i-th row.
+            for (int j = i + 1; j < rows; ++j) {
+                rhs[j] -= lhs(j, i) * rhs[i];
+                for (int k = i + 1; k < cols; ++k)
+                    lhs(j, k) -= lhs(j, i) * lhs(i, k);
+            }
+        }
+        // Up
+        for (int i = rows - 1; i > 0; --i) {
+            for (int j = i - 1; j >= 0; --j)
+                rhs[j] -= lhs(j, i) * rhs[i];
+        }
+        if (ok)
+            *ok = true;
+        return rhs;
+    }
+
+    Matrix<T, cols, rows> transpose() const
+    {
+        Matrix<T, cols, rows> result;
+        for (int i = 0; i < rows; ++i) {
+            for (int j = 0; j < cols; ++j)
+                result.v[j][i] = v[i][j];
+        }
+        return result;
+    }
+
+    static Matrix identity()
+    {
+        Matrix result = matrix(T(0));
+        for (int i = 0; i < rows && i < cols; ++i)
+            result.v[i][i] = T(1);
+        return result;
+    }
+
+    Vector<T, cols> v[rows];
+};
+
+template<class T, int rows, int cols>
+Vector<T, cols> operator * (const Vector<T, rows> &u, const Matrix<T, rows, cols> &m)
+{
+    Vector<T, cols> result = Vector<T, cols>::vector(T(0));
+    for (int i = 0; i < rows; ++i)
+        result += m[i] * u[i];
+    return result;
+}
+
+template<class T, int rows, int cols>
+std::ostream &operator << (std::ostream &os, const Matrix<T, rows, cols> &m)
+{
+    assert(rows > 0);
+    os << "[" << m[0];
+    for (int i = 1; i < rows; ++i)
+        os << ", " << m[i];
+    os << "]";
+    return os;
+}
+
+
+typedef Matrix<float, 2, 2> Matrix2x2f;
+typedef Matrix<float, 3, 3> Matrix3x3f;
+typedef Matrix<float, 4, 4> Matrix4x4f;
+
+template<class T>
+struct Quaternion
+{
+    // Keep the Quaternion struct a plain old data (POD) struct by avoiding constructors
+
+    static Quaternion quaternion(T s, T x, T y, T z)
+    {
+        Quaternion result;
+        result.scalar = s;
+        result.vector[0] = x;
+        result.vector[1] = y;
+        result.vector[2] = z;
+        return result;
+    }
+
+    static Quaternion quaternion(T s, const Vector<T, 3> &v)
+    {
+        Quaternion result;
+        result.scalar = s;
+        result.vector = v;
+        return result;
+    }
+
+    static Quaternion identity()
+    {
+        return quaternion(T(1), T(0), T(0), T(0));
+    }
+
+    // assumes that all the elements are packed tightly
+    T& operator [] (int i) {return reinterpret_cast<T *>(this)[i];}
+    T operator [] (int i) const {return reinterpret_cast<const T *>(this)[i];}
+
+#define QUATERNION_BINARY_OP(op, arg, rhs)  \
+    Quaternion operator op (arg) const      \
+    {                                       \
+        Quaternion result;                  \
+        for (int i = 0; i < 4; ++i)         \
+            result[i] = (*this)[i] op rhs;  \
+        return result;                      \
+    }
+
+    QUATERNION_BINARY_OP(+, const Quaternion &q, q[i])
+    QUATERNION_BINARY_OP(-, const Quaternion &q, q[i])
+    QUATERNION_BINARY_OP(*, T s, s)
+    QUATERNION_BINARY_OP(/, T s, s)
+#undef QUATERNION_BINARY_OP
+
+    Quaternion operator - () const
+    {
+        return Quaternion(-scalar, -vector);
+    }
+
+    Quaternion operator * (const Quaternion &q) const
+    {
+        Quaternion result;
+        result.scalar = scalar * q.scalar - Vector<T, 3>::dot(vector, q.vector);
+        result.vector = scalar * q.vector + vector * q.scalar + Vector<T, 3>::cross(vector, q.vector);
+        return result;
+    }
+
+    Quaternion operator * (const Vector<T, 3> &v) const
+    {
+        Quaternion result;
+        result.scalar = -Vector<T, 3>::dot(vector, v);
+        result.vector = scalar * v + Vector<T, 3>::cross(vector, v);
+        return result;
+    }
+
+    friend Quaternion operator * (const Vector<T, 3> &v, const Quaternion &q)
+    {
+        Quaternion result;
+        result.scalar = -Vector<T, 3>::dot(v, q.vector);
+        result.vector = v * q.scalar + Vector<T, 3>::cross(v, q.vector);
+        return result;
+    }
+
+#define QUATERNION_ASSIGN_OP(op, arg, rhs)  \
+    Quaternion &operator op (arg)           \
+    {                                       \
+        for (int i = 0; i < 4; ++i)         \
+            (*this)[i] op rhs;              \
+        return *this;                       \
+    }
+
+    QUATERNION_ASSIGN_OP(+=, const Quaternion &q, q[i])
+    QUATERNION_ASSIGN_OP(-=, const Quaternion &q, q[i])
+    QUATERNION_ASSIGN_OP(=, T s, s)
+    QUATERNION_ASSIGN_OP(*=, T s, s)
+    QUATERNION_ASSIGN_OP(/=, T s, s)
+#undef QUATERNION_ASSIGN_OP
+
+    Quaternion& operator *= (const Quaternion &q)
+    {
+        Quaternion result;
+        result.scalar = scalar * q.scalar - Vector<T, 3>::dot(vector, q.vector);
+        result.vector = scalar * q.vector + vector * q.scalar + Vector<T, 3>::cross(vector, q.vector);
+        return (*this = result);
+    }
+
+    Quaternion& operator *= (const Vector<T, 3> &v)
+    {
+        Quaternion result;
+        result.scalar = -Vector<T, 3>::dot(vector, v);
+        result.vector = scalar * v + Vector<T, 3>::cross(vector, v);
+        return (*this = result);
+    }
+
+    Quaternion conjugate() const
+    {
+        return quaternion(scalar, -vector);
+    }
+
+    T sqrNorm() const
+    {
+        return scalar * scalar + vector.sqrNorm();
+    }
+
+    Quaternion inverse() const
+    {
+        return conjugate() / sqrNorm();
+    }
+
+    // requires floating point type T
+    Quaternion normalized() const
+    {
+        T s = sqrNorm();
+        if (s == 0)
+            return *this;
+        return *this / sqrt(s);
+    }
+
+    void matrix(Matrix<T, 3, 3>& m) const
+    {
+        T bb = vector[0] * vector[0];
+        T cc = vector[1] * vector[1];
+        T dd = vector[2] * vector[2];
+        T diag = scalar * scalar - bb - cc - dd;
+        T ab = scalar * vector[0];
+        T ac = scalar * vector[1];
+        T ad = scalar * vector[2];
+        T bc = vector[0] * vector[1];
+        T cd = vector[1] * vector[2];
+        T bd = vector[2] * vector[0];
+        m(0, 0) = diag + 2 * bb;
+        m(0, 1) = 2 * (bc - ad);
+        m(0, 2) = 2 * (ac + bd);
+        m(1, 0) = 2 * (ad + bc);
+        m(1, 1) = diag + 2 * cc;
+        m(1, 2) = 2 * (cd - ab);
+        m(2, 0) = 2 * (bd - ac);
+        m(2, 1) = 2 * (ab + cd);
+        m(2, 2) = diag + 2 * dd;
+    }
+
+    void matrix(Matrix<T, 4, 4>& m) const
+    {
+        T bb = vector[0] * vector[0];
+        T cc = vector[1] * vector[1];
+        T dd = vector[2] * vector[2];
+        T diag = scalar * scalar - bb - cc - dd;
+        T ab = scalar * vector[0];
+        T ac = scalar * vector[1];
+        T ad = scalar * vector[2];
+        T bc = vector[0] * vector[1];
+        T cd = vector[1] * vector[2];
+        T bd = vector[2] * vector[0];
+        m(0, 0) = diag + 2 * bb;
+        m(0, 1) = 2 * (bc - ad);
+        m(0, 2) = 2 * (ac + bd);
+        m(0, 3) = 0;
+        m(1, 0) = 2 * (ad + bc);
+        m(1, 1) = diag + 2 * cc;
+        m(1, 2) = 2 * (cd - ab);
+        m(1, 3) = 0;
+        m(2, 0) = 2 * (bd - ac);
+        m(2, 1) = 2 * (ab + cd);
+        m(2, 2) = diag + 2 * dd;
+        m(2, 3) = 0;
+        m(3, 0) = 0;
+        m(3, 1) = 0;
+        m(3, 2) = 0;
+        m(3, 3) = 1;
+    }
+
+    // assumes that 'this' is normalized
+    Vector<T, 3> transform(const Vector<T, 3> &v) const
+    {
+        Matrix<T, 3, 3> m;
+        matrix(m);
+        return v * m;
+    }
+
+    // assumes that all the elements are packed tightly
+    T* bits() {return reinterpret_cast<T *>(this);}
+    const T* bits() const {return reinterpret_cast<const T *>(this);}
+
+    // requires floating point type T
+    static Quaternion rotation(T angle, const Vector<T, 3> &unitAxis)
+    {
+        T s = sin(angle / 2);
+        T c = cos(angle / 2);
+        return quaternion(c, unitAxis * s);
+    }
+
+    T scalar;
+    Vector<T, 3> vector;
+};
+
+template<class T>
+Quaternion<T> operator * (T s, const Quaternion<T>& q)
+{
+    return Quaternion<T>::quaternion(s * q.scalar, s * q.vector);
+}
+
+typedef Quaternion<float> Quaternionf;
+
+} // end namespace gfx
+
+#endif
diff --git a/demos/boxes/wood.fsh b/demos/boxes/wood.fsh
new file mode 100644
index 0000000..35bf7d6
--- /dev/null
+++ b/demos/boxes/wood.fsh
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform sampler3D noise;
+
+//const vec4 woodColors[2] = {vec4(0.37,0.24,0.20,1), vec4(0.8,0.6,0.4,1)};
+uniform vec4 woodColors[2];
+//const float woodTubulence = 0.1;
+uniform float woodTubulence;
+
+void main()
+{
+    float r = length(gl_TexCoord[1].yz);
+    r += woodTubulence * texture3D(noise, 0.25 * gl_TexCoord[1].xyz).x;
+
+    vec3 N = normalize(normal);
+    // assume directional light
+
+    gl_MaterialParameters M = gl_FrontMaterial;
+
+    float NdotL = dot(N, lightDirection.xyz);
+    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
+
+    float f = fract(16.0 * r);
+    vec4 unlitColor = mix(woodColors[0], woodColors[1], min(1.25 * f, 5.0 - 5.0 * f));
+    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
+                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
+}
diff --git a/demos/browser/Info_mac.plist b/demos/browser/Info_mac.plist
new file mode 100644
index 0000000..5648631
--- /dev/null
+++ b/demos/browser/Info_mac.plist
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleIconFile</key>
+	<string>@ICON@</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+        <key>CFBundleGetInfoString</key>
+	<string>Created by Qt/QMake</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.trolltech.DemoBrowser</string>
+	<key>CFBundleSignature</key>
+	<string>ttxt</string>
+	<key>CFBundleExecutable</key>
+	<string>@EXECUTABLE@</string>
+	<key>CFBundleDocumentTypes</key>
+        <array>
+                <dict>
+                        <key>CFBundleTypeExtensions</key>
+                        <array>
+                                <string>html</string>
+                                <string>htm</string>
+                                <string>shtml</string>
+                                <string>xht</string>
+                                <string>xhtml</string>
+                        </array>
+			<key>CFBundleTypeIconFile</key>
+			<string>@ICON@</string>
+                        <key>CFBundleTypeName</key>
+                        <string>HTML Document</string>
+                        <key>CFBundleTypeOSTypes</key>
+                        <array>
+                                <string>HTML</string>
+                        </array>
+                        <key>CFBundleTypeRole</key>
+                        <string>Viewer</string>
+                </dict>
+        </array>
+	<key>NOTE</key>
+	<string>DemoBrowser by Nokia Corporation and/or its subsidiary(-ies)</string>
+</dict>
+</plist>
diff --git a/demos/browser/addbookmarkdialog.ui b/demos/browser/addbookmarkdialog.ui
new file mode 100644
index 0000000..3460d7b
--- /dev/null
+++ b/demos/browser/addbookmarkdialog.ui
@@ -0,0 +1,98 @@
+<ui version="4.0" >
+ <class>AddBookmarkDialog</class>
+ <widget class="QDialog" name="AddBookmarkDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>240</width>
+    <height>168</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Add Bookmark</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" >
+   <item>
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Type a name for the bookmark, and choose where to keep it.</string>
+     </property>
+     <property name="textFormat" >
+      <enum>Qt::PlainText</enum>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="name" />
+   </item>
+   <item>
+    <widget class="QComboBox" name="location" />
+   </item>
+   <item>
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>2</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>AddBookmarkDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>AddBookmarkDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/autosaver.cpp b/demos/browser/autosaver.cpp
new file mode 100644
index 0000000..4e945f0
--- /dev/null
+++ b/demos/browser/autosaver.cpp
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "autosaver.h"
+
+#include <QtCore/QDir>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QMetaObject>
+#include <QtDebug>
+
+#define AUTOSAVE_IN  1000 * 3  // seconds
+#define MAXWAIT      1000 * 15 // seconds
+
+AutoSaver::AutoSaver(QObject *parent) : QObject(parent)
+{
+    Q_ASSERT(parent);
+}
+
+AutoSaver::~AutoSaver()
+{
+    if (m_timer.isActive())
+        qWarning() << "AutoSaver: still active when destroyed, changes not saved.";
+}
+
+void AutoSaver::changeOccurred()
+{
+    if (m_firstChange.isNull())
+        m_firstChange.start();
+
+    if (m_firstChange.elapsed() > MAXWAIT) {
+        saveIfNeccessary();
+    } else {
+        m_timer.start(AUTOSAVE_IN, this);
+    }
+}
+
+void AutoSaver::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == m_timer.timerId()) {
+        saveIfNeccessary();
+    } else {
+        QObject::timerEvent(event);
+    }
+}
+
+void AutoSaver::saveIfNeccessary()
+{
+    if (!m_timer.isActive())
+        return;
+    m_timer.stop();
+    m_firstChange = QTime();
+    if (!QMetaObject::invokeMethod(parent(), "save", Qt::DirectConnection)) {
+        qWarning() << "AutoSaver: error invoking slot save() on parent";
+    }
+}
+
diff --git a/demos/browser/autosaver.h b/demos/browser/autosaver.h
new file mode 100644
index 0000000..bb340cd
--- /dev/null
+++ b/demos/browser/autosaver.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef AUTOSAVER_H
+#define AUTOSAVER_H
+
+#include <QtCore/QObject>
+#include <QtCore/QBasicTimer>
+#include <QtCore/QTime>
+
+/*
+    This class will call the save() slot on the parent object when the parent changes.
+    It will wait several seconds after changed() to combining multiple changes and
+    prevent continuous writing to disk.
+  */
+class AutoSaver : public QObject {
+
+Q_OBJECT
+
+public:
+    AutoSaver(QObject *parent);
+    ~AutoSaver();
+    void saveIfNeccessary();
+
+public slots:
+    void changeOccurred();
+
+protected:
+    void timerEvent(QTimerEvent *event);
+
+private:
+    QBasicTimer m_timer;
+    QTime m_firstChange;
+
+};
+
+#endif // AUTOSAVER_H
+
diff --git a/demos/browser/bookmarks.cpp b/demos/browser/bookmarks.cpp
new file mode 100644
index 0000000..8e7823d
--- /dev/null
+++ b/demos/browser/bookmarks.cpp
@@ -0,0 +1,987 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "bookmarks.h"
+
+#include "autosaver.h"
+#include "browserapplication.h"
+#include "history.h"
+#include "xbel.h"
+
+#include <QtCore/QBuffer>
+#include <QtCore/QFile>
+#include <QtCore/QMimeData>
+
+#include <QtGui/QDesktopServices>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QFileDialog>
+#include <QtGui/QHeaderView>
+#include <QtGui/QIcon>
+#include <QtGui/QMessageBox>
+#include <QtGui/QToolButton>
+
+#include <QtWebKit/QWebSettings>
+
+#include <QtCore/QDebug>
+
+#define BOOKMARKBAR "Bookmarks Bar"
+#define BOOKMARKMENU "Bookmarks Menu"
+
+BookmarksManager::BookmarksManager(QObject *parent)
+    : QObject(parent)
+    , m_loaded(false)
+    , m_saveTimer(new AutoSaver(this))
+    , m_bookmarkRootNode(0)
+    , m_bookmarkModel(0)
+{
+    connect(this, SIGNAL(entryAdded(BookmarkNode *)),
+            m_saveTimer, SLOT(changeOccurred()));
+    connect(this, SIGNAL(entryRemoved(BookmarkNode *, int, BookmarkNode *)),
+            m_saveTimer, SLOT(changeOccurred()));
+    connect(this, SIGNAL(entryChanged(BookmarkNode *)),
+            m_saveTimer, SLOT(changeOccurred()));
+}
+
+BookmarksManager::~BookmarksManager()
+{
+    m_saveTimer->saveIfNeccessary();
+}
+
+void BookmarksManager::changeExpanded()
+{
+    m_saveTimer->changeOccurred();
+}
+
+void BookmarksManager::load()
+{
+    if (m_loaded)
+        return;
+    m_loaded = true;
+
+    QString dir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    QString bookmarkFile = dir + QLatin1String("/bookmarks.xbel");
+    if (!QFile::exists(bookmarkFile))
+        bookmarkFile = QLatin1String(":defaultbookmarks.xbel");
+
+    XbelReader reader;
+    m_bookmarkRootNode = reader.read(bookmarkFile);
+    if (reader.error() != QXmlStreamReader::NoError) {
+        QMessageBox::warning(0, QLatin1String("Loading Bookmark"),
+            tr("Error when loading bookmarks on line %1, column %2:\n"
+               "%3").arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString()));
+    }
+
+    BookmarkNode *toolbar = 0;
+    BookmarkNode *menu = 0;
+    QList<BookmarkNode*> others;
+    for (int i = m_bookmarkRootNode->children().count() - 1; i >= 0; --i) {
+        BookmarkNode *node = m_bookmarkRootNode->children().at(i);
+        if (node->type() == BookmarkNode::Folder) {
+            // Automatically convert
+            if (node->title == tr("Toolbar Bookmarks") && !toolbar) {
+                node->title = tr(BOOKMARKBAR);
+            }
+            if (node->title == tr(BOOKMARKBAR) && !toolbar) {
+                toolbar = node;
+            }
+
+            // Automatically convert
+            if (node->title == tr("Menu") && !menu) {
+                node->title = tr(BOOKMARKMENU);
+            }
+            if (node->title == tr(BOOKMARKMENU) && !menu) {
+                menu = node;
+            }
+        } else {
+            others.append(node);
+        }
+        m_bookmarkRootNode->remove(node);
+    }
+    Q_ASSERT(m_bookmarkRootNode->children().count() == 0);
+    if (!toolbar) {
+        toolbar = new BookmarkNode(BookmarkNode::Folder, m_bookmarkRootNode);
+        toolbar->title = tr(BOOKMARKBAR);
+    } else {
+        m_bookmarkRootNode->add(toolbar);
+    }
+
+    if (!menu) {
+        menu = new BookmarkNode(BookmarkNode::Folder, m_bookmarkRootNode);
+        menu->title = tr(BOOKMARKMENU);
+    } else {
+        m_bookmarkRootNode->add(menu);
+    }
+
+    for (int i = 0; i < others.count(); ++i)
+        menu->add(others.at(i));
+}
+
+void BookmarksManager::save() const
+{
+    if (!m_loaded)
+        return;
+
+    XbelWriter writer;
+    QString dir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    QString bookmarkFile = dir + QLatin1String("/bookmarks.xbel");
+    if (!writer.write(bookmarkFile, m_bookmarkRootNode))
+        qWarning() << "BookmarkManager: error saving to" << bookmarkFile;
+}
+
+void BookmarksManager::addBookmark(BookmarkNode *parent, BookmarkNode *node, int row)
+{
+    if (!m_loaded)
+        return;
+    Q_ASSERT(parent);
+    InsertBookmarksCommand *command = new InsertBookmarksCommand(this, parent, node, row);
+    m_commands.push(command);
+}
+
+void BookmarksManager::removeBookmark(BookmarkNode *node)
+{
+    if (!m_loaded)
+        return;
+
+    Q_ASSERT(node);
+    BookmarkNode *parent = node->parent();
+    int row = parent->children().indexOf(node);
+    RemoveBookmarksCommand *command = new RemoveBookmarksCommand(this, parent, row);
+    m_commands.push(command);
+}
+
+void BookmarksManager::setTitle(BookmarkNode *node, const QString &newTitle)
+{
+    if (!m_loaded)
+        return;
+
+    Q_ASSERT(node);
+    ChangeBookmarkCommand *command = new ChangeBookmarkCommand(this, node, newTitle, true);
+    m_commands.push(command);
+}
+
+void BookmarksManager::setUrl(BookmarkNode *node, const QString &newUrl)
+{
+    if (!m_loaded)
+        return;
+
+    Q_ASSERT(node);
+    ChangeBookmarkCommand *command = new ChangeBookmarkCommand(this, node, newUrl, false);
+    m_commands.push(command);
+}
+
+BookmarkNode *BookmarksManager::bookmarks()
+{
+    if (!m_loaded)
+        load();
+    return m_bookmarkRootNode;
+}
+
+BookmarkNode *BookmarksManager::menu()
+{
+    if (!m_loaded)
+        load();
+
+    for (int i = m_bookmarkRootNode->children().count() - 1; i >= 0; --i) {
+        BookmarkNode *node = m_bookmarkRootNode->children().at(i);
+        if (node->title == tr(BOOKMARKMENU))
+            return node;
+    }
+    Q_ASSERT(false);
+    return 0;
+}
+
+BookmarkNode *BookmarksManager::toolbar()
+{
+    if (!m_loaded)
+        load();
+
+    for (int i = m_bookmarkRootNode->children().count() - 1; i >= 0; --i) {
+        BookmarkNode *node = m_bookmarkRootNode->children().at(i);
+        if (node->title == tr(BOOKMARKBAR))
+            return node;
+    }
+    Q_ASSERT(false);
+    return 0;
+}
+
+BookmarksModel *BookmarksManager::bookmarksModel()
+{
+    if (!m_bookmarkModel)
+        m_bookmarkModel = new BookmarksModel(this, this);
+    return m_bookmarkModel;
+}
+
+void BookmarksManager::importBookmarks()
+{
+    QString fileName = QFileDialog::getOpenFileName(0, tr("Open File"),
+                                                     QString(),
+                                                     tr("XBEL (*.xbel *.xml)"));
+    if (fileName.isEmpty())
+        return;
+
+    XbelReader reader;
+    BookmarkNode *importRootNode = reader.read(fileName);
+    if (reader.error() != QXmlStreamReader::NoError) {
+        QMessageBox::warning(0, QLatin1String("Loading Bookmark"),
+            tr("Error when loading bookmarks on line %1, column %2:\n"
+               "%3").arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString()));
+    }
+
+    importRootNode->setType(BookmarkNode::Folder);
+    importRootNode->title = (tr("Imported %1").arg(QDate::currentDate().toString(Qt::SystemLocaleShortDate)));
+    addBookmark(menu(), importRootNode);
+}
+
+void BookmarksManager::exportBookmarks()
+{
+    QString fileName = QFileDialog::getSaveFileName(0, tr("Save File"),
+                                tr("%1 Bookmarks.xbel").arg(QCoreApplication::applicationName()),
+                                tr("XBEL (*.xbel *.xml)"));
+    if (fileName.isEmpty())
+        return;
+
+    XbelWriter writer;
+    if (!writer.write(fileName, m_bookmarkRootNode))
+        QMessageBox::critical(0, tr("Export error"), tr("error saving bookmarks"));
+}
+
+RemoveBookmarksCommand::RemoveBookmarksCommand(BookmarksManager *m_bookmarkManagaer, BookmarkNode *parent, int row)
+    : QUndoCommand(BookmarksManager::tr("Remove Bookmark"))
+    , m_row(row)
+    , m_bookmarkManagaer(m_bookmarkManagaer)
+    , m_node(parent->children().value(row))
+    , m_parent(parent)
+    , m_done(false)
+{
+}
+
+RemoveBookmarksCommand::~RemoveBookmarksCommand()
+{
+    if (m_done && !m_node->parent()) {
+        delete m_node;
+    }
+}
+
+void RemoveBookmarksCommand::undo()
+{
+    m_parent->add(m_node, m_row);
+    emit m_bookmarkManagaer->entryAdded(m_node);
+    m_done = false;
+}
+
+void RemoveBookmarksCommand::redo()
+{
+    m_parent->remove(m_node);
+    emit m_bookmarkManagaer->entryRemoved(m_parent, m_row, m_node);
+    m_done = true;
+}
+
+InsertBookmarksCommand::InsertBookmarksCommand(BookmarksManager *m_bookmarkManagaer,
+                BookmarkNode *parent, BookmarkNode *node, int row)
+    : RemoveBookmarksCommand(m_bookmarkManagaer, parent, row)
+{
+    setText(BookmarksManager::tr("Insert Bookmark"));
+    m_node = node;
+}
+
+ChangeBookmarkCommand::ChangeBookmarkCommand(BookmarksManager *m_bookmarkManagaer, BookmarkNode *node,
+                        const QString &newValue, bool title)
+    : QUndoCommand()
+    , m_bookmarkManagaer(m_bookmarkManagaer)
+    , m_title(title)
+    , m_newValue(newValue)
+    , m_node(node)
+{
+    if (m_title) {
+        m_oldValue = m_node->title;
+        setText(BookmarksManager::tr("Name Change"));
+    } else {
+        m_oldValue = m_node->url;
+        setText(BookmarksManager::tr("Address Change"));
+    }
+}
+
+void ChangeBookmarkCommand::undo()
+{
+    if (m_title)
+        m_node->title = m_oldValue;
+    else
+        m_node->url = m_oldValue;
+    emit m_bookmarkManagaer->entryChanged(m_node);
+}
+
+void ChangeBookmarkCommand::redo()
+{
+    if (m_title)
+        m_node->title = m_newValue;
+    else
+        m_node->url = m_newValue;
+    emit m_bookmarkManagaer->entryChanged(m_node);
+}
+
+BookmarksModel::BookmarksModel(BookmarksManager *bookmarkManager, QObject *parent)
+    : QAbstractItemModel(parent)
+    , m_endMacro(false)
+    , m_bookmarksManager(bookmarkManager)
+{
+    connect(bookmarkManager, SIGNAL(entryAdded(BookmarkNode *)),
+            this, SLOT(entryAdded(BookmarkNode *)));
+    connect(bookmarkManager, SIGNAL(entryRemoved(BookmarkNode *, int, BookmarkNode *)),
+            this, SLOT(entryRemoved(BookmarkNode *, int, BookmarkNode *)));
+    connect(bookmarkManager, SIGNAL(entryChanged(BookmarkNode *)),
+            this, SLOT(entryChanged(BookmarkNode *)));
+}
+
+QModelIndex BookmarksModel::index(BookmarkNode *node) const
+{
+    BookmarkNode *parent = node->parent();
+    if (!parent)
+        return QModelIndex();
+    return createIndex(parent->children().indexOf(node), 0, node);
+}
+
+void BookmarksModel::entryAdded(BookmarkNode *item)
+{
+    Q_ASSERT(item && item->parent());
+    int row = item->parent()->children().indexOf(item);
+    BookmarkNode *parent = item->parent();
+    // item was already added so remove beore beginInsertRows is called
+    parent->remove(item);
+    beginInsertRows(index(parent), row, row);
+    parent->add(item, row);
+    endInsertRows();
+}
+
+void BookmarksModel::entryRemoved(BookmarkNode *parent, int row, BookmarkNode *item)
+{
+    // item was already removed, re-add so beginRemoveRows works
+    parent->add(item, row);
+    beginRemoveRows(index(parent), row, row);
+    parent->remove(item);
+    endRemoveRows();
+}
+
+void BookmarksModel::entryChanged(BookmarkNode *item)
+{
+    QModelIndex idx = index(item);
+    emit dataChanged(idx, idx);
+}
+
+bool BookmarksModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (row < 0 || count <= 0 || row + count > rowCount(parent))
+        return false;
+
+    BookmarkNode *bookmarkNode = node(parent);
+    for (int i = row + count - 1; i >= row; --i) {
+        BookmarkNode *node = bookmarkNode->children().at(i);
+        if (node == m_bookmarksManager->menu()
+            || node == m_bookmarksManager->toolbar())
+            continue;
+
+        m_bookmarksManager->removeBookmark(node);
+    }
+    if (m_endMacro) {
+        m_bookmarksManager->undoRedoStack()->endMacro();
+        m_endMacro = false;
+    }
+    return true;
+}
+
+QVariant BookmarksModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
+        switch (section) {
+            case 0: return tr("Title");
+            case 1: return tr("Address");
+        }
+    }
+    return QAbstractItemModel::headerData(section, orientation, role);
+}
+
+QVariant BookmarksModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.model() != this)
+        return QVariant();
+
+    const BookmarkNode *bookmarkNode = node(index);
+    switch (role) {
+    case Qt::EditRole:
+    case Qt::DisplayRole:
+        if (bookmarkNode->type() == BookmarkNode::Separator) {
+            switch (index.column()) {
+            case 0: return QString(50, 0xB7);
+            case 1: return QString();
+            }
+        }
+
+        switch (index.column()) {
+        case 0: return bookmarkNode->title;
+        case 1: return bookmarkNode->url;
+        }
+        break;
+    case BookmarksModel::UrlRole:
+        return QUrl(bookmarkNode->url);
+        break;
+    case BookmarksModel::UrlStringRole:
+        return bookmarkNode->url;
+        break;
+    case BookmarksModel::TypeRole:
+        return bookmarkNode->type();
+        break;
+    case BookmarksModel::SeparatorRole:
+        return (bookmarkNode->type() == BookmarkNode::Separator);
+        break;
+    case Qt::DecorationRole:
+        if (index.column() == 0) {
+            if (bookmarkNode->type() == BookmarkNode::Folder)
+                return QApplication::style()->standardIcon(QStyle::SP_DirIcon);
+            return BrowserApplication::instance()->icon(bookmarkNode->url);
+        }
+    }
+
+    return QVariant();
+}
+
+int BookmarksModel::columnCount(const QModelIndex &parent) const
+{
+    return (parent.column() > 0) ? 0 : 2;
+}
+
+int BookmarksModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.column() > 0)
+        return 0;
+
+    if (!parent.isValid())
+        return m_bookmarksManager->bookmarks()->children().count();
+
+    const BookmarkNode *item = static_cast<BookmarkNode*>(parent.internalPointer());
+    return item->children().count();
+}
+
+QModelIndex BookmarksModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < 0 || column < 0 || row >= rowCount(parent) || column >= columnCount(parent))
+        return QModelIndex();
+
+    // get the parent node
+    BookmarkNode *parentNode = node(parent);
+    return createIndex(row, column, parentNode->children().at(row));
+}
+
+QModelIndex BookmarksModel::parent(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return QModelIndex();
+
+    BookmarkNode *itemNode = node(index);
+    BookmarkNode *parentNode = (itemNode ? itemNode->parent() : 0);
+    if (!parentNode || parentNode == m_bookmarksManager->bookmarks())
+        return QModelIndex();
+
+    // get the parent's row
+    BookmarkNode *grandParentNode = parentNode->parent();
+    int parentRow = grandParentNode->children().indexOf(parentNode);
+    Q_ASSERT(parentRow >= 0);
+    return createIndex(parentRow, 0, parentNode);
+}
+
+bool BookmarksModel::hasChildren(const QModelIndex &parent) const
+{
+    if (!parent.isValid())
+        return true;
+    const BookmarkNode *parentNode = node(parent);
+    return (parentNode->type() == BookmarkNode::Folder);
+}
+
+Qt::ItemFlags BookmarksModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::NoItemFlags;
+
+    Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+
+    BookmarkNode *bookmarkNode = node(index);
+
+    if (bookmarkNode != m_bookmarksManager->menu()
+        && bookmarkNode != m_bookmarksManager->toolbar()) {
+        flags |= Qt::ItemIsDragEnabled;
+        if (bookmarkNode->type() != BookmarkNode::Separator)
+            flags |= Qt::ItemIsEditable;
+    }
+    if (hasChildren(index))
+        flags |= Qt::ItemIsDropEnabled;
+    return flags;
+}
+
+Qt::DropActions BookmarksModel::supportedDropActions () const
+{
+    return Qt::CopyAction | Qt::MoveAction;
+}
+
+#define MIMETYPE QLatin1String("application/bookmarks.xbel")
+
+QStringList BookmarksModel::mimeTypes() const
+{
+    QStringList types;
+    types << MIMETYPE;
+    return types;
+}
+
+QMimeData *BookmarksModel::mimeData(const QModelIndexList &indexes) const
+{
+    QMimeData *mimeData = new QMimeData();
+    QByteArray data;
+    QDataStream stream(&data, QIODevice::WriteOnly);
+    foreach (QModelIndex index, indexes) {
+        if (index.column() != 0 || !index.isValid())
+            continue;
+        QByteArray encodedData;
+        QBuffer buffer(&encodedData);
+        buffer.open(QBuffer::ReadWrite);
+        XbelWriter writer;
+        const BookmarkNode *parentNode = node(index);
+        writer.write(&buffer, parentNode);
+        stream << encodedData;
+    }
+    mimeData->setData(MIMETYPE, data);
+    return mimeData;
+}
+
+bool BookmarksModel::dropMimeData(const QMimeData *data,
+     Qt::DropAction action, int row, int column, const QModelIndex &parent)
+{
+    if (action == Qt::IgnoreAction)
+        return true;
+
+    if (!data->hasFormat(MIMETYPE)
+        || column > 0)
+        return false;
+
+    QByteArray ba = data->data(MIMETYPE);
+    QDataStream stream(&ba, QIODevice::ReadOnly);
+    if (stream.atEnd())
+        return false;
+
+    QUndoStack *undoStack = m_bookmarksManager->undoRedoStack();
+    undoStack->beginMacro(QLatin1String("Move Bookmarks"));
+
+    while (!stream.atEnd()) {
+        QByteArray encodedData;
+        stream >> encodedData;
+        QBuffer buffer(&encodedData);
+        buffer.open(QBuffer::ReadOnly);
+
+        XbelReader reader;
+        BookmarkNode *rootNode = reader.read(&buffer);
+        QList<BookmarkNode*> children = rootNode->children();
+        for (int i = 0; i < children.count(); ++i) {
+            BookmarkNode *bookmarkNode = children.at(i);
+            rootNode->remove(bookmarkNode);
+            row = qMax(0, row);
+            BookmarkNode *parentNode = node(parent);
+            m_bookmarksManager->addBookmark(parentNode, bookmarkNode, row);
+            m_endMacro = true;
+        }
+        delete rootNode;
+    }
+    return true;
+}
+
+bool BookmarksModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (!index.isValid() || (flags(index) & Qt::ItemIsEditable) == 0)
+        return false;
+
+    BookmarkNode *item = node(index);
+
+    switch (role) {
+    case Qt::EditRole:
+    case Qt::DisplayRole:
+        if (index.column() == 0) {
+            m_bookmarksManager->setTitle(item, value.toString());
+            break;
+        }
+        if (index.column() == 1) {
+            m_bookmarksManager->setUrl(item, value.toString());
+            break;
+        }
+        return false;
+    case BookmarksModel::UrlRole:
+        m_bookmarksManager->setUrl(item, value.toUrl().toString());
+        break;
+    case BookmarksModel::UrlStringRole:
+        m_bookmarksManager->setUrl(item, value.toString());
+        break;
+    default:
+        break;
+        return false;
+    }
+
+    return true;
+}
+
+BookmarkNode *BookmarksModel::node(const QModelIndex &index) const
+{
+    BookmarkNode *itemNode = static_cast<BookmarkNode*>(index.internalPointer());
+    if (!itemNode)
+        return m_bookmarksManager->bookmarks();
+    return itemNode;
+}
+
+
+AddBookmarkProxyModel::AddBookmarkProxyModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+{
+}
+
+int AddBookmarkProxyModel::columnCount(const QModelIndex &parent) const
+{
+    return qMin(1, QSortFilterProxyModel::columnCount(parent));
+}
+
+bool AddBookmarkProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+{
+    QModelIndex idx = sourceModel()->index(source_row, 0, source_parent);
+    return sourceModel()->hasChildren(idx);
+}
+
+AddBookmarkDialog::AddBookmarkDialog(const QString &url, const QString &title, QWidget *parent, BookmarksManager *bookmarkManager)
+    : QDialog(parent)
+    , m_url(url)
+    , m_bookmarksManager(bookmarkManager)
+{
+    setWindowFlags(Qt::Sheet);
+    if (!m_bookmarksManager)
+        m_bookmarksManager = BrowserApplication::bookmarksManager();
+    setupUi(this);
+    QTreeView *view = new QTreeView(this);
+    m_proxyModel = new AddBookmarkProxyModel(this);
+    BookmarksModel *model = m_bookmarksManager->bookmarksModel();
+    m_proxyModel->setSourceModel(model);
+    view->setModel(m_proxyModel);
+    view->expandAll();
+    view->header()->setStretchLastSection(true);
+    view->header()->hide();
+    view->setItemsExpandable(false);
+    view->setRootIsDecorated(false);
+    view->setIndentation(10);
+    location->setModel(m_proxyModel);
+    view->show();
+    location->setView(view);
+    BookmarkNode *menu = m_bookmarksManager->menu();
+    QModelIndex idx = m_proxyModel->mapFromSource(model->index(menu));
+    view->setCurrentIndex(idx);
+    location->setCurrentIndex(idx.row());
+    name->setText(title);
+}
+
+void AddBookmarkDialog::accept()
+{
+    QModelIndex index = location->view()->currentIndex();
+    index = m_proxyModel->mapToSource(index);
+    if (!index.isValid())
+        index = m_bookmarksManager->bookmarksModel()->index(0, 0);
+    BookmarkNode *parent = m_bookmarksManager->bookmarksModel()->node(index);
+    BookmarkNode *bookmark = new BookmarkNode(BookmarkNode::Bookmark);
+    bookmark->url = m_url;
+    bookmark->title = name->text();
+    m_bookmarksManager->addBookmark(parent, bookmark);
+    QDialog::accept();
+}
+
+BookmarksMenu::BookmarksMenu(QWidget *parent)
+    : ModelMenu(parent)
+    , m_bookmarksManager(0)
+{
+    connect(this, SIGNAL(activated(const QModelIndex &)),
+            this, SLOT(activated(const QModelIndex &)));
+    setMaxRows(-1);
+    setHoverRole(BookmarksModel::UrlStringRole);
+    setSeparatorRole(BookmarksModel::SeparatorRole);
+}
+
+void BookmarksMenu::activated(const QModelIndex &index)
+{
+    emit openUrl(index.data(BookmarksModel::UrlRole).toUrl());
+}
+
+bool BookmarksMenu::prePopulated()
+{
+    m_bookmarksManager = BrowserApplication::bookmarksManager();
+    setModel(m_bookmarksManager->bookmarksModel());
+    setRootIndex(m_bookmarksManager->bookmarksModel()->index(1, 0));
+    // initial actions
+    for (int i = 0; i < m_initialActions.count(); ++i)
+        addAction(m_initialActions.at(i));
+    if (!m_initialActions.isEmpty())
+        addSeparator();
+    createMenu(model()->index(0, 0), 1, this);
+    return true;
+}
+
+void BookmarksMenu::setInitialActions(QList<QAction*> actions)
+{
+    m_initialActions = actions;
+    for (int i = 0; i < m_initialActions.count(); ++i)
+        addAction(m_initialActions.at(i));
+}
+
+BookmarksDialog::BookmarksDialog(QWidget *parent, BookmarksManager *manager)
+    : QDialog(parent)
+{
+    m_bookmarksManager = manager;
+    if (!m_bookmarksManager)
+        m_bookmarksManager = BrowserApplication::bookmarksManager();
+    setupUi(this);
+
+    tree->setUniformRowHeights(true);
+    tree->setSelectionBehavior(QAbstractItemView::SelectRows);
+    tree->setSelectionMode(QAbstractItemView::ContiguousSelection);
+    tree->setTextElideMode(Qt::ElideMiddle);
+    m_bookmarksModel = m_bookmarksManager->bookmarksModel();
+    m_proxyModel = new TreeProxyModel(this);
+    connect(search, SIGNAL(textChanged(QString)),
+            m_proxyModel, SLOT(setFilterFixedString(QString)));
+    connect(removeButton, SIGNAL(clicked()), tree, SLOT(removeOne()));
+    m_proxyModel->setSourceModel(m_bookmarksModel);
+    tree->setModel(m_proxyModel);
+    tree->setDragDropMode(QAbstractItemView::InternalMove);
+    tree->setExpanded(m_proxyModel->index(0, 0), true);
+    tree->setAlternatingRowColors(true);
+    QFontMetrics fm(font());
+    int header = fm.width(QLatin1Char('m')) * 40;
+    tree->header()->resizeSection(0, header);
+    tree->header()->setStretchLastSection(true);
+    connect(tree, SIGNAL(activated(const QModelIndex&)),
+            this, SLOT(open()));
+    tree->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(tree, SIGNAL(customContextMenuRequested(const QPoint &)),
+            this, SLOT(customContextMenuRequested(const QPoint &)));
+    connect(addFolderButton, SIGNAL(clicked()),
+            this, SLOT(newFolder()));
+    expandNodes(m_bookmarksManager->bookmarks());
+    setAttribute(Qt::WA_DeleteOnClose);
+}
+
+BookmarksDialog::~BookmarksDialog()
+{
+    if (saveExpandedNodes(tree->rootIndex()))
+        m_bookmarksManager->changeExpanded();
+}
+
+bool BookmarksDialog::saveExpandedNodes(const QModelIndex &parent)
+{
+    bool changed = false;
+    for (int i = 0; i < m_proxyModel->rowCount(parent); ++i) {
+        QModelIndex child = m_proxyModel->index(i, 0, parent);
+        QModelIndex sourceIndex = m_proxyModel->mapToSource(child);
+        BookmarkNode *childNode = m_bookmarksModel->node(sourceIndex);
+        bool wasExpanded = childNode->expanded;
+        if (tree->isExpanded(child)) {
+            childNode->expanded = true;
+            changed |= saveExpandedNodes(child);
+        } else {
+            childNode->expanded = false;
+        }
+        changed |= (wasExpanded != childNode->expanded);
+    }
+    return changed;
+}
+
+void BookmarksDialog::expandNodes(BookmarkNode *node)
+{
+    for (int i = 0; i < node->children().count(); ++i) {
+        BookmarkNode *childNode = node->children()[i];
+        if (childNode->expanded) {
+            QModelIndex idx = m_bookmarksModel->index(childNode);
+            idx = m_proxyModel->mapFromSource(idx);
+            tree->setExpanded(idx, true);
+            expandNodes(childNode);
+        }
+    }
+}
+
+void BookmarksDialog::customContextMenuRequested(const QPoint &pos)
+{
+    QMenu menu;
+    QModelIndex index = tree->indexAt(pos);
+    index = index.sibling(index.row(), 0);
+    if (index.isValid() && !tree->model()->hasChildren(index)) {
+        menu.addAction(tr("Open"), this, SLOT(open()));
+        menu.addSeparator();
+    }
+    menu.addAction(tr("Delete"), tree, SLOT(removeOne()));
+    menu.exec(QCursor::pos());
+}
+
+void BookmarksDialog::open()
+{
+    QModelIndex index = tree->currentIndex();
+    if (!index.parent().isValid())
+        return;
+    emit openUrl(index.sibling(index.row(), 1).data(BookmarksModel::UrlRole).toUrl());
+}
+
+void BookmarksDialog::newFolder()
+{
+    QModelIndex currentIndex = tree->currentIndex();
+    QModelIndex idx = currentIndex;
+    if (idx.isValid() && !idx.model()->hasChildren(idx))
+        idx = idx.parent();
+    if (!idx.isValid())
+        idx = tree->rootIndex();
+    idx = m_proxyModel->mapToSource(idx);
+    BookmarkNode *parent = m_bookmarksManager->bookmarksModel()->node(idx);
+    BookmarkNode *node = new BookmarkNode(BookmarkNode::Folder);
+    node->title = tr("New Folder");
+    m_bookmarksManager->addBookmark(parent, node, currentIndex.row() + 1);
+}
+
+BookmarksToolBar::BookmarksToolBar(BookmarksModel *model, QWidget *parent)
+    : QToolBar(tr("Bookmark"), parent)
+    , m_bookmarksModel(model)
+{
+    connect(this, SIGNAL(actionTriggered(QAction*)), this, SLOT(triggered(QAction*)));
+    setRootIndex(model->index(0, 0));
+    connect(m_bookmarksModel, SIGNAL(modelReset()), this, SLOT(build()));
+    connect(m_bookmarksModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(build()));
+    connect(m_bookmarksModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SLOT(build()));
+    connect(m_bookmarksModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(build()));
+    setAcceptDrops(true);
+}
+
+void BookmarksToolBar::dragEnterEvent(QDragEnterEvent *event)
+{
+    const QMimeData *mimeData = event->mimeData();
+    if (mimeData->hasUrls())
+        event->acceptProposedAction();
+    QToolBar::dragEnterEvent(event);
+}
+
+void BookmarksToolBar::dropEvent(QDropEvent *event)
+{
+    const QMimeData *mimeData = event->mimeData();
+    if (mimeData->hasUrls() && mimeData->hasText()) {
+        QList<QUrl> urls = mimeData->urls();
+        QAction *action = actionAt(event->pos());
+        QString dropText;
+        if (action)
+            dropText = action->text();
+        int row = -1;
+        QModelIndex parentIndex = m_root;
+        for (int i = 0; i < m_bookmarksModel->rowCount(m_root); ++i) {
+            QModelIndex idx = m_bookmarksModel->index(i, 0, m_root);
+            QString title = idx.data().toString();
+            if (title == dropText) {
+                row = i;
+                if (m_bookmarksModel->hasChildren(idx)) {
+                    parentIndex = idx;
+                    row = -1;
+                }
+                break;
+            }
+        }
+        BookmarkNode *bookmark = new BookmarkNode(BookmarkNode::Bookmark);
+        bookmark->url = urls.at(0).toString();
+        bookmark->title = mimeData->text();
+
+        BookmarkNode *parent = m_bookmarksModel->node(parentIndex);
+        BookmarksManager *bookmarksManager = m_bookmarksModel->bookmarksManager();
+        bookmarksManager->addBookmark(parent, bookmark, row);
+        event->acceptProposedAction();
+    }
+    QToolBar::dropEvent(event);
+}
+
+
+void BookmarksToolBar::setRootIndex(const QModelIndex &index)
+{
+    m_root = index;
+    build();
+}
+
+QModelIndex BookmarksToolBar::rootIndex() const
+{
+    return m_root;
+}
+
+void BookmarksToolBar::build()
+{
+    clear();
+    for (int i = 0; i < m_bookmarksModel->rowCount(m_root); ++i) {
+        QModelIndex idx = m_bookmarksModel->index(i, 0, m_root);
+        if (m_bookmarksModel->hasChildren(idx)) {
+            QToolButton *button = new QToolButton(this);
+            button->setPopupMode(QToolButton::InstantPopup);
+            button->setArrowType(Qt::DownArrow);
+            button->setText(idx.data().toString());
+            ModelMenu *menu = new ModelMenu(this);
+            connect(menu, SIGNAL(activated(const QModelIndex &)),
+                    this, SLOT(activated(const QModelIndex &)));
+            menu->setModel(m_bookmarksModel);
+            menu->setRootIndex(idx);
+            menu->addAction(new QAction(menu));
+            button->setMenu(menu);
+            button->setToolButtonStyle(Qt::ToolButtonTextOnly);
+            QAction *a = addWidget(button);
+            a->setText(idx.data().toString());
+        } else {
+            QAction *action = addAction(idx.data().toString());
+            action->setData(idx.data(BookmarksModel::UrlRole));
+        }
+    }
+}
+
+void BookmarksToolBar::triggered(QAction *action)
+{
+    QVariant v = action->data();
+    if (v.canConvert<QUrl>()) {
+        emit openUrl(v.toUrl());
+    }
+}
+
+void BookmarksToolBar::activated(const QModelIndex &index)
+{
+    emit openUrl(index.data(BookmarksModel::UrlRole).toUrl());
+}
+
diff --git a/demos/browser/bookmarks.h b/demos/browser/bookmarks.h
new file mode 100644
index 0000000..fb47b4f
--- /dev/null
+++ b/demos/browser/bookmarks.h
@@ -0,0 +1,310 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BOOKMARKS_H
+#define BOOKMARKS_H
+
+#include <QtCore/QObject>
+#include <QtCore/QAbstractItemModel>
+
+#include <QtGui/QUndoCommand>
+
+/*!
+    Bookmark manager, owner of the bookmarks, loads, saves and basic tasks
+  */
+class AutoSaver;
+class BookmarkNode;
+class BookmarksModel;
+class BookmarksManager : public QObject
+{
+    Q_OBJECT
+
+signals:
+    void entryAdded(BookmarkNode *item);
+    void entryRemoved(BookmarkNode *parent, int row, BookmarkNode *item);
+    void entryChanged(BookmarkNode *item);
+
+public:
+    BookmarksManager(QObject *parent = 0);
+    ~BookmarksManager();
+
+    void addBookmark(BookmarkNode *parent, BookmarkNode *node, int row = -1);
+    void removeBookmark(BookmarkNode *node);
+    void setTitle(BookmarkNode *node, const QString &newTitle);
+    void setUrl(BookmarkNode *node, const QString &newUrl);
+    void changeExpanded();
+
+    BookmarkNode *bookmarks();
+    BookmarkNode *menu();
+    BookmarkNode *toolbar();
+
+    BookmarksModel *bookmarksModel();
+    QUndoStack *undoRedoStack() { return &m_commands; };
+
+public slots:
+    void importBookmarks();
+    void exportBookmarks();
+
+private slots:
+    void save() const;
+
+private:
+    void load();
+
+    bool m_loaded;
+    AutoSaver *m_saveTimer;
+    BookmarkNode *m_bookmarkRootNode;
+    BookmarksModel *m_bookmarkModel;
+    QUndoStack m_commands;
+
+    friend class RemoveBookmarksCommand;
+    friend class ChangeBookmarkCommand;
+};
+
+class RemoveBookmarksCommand : public QUndoCommand
+{
+
+public:
+    RemoveBookmarksCommand(BookmarksManager *m_bookmarkManagaer, BookmarkNode *parent, int row);
+    ~RemoveBookmarksCommand();
+    void undo();
+    void redo();
+
+protected:
+    int m_row;
+    BookmarksManager *m_bookmarkManagaer;
+    BookmarkNode *m_node;
+    BookmarkNode *m_parent;
+    bool m_done;
+};
+
+class InsertBookmarksCommand : public RemoveBookmarksCommand
+{
+
+public:
+    InsertBookmarksCommand(BookmarksManager *m_bookmarkManagaer,
+        BookmarkNode *parent, BookmarkNode *node, int row);
+    void undo() { RemoveBookmarksCommand::redo(); }
+    void redo() { RemoveBookmarksCommand::undo(); }
+
+};
+
+class ChangeBookmarkCommand : public QUndoCommand
+{
+
+public:
+    ChangeBookmarkCommand(BookmarksManager *m_bookmarkManagaer,
+        BookmarkNode *node, const QString &newValue, bool title);
+    void undo();
+    void redo();
+
+private:
+    BookmarksManager *m_bookmarkManagaer;
+    bool m_title;
+    QString m_oldValue;
+    QString m_newValue;
+    BookmarkNode *m_node;
+};
+
+/*!
+    BookmarksModel is a QAbstractItemModel wrapper around the BookmarkManager
+  */
+#include <QtGui/QIcon>
+class BookmarksModel : public QAbstractItemModel
+{
+    Q_OBJECT
+
+public slots:
+    void entryAdded(BookmarkNode *item);
+    void entryRemoved(BookmarkNode *parent, int row, BookmarkNode *item);
+    void entryChanged(BookmarkNode *item);
+
+public:
+    enum Roles {
+        TypeRole = Qt::UserRole + 1,
+        UrlRole = Qt::UserRole + 2,
+        UrlStringRole = Qt::UserRole + 3,
+        SeparatorRole = Qt::UserRole + 4
+    };
+
+    BookmarksModel(BookmarksManager *bookmarkManager, QObject *parent = 0);
+    inline BookmarksManager *bookmarksManager() const { return m_bookmarksManager; }
+
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex index(int, int, const QModelIndex& = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex& index= QModelIndex()) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    Qt::DropActions supportedDropActions () const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+    QMimeData *mimeData(const QModelIndexList &indexes) const;
+    QStringList mimeTypes() const;
+    bool dropMimeData(const QMimeData *data,
+        Qt::DropAction action, int row, int column, const QModelIndex &parent);
+    bool hasChildren(const QModelIndex &parent = QModelIndex()) const;
+
+    BookmarkNode *node(const QModelIndex &index) const;
+    QModelIndex index(BookmarkNode *node) const;
+
+private:
+
+    bool m_endMacro;
+    BookmarksManager *m_bookmarksManager;
+};
+
+// Menu that is dynamically populated from the bookmarks
+#include "modelmenu.h"
+class BookmarksMenu : public ModelMenu
+{
+    Q_OBJECT
+
+signals:
+    void openUrl(const QUrl &url);
+
+public:
+     BookmarksMenu(QWidget *parent = 0);
+     void setInitialActions(QList<QAction*> actions);
+
+protected:
+    bool prePopulated();
+
+private slots:
+    void activated(const QModelIndex &index);
+
+private:
+    BookmarksManager *m_bookmarksManager;
+    QList<QAction*> m_initialActions;
+};
+
+/*
+    Proxy model that filters out the bookmarks so only the folders
+    are left behind.  Used in the add bookmark dialog combobox.
+ */
+#include <QtGui/QSortFilterProxyModel>
+class AddBookmarkProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+public:
+    AddBookmarkProxyModel(QObject * parent = 0);
+    int columnCount(const QModelIndex & parent = QModelIndex()) const;
+
+protected:
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+};
+
+/*!
+    Add bookmark dialog
+ */
+#include "ui_addbookmarkdialog.h"
+class AddBookmarkDialog : public QDialog, public Ui_AddBookmarkDialog
+{
+    Q_OBJECT
+
+public:
+    AddBookmarkDialog(const QString &url, const QString &title, QWidget *parent = 0, BookmarksManager *bookmarkManager = 0);
+
+private slots:
+    void accept();
+
+private:
+    QString m_url;
+    BookmarksManager *m_bookmarksManager;
+    AddBookmarkProxyModel *m_proxyModel;
+};
+
+#include "ui_bookmarks.h"
+class TreeProxyModel;
+class BookmarksDialog : public QDialog, public Ui_BookmarksDialog
+{
+    Q_OBJECT
+
+signals:
+    void openUrl(const QUrl &url);
+
+public:
+    BookmarksDialog(QWidget *parent = 0, BookmarksManager *manager = 0);
+    ~BookmarksDialog();
+
+private slots:
+    void customContextMenuRequested(const QPoint &pos);
+    void open();
+    void newFolder();
+
+private:
+    void expandNodes(BookmarkNode *node);
+    bool saveExpandedNodes(const QModelIndex &parent);
+
+    BookmarksManager *m_bookmarksManager;
+    BookmarksModel *m_bookmarksModel;
+    TreeProxyModel *m_proxyModel;
+};
+
+#include <QtGui/QToolBar>
+class BookmarksToolBar : public QToolBar
+{
+    Q_OBJECT
+
+signals:
+    void openUrl(const QUrl &url);
+
+public:
+    BookmarksToolBar(BookmarksModel *model, QWidget *parent = 0);
+    void setRootIndex(const QModelIndex &index);
+    QModelIndex rootIndex() const;
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dropEvent(QDropEvent *event);
+
+private slots:
+    void triggered(QAction *action);
+    void activated(const QModelIndex &index);
+    void build();
+
+private:
+    BookmarksModel *m_bookmarksModel;
+    QPersistentModelIndex m_root;
+};
+
+#endif // BOOKMARKS_H
diff --git a/demos/browser/bookmarks.ui b/demos/browser/bookmarks.ui
new file mode 100644
index 0000000..c893e94
--- /dev/null
+++ b/demos/browser/bookmarks.ui
@@ -0,0 +1,106 @@
+<ui version="4.0" >
+ <class>BookmarksDialog</class>
+ <widget class="QDialog" name="BookmarksDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>758</width>
+    <height>450</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Bookmarks</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>252</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <widget class="SearchLineEdit" name="search" />
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="EditTreeView" name="tree" />
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="removeButton" >
+       <property name="text" >
+        <string>&amp;Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="addFolderButton" >
+       <property name="text" >
+        <string>Add Folder</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>searchlineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>EditTreeView</class>
+   <extends>QTreeView</extends>
+   <header>edittreeview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>BookmarksDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>472</x>
+     <y>329</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>461</x>
+     <y>356</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/browser.icns b/demos/browser/browser.icns
new file mode 100644
index 0000000..f591ae4
--- /dev/null
+++ b/demos/browser/browser.icns
diff --git a/demos/browser/browser.ico b/demos/browser/browser.ico
new file mode 100644
index 0000000..7f9be93
--- /dev/null
+++ b/demos/browser/browser.ico
diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro
new file mode 100644
index 0000000..d970f99
--- /dev/null
+++ b/demos/browser/browser.pro
@@ -0,0 +1,91 @@
+TEMPLATE = app
+TARGET = browser
+QT += webkit network
+
+CONFIG += qt warn_on
+contains(QT_BUILD_PARTS, tools): CONFIG += uitools
+else: DEFINES += QT_NO_UITOOLS
+
+FORMS += \
+    addbookmarkdialog.ui \
+    bookmarks.ui \
+    cookies.ui \
+    cookiesexceptions.ui \
+    downloaditem.ui \
+    downloads.ui \
+    history.ui \
+    passworddialog.ui \
+    proxy.ui \
+    settings.ui
+
+HEADERS += \
+    autosaver.h \
+    bookmarks.h \
+    browserapplication.h \
+    browsermainwindow.h \
+    chasewidget.h \
+    cookiejar.h \
+    downloadmanager.h \
+    edittableview.h \
+    edittreeview.h \
+    history.h \
+    modelmenu.h \
+    networkaccessmanager.h \
+    searchlineedit.h \
+    settings.h \
+    squeezelabel.h \
+    tabwidget.h \
+    toolbarsearch.h \
+    urllineedit.h \
+    webview.h \
+    xbel.h
+
+SOURCES += \
+    autosaver.cpp \
+    bookmarks.cpp \
+    browserapplication.cpp \
+    browsermainwindow.cpp \
+    chasewidget.cpp \
+    cookiejar.cpp \
+    downloadmanager.cpp \
+    edittableview.cpp \
+    edittreeview.cpp \
+    history.cpp \
+    modelmenu.cpp \
+    networkaccessmanager.cpp \
+    searchlineedit.cpp \
+    settings.cpp \
+    squeezelabel.cpp \
+    tabwidget.cpp \
+    toolbarsearch.cpp \
+    urllineedit.cpp \
+    webview.cpp \
+    xbel.cpp \
+    main.cpp
+
+RESOURCES += data/data.qrc htmls/htmls.qrc
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+win32 {
+   RC_FILE = browser.rc
+}
+
+mac {
+    ICON = browser.icns
+    QMAKE_INFO_PLIST = Info_mac.plist
+    TARGET = Browser
+}
+
+wince*: {
+    DEPLOYMENT_PLUGIN += qjpeg qgif
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/browser
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.plist *.icns *.ico *.rc *.pro *.html *.doc images htmls
+sources.path = $$[QT_INSTALL_DEMOS]/browser
+INSTALLS += target sources
diff --git a/demos/browser/browser.rc b/demos/browser/browser.rc
new file mode 100644
index 0000000..89a237c
--- /dev/null
+++ b/demos/browser/browser.rc
@@ -0,0 +1,2 @@
+IDI_ICON1               ICON    DISCARDABLE     "browser.ico"
+
diff --git a/demos/browser/browserapplication.cpp b/demos/browser/browserapplication.cpp
new file mode 100644
index 0000000..5433022
--- /dev/null
+++ b/demos/browser/browserapplication.cpp
@@ -0,0 +1,456 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "browserapplication.h"
+
+#include "bookmarks.h"
+#include "browsermainwindow.h"
+#include "cookiejar.h"
+#include "downloadmanager.h"
+#include "history.h"
+#include "networkaccessmanager.h"
+#include "tabwidget.h"
+#include "webview.h"
+
+#include <QtCore/QBuffer>
+#include <QtCore/QDir>
+#include <QtCore/QLibraryInfo>
+#include <QtCore/QSettings>
+#include <QtCore/QTextStream>
+#include <QtCore/QTranslator>
+
+#include <QtGui/QDesktopServices>
+#include <QtGui/QFileOpenEvent>
+#include <QtGui/QMessageBox>
+
+#include <QtNetwork/QLocalServer>
+#include <QtNetwork/QLocalSocket>
+#include <QtNetwork/QNetworkProxy>
+#include <QtNetwork/QSslSocket>
+
+#include <QtWebKit/QWebSettings>
+
+#include <QtCore/QDebug>
+
+DownloadManager *BrowserApplication::s_downloadManager = 0;
+HistoryManager *BrowserApplication::s_historyManager = 0;
+NetworkAccessManager *BrowserApplication::s_networkAccessManager = 0;
+BookmarksManager *BrowserApplication::s_bookmarksManager = 0;
+
+BrowserApplication::BrowserApplication(int &argc, char **argv)
+    : QApplication(argc, argv)
+    , m_localServer(0)
+{
+    QCoreApplication::setOrganizationName(QLatin1String("Trolltech"));
+    QCoreApplication::setApplicationName(QLatin1String("demobrowser"));
+    QCoreApplication::setApplicationVersion(QLatin1String("0.1"));
+#ifdef Q_WS_QWS
+    // Use a different server name for QWS so we can run an X11
+    // browser and a QWS browser in parallel on the same machine for
+    // debugging
+    QString serverName = QCoreApplication::applicationName() + QLatin1String("_qws");
+#else
+    QString serverName = QCoreApplication::applicationName();
+#endif
+    QLocalSocket socket;
+    socket.connectToServer(serverName);
+    if (socket.waitForConnected(500)) {
+        QTextStream stream(&socket);
+        QStringList args = QCoreApplication::arguments();
+        if (args.count() > 1)
+            stream << args.last();
+        else
+            stream << QString();
+        stream.flush();
+        socket.waitForBytesWritten();
+        return;
+    }
+
+#if defined(Q_WS_MAC)
+    QApplication::setQuitOnLastWindowClosed(false);
+#else
+    QApplication::setQuitOnLastWindowClosed(true);
+#endif
+
+    m_localServer = new QLocalServer(this);
+    connect(m_localServer, SIGNAL(newConnection()),
+            this, SLOT(newLocalSocketConnection()));
+    if (!m_localServer->listen(serverName)) {
+        if (m_localServer->serverError() == QAbstractSocket::AddressInUseError
+            && QFile::exists(m_localServer->serverName())) {
+            QFile::remove(m_localServer->serverName());
+            m_localServer->listen(serverName);
+        }
+    }
+
+#ifndef QT_NO_OPENSSL
+    if (!QSslSocket::supportsSsl()) {
+    QMessageBox::information(0, "Demo Browser",
+                 "This system does not support OpenSSL. SSL websites will not be available.");
+    }
+#endif
+
+    QDesktopServices::setUrlHandler(QLatin1String("http"), this, "openUrl");
+    QString localSysName = QLocale::system().name();
+
+    installTranslator(QLatin1String("qt_") + localSysName);
+
+    QSettings settings;
+    settings.beginGroup(QLatin1String("sessions"));
+    m_lastSession = settings.value(QLatin1String("lastSession")).toByteArray();
+    settings.endGroup();
+
+#if defined(Q_WS_MAC)
+    connect(this, SIGNAL(lastWindowClosed()),
+            this, SLOT(lastWindowClosed()));
+#endif
+
+    QTimer::singleShot(0, this, SLOT(postLaunch()));
+}
+
+BrowserApplication::~BrowserApplication()
+{
+    delete s_downloadManager;
+    for (int i = 0; i < m_mainWindows.size(); ++i) {
+        BrowserMainWindow *window = m_mainWindows.at(i);
+        delete window;
+    }
+    delete s_networkAccessManager;
+    delete s_bookmarksManager;
+}
+
+#if defined(Q_WS_MAC)
+void BrowserApplication::lastWindowClosed()
+{
+    clean();
+    BrowserMainWindow *mw = new BrowserMainWindow;
+    mw->slotHome();
+    m_mainWindows.prepend(mw);
+}
+#endif
+
+BrowserApplication *BrowserApplication::instance()
+{
+    return (static_cast<BrowserApplication *>(QCoreApplication::instance()));
+}
+
+#if defined(Q_WS_MAC)
+#include <QtGui/QMessageBox>
+void BrowserApplication::quitBrowser()
+{
+    clean();
+    int tabCount = 0;
+    for (int i = 0; i < m_mainWindows.count(); ++i) {
+        tabCount =+ m_mainWindows.at(i)->tabWidget()->count();
+    }
+
+    if (tabCount > 1) {
+        int ret = QMessageBox::warning(mainWindow(), QString(),
+                           tr("There are %1 windows and %2 tabs open\n"
+                              "Do you want to quit anyway?").arg(m_mainWindows.count()).arg(tabCount),
+                           QMessageBox::Yes | QMessageBox::No,
+                           QMessageBox::No);
+        if (ret == QMessageBox::No)
+            return;
+    }
+
+    exit(0);
+}
+#endif
+
+/*!
+    Any actions that can be delayed until the window is visible
+ */
+void BrowserApplication::postLaunch()
+{
+    QString directory = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    if (directory.isEmpty())
+        directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName();
+    QWebSettings::setIconDatabasePath(directory);
+
+    setWindowIcon(QIcon(QLatin1String(":browser.svg")));
+
+    loadSettings();
+
+    // newMainWindow() needs to be called in main() for this to happen
+    if (m_mainWindows.count() > 0) {
+        QStringList args = QCoreApplication::arguments();
+        if (args.count() > 1)
+            mainWindow()->loadPage(args.last());
+        else
+            mainWindow()->slotHome();
+    }
+    BrowserApplication::historyManager();
+}
+
+void BrowserApplication::loadSettings()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("websettings"));
+
+    QWebSettings *defaultSettings = QWebSettings::globalSettings();
+    QString standardFontFamily = defaultSettings->fontFamily(QWebSettings::StandardFont);
+    int standardFontSize = defaultSettings->fontSize(QWebSettings::DefaultFontSize);
+    QFont standardFont = QFont(standardFontFamily, standardFontSize);
+    standardFont = qVariantValue<QFont>(settings.value(QLatin1String("standardFont"), standardFont));
+    defaultSettings->setFontFamily(QWebSettings::StandardFont, standardFont.family());
+    defaultSettings->setFontSize(QWebSettings::DefaultFontSize, standardFont.pointSize());
+
+    QString fixedFontFamily = defaultSettings->fontFamily(QWebSettings::FixedFont);
+    int fixedFontSize = defaultSettings->fontSize(QWebSettings::DefaultFixedFontSize);
+    QFont fixedFont = QFont(fixedFontFamily, fixedFontSize);
+    fixedFont = qVariantValue<QFont>(settings.value(QLatin1String("fixedFont"), fixedFont));
+    defaultSettings->setFontFamily(QWebSettings::FixedFont, fixedFont.family());
+    defaultSettings->setFontSize(QWebSettings::DefaultFixedFontSize, fixedFont.pointSize());
+
+    defaultSettings->setAttribute(QWebSettings::JavascriptEnabled, settings.value(QLatin1String("enableJavascript"), true).toBool());
+    defaultSettings->setAttribute(QWebSettings::PluginsEnabled, settings.value(QLatin1String("enablePlugins"), true).toBool());
+
+    QUrl url = settings.value(QLatin1String("userStyleSheet")).toUrl();
+    defaultSettings->setUserStyleSheetUrl(url);
+
+    settings.endGroup();
+}
+
+QList<BrowserMainWindow*> BrowserApplication::mainWindows()
+{
+    clean();
+    QList<BrowserMainWindow*> list;
+    for (int i = 0; i < m_mainWindows.count(); ++i)
+        list.append(m_mainWindows.at(i));
+    return list;
+}
+
+void BrowserApplication::clean()
+{
+    // cleanup any deleted main windows first
+    for (int i = m_mainWindows.count() - 1; i >= 0; --i)
+        if (m_mainWindows.at(i).isNull())
+            m_mainWindows.removeAt(i);
+}
+
+void BrowserApplication::saveSession()
+{
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+        return;
+
+    clean();
+
+    QSettings settings;
+    settings.beginGroup(QLatin1String("sessions"));
+
+    QByteArray data;
+    QBuffer buffer(&data);
+    QDataStream stream(&buffer);
+    buffer.open(QIODevice::ReadWrite);
+
+    stream << m_mainWindows.count();
+    for (int i = 0; i < m_mainWindows.count(); ++i)
+        stream << m_mainWindows.at(i)->saveState();
+    settings.setValue(QLatin1String("lastSession"), data);
+    settings.endGroup();
+}
+
+bool BrowserApplication::canRestoreSession() const
+{
+    return !m_lastSession.isEmpty();
+}
+
+void BrowserApplication::restoreLastSession()
+{
+    QList<QByteArray> windows;
+    QBuffer buffer(&m_lastSession);
+    QDataStream stream(&buffer);
+    buffer.open(QIODevice::ReadOnly);
+    int windowCount;
+    stream >> windowCount;
+    for (int i = 0; i < windowCount; ++i) {
+        QByteArray windowState;
+        stream >> windowState;
+        windows.append(windowState);
+    }
+    for (int i = 0; i < windows.count(); ++i) {
+        BrowserMainWindow *newWindow = 0;
+        if (m_mainWindows.count() == 1
+            && mainWindow()->tabWidget()->count() == 1
+            && mainWindow()->currentTab()->url() == QUrl()) {
+            newWindow = mainWindow();
+        } else {
+            newWindow = newMainWindow();
+        }
+        newWindow->restoreState(windows.at(i));
+    }
+}
+
+bool BrowserApplication::isTheOnlyBrowser() const
+{
+    return (m_localServer != 0);
+}
+
+void BrowserApplication::installTranslator(const QString &name)
+{
+    QTranslator *translator = new QTranslator(this);
+    translator->load(name, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    QApplication::installTranslator(translator);
+}
+
+#if defined(Q_WS_MAC)
+bool BrowserApplication::event(QEvent* event)
+{
+    switch (event->type()) {
+    case QEvent::ApplicationActivate: {
+        clean();
+        if (!m_mainWindows.isEmpty()) {
+            BrowserMainWindow *mw = mainWindow();
+            if (mw && !mw->isMinimized()) {
+                mainWindow()->show();
+            }
+            return true;
+        }
+    }
+    case QEvent::FileOpen:
+        if (!m_mainWindows.isEmpty()) {
+            mainWindow()->loadPage(static_cast<QFileOpenEvent *>(event)->file());
+            return true;
+        }
+    default:
+        break;
+    }
+    return QApplication::event(event);
+}
+#endif
+
+void BrowserApplication::openUrl(const QUrl &url)
+{
+    mainWindow()->loadPage(url.toString());
+}
+
+BrowserMainWindow *BrowserApplication::newMainWindow()
+{
+    BrowserMainWindow *browser = new BrowserMainWindow();
+    m_mainWindows.prepend(browser);
+    browser->show();
+    return browser;
+}
+
+BrowserMainWindow *BrowserApplication::mainWindow()
+{
+    clean();
+    if (m_mainWindows.isEmpty())
+        newMainWindow();
+    return m_mainWindows[0];
+}
+
+void BrowserApplication::newLocalSocketConnection()
+{
+    QLocalSocket *socket = m_localServer->nextPendingConnection();
+    if (!socket)
+        return;
+    socket->waitForReadyRead(1000);
+    QTextStream stream(socket);
+    QString url;
+    stream >> url;
+    if (!url.isEmpty()) {
+        QSettings settings;
+        settings.beginGroup(QLatin1String("general"));
+        int openLinksIn = settings.value(QLatin1String("openLinksIn"), 0).toInt();
+        settings.endGroup();
+        if (openLinksIn == 1)
+            newMainWindow();
+        else
+            mainWindow()->tabWidget()->newTab();
+        openUrl(url);
+    }
+    delete socket;
+    mainWindow()->raise();
+    mainWindow()->activateWindow();
+}
+
+CookieJar *BrowserApplication::cookieJar()
+{
+    return (CookieJar*)networkAccessManager()->cookieJar();
+}
+
+DownloadManager *BrowserApplication::downloadManager()
+{
+    if (!s_downloadManager) {
+        s_downloadManager = new DownloadManager();
+    }
+    return s_downloadManager;
+}
+
+NetworkAccessManager *BrowserApplication::networkAccessManager()
+{
+    if (!s_networkAccessManager) {
+        s_networkAccessManager = new NetworkAccessManager();
+        s_networkAccessManager->setCookieJar(new CookieJar);
+    }
+    return s_networkAccessManager;
+}
+
+HistoryManager *BrowserApplication::historyManager()
+{
+    if (!s_historyManager) {
+        s_historyManager = new HistoryManager();
+        QWebHistoryInterface::setDefaultInterface(s_historyManager);
+    }
+    return s_historyManager;
+}
+
+BookmarksManager *BrowserApplication::bookmarksManager()
+{
+    if (!s_bookmarksManager) {
+        s_bookmarksManager = new BookmarksManager;
+    }
+    return s_bookmarksManager;
+}
+
+QIcon BrowserApplication::icon(const QUrl &url) const
+{
+    QIcon icon = QWebSettings::iconForUrl(url);
+    if (!icon.isNull())
+        return icon.pixmap(16, 16);
+    if (m_defaultIcon.isNull())
+        m_defaultIcon = QIcon(QLatin1String(":defaulticon.png"));
+    return m_defaultIcon.pixmap(16, 16);
+}
+
diff --git a/demos/browser/browserapplication.h b/demos/browser/browserapplication.h
new file mode 100644
index 0000000..6887dfd
--- /dev/null
+++ b/demos/browser/browserapplication.h
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BROWSERAPPLICATION_H
+#define BROWSERAPPLICATION_H
+
+#include <QtGui/QApplication>
+
+#include <QtCore/QUrl>
+#include <QtCore/QPointer>
+
+#include <QtGui/QIcon>
+
+QT_BEGIN_NAMESPACE
+class QLocalServer;
+QT_END_NAMESPACE
+
+class BookmarksManager;
+class BrowserMainWindow;
+class CookieJar;
+class DownloadManager;
+class HistoryManager;
+class NetworkAccessManager;
+class BrowserApplication : public QApplication
+{
+    Q_OBJECT
+
+public:
+    BrowserApplication(int &argc, char **argv);
+    ~BrowserApplication();
+    static BrowserApplication *instance();
+    void loadSettings();
+
+    bool isTheOnlyBrowser() const;
+    BrowserMainWindow *mainWindow();
+    QList<BrowserMainWindow*> mainWindows();
+    QIcon icon(const QUrl &url) const;
+
+    void saveSession();
+    bool canRestoreSession() const;
+
+    static HistoryManager *historyManager();
+    static CookieJar *cookieJar();
+    static DownloadManager *downloadManager();
+    static NetworkAccessManager *networkAccessManager();
+    static BookmarksManager *bookmarksManager();
+
+#if defined(Q_WS_MAC)
+    bool event(QEvent *event);
+#endif
+
+public slots:
+    BrowserMainWindow *newMainWindow();
+    void restoreLastSession();
+#if defined(Q_WS_MAC)
+    void lastWindowClosed();
+    void quitBrowser();
+#endif
+
+private slots:
+    void postLaunch();
+    void openUrl(const QUrl &url);
+    void newLocalSocketConnection();
+
+private:
+    void clean();
+    void installTranslator(const QString &name);
+
+    static HistoryManager *s_historyManager;
+    static DownloadManager *s_downloadManager;
+    static NetworkAccessManager *s_networkAccessManager;
+    static BookmarksManager *s_bookmarksManager;
+
+    QList<QPointer<BrowserMainWindow> > m_mainWindows;
+    QLocalServer *m_localServer;
+    QByteArray m_lastSession;
+    mutable QIcon m_defaultIcon;
+};
+
+#endif // BROWSERAPPLICATION_H
+
diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp
new file mode 100644
index 0000000..f1dcaef
--- /dev/null
+++ b/demos/browser/browsermainwindow.cpp
@@ -0,0 +1,991 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "browsermainwindow.h"
+
+#include "autosaver.h"
+#include "bookmarks.h"
+#include "browserapplication.h"
+#include "chasewidget.h"
+#include "downloadmanager.h"
+#include "history.h"
+#include "settings.h"
+#include "tabwidget.h"
+#include "toolbarsearch.h"
+#include "ui_passworddialog.h"
+#include "webview.h"
+
+#include <QtCore/QSettings>
+
+#include <QtGui/QDesktopWidget>
+#include <QtGui/QFileDialog>
+#include <QtGui/QPlainTextEdit>
+#include <QtGui/QPrintDialog>
+#include <QtGui/QPrintPreviewDialog>
+#include <QtGui/QPrinter>
+#include <QtGui/QMenuBar>
+#include <QtGui/QMessageBox>
+#include <QtGui/QStatusBar>
+#include <QtGui/QToolBar>
+#include <QtGui/QInputDialog>
+
+#include <QtWebKit/QWebFrame>
+#include <QtWebKit/QWebHistory>
+
+#include <QtCore/QDebug>
+
+BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
+    : QMainWindow(parent, flags)
+    , m_tabWidget(new TabWidget(this))
+    , m_autoSaver(new AutoSaver(this))
+    , m_historyBack(0)
+    , m_historyForward(0)
+    , m_stop(0)
+    , m_reload(0)
+{
+    setAttribute(Qt::WA_DeleteOnClose, true);
+    statusBar()->setSizeGripEnabled(true);
+    setupMenu();
+    setupToolBar();
+
+    QWidget *centralWidget = new QWidget(this);
+    BookmarksModel *boomarksModel = BrowserApplication::bookmarksManager()->bookmarksModel();
+    m_bookmarksToolbar = new BookmarksToolBar(boomarksModel, this);
+    connect(m_bookmarksToolbar, SIGNAL(openUrl(const QUrl&)),
+            m_tabWidget, SLOT(loadUrlInCurrentTab(const QUrl&)));
+    connect(m_bookmarksToolbar->toggleViewAction(), SIGNAL(toggled(bool)),
+            this, SLOT(updateBookmarksToolbarActionText(bool)));
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->setSpacing(0);
+    layout->setMargin(0);
+#if defined(Q_WS_MAC)
+    layout->addWidget(m_bookmarksToolbar);
+    layout->addWidget(new QWidget); // <- OS X tab widget style bug
+#else
+    addToolBarBreak();
+    addToolBar(m_bookmarksToolbar);
+#endif
+    layout->addWidget(m_tabWidget);
+    centralWidget->setLayout(layout);
+	setCentralWidget(centralWidget);
+
+    connect(m_tabWidget, SIGNAL(loadPage(const QString &)),
+        this, SLOT(loadPage(const QString &)));
+    connect(m_tabWidget, SIGNAL(setCurrentTitle(const QString &)),
+        this, SLOT(slotUpdateWindowTitle(const QString &)));
+    connect(m_tabWidget, SIGNAL(showStatusBarMessage(const QString&)),
+            statusBar(), SLOT(showMessage(const QString&)));
+    connect(m_tabWidget, SIGNAL(linkHovered(const QString&)),
+            statusBar(), SLOT(showMessage(const QString&)));
+    connect(m_tabWidget, SIGNAL(loadProgress(int)),
+            this, SLOT(slotLoadProgress(int)));
+    connect(m_tabWidget, SIGNAL(tabsChanged()),
+            m_autoSaver, SLOT(changeOccurred()));
+    connect(m_tabWidget, SIGNAL(geometryChangeRequested(const QRect &)),
+            this, SLOT(geometryChangeRequested(const QRect &)));
+    connect(m_tabWidget, SIGNAL(printRequested(QWebFrame *)),
+            this, SLOT(printRequested(QWebFrame *)));
+    connect(m_tabWidget, SIGNAL(menuBarVisibilityChangeRequested(bool)),
+            menuBar(), SLOT(setVisible(bool)));
+    connect(m_tabWidget, SIGNAL(statusBarVisibilityChangeRequested(bool)),
+            statusBar(), SLOT(setVisible(bool)));
+    connect(m_tabWidget, SIGNAL(toolBarVisibilityChangeRequested(bool)),
+            m_navigationBar, SLOT(setVisible(bool)));
+    connect(m_tabWidget, SIGNAL(toolBarVisibilityChangeRequested(bool)),
+            m_bookmarksToolbar, SLOT(setVisible(bool)));
+#if defined(Q_WS_MAC)
+    connect(m_tabWidget, SIGNAL(lastTabClosed()),
+            this, SLOT(close()));
+#else
+    connect(m_tabWidget, SIGNAL(lastTabClosed()),
+            m_tabWidget, SLOT(newTab()));
+#endif
+
+    slotUpdateWindowTitle();
+    loadDefaultState();
+    m_tabWidget->newTab();
+
+    int size = m_tabWidget->lineEditStack()->sizeHint().height();
+    m_navigationBar->setIconSize(QSize(size, size));
+
+}
+
+BrowserMainWindow::~BrowserMainWindow()
+{
+    m_autoSaver->changeOccurred();
+    m_autoSaver->saveIfNeccessary();
+}
+
+void BrowserMainWindow::loadDefaultState()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("BrowserMainWindow"));
+    QByteArray data = settings.value(QLatin1String("defaultState")).toByteArray();
+    restoreState(data);
+    settings.endGroup();
+}
+
+QSize BrowserMainWindow::sizeHint() const
+{
+    QRect desktopRect = QApplication::desktop()->screenGeometry();
+    QSize size = desktopRect.size() * qreal(0.9);
+    return size;
+}
+
+void BrowserMainWindow::save()
+{
+    BrowserApplication::instance()->saveSession();
+
+    QSettings settings;
+    settings.beginGroup(QLatin1String("BrowserMainWindow"));
+    QByteArray data = saveState(false);
+    settings.setValue(QLatin1String("defaultState"), data);
+    settings.endGroup();
+}
+
+static const qint32 BrowserMainWindowMagic = 0xba;
+
+QByteArray BrowserMainWindow::saveState(bool withTabs) const
+{
+    int version = 2;
+    QByteArray data;
+    QDataStream stream(&data, QIODevice::WriteOnly);
+
+    stream << qint32(BrowserMainWindowMagic);
+    stream << qint32(version);
+
+    stream << size();
+    stream << !m_navigationBar->isHidden();
+    stream << !m_bookmarksToolbar->isHidden();
+    stream << !statusBar()->isHidden();
+    if (withTabs)
+        stream << tabWidget()->saveState();
+    else
+        stream << QByteArray();
+    return data;
+}
+
+bool BrowserMainWindow::restoreState(const QByteArray &state)
+{
+    int version = 2;
+    QByteArray sd = state;
+    QDataStream stream(&sd, QIODevice::ReadOnly);
+    if (stream.atEnd())
+        return false;
+
+    qint32 marker;
+    qint32 v;
+    stream >> marker;
+    stream >> v;
+    if (marker != BrowserMainWindowMagic || v != version)
+        return false;
+
+    QSize size;
+    bool showToolbar;
+    bool showBookmarksBar;
+    bool showStatusbar;
+    QByteArray tabState;
+
+    stream >> size;
+    stream >> showToolbar;
+    stream >> showBookmarksBar;
+    stream >> showStatusbar;
+    stream >> tabState;
+
+    resize(size);
+
+    m_navigationBar->setVisible(showToolbar);
+    updateToolbarActionText(showToolbar);
+
+    m_bookmarksToolbar->setVisible(showBookmarksBar);
+    updateBookmarksToolbarActionText(showBookmarksBar);
+
+    statusBar()->setVisible(showStatusbar);
+    updateStatusbarActionText(showStatusbar);
+
+    if (!tabWidget()->restoreState(tabState))
+        return false;
+
+    return true;
+}
+
+void BrowserMainWindow::setupMenu()
+{
+    new QShortcut(QKeySequence(Qt::Key_F6), this, SLOT(slotSwapFocus()));
+
+    // File
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+
+    fileMenu->addAction(tr("&New Window"), this, SLOT(slotFileNew()), QKeySequence::New);
+    fileMenu->addAction(m_tabWidget->newTabAction());
+    fileMenu->addAction(tr("&Open File..."), this, SLOT(slotFileOpen()), QKeySequence::Open);
+    fileMenu->addAction(tr("Open &Location..."), this,
+                SLOT(slotSelectLineEdit()), QKeySequence(Qt::ControlModifier + Qt::Key_L));
+    fileMenu->addSeparator();
+    fileMenu->addAction(m_tabWidget->closeTabAction());
+    fileMenu->addSeparator();
+    fileMenu->addAction(tr("&Save As..."), this,
+                SLOT(slotFileSaveAs()), QKeySequence(QKeySequence::Save));
+    fileMenu->addSeparator();
+    BookmarksManager *bookmarksManager = BrowserApplication::bookmarksManager();
+    fileMenu->addAction(tr("&Import Bookmarks..."), bookmarksManager, SLOT(importBookmarks()));
+    fileMenu->addAction(tr("&Export Bookmarks..."), bookmarksManager, SLOT(exportBookmarks()));
+    fileMenu->addSeparator();
+    fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview()));
+    fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print);
+    fileMenu->addSeparator();
+    QAction *action = fileMenu->addAction(tr("Private &Browsing..."), this, SLOT(slotPrivateBrowsing()));
+    action->setCheckable(true);
+    fileMenu->addSeparator();
+
+#if defined(Q_WS_MAC)
+    fileMenu->addAction(tr("&Quit"), BrowserApplication::instance(), SLOT(quitBrowser()), QKeySequence(Qt::CTRL | Qt::Key_Q));
+#else
+    fileMenu->addAction(tr("&Quit"), this, SLOT(close()), QKeySequence(Qt::CTRL | Qt::Key_Q));
+#endif
+
+    // Edit
+    QMenu *editMenu = menuBar()->addMenu(tr("&Edit"));
+    QAction *m_undo = editMenu->addAction(tr("&Undo"));
+    m_undo->setShortcuts(QKeySequence::Undo);
+    m_tabWidget->addWebAction(m_undo, QWebPage::Undo);
+    QAction *m_redo = editMenu->addAction(tr("&Redo"));
+    m_redo->setShortcuts(QKeySequence::Redo);
+    m_tabWidget->addWebAction(m_redo, QWebPage::Redo);
+    editMenu->addSeparator();
+    QAction *m_cut = editMenu->addAction(tr("Cu&t"));
+    m_cut->setShortcuts(QKeySequence::Cut);
+    m_tabWidget->addWebAction(m_cut, QWebPage::Cut);
+    QAction *m_copy = editMenu->addAction(tr("&Copy"));
+    m_copy->setShortcuts(QKeySequence::Copy);
+    m_tabWidget->addWebAction(m_copy, QWebPage::Copy);
+    QAction *m_paste = editMenu->addAction(tr("&Paste"));
+    m_paste->setShortcuts(QKeySequence::Paste);
+    m_tabWidget->addWebAction(m_paste, QWebPage::Paste);
+    editMenu->addSeparator();
+
+    QAction *m_find = editMenu->addAction(tr("&Find"));
+    m_find->setShortcuts(QKeySequence::Find);
+    connect(m_find, SIGNAL(triggered()), this, SLOT(slotEditFind()));
+    new QShortcut(QKeySequence(Qt::Key_Slash), this, SLOT(slotEditFind()));
+
+    QAction *m_findNext = editMenu->addAction(tr("&Find Next"));
+    m_findNext->setShortcuts(QKeySequence::FindNext);
+    connect(m_findNext, SIGNAL(triggered()), this, SLOT(slotEditFindNext()));
+
+    QAction *m_findPrevious = editMenu->addAction(tr("&Find Previous"));
+    m_findPrevious->setShortcuts(QKeySequence::FindPrevious);
+    connect(m_findPrevious, SIGNAL(triggered()), this, SLOT(slotEditFindPrevious()));
+
+    editMenu->addSeparator();
+    editMenu->addAction(tr("&Preferences"), this, SLOT(slotPreferences()), tr("Ctrl+,"));
+
+    // View
+    QMenu *viewMenu = menuBar()->addMenu(tr("&View"));
+
+    m_viewBookmarkBar = new QAction(this);
+    updateBookmarksToolbarActionText(true);
+    m_viewBookmarkBar->setShortcut(tr("Shift+Ctrl+B"));
+    connect(m_viewBookmarkBar, SIGNAL(triggered()), this, SLOT(slotViewBookmarksBar()));
+    viewMenu->addAction(m_viewBookmarkBar);
+
+    m_viewToolbar = new QAction(this);
+    updateToolbarActionText(true);
+    m_viewToolbar->setShortcut(tr("Ctrl+|"));
+    connect(m_viewToolbar, SIGNAL(triggered()), this, SLOT(slotViewToolbar()));
+    viewMenu->addAction(m_viewToolbar);
+
+    m_viewStatusbar = new QAction(this);
+    updateStatusbarActionText(true);
+    m_viewStatusbar->setShortcut(tr("Ctrl+/"));
+    connect(m_viewStatusbar, SIGNAL(triggered()), this, SLOT(slotViewStatusbar()));
+    viewMenu->addAction(m_viewStatusbar);
+
+    viewMenu->addSeparator();
+
+    m_stop = viewMenu->addAction(tr("&Stop"));
+    QList<QKeySequence> shortcuts;
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_Period));
+    shortcuts.append(Qt::Key_Escape);
+    m_stop->setShortcuts(shortcuts);
+    m_tabWidget->addWebAction(m_stop, QWebPage::Stop);
+
+    m_reload = viewMenu->addAction(tr("Reload Page"));
+    m_reload->setShortcuts(QKeySequence::Refresh);
+    m_tabWidget->addWebAction(m_reload, QWebPage::Reload);
+
+    viewMenu->addAction(tr("Zoom &In"), this, SLOT(slotViewZoomIn()), QKeySequence(Qt::CTRL | Qt::Key_Plus));
+    viewMenu->addAction(tr("Zoom &Out"), this, SLOT(slotViewZoomOut()), QKeySequence(Qt::CTRL | Qt::Key_Minus));
+    viewMenu->addAction(tr("Reset &Zoom"), this, SLOT(slotViewResetZoom()), QKeySequence(Qt::CTRL | Qt::Key_0));
+    QAction *zoomTextOnlyAction = viewMenu->addAction(tr("Zoom &Text Only"));
+    connect(zoomTextOnlyAction, SIGNAL(toggled(bool)), this, SLOT(slotViewZoomTextOnly(bool)));
+    zoomTextOnlyAction->setCheckable(true);
+    zoomTextOnlyAction->setChecked(false);
+
+    viewMenu->addSeparator();
+    viewMenu->addAction(tr("Page S&ource"), this, SLOT(slotViewPageSource()), tr("Ctrl+Alt+U"));
+    QAction *a = viewMenu->addAction(tr("&Full Screen"), this, SLOT(slotViewFullScreen(bool)),  Qt::Key_F11);
+    a->setCheckable(true);
+
+    // History
+    HistoryMenu *historyMenu = new HistoryMenu(this);
+    connect(historyMenu, SIGNAL(openUrl(const QUrl&)),
+            m_tabWidget, SLOT(loadUrlInCurrentTab(const QUrl&)));
+    connect(historyMenu, SIGNAL(hovered(const QString&)), this,
+            SLOT(slotUpdateStatusbar(const QString&)));
+    historyMenu->setTitle(tr("Hi&story"));
+    menuBar()->addMenu(historyMenu);
+    QList<QAction*> historyActions;
+
+    m_historyBack = new QAction(tr("Back"), this);
+    m_tabWidget->addWebAction(m_historyBack, QWebPage::Back);
+    m_historyBack->setShortcuts(QKeySequence::Back);
+    m_historyBack->setIconVisibleInMenu(false);
+
+    m_historyForward = new QAction(tr("Forward"), this);
+    m_tabWidget->addWebAction(m_historyForward, QWebPage::Forward);
+    m_historyForward->setShortcuts(QKeySequence::Forward);
+    m_historyForward->setIconVisibleInMenu(false);
+
+    QAction *m_historyHome = new QAction(tr("Home"), this);
+    connect(m_historyHome, SIGNAL(triggered()), this, SLOT(slotHome()));
+    m_historyHome->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_H));
+
+    m_restoreLastSession = new QAction(tr("Restore Last Session"), this);
+    connect(m_restoreLastSession, SIGNAL(triggered()), BrowserApplication::instance(), SLOT(restoreLastSession()));
+    m_restoreLastSession->setEnabled(BrowserApplication::instance()->canRestoreSession());
+
+    historyActions.append(m_historyBack);
+    historyActions.append(m_historyForward);
+    historyActions.append(m_historyHome);
+    historyActions.append(m_tabWidget->recentlyClosedTabsAction());
+    historyActions.append(m_restoreLastSession);
+    historyMenu->setInitialActions(historyActions);
+
+    // Bookmarks
+    BookmarksMenu *bookmarksMenu = new BookmarksMenu(this);
+    connect(bookmarksMenu, SIGNAL(openUrl(const QUrl&)),
+            m_tabWidget, SLOT(loadUrlInCurrentTab(const QUrl&)));
+    connect(bookmarksMenu, SIGNAL(hovered(const QString&)),
+            this, SLOT(slotUpdateStatusbar(const QString&)));
+    bookmarksMenu->setTitle(tr("&Bookmarks"));
+    menuBar()->addMenu(bookmarksMenu);
+
+    QList<QAction*> bookmarksActions;
+
+    QAction *showAllBookmarksAction = new QAction(tr("Show All Bookmarks"), this);
+    connect(showAllBookmarksAction, SIGNAL(triggered()), this, SLOT(slotShowBookmarksDialog()));
+    m_addBookmark = new QAction(QIcon(QLatin1String(":addbookmark.png")), tr("Add Bookmark..."), this);
+    m_addBookmark->setIconVisibleInMenu(false);
+
+    connect(m_addBookmark, SIGNAL(triggered()), this, SLOT(slotAddBookmark()));
+    m_addBookmark->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_D));
+
+    bookmarksActions.append(showAllBookmarksAction);
+    bookmarksActions.append(m_addBookmark);
+    bookmarksMenu->setInitialActions(bookmarksActions);
+
+    // Window
+    m_windowMenu = menuBar()->addMenu(tr("&Window"));
+    connect(m_windowMenu, SIGNAL(aboutToShow()),
+            this, SLOT(slotAboutToShowWindowMenu()));
+    slotAboutToShowWindowMenu();
+
+    QMenu *toolsMenu = menuBar()->addMenu(tr("&Tools"));
+    toolsMenu->addAction(tr("Web &Search"), this, SLOT(slotWebSearch()), QKeySequence(tr("Ctrl+K", "Web Search")));
+#ifndef Q_CC_MINGW
+    a = toolsMenu->addAction(tr("Enable Web &Inspector"), this, SLOT(slotToggleInspector(bool)));
+    a->setCheckable(true);
+#endif
+
+    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(tr("About &Qt"), qApp, SLOT(aboutQt()));
+    helpMenu->addAction(tr("About &Demo Browser"), this, SLOT(slotAboutApplication()));
+}
+
+void BrowserMainWindow::setupToolBar()
+{
+    setUnifiedTitleAndToolBarOnMac(true);
+    m_navigationBar = addToolBar(tr("Navigation"));
+    connect(m_navigationBar->toggleViewAction(), SIGNAL(toggled(bool)),
+            this, SLOT(updateToolbarActionText(bool)));
+
+    m_historyBack->setIcon(style()->standardIcon(QStyle::SP_ArrowBack, 0, this));
+    m_historyBackMenu = new QMenu(this);
+    m_historyBack->setMenu(m_historyBackMenu);
+    connect(m_historyBackMenu, SIGNAL(aboutToShow()),
+            this, SLOT(slotAboutToShowBackMenu()));
+    connect(m_historyBackMenu, SIGNAL(triggered(QAction *)),
+            this, SLOT(slotOpenActionUrl(QAction *)));
+    m_navigationBar->addAction(m_historyBack);
+
+    m_historyForward->setIcon(style()->standardIcon(QStyle::SP_ArrowForward, 0, this));
+    m_historyForwardMenu = new QMenu(this);
+    connect(m_historyForwardMenu, SIGNAL(aboutToShow()),
+            this, SLOT(slotAboutToShowForwardMenu()));
+    connect(m_historyForwardMenu, SIGNAL(triggered(QAction *)),
+            this, SLOT(slotOpenActionUrl(QAction *)));
+    m_historyForward->setMenu(m_historyForwardMenu);
+    m_navigationBar->addAction(m_historyForward);
+
+    m_stopReload = new QAction(this);
+    m_reloadIcon = style()->standardIcon(QStyle::SP_BrowserReload);
+    m_stopReload->setIcon(m_reloadIcon);
+
+    m_navigationBar->addAction(m_stopReload);
+
+    m_navigationBar->addWidget(m_tabWidget->lineEditStack());
+
+    m_toolbarSearch = new ToolbarSearch(m_navigationBar);
+    m_navigationBar->addWidget(m_toolbarSearch);
+    connect(m_toolbarSearch, SIGNAL(search(const QUrl&)), SLOT(loadUrl(const QUrl&)));
+
+    m_chaseWidget = new ChaseWidget(this);
+    m_navigationBar->addWidget(m_chaseWidget);
+}
+
+void BrowserMainWindow::slotShowBookmarksDialog()
+{
+    BookmarksDialog *dialog = new BookmarksDialog(this);
+    connect(dialog, SIGNAL(openUrl(const QUrl&)),
+            m_tabWidget, SLOT(loadUrlInCurrentTab(const QUrl&)));
+    dialog->show();
+}
+
+void BrowserMainWindow::slotAddBookmark()
+{
+    WebView *webView = currentTab();
+    QString url = webView->url().toString();
+    QString title = webView->title();
+    AddBookmarkDialog dialog(url, title);
+    dialog.exec();
+}
+
+void BrowserMainWindow::slotViewToolbar()
+{
+    if (m_navigationBar->isVisible()) {
+        updateToolbarActionText(false);
+        m_navigationBar->close();
+    } else {
+        updateToolbarActionText(true);
+        m_navigationBar->show();
+    }
+    m_autoSaver->changeOccurred();
+}
+
+void BrowserMainWindow::slotViewBookmarksBar()
+{
+    if (m_bookmarksToolbar->isVisible()) {
+        updateBookmarksToolbarActionText(false);
+        m_bookmarksToolbar->close();
+    } else {
+        updateBookmarksToolbarActionText(true);
+        m_bookmarksToolbar->show();
+    }
+    m_autoSaver->changeOccurred();
+}
+
+void BrowserMainWindow::updateStatusbarActionText(bool visible)
+{
+    m_viewStatusbar->setText(!visible ? tr("Show Status Bar") : tr("Hide Status Bar"));
+}
+
+void BrowserMainWindow::updateToolbarActionText(bool visible)
+{
+    m_viewToolbar->setText(!visible ? tr("Show Toolbar") : tr("Hide Toolbar"));
+}
+
+void BrowserMainWindow::updateBookmarksToolbarActionText(bool visible)
+{
+    m_viewBookmarkBar->setText(!visible ? tr("Show Bookmarks bar") : tr("Hide Bookmarks bar"));
+}
+
+void BrowserMainWindow::slotViewStatusbar()
+{
+    if (statusBar()->isVisible()) {
+        updateStatusbarActionText(false);
+        statusBar()->close();
+    } else {
+        updateStatusbarActionText(true);
+        statusBar()->show();
+    }
+    m_autoSaver->changeOccurred();
+}
+
+QUrl BrowserMainWindow::guessUrlFromString(const QString &string)
+{
+    QString urlStr = string.trimmed();
+    QRegExp test(QLatin1String("^[a-zA-Z]+\\:.*"));
+
+    // Check if it looks like a qualified URL. Try parsing it and see.
+    bool hasSchema = test.exactMatch(urlStr);
+    if (hasSchema) {
+        QUrl url = QUrl::fromEncoded(urlStr.toUtf8(), QUrl::TolerantMode);
+        if (url.isValid())
+            return url;
+    }
+
+    // Might be a file.
+    if (QFile::exists(urlStr)) {
+        QFileInfo info(urlStr);
+        return QUrl::fromLocalFile(info.absoluteFilePath());
+    }
+
+    // Might be a shorturl - try to detect the schema.
+    if (!hasSchema) {
+        int dotIndex = urlStr.indexOf(QLatin1Char('.'));
+        if (dotIndex != -1) {
+            QString prefix = urlStr.left(dotIndex).toLower();
+            QByteArray schema = (prefix == QLatin1String("ftp")) ? prefix.toLatin1() : "http";
+            QUrl url =
+                QUrl::fromEncoded(schema + "://" + urlStr.toUtf8(), QUrl::TolerantMode);
+            if (url.isValid())
+                return url;
+        }
+    }
+
+    // Fall back to QUrl's own tolerant parser.
+    QUrl url = QUrl::fromEncoded(string.toUtf8(), QUrl::TolerantMode);
+
+    // finally for cases where the user just types in a hostname add http
+    if (url.scheme().isEmpty())
+        url = QUrl::fromEncoded("http://" + string.toUtf8(), QUrl::TolerantMode);
+    return url;
+}
+
+void BrowserMainWindow::loadUrl(const QUrl &url)
+{
+    if (!currentTab() || !url.isValid())
+        return;
+
+    m_tabWidget->currentLineEdit()->setText(QString::fromUtf8(url.toEncoded()));
+    m_tabWidget->loadUrlInCurrentTab(url);
+}
+
+void BrowserMainWindow::slotDownloadManager()
+{
+    BrowserApplication::downloadManager()->show();
+}
+
+void BrowserMainWindow::slotSelectLineEdit()
+{
+    m_tabWidget->currentLineEdit()->selectAll();
+    m_tabWidget->currentLineEdit()->setFocus();
+}
+
+void BrowserMainWindow::slotFileSaveAs()
+{
+    BrowserApplication::downloadManager()->download(currentTab()->url(), true);
+}
+
+void BrowserMainWindow::slotPreferences()
+{
+    SettingsDialog *s = new SettingsDialog(this);
+    s->show();
+}
+
+void BrowserMainWindow::slotUpdateStatusbar(const QString &string)
+{
+    statusBar()->showMessage(string, 2000);
+}
+
+void BrowserMainWindow::slotUpdateWindowTitle(const QString &title)
+{
+    if (title.isEmpty()) {
+        setWindowTitle(tr("Qt Demo Browser"));
+    } else {
+#if defined(Q_WS_MAC)
+        setWindowTitle(title);
+#else
+        setWindowTitle(tr("%1 - Qt Demo Browser", "Page title and Browser name").arg(title));
+#endif
+    }
+}
+
+void BrowserMainWindow::slotAboutApplication()
+{
+    QMessageBox::about(this, tr("About"), tr(
+        "Version %1"
+        "<p>This demo demonstrates Qt's "
+        "webkit facilities in action, providing an example "
+        "browser for you to experiment with.<p>"
+        "<p>QtWebKit is based on the Open Source WebKit Project developed at <a href=\"http://webkit.org/\">http://webkit.org/</a>."
+        ).arg(QCoreApplication::applicationVersion()));
+}
+
+void BrowserMainWindow::slotFileNew()
+{
+    BrowserApplication::instance()->newMainWindow();
+    BrowserMainWindow *mw = BrowserApplication::instance()->mainWindow();
+    mw->slotHome();
+}
+
+void BrowserMainWindow::slotFileOpen()
+{
+    QString file = QFileDialog::getOpenFileName(this, tr("Open Web Resource"), QString(),
+            tr("Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)"));
+
+    if (file.isEmpty())
+        return;
+
+    loadPage(file);
+}
+
+void BrowserMainWindow::slotFilePrintPreview()
+{
+#ifndef QT_NO_PRINTER
+    if (!currentTab())
+        return;
+    QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this);
+    connect(dialog, SIGNAL(paintRequested(QPrinter *)),
+            currentTab(), SLOT(print(QPrinter *)));
+    dialog->exec();
+#endif
+}
+
+void BrowserMainWindow::slotFilePrint()
+{
+    if (!currentTab())
+        return;
+    printRequested(currentTab()->page()->mainFrame());
+}
+
+void BrowserMainWindow::printRequested(QWebFrame *frame)
+{
+#ifndef QT_NO_PRINTER
+    QPrinter printer;
+    QPrintDialog *dialog = new QPrintDialog(&printer, this);
+    dialog->setWindowTitle(tr("Print Document"));
+    if (dialog->exec() != QDialog::Accepted)
+        return;
+    frame->print(&printer);
+#endif
+}
+
+void BrowserMainWindow::slotPrivateBrowsing()
+{
+    QWebSettings *settings = QWebSettings::globalSettings();
+    bool pb = settings->testAttribute(QWebSettings::PrivateBrowsingEnabled);
+    if (!pb) {
+        QString title = tr("Are you sure you want to turn on private browsing?");
+        QString text = tr("<b>%1</b><br><br>When private browsing in turned on,"
+            " webpages are not added to the history,"
+            " items are automatically removed from the Downloads window," \
+            " new cookies are not stored, current cookies can't be accessed," \
+            " site icons wont be stored, session wont be saved, " \
+            " and searches are not addded to the pop-up menu in the Google search box." \
+            "  Until you close the window, you can still click the Back and Forward buttons" \
+            " to return to the webpages you have opened.").arg(title);
+
+        QMessageBox::StandardButton button = QMessageBox::question(this, QString(), text,
+                               QMessageBox::Ok | QMessageBox::Cancel,
+                               QMessageBox::Ok);
+        if (button == QMessageBox::Ok) {
+            settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
+        }
+    } else {
+        settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, false);
+
+        QList<BrowserMainWindow*> windows = BrowserApplication::instance()->mainWindows();
+        for (int i = 0; i < windows.count(); ++i) {
+            BrowserMainWindow *window = windows.at(i);
+            window->m_lastSearch = QString::null;
+            window->tabWidget()->clear();
+        }
+    }
+}
+
+void BrowserMainWindow::closeEvent(QCloseEvent *event)
+{
+    if (m_tabWidget->count() > 1) {
+        int ret = QMessageBox::warning(this, QString(),
+                           tr("Are you sure you want to close the window?"
+                              "  There are %1 tab open").arg(m_tabWidget->count()),
+                           QMessageBox::Yes | QMessageBox::No,
+                           QMessageBox::No);
+        if (ret == QMessageBox::No) {
+            event->ignore();
+            return;
+        }
+    }
+    event->accept();
+    deleteLater();
+}
+
+void BrowserMainWindow::slotEditFind()
+{
+    if (!currentTab())
+        return;
+    bool ok;
+    QString search = QInputDialog::getText(this, tr("Find"),
+                                          tr("Text:"), QLineEdit::Normal,
+                                          m_lastSearch, &ok);
+    if (ok && !search.isEmpty()) {
+        m_lastSearch = search;
+        if (!currentTab()->findText(m_lastSearch))
+            slotUpdateStatusbar(tr("\"%1\" not found.").arg(m_lastSearch));
+    }
+}
+
+void BrowserMainWindow::slotEditFindNext()
+{
+    if (!currentTab() && !m_lastSearch.isEmpty())
+        return;
+    currentTab()->findText(m_lastSearch);
+}
+
+void BrowserMainWindow::slotEditFindPrevious()
+{
+    if (!currentTab() && !m_lastSearch.isEmpty())
+        return;
+    currentTab()->findText(m_lastSearch, QWebPage::FindBackward);
+}
+
+void BrowserMainWindow::slotViewZoomIn()
+{
+    if (!currentTab())
+        return;
+    currentTab()->setZoomFactor(currentTab()->zoomFactor() + 0.1);
+}
+
+void BrowserMainWindow::slotViewZoomOut()
+{
+    if (!currentTab())
+        return;
+    currentTab()->setZoomFactor(currentTab()->zoomFactor() - 0.1);
+}
+
+void BrowserMainWindow::slotViewResetZoom()
+{
+    if (!currentTab())
+        return;
+    currentTab()->setZoomFactor(1.0);
+}
+
+void BrowserMainWindow::slotViewZoomTextOnly(bool enable)
+{
+    if (!currentTab())
+        return;
+    currentTab()->page()->settings()->setAttribute(QWebSettings::ZoomTextOnly, enable);
+}
+
+void BrowserMainWindow::slotViewFullScreen(bool makeFullScreen)
+{
+    if (makeFullScreen) {
+        showFullScreen();
+    } else {
+        if (isMinimized())
+            showMinimized();
+        else if (isMaximized())
+            showMaximized();
+        else showNormal();
+    }
+}
+
+void BrowserMainWindow::slotViewPageSource()
+{
+    if (!currentTab())
+        return;
+
+    QString markup = currentTab()->page()->mainFrame()->toHtml();
+    QPlainTextEdit *view = new QPlainTextEdit(markup);
+    view->setWindowTitle(tr("Page Source of %1").arg(currentTab()->title()));
+    view->setMinimumWidth(640);
+    view->setAttribute(Qt::WA_DeleteOnClose);
+    view->show();
+}
+
+void BrowserMainWindow::slotHome()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("MainWindow"));
+    QString home = settings.value(QLatin1String("home"), QLatin1String("http://qtsoftware.com/")).toString();
+    loadPage(home);
+}
+
+void BrowserMainWindow::slotWebSearch()
+{
+    m_toolbarSearch->lineEdit()->selectAll();
+    m_toolbarSearch->lineEdit()->setFocus();
+}
+
+void BrowserMainWindow::slotToggleInspector(bool enable)
+{
+    QWebSettings::globalSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, enable);
+    if (enable) {
+        int result = QMessageBox::question(this, tr("Web Inspector"),
+                                           tr("The web inspector will only work correctly for pages that were loaded after enabling.\n"
+                                           "Do you want to reload all pages?"),
+                                           QMessageBox::Yes | QMessageBox::No);
+        if (result == QMessageBox::Yes) {
+            m_tabWidget->reloadAllTabs();
+        }
+    }
+}
+
+void BrowserMainWindow::slotSwapFocus()
+{
+    if (currentTab()->hasFocus())
+        m_tabWidget->currentLineEdit()->setFocus();
+    else
+        currentTab()->setFocus();
+}
+
+void BrowserMainWindow::loadPage(const QString &page)
+{
+    QUrl url = guessUrlFromString(page);
+    loadUrl(url);
+}
+
+TabWidget *BrowserMainWindow::tabWidget() const
+{
+    return m_tabWidget;
+}
+
+WebView *BrowserMainWindow::currentTab() const
+{
+    return m_tabWidget->currentWebView();
+}
+
+void BrowserMainWindow::slotLoadProgress(int progress)
+{
+    if (progress < 100 && progress > 0) {
+        m_chaseWidget->setAnimated(true);
+        disconnect(m_stopReload, SIGNAL(triggered()), m_reload, SLOT(trigger()));
+        if (m_stopIcon.isNull())
+            m_stopIcon = style()->standardIcon(QStyle::SP_BrowserStop);
+        m_stopReload->setIcon(m_stopIcon);
+        connect(m_stopReload, SIGNAL(triggered()), m_stop, SLOT(trigger()));
+        m_stopReload->setToolTip(tr("Stop loading the current page"));
+    } else {
+        m_chaseWidget->setAnimated(false);
+        disconnect(m_stopReload, SIGNAL(triggered()), m_stop, SLOT(trigger()));
+        m_stopReload->setIcon(m_reloadIcon);
+        connect(m_stopReload, SIGNAL(triggered()), m_reload, SLOT(trigger()));
+        m_stopReload->setToolTip(tr("Reload the current page"));
+    }
+}
+
+void BrowserMainWindow::slotAboutToShowBackMenu()
+{
+    m_historyBackMenu->clear();
+    if (!currentTab())
+        return;
+    QWebHistory *history = currentTab()->history();
+    int historyCount = history->count();
+    for (int i = history->backItems(historyCount).count() - 1; i >= 0; --i) {
+        QWebHistoryItem item = history->backItems(history->count()).at(i);
+        QAction *action = new QAction(this);
+        action->setData(-1*(historyCount-i-1));
+        QIcon icon = BrowserApplication::instance()->icon(item.url());
+        action->setIcon(icon);
+        action->setText(item.title());
+        m_historyBackMenu->addAction(action);
+    }
+}
+
+void BrowserMainWindow::slotAboutToShowForwardMenu()
+{
+    m_historyForwardMenu->clear();
+    if (!currentTab())
+        return;
+    QWebHistory *history = currentTab()->history();
+    int historyCount = history->count();
+    for (int i = 0; i < history->forwardItems(history->count()).count(); ++i) {
+        QWebHistoryItem item = history->forwardItems(historyCount).at(i);
+        QAction *action = new QAction(this);
+        action->setData(historyCount-i);
+        QIcon icon = BrowserApplication::instance()->icon(item.url());
+        action->setIcon(icon);
+        action->setText(item.title());
+        m_historyForwardMenu->addAction(action);
+    }
+}
+
+void BrowserMainWindow::slotAboutToShowWindowMenu()
+{
+    m_windowMenu->clear();
+    m_windowMenu->addAction(m_tabWidget->nextTabAction());
+    m_windowMenu->addAction(m_tabWidget->previousTabAction());
+    m_windowMenu->addSeparator();
+    m_windowMenu->addAction(tr("Downloads"), this, SLOT(slotDownloadManager()), QKeySequence(tr("Alt+Ctrl+L", "Download Manager")));
+
+    m_windowMenu->addSeparator();
+    QList<BrowserMainWindow*> windows = BrowserApplication::instance()->mainWindows();
+    for (int i = 0; i < windows.count(); ++i) {
+        BrowserMainWindow *window = windows.at(i);
+        QAction *action = m_windowMenu->addAction(window->windowTitle(), this, SLOT(slotShowWindow()));
+        action->setData(i);
+        action->setCheckable(true);
+        if (window == this)
+            action->setChecked(true);
+    }
+}
+
+void BrowserMainWindow::slotShowWindow()
+{
+    if (QAction *action = qobject_cast<QAction*>(sender())) {
+        QVariant v = action->data();
+        if (v.canConvert<int>()) {
+            int offset = qvariant_cast<int>(v);
+            QList<BrowserMainWindow*> windows = BrowserApplication::instance()->mainWindows();
+            windows.at(offset)->activateWindow();
+            windows.at(offset)->currentTab()->setFocus();
+        }
+    }
+}
+
+void BrowserMainWindow::slotOpenActionUrl(QAction *action)
+{
+    int offset = action->data().toInt();
+    QWebHistory *history = currentTab()->history();
+    if (offset < 0)
+        history->goToItem(history->backItems(-1*offset).first()); // back
+    else if (offset > 0)
+        history->goToItem(history->forwardItems(history->count() - offset + 1).back()); // forward
+ }
+
+void BrowserMainWindow::geometryChangeRequested(const QRect &geometry)
+{
+    setGeometry(geometry);
+}
+
diff --git a/demos/browser/browsermainwindow.h b/demos/browser/browsermainwindow.h
new file mode 100644
index 0000000..eaf976c
--- /dev/null
+++ b/demos/browser/browsermainwindow.h
@@ -0,0 +1,169 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BROWSERMAINWINDOW_H
+#define BROWSERMAINWINDOW_H
+
+#include <QtGui/QMainWindow>
+#include <QtGui/QIcon>
+#include <QtCore/QUrl>
+
+class AutoSaver;
+class BookmarksToolBar;
+class ChaseWidget;
+class QWebFrame;
+class TabWidget;
+class ToolbarSearch;
+class WebView;
+
+/*!
+    The MainWindow of the Browser Application.
+
+    Handles the tab widget and all the actions
+ */
+class BrowserMainWindow : public QMainWindow {
+    Q_OBJECT
+
+public:
+    BrowserMainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+    ~BrowserMainWindow();
+    QSize sizeHint() const;
+
+public:
+    static QUrl guessUrlFromString(const QString &url);
+    TabWidget *tabWidget() const;
+    WebView *currentTab() const;
+    QByteArray saveState(bool withTabs = true) const;
+    bool restoreState(const QByteArray &state);
+
+public slots:
+    void loadPage(const QString &url);
+    void slotHome();
+
+protected:
+    void closeEvent(QCloseEvent *event);
+
+private slots:
+    void save();
+
+    void slotLoadProgress(int);
+    void slotUpdateStatusbar(const QString &string);
+    void slotUpdateWindowTitle(const QString &title = QString());
+
+    void loadUrl(const QUrl &url);
+    void slotPreferences();
+
+    void slotFileNew();
+    void slotFileOpen();
+    void slotFilePrintPreview();
+    void slotFilePrint();
+    void slotPrivateBrowsing();
+    void slotFileSaveAs();
+    void slotEditFind();
+    void slotEditFindNext();
+    void slotEditFindPrevious();
+    void slotShowBookmarksDialog();
+    void slotAddBookmark();
+    void slotViewZoomIn();
+    void slotViewZoomOut();
+    void slotViewResetZoom();
+    void slotViewZoomTextOnly(bool enable);
+    void slotViewToolbar();
+    void slotViewBookmarksBar();
+    void slotViewStatusbar();
+    void slotViewPageSource();
+    void slotViewFullScreen(bool enable);
+
+    void slotWebSearch();
+    void slotToggleInspector(bool enable);
+    void slotAboutApplication();
+    void slotDownloadManager();
+    void slotSelectLineEdit();
+
+    void slotAboutToShowBackMenu();
+    void slotAboutToShowForwardMenu();
+    void slotAboutToShowWindowMenu();
+    void slotOpenActionUrl(QAction *action);
+    void slotShowWindow();
+    void slotSwapFocus();
+
+    void printRequested(QWebFrame *frame);
+    void geometryChangeRequested(const QRect &geometry);
+    void updateToolbarActionText(bool visible);
+    void updateBookmarksToolbarActionText(bool visible);
+
+private:
+    void loadDefaultState();
+    void setupMenu();
+    void setupToolBar();
+    void updateStatusbarActionText(bool visible);
+
+private:
+    QToolBar *m_navigationBar;
+    ToolbarSearch *m_toolbarSearch;
+    BookmarksToolBar *m_bookmarksToolbar;
+    ChaseWidget *m_chaseWidget;
+    TabWidget *m_tabWidget;
+    AutoSaver *m_autoSaver;
+
+    QAction *m_historyBack;
+    QMenu *m_historyBackMenu;
+    QAction *m_historyForward;
+    QMenu *m_historyForwardMenu;
+    QMenu *m_windowMenu;
+
+    QAction *m_stop;
+    QAction *m_reload;
+    QAction *m_stopReload;
+    QAction *m_viewToolbar;
+    QAction *m_viewBookmarkBar;
+    QAction *m_viewStatusbar;
+    QAction *m_restoreLastSession;
+    QAction *m_addBookmark;
+
+    QIcon m_reloadIcon;
+    QIcon m_stopIcon;
+
+    QString m_lastSearch;
+};
+
+#endif // BROWSERMAINWINDOW_H
+
diff --git a/demos/browser/chasewidget.cpp b/demos/browser/chasewidget.cpp
new file mode 100644
index 0000000..7ebe282
--- /dev/null
+++ b/demos/browser/chasewidget.cpp
@@ -0,0 +1,142 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "chasewidget.h"
+
+#include <QtCore/QPoint>
+
+#include <QtGui/QApplication>
+#include <QtGui/QHideEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QShowEvent>
+
+ChaseWidget::ChaseWidget(QWidget *parent, QPixmap pixmap, bool pixmapEnabled)
+    : QWidget(parent)
+    , m_segment(0)
+    , m_delay(100)
+    , m_step(40)
+    , m_timerId(-1)
+    , m_animated(false)
+    , m_pixmap(pixmap)
+    , m_pixmapEnabled(pixmapEnabled)
+{
+}
+
+void ChaseWidget::setAnimated(bool value)
+{
+    if (m_animated == value)
+        return;
+    m_animated = value;
+    if (m_timerId != -1) {
+        killTimer(m_timerId);
+        m_timerId = -1;
+    }
+    if (m_animated) {
+        m_segment = 0;
+        m_timerId = startTimer(m_delay);
+    }
+    update();
+}
+
+void ChaseWidget::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+    QPainter p(this);
+    if (m_pixmapEnabled && !m_pixmap.isNull()) {
+        p.drawPixmap(0, 0, m_pixmap);
+        return;
+    }
+
+    const int extent = qMin(width() - 8, height() - 8);
+    const int displ = extent / 4;
+    const int ext = extent / 4 - 1;
+
+    p.setRenderHint(QPainter::Antialiasing, true);
+
+    if(m_animated)
+        p.setPen(Qt::gray);
+    else
+        p.setPen(QPen(palette().dark().color()));
+
+    p.translate(width() / 2, height() / 2); // center
+
+    for (int segment = 0; segment < segmentCount(); ++segment) {
+        p.rotate(QApplication::isRightToLeft() ? m_step : -m_step);
+        if(m_animated)
+            p.setBrush(colorForSegment(segment));
+        else
+            p.setBrush(palette().background());
+        p.drawEllipse(QRect(displ, -ext / 2, ext, ext));
+    }
+}
+
+QSize ChaseWidget::sizeHint() const
+{
+    return QSize(32, 32);
+}
+
+void ChaseWidget::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == m_timerId) {
+        ++m_segment;
+        update();
+    }
+    QWidget::timerEvent(event);
+}
+
+QColor ChaseWidget::colorForSegment(int seg) const
+{
+    int index = ((seg + m_segment) % segmentCount());
+    int comp = qMax(0, 255 - (index * (255 / segmentCount())));
+    return QColor(comp, comp, comp, 255);
+}
+
+int ChaseWidget::segmentCount() const
+{
+    return 360 / m_step;
+}
+
+void ChaseWidget::setPixmapEnabled(bool enable)
+{
+    m_pixmapEnabled = enable;
+}
+
diff --git a/demos/browser/chasewidget.h b/demos/browser/chasewidget.h
new file mode 100644
index 0000000..78968ba
--- /dev/null
+++ b/demos/browser/chasewidget.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CHASEWIDGET_H
+#define CHASEWIDGET_H
+
+#include <QtGui/QWidget>
+
+#include <QtCore/QSize>
+#include <QtGui/QColor>
+#include <QtGui/QPixmap>
+
+QT_BEGIN_NAMESPACE
+class QHideEvent;
+class QShowEvent;
+class QPaintEvent;
+class QTimerEvent;
+QT_END_NAMESPACE
+
+class ChaseWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    ChaseWidget(QWidget *parent = 0, QPixmap pixmap = QPixmap(), bool pixmapEnabled = false);
+
+    void setAnimated(bool value);
+    void setPixmapEnabled(bool enable);
+    QSize sizeHint() const;
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void timerEvent(QTimerEvent *event);
+
+private:
+    int segmentCount() const;
+    QColor colorForSegment(int segment) const;
+
+    int m_segment;
+    int m_delay;
+    int m_step;
+    int m_timerId;
+    bool m_animated;
+    QPixmap m_pixmap;
+    bool m_pixmapEnabled;
+};
+
+#endif
diff --git a/demos/browser/cookiejar.cpp b/demos/browser/cookiejar.cpp
new file mode 100644
index 0000000..9e11c8e
--- /dev/null
+++ b/demos/browser/cookiejar.cpp
@@ -0,0 +1,733 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "cookiejar.h"
+
+#include "autosaver.h"
+
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QMetaEnum>
+#include <QtCore/QSettings>
+#include <QtCore/QUrl>
+
+#include <QtGui/QCompleter>
+#include <QtGui/QDesktopServices>
+#include <QtGui/QFont>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QHeaderView>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QSortFilterProxyModel>
+
+#include <QtWebKit/QWebSettings>
+
+#include <QtCore/QDebug>
+
+static const unsigned int JAR_VERSION = 23;
+
+QT_BEGIN_NAMESPACE
+QDataStream &operator<<(QDataStream &stream, const QList<QNetworkCookie> &list)
+{
+    stream << JAR_VERSION;
+    stream << quint32(list.size());
+    for (int i = 0; i < list.size(); ++i)
+        stream << list.at(i).toRawForm();
+    return stream;
+}
+
+QDataStream &operator>>(QDataStream &stream, QList<QNetworkCookie> &list)
+{
+    list.clear();
+
+    quint32 version;
+    stream >> version;
+
+    if (version != JAR_VERSION)
+        return stream;
+
+    quint32 count;
+    stream >> count;
+    for(quint32 i = 0; i < count; ++i)
+    {
+        QByteArray value;
+        stream >> value;
+        QList<QNetworkCookie> newCookies = QNetworkCookie::parseCookies(value);
+        if (newCookies.count() == 0 && value.length() != 0) {
+            qWarning() << "CookieJar: Unable to parse saved cookie:" << value;
+        }
+        for (int j = 0; j < newCookies.count(); ++j)
+            list.append(newCookies.at(j));
+        if (stream.atEnd())
+            break;
+    }
+    return stream;
+}
+QT_END_NAMESPACE
+
+CookieJar::CookieJar(QObject *parent)
+    : QNetworkCookieJar(parent)
+    , m_loaded(false)
+    , m_saveTimer(new AutoSaver(this))
+    , m_acceptCookies(AcceptOnlyFromSitesNavigatedTo)
+{
+}
+
+CookieJar::~CookieJar()
+{
+    if (m_keepCookies == KeepUntilExit)
+        clear();
+    m_saveTimer->saveIfNeccessary();
+}
+
+void CookieJar::clear()
+{
+    setAllCookies(QList<QNetworkCookie>());
+    m_saveTimer->changeOccurred();
+    emit cookiesChanged();
+}
+
+void CookieJar::load()
+{
+    if (m_loaded)
+        return;
+    // load cookies and exceptions
+    qRegisterMetaTypeStreamOperators<QList<QNetworkCookie> >("QList<QNetworkCookie>");
+    QSettings cookieSettings(QDesktopServices::storageLocation(QDesktopServices::DataLocation) + QLatin1String("/cookies.ini"), QSettings::IniFormat);
+    setAllCookies(qvariant_cast<QList<QNetworkCookie> >(cookieSettings.value(QLatin1String("cookies"))));
+    cookieSettings.beginGroup(QLatin1String("Exceptions"));
+    m_exceptions_block = cookieSettings.value(QLatin1String("block")).toStringList();
+    m_exceptions_allow = cookieSettings.value(QLatin1String("allow")).toStringList();
+    m_exceptions_allowForSession = cookieSettings.value(QLatin1String("allowForSession")).toStringList();
+    qSort(m_exceptions_block.begin(), m_exceptions_block.end());
+    qSort(m_exceptions_allow.begin(), m_exceptions_allow.end());
+    qSort(m_exceptions_allowForSession.begin(), m_exceptions_allowForSession.end());
+
+    loadSettings();
+}
+
+void CookieJar::loadSettings()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("cookies"));
+    QByteArray value = settings.value(QLatin1String("acceptCookies"),
+                        QLatin1String("AcceptOnlyFromSitesNavigatedTo")).toByteArray();
+    QMetaEnum acceptPolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("AcceptPolicy"));
+    m_acceptCookies = acceptPolicyEnum.keyToValue(value) == -1 ?
+                        AcceptOnlyFromSitesNavigatedTo :
+                        static_cast<AcceptPolicy>(acceptPolicyEnum.keyToValue(value));
+
+    value = settings.value(QLatin1String("keepCookiesUntil"), QLatin1String("KeepUntilExpire")).toByteArray();
+    QMetaEnum keepPolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("KeepPolicy"));
+    m_keepCookies = keepPolicyEnum.keyToValue(value) == -1 ?
+                        KeepUntilExpire :
+                        static_cast<KeepPolicy>(keepPolicyEnum.keyToValue(value));
+
+    if (m_keepCookies == KeepUntilExit)
+        setAllCookies(QList<QNetworkCookie>());
+
+    m_loaded = true;
+    emit cookiesChanged();
+}
+
+void CookieJar::save()
+{
+    if (!m_loaded)
+        return;
+    purgeOldCookies();
+    QString directory = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    if (directory.isEmpty())
+        directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName();
+    if (!QFile::exists(directory)) {
+        QDir dir;
+        dir.mkpath(directory);
+    }
+    QSettings cookieSettings(directory + QLatin1String("/cookies.ini"), QSettings::IniFormat);
+    QList<QNetworkCookie> cookies = allCookies();
+    for (int i = cookies.count() - 1; i >= 0; --i) {
+        if (cookies.at(i).isSessionCookie())
+            cookies.removeAt(i);
+    }
+    cookieSettings.setValue(QLatin1String("cookies"), qVariantFromValue<QList<QNetworkCookie> >(cookies));
+    cookieSettings.beginGroup(QLatin1String("Exceptions"));
+    cookieSettings.setValue(QLatin1String("block"), m_exceptions_block);
+    cookieSettings.setValue(QLatin1String("allow"), m_exceptions_allow);
+    cookieSettings.setValue(QLatin1String("allowForSession"), m_exceptions_allowForSession);
+
+    // save cookie settings
+    QSettings settings;
+    settings.beginGroup(QLatin1String("cookies"));
+    QMetaEnum acceptPolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("AcceptPolicy"));
+    settings.setValue(QLatin1String("acceptCookies"), QLatin1String(acceptPolicyEnum.valueToKey(m_acceptCookies)));
+
+    QMetaEnum keepPolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("KeepPolicy"));
+    settings.setValue(QLatin1String("keepCookiesUntil"), QLatin1String(keepPolicyEnum.valueToKey(m_keepCookies)));
+}
+
+void CookieJar::purgeOldCookies()
+{
+    QList<QNetworkCookie> cookies = allCookies();
+    if (cookies.isEmpty())
+        return;
+    int oldCount = cookies.count();
+    QDateTime now = QDateTime::currentDateTime();
+    for (int i = cookies.count() - 1; i >= 0; --i) {
+        if (!cookies.at(i).isSessionCookie() && cookies.at(i).expirationDate() < now)
+            cookies.removeAt(i);
+    }
+    if (oldCount == cookies.count())
+        return;
+    setAllCookies(cookies);
+    emit cookiesChanged();
+}
+
+QList<QNetworkCookie> CookieJar::cookiesForUrl(const QUrl &url) const
+{
+    CookieJar *that = const_cast<CookieJar*>(this);
+    if (!m_loaded)
+        that->load();
+
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) {
+        QList<QNetworkCookie> noCookies;
+        return noCookies;
+    }
+
+    return QNetworkCookieJar::cookiesForUrl(url);
+}
+
+bool CookieJar::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url)
+{
+    if (!m_loaded)
+        load();
+
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+        return false;
+
+    QString host = url.host();
+    bool eBlock = qBinaryFind(m_exceptions_block.begin(), m_exceptions_block.end(), host) != m_exceptions_block.end();
+    bool eAllow = qBinaryFind(m_exceptions_allow.begin(), m_exceptions_allow.end(), host) != m_exceptions_allow.end();
+    bool eAllowSession = qBinaryFind(m_exceptions_allowForSession.begin(), m_exceptions_allowForSession.end(), host) != m_exceptions_allowForSession.end();
+
+    bool addedCookies = false;
+    // pass exceptions
+    bool acceptInitially = (m_acceptCookies != AcceptNever);
+    if ((acceptInitially && !eBlock)
+        || (!acceptInitially && (eAllow || eAllowSession))) {
+        // pass url domain == cookie domain
+        QDateTime soon = QDateTime::currentDateTime();
+        soon = soon.addDays(90);
+        foreach(QNetworkCookie cookie, cookieList) {
+            QList<QNetworkCookie> lst;
+            if (m_keepCookies == KeepUntilTimeLimit
+                && !cookie.isSessionCookie()
+                && cookie.expirationDate() > soon) {
+                    cookie.setExpirationDate(soon);
+            }
+            lst += cookie;
+            if (QNetworkCookieJar::setCookiesFromUrl(lst, url)) {
+                addedCookies = true;
+            } else {
+                // finally force it in if wanted
+                if (m_acceptCookies == AcceptAlways) {
+                    QList<QNetworkCookie> cookies = allCookies();
+                    cookies += cookie;
+                    setAllCookies(cookies);
+                    addedCookies = true;
+                }
+#if 0
+                else
+                    qWarning() << "setCookiesFromUrl failed" << url << cookieList.value(0).toRawForm();
+#endif
+            }
+        }
+    }
+
+    if (addedCookies) {
+        m_saveTimer->changeOccurred();
+        emit cookiesChanged();
+    }
+    return addedCookies;
+}
+
+CookieJar::AcceptPolicy CookieJar::acceptPolicy() const
+{
+    if (!m_loaded)
+        (const_cast<CookieJar*>(this))->load();
+    return m_acceptCookies;
+}
+
+void CookieJar::setAcceptPolicy(AcceptPolicy policy)
+{
+    if (!m_loaded)
+        load();
+    if (policy == m_acceptCookies)
+        return;
+    m_acceptCookies = policy;
+    m_saveTimer->changeOccurred();
+}
+
+CookieJar::KeepPolicy CookieJar::keepPolicy() const
+{
+    if (!m_loaded)
+        (const_cast<CookieJar*>(this))->load();
+    return m_keepCookies;
+}
+
+void CookieJar::setKeepPolicy(KeepPolicy policy)
+{
+    if (!m_loaded)
+        load();
+    if (policy == m_keepCookies)
+        return;
+    m_keepCookies = policy;
+    m_saveTimer->changeOccurred();
+}
+
+QStringList CookieJar::blockedCookies() const
+{
+    if (!m_loaded)
+        (const_cast<CookieJar*>(this))->load();
+    return m_exceptions_block;
+}
+
+QStringList CookieJar::allowedCookies() const
+{
+    if (!m_loaded)
+        (const_cast<CookieJar*>(this))->load();
+    return m_exceptions_allow;
+}
+
+QStringList CookieJar::allowForSessionCookies() const
+{
+    if (!m_loaded)
+        (const_cast<CookieJar*>(this))->load();
+    return m_exceptions_allowForSession;
+}
+
+void CookieJar::setBlockedCookies(const QStringList &list)
+{
+    if (!m_loaded)
+        load();
+    m_exceptions_block = list;
+    qSort(m_exceptions_block.begin(), m_exceptions_block.end());
+    m_saveTimer->changeOccurred();
+}
+
+void CookieJar::setAllowedCookies(const QStringList &list)
+{
+    if (!m_loaded)
+        load();
+    m_exceptions_allow = list;
+    qSort(m_exceptions_allow.begin(), m_exceptions_allow.end());
+    m_saveTimer->changeOccurred();
+}
+
+void CookieJar::setAllowForSessionCookies(const QStringList &list)
+{
+    if (!m_loaded)
+        load();
+    m_exceptions_allowForSession = list;
+    qSort(m_exceptions_allowForSession.begin(), m_exceptions_allowForSession.end());
+    m_saveTimer->changeOccurred();
+}
+
+CookieModel::CookieModel(CookieJar *cookieJar, QObject *parent)
+    : QAbstractTableModel(parent)
+    , m_cookieJar(cookieJar)
+{
+    connect(m_cookieJar, SIGNAL(cookiesChanged()), this, SLOT(cookiesChanged()));
+    m_cookieJar->load();
+}
+
+QVariant CookieModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (role == Qt::SizeHintRole) {
+        QFont font;
+        font.setPointSize(10);
+        QFontMetrics fm(font);
+        int height = fm.height() + fm.height()/3;
+        int width = fm.width(headerData(section, orientation, Qt::DisplayRole).toString());
+        return QSize(width, height);
+    }
+
+    if (orientation == Qt::Horizontal) {
+        if (role != Qt::DisplayRole)
+            return QVariant();
+
+        switch (section) {
+            case 0:
+                return tr("Website");
+            case 1:
+                return tr("Name");
+            case 2:
+                return tr("Path");
+            case 3:
+                return tr("Secure");
+            case 4:
+                return tr("Expires");
+            case 5:
+                return tr("Contents");
+            default:
+                return QVariant();
+        }
+    }
+    return QAbstractTableModel::headerData(section, orientation, role);
+}
+
+QVariant CookieModel::data(const QModelIndex &index, int role) const
+{
+    QList<QNetworkCookie> lst;
+    if (m_cookieJar)
+        lst = m_cookieJar->allCookies();
+    if (index.row() < 0 || index.row() >= lst.size())
+        return QVariant();
+
+    switch (role) {
+    case Qt::DisplayRole:
+    case Qt::EditRole: {
+        QNetworkCookie cookie = lst.at(index.row());
+        switch (index.column()) {
+            case 0:
+                return cookie.domain();
+            case 1:
+                return cookie.name();
+            case 2:
+                return cookie.path();
+            case 3:
+                return cookie.isSecure();
+            case 4:
+                return cookie.expirationDate();
+            case 5:
+                return cookie.value();
+        }
+        }
+    case Qt::FontRole:{
+        QFont font;
+        font.setPointSize(10);
+        return font;
+        }
+    }
+
+    return QVariant();
+}
+
+int CookieModel::columnCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : 6;
+}
+
+int CookieModel::rowCount(const QModelIndex &parent) const
+{
+    return (parent.isValid() || !m_cookieJar) ? 0 : m_cookieJar->allCookies().count();
+}
+
+bool CookieModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (parent.isValid() || !m_cookieJar)
+        return false;
+    int lastRow = row + count - 1;
+    beginRemoveRows(parent, row, lastRow);
+    QList<QNetworkCookie> lst = m_cookieJar->allCookies();
+    for (int i = lastRow; i >= row; --i) {
+        lst.removeAt(i);
+    }
+    m_cookieJar->setAllCookies(lst);
+    endRemoveRows();
+    return true;
+}
+
+void CookieModel::cookiesChanged()
+{
+    reset();
+}
+
+CookiesDialog::CookiesDialog(CookieJar *cookieJar, QWidget *parent) : QDialog(parent)
+{
+    setupUi(this);
+    setWindowFlags(Qt::Sheet);
+    CookieModel *model = new CookieModel(cookieJar, this);
+    m_proxyModel = new QSortFilterProxyModel(this);
+    connect(search, SIGNAL(textChanged(QString)),
+            m_proxyModel, SLOT(setFilterFixedString(QString)));
+    connect(removeButton, SIGNAL(clicked()), cookiesTable, SLOT(removeOne()));
+    connect(removeAllButton, SIGNAL(clicked()), cookiesTable, SLOT(removeAll()));
+    m_proxyModel->setSourceModel(model);
+    cookiesTable->verticalHeader()->hide();
+    cookiesTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+    cookiesTable->setModel(m_proxyModel);
+    cookiesTable->setAlternatingRowColors(true);
+    cookiesTable->setTextElideMode(Qt::ElideMiddle);
+    cookiesTable->setShowGrid(false);
+    cookiesTable->setSortingEnabled(true);
+    QFont f = font();
+    f.setPointSize(10);
+    QFontMetrics fm(f);
+    int height = fm.height() + fm.height()/3;
+    cookiesTable->verticalHeader()->setDefaultSectionSize(height);
+    cookiesTable->verticalHeader()->setMinimumSectionSize(-1);
+    for (int i = 0; i < model->columnCount(); ++i){
+        int header = cookiesTable->horizontalHeader()->sectionSizeHint(i);
+        switch (i) {
+        case 0:
+            header = fm.width(QLatin1String("averagehost.domain.com"));
+            break;
+        case 1:
+            header = fm.width(QLatin1String("_session_id"));
+            break;
+        case 4:
+            header = fm.width(QDateTime::currentDateTime().toString(Qt::LocalDate));
+            break;
+        }
+        int buffer = fm.width(QLatin1String("xx"));
+        header += buffer;
+        cookiesTable->horizontalHeader()->resizeSection(i, header);
+    }
+    cookiesTable->horizontalHeader()->setStretchLastSection(true);
+}
+
+
+
+CookieExceptionsModel::CookieExceptionsModel(CookieJar *cookiejar, QObject *parent)
+    : QAbstractTableModel(parent)
+    , m_cookieJar(cookiejar)
+{
+    m_allowedCookies = m_cookieJar->allowedCookies();
+    m_blockedCookies = m_cookieJar->blockedCookies();
+    m_sessionCookies = m_cookieJar->allowForSessionCookies();
+}
+
+QVariant CookieExceptionsModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (role == Qt::SizeHintRole) {
+        QFont font;
+        font.setPointSize(10);
+        QFontMetrics fm(font);
+        int height = fm.height() + fm.height()/3;
+        int width = fm.width(headerData(section, orientation, Qt::DisplayRole).toString());
+        return QSize(width, height);
+    }
+
+    if (orientation == Qt::Horizontal
+        && role == Qt::DisplayRole) {
+        switch (section) {
+            case 0:
+                return tr("Website");
+            case 1:
+                return tr("Status");
+        }
+    }
+    return QAbstractTableModel::headerData(section, orientation, role);
+}
+
+QVariant CookieExceptionsModel::data(const QModelIndex &index, int role) const
+{
+    if (index.row() < 0 || index.row() >= rowCount())
+        return QVariant();
+
+    switch (role) {
+    case Qt::DisplayRole:
+    case Qt::EditRole: {
+        int row = index.row();
+        if (row < m_allowedCookies.count()) {
+            switch (index.column()) {
+                case 0:
+                    return m_allowedCookies.at(row);
+                case 1:
+                    return tr("Allow");
+            }
+        }
+        row = row - m_allowedCookies.count();
+        if (row < m_blockedCookies.count()) {
+            switch (index.column()) {
+                case 0:
+                    return m_blockedCookies.at(row);
+                case 1:
+                    return tr("Block");
+            }
+        }
+        row = row - m_blockedCookies.count();
+        if (row < m_sessionCookies.count()) {
+            switch (index.column()) {
+                case 0:
+                    return m_sessionCookies.at(row);
+                case 1:
+                    return tr("Allow For Session");
+            }
+        }
+        }
+    case Qt::FontRole:{
+        QFont font;
+        font.setPointSize(10);
+        return font;
+        }
+    }
+    return QVariant();
+}
+
+int CookieExceptionsModel::columnCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : 2;
+}
+
+int CookieExceptionsModel::rowCount(const QModelIndex &parent) const
+{
+    return (parent.isValid() || !m_cookieJar) ? 0 : m_allowedCookies.count() + m_blockedCookies.count() + m_sessionCookies.count();
+}
+
+bool CookieExceptionsModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (parent.isValid() || !m_cookieJar)
+        return false;
+
+    int lastRow = row + count - 1;
+    beginRemoveRows(parent, row, lastRow);
+    for (int i = lastRow; i >= row; --i) {
+        if (i < m_allowedCookies.count()) {
+            m_allowedCookies.removeAt(row);
+            continue;
+        }
+        i = i - m_allowedCookies.count();
+        if (i < m_blockedCookies.count()) {
+            m_blockedCookies.removeAt(row);
+            continue;
+        }
+        i = i - m_blockedCookies.count();
+        if (i < m_sessionCookies.count()) {
+            m_sessionCookies.removeAt(row);
+            continue;
+        }
+    }
+    m_cookieJar->setAllowedCookies(m_allowedCookies);
+    m_cookieJar->setBlockedCookies(m_blockedCookies);
+    m_cookieJar->setAllowForSessionCookies(m_sessionCookies);
+    endRemoveRows();
+    return true;
+}
+
+CookiesExceptionsDialog::CookiesExceptionsDialog(CookieJar *cookieJar, QWidget *parent)
+    : QDialog(parent)
+    , m_cookieJar(cookieJar)
+{
+    setupUi(this);
+    setWindowFlags(Qt::Sheet);
+    connect(removeButton, SIGNAL(clicked()), exceptionTable, SLOT(removeOne()));
+    connect(removeAllButton, SIGNAL(clicked()), exceptionTable, SLOT(removeAll()));
+    exceptionTable->verticalHeader()->hide();
+    exceptionTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+    exceptionTable->setAlternatingRowColors(true);
+    exceptionTable->setTextElideMode(Qt::ElideMiddle);
+    exceptionTable->setShowGrid(false);
+    exceptionTable->setSortingEnabled(true);
+    m_exceptionsModel = new CookieExceptionsModel(cookieJar, this);
+    m_proxyModel = new QSortFilterProxyModel(this);
+    m_proxyModel->setSourceModel(m_exceptionsModel);
+    connect(search, SIGNAL(textChanged(QString)),
+            m_proxyModel, SLOT(setFilterFixedString(QString)));
+    exceptionTable->setModel(m_proxyModel);
+
+    CookieModel *cookieModel = new CookieModel(cookieJar, this);
+    domainLineEdit->setCompleter(new QCompleter(cookieModel, domainLineEdit));
+
+    connect(domainLineEdit, SIGNAL(textChanged(const QString &)),
+            this, SLOT(textChanged(const QString &)));
+    connect(blockButton, SIGNAL(clicked()), this, SLOT(block()));
+    connect(allowButton, SIGNAL(clicked()), this, SLOT(allow()));
+    connect(allowForSessionButton, SIGNAL(clicked()), this, SLOT(allowForSession()));
+
+    QFont f = font();
+    f.setPointSize(10);
+    QFontMetrics fm(f);
+    int height = fm.height() + fm.height()/3;
+    exceptionTable->verticalHeader()->setDefaultSectionSize(height);
+    exceptionTable->verticalHeader()->setMinimumSectionSize(-1);
+    for (int i = 0; i < m_exceptionsModel->columnCount(); ++i){
+        int header = exceptionTable->horizontalHeader()->sectionSizeHint(i);
+        switch (i) {
+        case 0:
+            header = fm.width(QLatin1String("averagebiglonghost.domain.com"));
+            break;
+        case 1:
+            header = fm.width(QLatin1String("Allow For Session"));
+            break;
+        }
+        int buffer = fm.width(QLatin1String("xx"));
+        header += buffer;
+        exceptionTable->horizontalHeader()->resizeSection(i, header);
+    }
+}
+
+void CookiesExceptionsDialog::textChanged(const QString &text)
+{
+    bool enabled = !text.isEmpty();
+    blockButton->setEnabled(enabled);
+    allowButton->setEnabled(enabled);
+    allowForSessionButton->setEnabled(enabled);
+}
+
+void CookiesExceptionsDialog::block()
+{
+    if (domainLineEdit->text().isEmpty())
+        return;
+    m_exceptionsModel->m_blockedCookies.append(domainLineEdit->text());
+    m_cookieJar->setBlockedCookies(m_exceptionsModel->m_blockedCookies);
+    m_exceptionsModel->reset();
+}
+
+void CookiesExceptionsDialog::allow()
+{
+    if (domainLineEdit->text().isEmpty())
+        return;
+    m_exceptionsModel->m_allowedCookies.append(domainLineEdit->text());
+    m_cookieJar->setAllowedCookies(m_exceptionsModel->m_allowedCookies);
+    m_exceptionsModel->reset();
+}
+
+void CookiesExceptionsDialog::allowForSession()
+{
+    if (domainLineEdit->text().isEmpty())
+        return;
+    m_exceptionsModel->m_sessionCookies.append(domainLineEdit->text());
+    m_cookieJar->setAllowForSessionCookies(m_exceptionsModel->m_sessionCookies);
+    m_exceptionsModel->reset();
+}
+
diff --git a/demos/browser/cookiejar.h b/demos/browser/cookiejar.h
new file mode 100644
index 0000000..ffcd4c1
--- /dev/null
+++ b/demos/browser/cookiejar.h
@@ -0,0 +1,204 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COOKIEJAR_H
+#define COOKIEJAR_H
+
+#include <QtNetwork/QNetworkCookieJar>
+
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QStringList>
+
+#include <QtGui/QDialog>
+#include <QtGui/QTableView>
+
+QT_BEGIN_NAMESPACE
+class QSortFilterProxyModel;
+class QKeyEvent;
+QT_END_NAMESPACE
+
+class AutoSaver;
+
+class CookieJar : public QNetworkCookieJar
+{
+    friend class CookieModel;
+    Q_OBJECT
+    Q_PROPERTY(AcceptPolicy acceptPolicy READ acceptPolicy WRITE setAcceptPolicy)
+    Q_PROPERTY(KeepPolicy keepPolicy READ keepPolicy WRITE setKeepPolicy)
+    Q_PROPERTY(QStringList blockedCookies READ blockedCookies WRITE setBlockedCookies)
+    Q_PROPERTY(QStringList allowedCookies READ allowedCookies WRITE setAllowedCookies)
+    Q_PROPERTY(QStringList allowForSessionCookies READ allowForSessionCookies WRITE setAllowForSessionCookies)
+    Q_ENUMS(KeepPolicy)
+    Q_ENUMS(AcceptPolicy)
+
+signals:
+    void cookiesChanged();
+
+public:
+    enum AcceptPolicy {
+        AcceptAlways,
+        AcceptNever,
+        AcceptOnlyFromSitesNavigatedTo
+    };
+
+    enum KeepPolicy {
+        KeepUntilExpire,
+        KeepUntilExit,
+        KeepUntilTimeLimit
+    };
+
+    CookieJar(QObject *parent = 0);
+    ~CookieJar();
+
+    QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const;
+    bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url);
+
+    AcceptPolicy acceptPolicy() const;
+    void setAcceptPolicy(AcceptPolicy policy);
+
+    KeepPolicy keepPolicy() const;
+    void setKeepPolicy(KeepPolicy policy);
+
+    QStringList blockedCookies() const;
+    QStringList allowedCookies() const;
+    QStringList allowForSessionCookies() const;
+
+    void setBlockedCookies(const QStringList &list);
+    void setAllowedCookies(const QStringList &list);
+    void setAllowForSessionCookies(const QStringList &list);
+
+public slots:
+    void clear();
+    void loadSettings();
+
+private slots:
+    void save();
+
+private:
+    void purgeOldCookies();
+    void load();
+    bool m_loaded;
+    AutoSaver *m_saveTimer;
+
+    AcceptPolicy m_acceptCookies;
+    KeepPolicy m_keepCookies;
+
+    QStringList m_exceptions_block;
+    QStringList m_exceptions_allow;
+    QStringList m_exceptions_allowForSession;
+};
+
+class CookieModel : public QAbstractTableModel
+{
+    Q_OBJECT
+
+public:
+    CookieModel(CookieJar *jar, QObject *parent = 0);
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+
+private slots:
+    void cookiesChanged();
+
+private:
+    CookieJar *m_cookieJar;
+};
+
+#include "ui_cookies.h"
+#include "ui_cookiesexceptions.h"
+
+class CookiesDialog : public QDialog, public Ui_CookiesDialog
+{
+    Q_OBJECT
+
+public:
+    CookiesDialog(CookieJar *cookieJar, QWidget *parent = 0);
+
+private:
+    QSortFilterProxyModel *m_proxyModel;
+};
+
+class CookieExceptionsModel : public QAbstractTableModel
+{
+    Q_OBJECT
+    friend class CookiesExceptionsDialog;
+
+public:
+    CookieExceptionsModel(CookieJar *cookieJar, QObject *parent = 0);
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+
+private:
+    CookieJar *m_cookieJar;
+
+    // Domains we allow, Domains we block, Domains we allow for this session
+    QStringList m_allowedCookies;
+    QStringList m_blockedCookies;
+    QStringList m_sessionCookies;
+};
+
+class CookiesExceptionsDialog : public QDialog, public Ui_CookiesExceptionsDialog
+{
+    Q_OBJECT
+
+public:
+    CookiesExceptionsDialog(CookieJar *cookieJar, QWidget *parent = 0);
+
+private slots:
+    void block();
+    void allow();
+    void allowForSession();
+    void textChanged(const QString &text);
+
+private:
+    CookieExceptionsModel *m_exceptionsModel;
+    QSortFilterProxyModel *m_proxyModel;
+    CookieJar *m_cookieJar;
+};
+
+#endif // COOKIEJAR_H
+
diff --git a/demos/browser/cookies.ui b/demos/browser/cookies.ui
new file mode 100644
index 0000000..c4bccc5
--- /dev/null
+++ b/demos/browser/cookies.ui
@@ -0,0 +1,106 @@
+<ui version="4.0" >
+ <class>CookiesDialog</class>
+ <widget class="QDialog" name="CookiesDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>550</width>
+    <height>370</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Cookies</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>252</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <widget class="SearchLineEdit" name="search" />
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="EditTableView" name="cookiesTable" />
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="removeButton" >
+       <property name="text" >
+        <string>&amp;Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="removeAllButton" >
+       <property name="text" >
+        <string>Remove &amp;All Cookies</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>searchlineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>EditTableView</class>
+   <extends>QTableView</extends>
+   <header>edittableview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CookiesDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>472</x>
+     <y>329</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>461</x>
+     <y>356</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/cookiesexceptions.ui b/demos/browser/cookiesexceptions.ui
new file mode 100644
index 0000000..3d9ef62
--- /dev/null
+++ b/demos/browser/cookiesexceptions.ui
@@ -0,0 +1,184 @@
+<ui version="4.0" >
+ <class>CookiesExceptionsDialog</class>
+ <widget class="QDialog" name="CookiesExceptionsDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>466</width>
+    <height>446</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Cookie Exceptions</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QGroupBox" name="newExceptionGroupBox" >
+     <property name="title" >
+      <string>New Exception</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="text" >
+           <string>Domain:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="domainLineEdit" />
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0" >
+       <layout class="QHBoxLayout" >
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>81</width>
+            <height>25</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="blockButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>Block</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="allowForSessionButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>Allow For Session</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="allowButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>Allow</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="ExceptionsGroupBox" >
+     <property name="title" >
+      <string>Exceptions</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" colspan="3" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>252</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="3" >
+       <widget class="SearchLineEdit" name="search" />
+      </item>
+      <item row="1" column="0" colspan="4" >
+       <widget class="EditTableView" name="exceptionTable" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QPushButton" name="removeButton" >
+        <property name="text" >
+         <string>&amp;Remove</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="removeAllButton" >
+        <property name="text" >
+         <string>Remove &amp;All</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" colspan="2" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>searchlineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>EditTableView</class>
+   <extends>QTableView</extends>
+   <header>edittableview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CookiesExceptionsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>381</x>
+     <y>428</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>336</x>
+     <y>443</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/data/addtab.png b/demos/browser/data/addtab.png
new file mode 100644
index 0000000..20928fb
--- /dev/null
+++ b/demos/browser/data/addtab.png
diff --git a/demos/browser/data/browser.svg b/demos/browser/data/browser.svg
new file mode 100644
index 0000000..4b0fa72
--- /dev/null
+++ b/demos/browser/data/browser.svg
@@ -0,0 +1,411 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2160"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   inkscape:export-filename="c:\icons\qtbrowser48.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docbase="C:\icons"
+   sodipodi:docname="browser.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2162"><linearGradient
+   id="linearGradient3808">
+  <stop
+     id="stop3810"
+     offset="0"
+     style="stop-color:#000000;stop-opacity:0.54263568;" />
+  <stop
+     id="stop3812"
+     offset="1"
+     style="stop-color:#000000;stop-opacity:0;" />
+</linearGradient>
+<inkscape:perspective
+   sodipodi:type="inkscape:persp3d"
+   inkscape:vp_x="0 : 24 : 1"
+   inkscape:vp_y="0 : 1000 : 0"
+   inkscape:vp_z="48 : 24 : 1"
+   inkscape:persp3d-origin="24 : 16 : 1"
+   id="perspective63" />
+<linearGradient
+   id="linearGradient3326">
+  <stop
+     style="stop-color:#000000;stop-opacity:0.3137255;"
+     offset="0"
+     id="stop3328" />
+  <stop
+     style="stop-color:#000000;stop-opacity:0;"
+     offset="1"
+     id="stop3330" />
+</linearGradient>
+<linearGradient
+   id="linearGradient3318">
+  <stop
+     style="stop-color:#000000;stop-opacity:0.3137255;"
+     offset="0"
+     id="stop3320" />
+  <stop
+     style="stop-color:#000000;stop-opacity:0;"
+     offset="1"
+     id="stop3322" />
+</linearGradient>
+<linearGradient
+   id="linearGradient3302">
+  <stop
+     style="stop-color:#000000;stop-opacity:0.3137255;"
+     offset="0"
+     id="stop3304" />
+  <stop
+     style="stop-color:#000000;stop-opacity:0;"
+     offset="1"
+     id="stop3306" />
+</linearGradient>
+<linearGradient
+   id="linearGradient3267">
+  <stop
+     style="stop-color:#000000;stop-opacity:1;"
+     offset="0"
+     id="stop3269" />
+  <stop
+     id="stop3275"
+     offset="0.79661018"
+     style="stop-color:#000000;stop-opacity:1;" />
+  <stop
+     style="stop-color:#000000;stop-opacity:0;"
+     offset="1"
+     id="stop3271" />
+</linearGradient>
+<linearGradient
+   id="linearGradient3745">
+  <stop
+     style="stop-color:#ffffff;stop-opacity:0.19587629;"
+     offset="0"
+     id="stop3747" />
+  <stop
+     style="stop-color:#7cb2ff;stop-opacity:0.07216495;"
+     offset="1"
+     id="stop3749" />
+</linearGradient>
+<linearGradient
+   inkscape:collect="always"
+   id="linearGradient3561">
+  <stop
+     style="stop-color:#b1d0ff;stop-opacity:1;"
+     offset="0"
+     id="stop3563" />
+  <stop
+     style="stop-color:#b1d0ff;stop-opacity:0;"
+     offset="1"
+     id="stop3565" />
+</linearGradient>
+<linearGradient
+   id="linearGradient3181">
+  <stop
+     style="stop-color:#4f7a33;stop-opacity:1;"
+     offset="0"
+     id="stop3183" />
+  <stop
+     style="stop-color:#204712;stop-opacity:1;"
+     offset="1"
+     id="stop3185" />
+</linearGradient>
+<linearGradient
+   id="linearGradient3143">
+  <stop
+     style="stop-color:#c1dbff;stop-opacity:1;"
+     offset="0"
+     id="stop3145" />
+  <stop
+     style="stop-color:#004e92;stop-opacity:1;"
+     offset="1"
+     id="stop3147" />
+</linearGradient>
+<radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3143"
+   id="radialGradient3149"
+   cx="9.1428566"
+   cy="15.142858"
+   fx="9.1428566"
+   fy="15.142858"
+   r="20.121096"
+   gradientUnits="userSpaceOnUse" />
+<radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3181"
+   id="radialGradient3187"
+   cx="10.739879"
+   cy="18.250999"
+   fx="10.739879"
+   fy="18.250999"
+   r="7.4191086"
+   gradientTransform="matrix(1.0504709,0,0,1.5077925,-0.3797113,-9.2677171)"
+   gradientUnits="userSpaceOnUse" />
+<radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3181"
+   id="radialGradient3195"
+   cx="14.947268"
+   cy="35.920116"
+   fx="14.947268"
+   fy="35.920116"
+   r="6.0472684"
+   gradientTransform="matrix(1,0,0,0.7248478,0,9.8834985)"
+   gradientUnits="userSpaceOnUse" />
+<radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3181"
+   id="radialGradient3203"
+   cx="34.227203"
+   cy="24.681196"
+   fx="34.227203"
+   fy="24.681196"
+   r="6.7517419"
+   gradientTransform="matrix(0.9941509,-0.1079997,0.2962199,2.7267411,-7.1108629,-38.921508)"
+   gradientUnits="userSpaceOnUse" />
+<radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3561"
+   id="radialGradient3567"
+   cx="22.714285"
+   cy="23.571428"
+   fx="22.714285"
+   fy="23.571428"
+   r="19.828572"
+   gradientUnits="userSpaceOnUse" />
+<linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3745"
+   id="linearGradient3751"
+   x1="0.84126461"
+   y1="13.678415"
+   x2="31.397495"
+   y2="13.678415"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.8791332,0.7829527,-0.6285195,1.0951445,14.147627,-10.49311)" />
+<filter
+   inkscape:collect="always"
+   id="filter4176">
+  <feGaussianBlur
+     inkscape:collect="always"
+     stdDeviation="0.27747502"
+     id="feGaussianBlur4178" />
+</filter>
+<radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3267"
+   id="radialGradient3273"
+   cx="22.714285"
+   cy="23.571428"
+   fx="22.714285"
+   fy="23.571428"
+   r="19.428572"
+   gradientUnits="userSpaceOnUse" />
+<inkscape:perspective
+   id="perspective136"
+   inkscape:persp3d-origin="138.6795 : 92.479329 : 1"
+   inkscape:vp_z="277.35901 : 138.71899 : 1"
+   inkscape:vp_y="0 : 1000 : 0"
+   inkscape:vp_x="0 : 138.71899 : 1"
+   sodipodi:type="inkscape:persp3d" />
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+<linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3808"
+   id="linearGradient3806"
+   x1="32.829472"
+   y1="32.055603"
+   x2="34.522324"
+   y2="-1.0290829"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.8832227,0,0,1,-8.0103007,9.1923882)" />
+</defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="30.924085"
+     inkscape:cy="24.59691"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1299"
+     inkscape:window-height="883"
+     inkscape:window-x="373"
+     inkscape:window-y="89"
+     showguides="false" />
+  <metadata
+     id="metadata2165">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Qt Browser</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jens Bache-Wiig</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.78108437;fill:url(#radialGradient3273);fill-opacity:1;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3407"
+       sodipodi:cx="22.714285"
+       sodipodi:cy="23.571428"
+       sodipodi:rx="19.428572"
+       sodipodi:ry="19.428572"
+       d="M 42.142857,23.571428 A 19.428572,19.428572 0 1 1 3.2857132,23.571428 A 19.428572,19.428572 0 1 1 42.142857,23.571428 z"
+       transform="matrix(1.0818892,0,0,1.0409446,-2.4313375,0.4303723)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3149);fill-opacity:1;stroke:none;stroke-width:0.80000000000000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2170"
+       sodipodi:cx="22.714285"
+       sodipodi:cy="23.571428"
+       sodipodi:rx="19.428572"
+       sodipodi:ry="19.428572"
+       d="M 42.142857 23.571428 A 19.428572 19.428572 0 1 1  3.2857132,23.571428 A 19.428572 19.428572 0 1 1  42.142857 23.571428 z" />
+    <path
+       d="M 26.602136,8.2160843 C 26.322653,8.1637524 26.048884,8.1512446 25.78375,8.1745351 L 25.783243,8.1743913 C 25.783243,8.1743913 23.973525,8.3138471 23.891496,8.3211793 C 22.239361,8.4705552 20.985434,10.008307 20.985434,12.131916 L 20.985434,37.174579 L 22.83515,39.126673 L 41.425135,33.998394 C 42.704203,33.746799 43.714709,33.629384 43.714709,31.78483 L 43.714709,11.392226 L 26.602136,8.2160843 z"
+       id="path2998"
+       style="fill:url(#linearGradient3806);fill-opacity:1"
+       sodipodi:nodetypes="cccsccccccc" />
+    <path
+       style="fill:url(#radialGradient3203);fill-opacity:1;fill-rule:evenodd;stroke:#1d3215;stroke-width:0.51392877000000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 37.535517,11.721122 C 32.782916,8.7478602 30.602351,6.3542385 32.09957,13.4346 C 32.320572,14.27055 33.291276,13.739232 33.291276,14.862228 C 33.291276,16.155819 32.607502,17.380765 31.797574,18.146663 C 30.959323,18.939344 31.011357,20.258984 31.797574,21.002459 C 33.06234,22.198469 33.942515,22.715936 35.572536,22.715936 C 36.6448,22.715936 37.003629,23.274262 37.23352,24.143834 C 37.362263,24.630808 38.410486,25.085663 38.894503,25.428942 C 38.938905,25.460433 38.139512,26.551348 38.139512,27.999158 C 38.139512,29.113512 38.405167,29.358325 38.743505,29.998215 C 38.949111,30.387072 36.418877,30.283794 36.025532,30.283794 C 35.005751,30.283794 34.181701,30.712163 33.15656,30.712163 C 32.264543,30.712163 31.099578,30.3566 31.344578,31.283323 C 31.763542,32.868074 32.552566,33.932342 32.552566,35.709806 C 32.552566,36.862272 31.047367,37.598377 30.287588,38.137232 C 29.30273,38.835721 29.133207,39.307154 28.475606,40.136289 C 28.132145,40.569341 26.990548,41.409612 28.475606,40.707448 C 29.476144,40.234375 31.192063,39.423774 32.09957,38.565601 C 33.257846,37.470293 34.527421,37.269266 35.723534,36.138176 C 36.659137,35.253436 37.512933,34.691155 38.29051,33.710749 C 39.024031,32.785889 39.498498,31.90347 39.498498,30.712163 C 39.498498,29.682482 39.308098,28.750366 39.951493,28.141948 C 40.902684,24.235856 42.225874,19.789742 39.751646,16.005086 C 38.569376,15.014407 37.717516,13.109859 37.535517,11.721122 z "
+       id="path3151"
+       sodipodi:nodetypes="ccsssssssssssssssssssccc" />
+    <path
+       style="fill:url(#radialGradient3187);fill-opacity:1;fill-rule:evenodd;stroke:#063a0a;stroke-width:0.51231807;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.777083,7.8630009 C 14.047432,8.4403746 12.751987,10.898939 13.27641,12.146301 C 13.709874,13.177316 14.920827,13.613143 15.827553,13.859622 C 16.568703,14.061091 17.049015,14.457271 17.478293,15.001835 C 17.832696,15.451415 17.971105,16.346745 18.078563,16.857932 C 18.298637,17.904845 18.947911,17.058563 17.62836,18.000145 C 17.234352,18.281296 14.875696,18.000145 14.476948,18.000145 C 11.976825,18.384083 14.297504,19.464893 14.92715,20.712903 C 15.204987,21.770261 15.377352,22.405336 15.377352,23.711213 C 15.377352,24.875672 15.377352,24.78389 15.377352,25.99564 C 15.377352,27.194757 15.044241,27.28063 13.876679,27.28063 C 13.023055,27.28063 12.647321,26.423969 11.625669,26.423969 C 10.400599,26.423969 11.303539,27.667106 11.475602,27.994513 C 12.006402,29.004538 11.662121,29.599737 10.875334,28.851174 C 9.855722,27.881096 8.8280305,26.760556 8.0240557,25.99564 C 2.8789379,25.807372 4.5677903,23.466499 3.9722395,18.999582 C 5.041259,16.526382 4.7558935,17.248897 7.2737194,12.574632 C 10.149914,9.5491592 13.589212,5.9532919 14.777083,7.8630009 z"
+       id="path3159"
+       sodipodi:nodetypes="csssssccsssssscccc" />
+    <path
+       style="fill:url(#radialGradient3195);fill-opacity:1;fill-rule:evenodd;stroke:#163c0c;stroke-width:0.59999999999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10.265966,34.571429 C 9.245427,35.081699 8.6225774,36.042538 9.980252,36.857143 C 10.637564,37.25153 11.478587,37.606311 12.265966,38 C 13.258976,38.496505 14.481138,39.018522 15.408823,39.714286 C 16.227572,40.328348 15.587589,39.928184 16.123109,38.857143 C 16.827927,37.447507 18.14516,38.79674 18.837395,39.142857 C 20.044787,39.746554 20.46001,38.652394 20.694537,37.714286 C 20.459863,35.791335 18.579948,34.625723 17.123109,33.285715 C 16.704922,32.588736 15.507117,31.689713 14.837395,31.857143 C 13.49505,33.304042 12.350312,33.960279 10.265966,34.571429 z "
+       id="path3161"
+       sodipodi:nodetypes="cssssscccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;stroke:url(#radialGradient3567);stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.6502732"
+       id="path3557"
+       sodipodi:cx="22.714285"
+       sodipodi:cy="23.571428"
+       sodipodi:rx="19.428572"
+       sodipodi:ry="19.428572"
+       d="M 42.142857 23.571428 A 19.428572 19.428572 0 1 1  3.2857132,23.571428 A 19.428572 19.428572 0 1 1  42.142857 23.571428 z"
+       transform="matrix(0.95317,0,0,0.95317,0.9922816,1.1752786)" />
+    <path
+       style="fill:url(#linearGradient3751);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 39.916926,27.786316 C 44.588637,26.790847 38.225604,13.201712 32.946381,8.5000566 C 18.135275,-0.40265528 10.844456,5.6490056 3.6645529,16.333771 C 5.7478288,18.189127 14.704728,33.158645 39.916926,27.786316 z"
+       id="path3578"
+       sodipodi:nodetypes="cccs" />
+    <path
+       d="M 45.902562,20.610592 C 46.007701,20.610592 46.120332,20.603354 46.240455,20.590275 L 45.609873,20.590275 C 45.697743,20.603608 45.798946,20.610592 45.902562,20.610592 z"
+       id="path3012"
+       style="fill:#0a6333" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;stroke:#273e5e;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3818"
+       sodipodi:cx="22.714285"
+       sodipodi:cy="23.571428"
+       sodipodi:rx="19.428572"
+       sodipodi:ry="19.428572"
+       d="M 42.142857,23.571428 A 19.428572,19.428572 0 1 1 3.2857132,23.571428 A 19.428572,19.428572 0 1 1 42.142857,23.571428 z"
+       transform="matrix(0.9754581,0,0,0.9754581,0.3821951,0.7002631)" />
+    <g
+       transform="matrix(0.1269799,0,0,0.1269799,23.283534,9.5774104)"
+       id="g236">
+	<path
+   style="fill:#024c1c"
+   id="path238"
+   d="M 44.233,0.368 C 42.032,0.004 39.876,-0.083 37.788,0.079 L 37.784,0.078 C 37.784,0.078 23.532,1.048 22.886,1.099 C 9.875,2.138 0,12.834 0,27.605 L 0,201.792 L 14.567,215.37 L 160.968,190.766 C 171.041,189.016 178.999,177.133 178.999,164.303 L 178.999,22.46 L 44.233,0.368 z" />
+
+	<path
+   style="fill:#66b036"
+   id="path240"
+   d="M 179,164.304 C 179,177.134 171.042,189.017 160.969,190.767 L 14.567,215.37 L 14.567,26.683 C 14.567,9.52 28.263,-2.264 44.231,0.368 L 179,22.462 L 179,164.304 z" />
+
+	<g
+   id="g242">
+		<path
+   style="fill:#ffffff"
+   id="path244"
+   d="M 133.897,47.137 L 145.72,48.411 L 145.72,69.158 L 159.025,70.099 L 159.025,83.113 L 145.72,82.502 L 145.72,130.066 C 145.72,134.207 146.176,136.869 147.093,138.064 C 147.919,139.158 149.195,139.697 150.907,139.697 C 151.069,139.697 151.24,139.695 151.414,139.683 C 154.031,139.533 156.878,138.728 159.98,137.314 L 159.98,149.275 C 154.707,151.591 149.532,152.966 144.452,153.398 C 143.716,153.457 143.005,153.486 142.317,153.486 C 137.716,153.486 134.199,152.152 131.797,149.451 C 128.998,146.318 127.598,141.285 127.598,134.387 L 127.598,81.661 L 121.209,81.368 L 121.209,67.424 L 129,67.985 L 133.897,47.137 z" />
+
+	</g>
+
+	<polygon
+   style="fill:#0a6333"
+   id="polygon246"
+   points="159.027,83.112 145.722,82.501 145.722,82.785 152.854,83.112 159.027,83.112 " />
+
+	<path
+   style="fill:#024c1c"
+   id="path248"
+   d="M 148.488,139.21 C 149.168,139.548 149.96,139.696 150.908,139.696 C 151.07,139.696 151.241,139.694 151.415,139.682 C 154.032,139.532 156.879,138.727 159.981,137.313 L 153.806,137.313 C 151.938,138.169 150.178,138.808 148.488,139.21 z" />
+
+	<path
+   style="fill:#024c1c"
+   id="path250"
+   d="M 133.897,47.137 L 127.723,47.137 L 122.93,67.549 L 129,67.985 L 133.897,47.137 z M 131.799,149.45 C 129,146.317 127.6,141.284 127.6,134.386 L 127.6,81.661 L 121.211,81.368 L 121.211,67.424 L 115.03,67.424 L 115.03,70.539 C 115.926,73.897 116.63,77.539 117.149,81.465 L 121.426,81.661 L 121.426,134.386 C 121.426,141.284 122.827,146.318 125.625,149.45 C 128.029,152.151 131.541,153.485 136.141,153.485 L 142.318,153.485 C 137.718,153.485 134.2,152.151 131.799,149.45 z" />
+
+	<path
+   style="fill:#0a6333"
+   id="path252"
+   d="M 102.954,170.419 C 103.782,170.419 104.669,170.362 105.615,170.259 L 100.649,170.259 C 101.341,170.364 102.138,170.419 102.954,170.419 z" />
+
+	<path
+   style="fill:#ffffff"
+   id="path254"
+   d="M 112.036,139.78 C 107.81,149.749 101.365,156.27 92.542,159.288 C 93.43,163.856 94.778,166.929 96.567,168.55 C 97.955,169.796 100.094,170.419 102.958,170.419 C 103.782,170.419 104.671,170.362 105.615,170.259 L 105.615,183.736 L 99.497,184.539 C 97.692,184.771 95.98,184.889 94.361,184.889 C 89.001,184.889 84.665,183.59 81.402,180.961 C 77.085,177.496 73.899,170.805 71.857,160.908 C 62.48,158.91 55.166,152.945 50.103,142.937 C 44.965,132.769 42.349,117.895 42.349,98.441 C 42.349,77.466 45.927,61.985 52.971,52.169 C 58.912,43.885 67.202,39.812 77.634,39.812 C 79.306,39.812 81.033,39.916 82.809,40.124 C 95.081,41.539 103.977,47.329 109.77,57.362 C 115.453,67.177 118.243,81.244 118.243,99.721 C 118.242,116.643 116.186,129.954 112.036,139.78 z M 93.582,135.933 C 95.996,129.724 97.189,117.54 97.189,99.37 C 97.189,83.054 96.007,71.837 93.608,65.682 C 91.21,59.496 87.622,56.153 82.808,55.731 C 82.441,55.7 82.075,55.681 81.724,55.681 C 77.264,55.681 73.84,58.283 71.447,63.508 C 68.863,69.201 67.555,81.003 67.555,98.866 C 67.555,116.129 68.826,128.379 71.388,135.569 C 73.804,142.419 77.423,145.813 82.174,145.813 C 82.384,145.813 82.593,145.805 82.809,145.79 C 87.566,145.489 91.148,142.202 93.582,135.933" />
+
+	<path
+   style="fill:#024c1c"
+   id="path256"
+   d="M 84.708,183.003 C 84.59,182.95 84.477,182.896 84.361,182.839 C 84.349,182.835 84.336,182.829 84.323,182.821 C 84.218,182.77 84.115,182.716 84.011,182.663 C 83.991,182.653 83.971,182.642 83.948,182.63 C 83.854,182.579 83.761,182.528 83.667,182.476 C 83.636,182.46 83.609,182.443 83.579,182.427 C 83.494,182.38 83.412,182.331 83.328,182.284 C 83.286,182.263 83.25,182.239 83.209,182.214 C 83.137,182.171 83.062,182.128 82.994,182.083 C 82.943,182.054 82.897,182.024 82.848,181.993 C 82.785,181.954 82.726,181.915 82.663,181.876 C 82.606,181.837 82.552,181.798 82.492,181.759 C 82.442,181.726 82.392,181.693 82.342,181.659 C 82.272,181.612 82.206,181.563 82.141,181.518 C 82.101,181.489 82.061,181.463 82.021,181.432 C 81.943,181.377 81.866,181.319 81.79,181.26 C 81.764,181.239 81.735,181.221 81.708,181.199 C 81.607,181.121 81.505,181.039 81.402,180.959 C 77.085,177.494 73.899,170.803 71.857,160.906 C 62.48,158.908 55.166,152.943 50.103,142.935 C 44.965,132.767 42.349,117.893 42.349,98.439 C 42.349,77.464 45.927,61.983 52.971,52.167 C 58.912,43.883 67.202,39.81 77.634,39.81 C 77.67,39.81 71.114,39.806 71.114,39.806 L 71.114,39.81 C 60.694,39.818 52.411,43.89 46.476,52.167 C 39.434,61.984 35.855,77.465 35.855,98.439 C 35.855,117.892 38.469,132.767 43.609,142.935 C 48.671,152.943 55.983,158.908 65.361,160.906 C 67.403,170.802 70.588,177.494 74.904,180.959 C 78.168,183.588 82.507,184.887 87.867,184.887 C 87.967,184.887 88.07,184.887 88.17,184.885 L 93.861,184.885 C 90.361,184.828 87.306,184.203 84.716,183.006 C 84.712,183.007 84.708,183.007 84.708,183.003 z M 87.113,65.681 C 89.511,71.837 90.69,83.054 90.69,99.369 C 90.69,117.539 89.502,129.723 87.083,135.932 C 85.142,140.942 82.439,144.047 79.013,145.248 C 79.999,145.621 81.058,145.81 82.173,145.81 C 82.383,145.81 82.592,145.802 82.808,145.787 C 87.567,145.488 91.149,142.201 93.582,135.932 C 95.996,129.723 97.189,117.539 97.189,99.369 C 97.189,83.053 96.007,71.836 93.608,65.681 C 91.21,59.495 87.622,56.152 82.808,55.73 C 82.441,55.699 82.075,55.68 81.724,55.68 C 80.601,55.68 79.549,55.845 78.556,56.173 L 78.556,56.175 L 78.556,56.175 C 82.254,57.322 85.104,60.5 87.113,65.681 z" />
+
+</g>
+  </g>
+</svg>
diff --git a/demos/browser/data/closetab.png b/demos/browser/data/closetab.png
new file mode 100644
index 0000000..ab9d669
--- /dev/null
+++ b/demos/browser/data/closetab.png
diff --git a/demos/browser/data/data.qrc b/demos/browser/data/data.qrc
new file mode 100644
index 0000000..c7d0294
--- /dev/null
+++ b/demos/browser/data/data.qrc
@@ -0,0 +1,11 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>addtab.png</file>
+    <file>closetab.png</file>
+    <file>history.png</file>
+    <file>browser.svg</file>
+    <file>defaultbookmarks.xbel</file>
+    <file>loading.gif</file>
+    <file>defaulticon.png</file>
+</qresource>
+</RCC>
diff --git a/demos/browser/data/defaultbookmarks.xbel b/demos/browser/data/defaultbookmarks.xbel
new file mode 100644
index 0000000..a168244
--- /dev/null
+++ b/demos/browser/data/defaultbookmarks.xbel
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xbel>
+<xbel version="1.0">
+    <folder folded="yes">
+        <title>Bookmarks Bar</title>
+        <bookmark href="http://qtsoftware.com/">
+            <title>Qt Software</title>
+        </bookmark>
+        <bookmark href="http://webkit.org/">
+            <title>WebKit.org</title>
+        </bookmark>
+        <bookmark href="http://doc.trolltech.com/">
+            <title>Qt Documentation</title>
+        </bookmark>
+        <bookmark href="http://doc.trolltech.com/qq/">
+            <title>Qt Quarterly</title>
+        </bookmark>
+        <bookmark href="http://labs.trolltech.com/">
+            <title>Qt Labs</title>
+        </bookmark>
+        <bookmark href="http://www.qtcentre.org/">
+            <title>Qt Centre</title>
+        </bookmark>
+        <bookmark href="http://qt-apps.org/">
+            <title>Qt-Apps.org</title>
+        </bookmark>
+        <bookmark href="http://qtnode.net/">
+            <title>qtnode</title>
+        </bookmark>
+       <bookmark href="http://xkcd.com/">
+            <title>xkcd</title>
+        </bookmark>
+    </folder>
+    <folder folded="yes">
+        <title>Bookmarks Menu</title>
+        <bookmark href="http://reddit.com/">
+            <title>reddit.com: what's new online!</title>
+        </bookmark>
+    </folder>
+</xbel>
diff --git a/demos/browser/data/defaulticon.png b/demos/browser/data/defaulticon.png
new file mode 100644
index 0000000..01a0920
--- /dev/null
+++ b/demos/browser/data/defaulticon.png
diff --git a/demos/browser/data/history.png b/demos/browser/data/history.png
new file mode 100644
index 0000000..552a1cb
--- /dev/null
+++ b/demos/browser/data/history.png
diff --git a/demos/browser/data/loading.gif b/demos/browser/data/loading.gif
new file mode 100644
index 0000000..c1545eb
--- /dev/null
+++ b/demos/browser/data/loading.gif
diff --git a/demos/browser/downloaditem.ui b/demos/browser/downloaditem.ui
new file mode 100644
index 0000000..4a0a0fd
--- /dev/null
+++ b/demos/browser/downloaditem.ui
@@ -0,0 +1,134 @@
+<ui version="4.0" >
+ <class>DownloadItem</class>
+ <widget class="QWidget" name="DownloadItem" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>423</width>
+    <height>110</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="fileIcon" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Ico</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_2" >
+     <item>
+      <widget class="SqueezeLabel" native="1" name="fileNameLabel" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" stdset="0" >
+        <string>Filename</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QProgressBar" name="progressBar" >
+       <property name="value" >
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SqueezeLabel" native="1" name="downloadInfoLabel" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" stdset="0" >
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout" >
+     <item>
+      <spacer name="verticalSpacer" >
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>17</width>
+         <height>1</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="tryAgainButton" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="text" >
+        <string>Try Again</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="stopButton" >
+       <property name="text" >
+        <string>Stop</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="openButton" >
+       <property name="text" >
+        <string>Open</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_2" >
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>17</width>
+         <height>5</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SqueezeLabel</class>
+   <extends>QWidget</extends>
+   <header>squeezelabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/demos/browser/downloadmanager.cpp b/demos/browser/downloadmanager.cpp
new file mode 100644
index 0000000..af31391
--- /dev/null
+++ b/demos/browser/downloadmanager.cpp
@@ -0,0 +1,579 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "downloadmanager.h"
+
+#include "autosaver.h"
+#include "browserapplication.h"
+#include "networkaccessmanager.h"
+
+#include <math.h>
+
+#include <QtCore/QMetaEnum>
+#include <QtCore/QSettings>
+
+#include <QtGui/QDesktopServices>
+#include <QtGui/QFileDialog>
+#include <QtGui/QHeaderView>
+#include <QtGui/QFileIconProvider>
+
+#include <QtCore/QDebug>
+
+#include <QtWebKit/QWebSettings>
+
+/*!
+    DownloadItem is a widget that is displayed in the download manager list.
+    It moves the data from the QNetworkReply into the QFile as well
+    as update the information/progressbar and report errors.
+ */
+DownloadItem::DownloadItem(QNetworkReply *reply, bool requestFileName, QWidget *parent)
+    : QWidget(parent)
+    , m_reply(reply)
+    , m_requestFileName(requestFileName)
+    , m_bytesReceived(0)
+{
+    setupUi(this);
+    QPalette p = downloadInfoLabel->palette();
+    p.setColor(QPalette::Text, Qt::darkGray);
+    downloadInfoLabel->setPalette(p);
+    progressBar->setMaximum(0);
+    tryAgainButton->hide();
+    connect(stopButton, SIGNAL(clicked()), this, SLOT(stop()));
+    connect(openButton, SIGNAL(clicked()), this, SLOT(open()));
+    connect(tryAgainButton, SIGNAL(clicked()), this, SLOT(tryAgain()));
+
+    init();
+}
+
+void DownloadItem::init()
+{
+    if (!m_reply)
+        return;
+
+    // attach to the m_reply
+    m_url = m_reply->url();
+    m_reply->setParent(this);
+    connect(m_reply, SIGNAL(readyRead()), this, SLOT(downloadReadyRead()));
+    connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)),
+            this, SLOT(error(QNetworkReply::NetworkError)));
+    connect(m_reply, SIGNAL(downloadProgress(qint64, qint64)),
+            this, SLOT(downloadProgress(qint64, qint64)));
+    connect(m_reply, SIGNAL(metaDataChanged()),
+            this, SLOT(metaDataChanged()));
+    connect(m_reply, SIGNAL(finished()),
+            this, SLOT(finished()));
+
+    // reset info
+    downloadInfoLabel->clear();
+    progressBar->setValue(0);
+    getFileName();
+
+    // start timer for the download estimation
+    m_downloadTime.start();
+
+    if (m_reply->error() != QNetworkReply::NoError) {
+        error(m_reply->error());
+        finished();
+    }
+}
+
+void DownloadItem::getFileName()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("downloadmanager"));
+    QString defaultLocation = QDesktopServices::storageLocation(QDesktopServices::DesktopLocation);
+    QString downloadDirectory = settings.value(QLatin1String("downloadDirectory"), defaultLocation).toString();
+    if (!downloadDirectory.isEmpty())
+        downloadDirectory += QLatin1Char('/');
+
+    QString defaultFileName = saveFileName(downloadDirectory);
+    QString fileName = defaultFileName;
+    if (m_requestFileName) {
+        fileName = QFileDialog::getSaveFileName(this, tr("Save File"), defaultFileName);
+        if (fileName.isEmpty()) {
+            m_reply->close();
+            fileNameLabel->setText(tr("Download canceled: %1").arg(QFileInfo(defaultFileName).fileName()));
+            return;
+        }
+    }
+    m_output.setFileName(fileName);
+    fileNameLabel->setText(QFileInfo(m_output.fileName()).fileName());
+    if (m_requestFileName)
+        downloadReadyRead();
+}
+
+QString DownloadItem::saveFileName(const QString &directory) const
+{
+    // Move this function into QNetworkReply to also get file name sent from the server
+    QString path = m_url.path();
+    QFileInfo info(path);
+    QString baseName = info.completeBaseName();
+    QString endName = info.suffix();
+
+    if (baseName.isEmpty()) {
+        baseName = QLatin1String("unnamed_download");
+        qDebug() << "DownloadManager:: downloading unknown file:" << m_url;
+    }
+    QString name = directory + baseName + QLatin1Char('.') + endName;
+    if (QFile::exists(name)) {
+        // already exists, don't overwrite
+        int i = 1;
+        do {
+            name = directory + baseName + QLatin1Char('-') + QString::number(i++) + QLatin1Char('.') + endName;
+        } while (QFile::exists(name));
+    }
+    return name;
+}
+
+
+void DownloadItem::stop()
+{
+    setUpdatesEnabled(false);
+    stopButton->setEnabled(false);
+    stopButton->hide();
+    tryAgainButton->setEnabled(true);
+    tryAgainButton->show();
+    setUpdatesEnabled(true);
+    m_reply->abort();
+}
+
+void DownloadItem::open()
+{
+    QFileInfo info(m_output);
+    QUrl url = QUrl::fromLocalFile(info.absolutePath());
+    QDesktopServices::openUrl(url);
+}
+
+void DownloadItem::tryAgain()
+{
+    if (!tryAgainButton->isEnabled())
+        return;
+
+    tryAgainButton->setEnabled(false);
+    tryAgainButton->setVisible(false);
+    stopButton->setEnabled(true);
+    stopButton->setVisible(true);
+    progressBar->setVisible(true);
+
+    QNetworkReply *r = BrowserApplication::networkAccessManager()->get(QNetworkRequest(m_url));
+    if (m_reply)
+        m_reply->deleteLater();
+    if (m_output.exists())
+        m_output.remove();
+    m_reply = r;
+    init();
+    emit statusChanged();
+}
+
+void DownloadItem::downloadReadyRead()
+{
+    if (m_requestFileName && m_output.fileName().isEmpty())
+        return;
+    if (!m_output.isOpen()) {
+        // in case someone else has already put a file there
+        if (!m_requestFileName)
+            getFileName();
+        if (!m_output.open(QIODevice::WriteOnly)) {
+            downloadInfoLabel->setText(tr("Error opening save file: %1")
+                    .arg(m_output.errorString()));
+            stopButton->click();
+            emit statusChanged();
+            return;
+        }
+        emit statusChanged();
+    }
+    if (-1 == m_output.write(m_reply->readAll())) {
+        downloadInfoLabel->setText(tr("Error saving: %1")
+                .arg(m_output.errorString()));
+        stopButton->click();
+    }
+}
+
+void DownloadItem::error(QNetworkReply::NetworkError)
+{
+    qDebug() << "DownloadItem::error" << m_reply->errorString() << m_url;
+    downloadInfoLabel->setText(tr("Network Error: %1").arg(m_reply->errorString()));
+    tryAgainButton->setEnabled(true);
+    tryAgainButton->setVisible(true);
+}
+
+void DownloadItem::metaDataChanged()
+{
+    qDebug() << "DownloadItem::metaDataChanged: not handled.";
+}
+
+void DownloadItem::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
+{
+    m_bytesReceived = bytesReceived;
+    if (bytesTotal == -1) {
+        progressBar->setValue(0);
+        progressBar->setMaximum(0);
+    } else {
+        progressBar->setValue(bytesReceived);
+        progressBar->setMaximum(bytesTotal);
+    }
+    updateInfoLabel();
+}
+
+void DownloadItem::updateInfoLabel()
+{
+    if (m_reply->error() == QNetworkReply::NoError)
+        return;
+
+    qint64 bytesTotal = progressBar->maximum();
+    bool running = !downloadedSuccessfully();
+
+    // update info label
+    double speed = m_bytesReceived * 1000.0 / m_downloadTime.elapsed();
+    double timeRemaining = ((double)(bytesTotal - m_bytesReceived)) / speed;
+    QString timeRemainingString = tr("seconds");
+    if (timeRemaining > 60) {
+        timeRemaining = timeRemaining / 60;
+        timeRemainingString = tr("minutes");
+    }
+    timeRemaining = floor(timeRemaining);
+
+    // When downloading the eta should never be 0
+    if (timeRemaining == 0)
+        timeRemaining = 1;
+
+    QString info;
+    if (running) {
+        QString remaining;
+        if (bytesTotal != 0)
+            remaining = tr("- %4 %5 remaining")
+            .arg(timeRemaining)
+            .arg(timeRemainingString);
+        info = QString(tr("%1 of %2 (%3/sec) %4"))
+            .arg(dataString(m_bytesReceived))
+            .arg(bytesTotal == 0 ? tr("?") : dataString(bytesTotal))
+            .arg(dataString((int)speed))
+            .arg(remaining);
+    } else {
+        if (m_bytesReceived == bytesTotal)
+            info = dataString(m_output.size());
+        else
+            info = tr("%1 of %2 - Stopped")
+                .arg(dataString(m_bytesReceived))
+                .arg(dataString(bytesTotal));
+    }
+    downloadInfoLabel->setText(info);
+}
+
+QString DownloadItem::dataString(int size) const
+{
+    QString unit;
+    if (size < 1024) {
+        unit = tr("bytes");
+    } else if (size < 1024*1024) {
+        size /= 1024;
+        unit = tr("kB");
+    } else {
+        size /= 1024*1024;
+        unit = tr("MB");
+    }
+    return QString(QLatin1String("%1 %2")).arg(size).arg(unit);
+}
+
+bool DownloadItem::downloading() const
+{
+    return (progressBar->isVisible());
+}
+
+bool DownloadItem::downloadedSuccessfully() const
+{
+    return (stopButton->isHidden() && tryAgainButton->isHidden());
+}
+
+void DownloadItem::finished()
+{
+    progressBar->hide();
+    stopButton->setEnabled(false);
+    stopButton->hide();
+    m_output.close();
+    updateInfoLabel();
+    emit statusChanged();
+}
+
+/*!
+    DownloadManager is a Dialog that contains a list of DownloadItems
+
+    It is a basic download manager.  It only downloads the file, doesn't do BitTorrent,
+    extract zipped files or anything fancy.
+  */
+DownloadManager::DownloadManager(QWidget *parent)
+    : QDialog(parent)
+    , m_autoSaver(new AutoSaver(this))
+    , m_manager(BrowserApplication::networkAccessManager())
+    , m_iconProvider(0)
+    , m_removePolicy(Never)
+{
+    setupUi(this);
+    downloadsView->setShowGrid(false);
+    downloadsView->verticalHeader()->hide();
+    downloadsView->horizontalHeader()->hide();
+    downloadsView->setAlternatingRowColors(true);
+    downloadsView->horizontalHeader()->setStretchLastSection(true);
+    m_model = new DownloadModel(this);
+    downloadsView->setModel(m_model);
+    connect(cleanupButton, SIGNAL(clicked()), this, SLOT(cleanup()));
+    load();
+}
+
+DownloadManager::~DownloadManager()
+{
+    m_autoSaver->changeOccurred();
+    m_autoSaver->saveIfNeccessary();
+    if (m_iconProvider)
+        delete m_iconProvider;
+}
+
+int DownloadManager::activeDownloads() const
+{
+    int count = 0;
+    for (int i = 0; i < m_downloads.count(); ++i) {
+        if (m_downloads.at(i)->stopButton->isEnabled())
+            ++count;
+    }
+    return count;
+}
+
+void DownloadManager::download(const QNetworkRequest &request, bool requestFileName)
+{
+    if (request.url().isEmpty())
+        return;
+    handleUnsupportedContent(m_manager->get(request), requestFileName);
+}
+
+void DownloadManager::handleUnsupportedContent(QNetworkReply *reply, bool requestFileName)
+{
+    if (!reply || reply->url().isEmpty())
+        return;
+    QVariant header = reply->header(QNetworkRequest::ContentLengthHeader);
+    bool ok;
+    int size = header.toInt(&ok);
+    if (ok && size == 0)
+        return;
+
+    qDebug() << "DownloadManager::handleUnsupportedContent" << reply->url() << "requestFileName" << requestFileName;
+    DownloadItem *item = new DownloadItem(reply, requestFileName, this);
+    addItem(item);
+}
+
+void DownloadManager::addItem(DownloadItem *item)
+{
+    connect(item, SIGNAL(statusChanged()), this, SLOT(updateRow()));
+    int row = m_downloads.count();
+    m_model->beginInsertRows(QModelIndex(), row, row);
+    m_downloads.append(item);
+    m_model->endInsertRows();
+    updateItemCount();
+    if (row == 0)
+        show();
+    downloadsView->setIndexWidget(m_model->index(row, 0), item);
+    QIcon icon = style()->standardIcon(QStyle::SP_FileIcon);
+    item->fileIcon->setPixmap(icon.pixmap(48, 48));
+    downloadsView->setRowHeight(row, item->sizeHint().height());
+}
+
+void DownloadManager::updateRow()
+{
+    DownloadItem *item = qobject_cast<DownloadItem*>(sender());
+    int row = m_downloads.indexOf(item);
+    if (-1 == row)
+        return;
+    if (!m_iconProvider)
+        m_iconProvider = new QFileIconProvider();
+    QIcon icon = m_iconProvider->icon(item->m_output.fileName());
+    if (icon.isNull())
+        icon = style()->standardIcon(QStyle::SP_FileIcon);
+    item->fileIcon->setPixmap(icon.pixmap(48, 48));
+    downloadsView->setRowHeight(row, item->minimumSizeHint().height());
+
+    bool remove = false;
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (!item->downloading()
+        && globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+        remove = true;
+
+    if (item->downloadedSuccessfully()
+        && removePolicy() == DownloadManager::SuccessFullDownload) {
+        remove = true;
+    }
+    if (remove)
+        m_model->removeRow(row);
+
+    cleanupButton->setEnabled(m_downloads.count() - activeDownloads() > 0);
+}
+
+DownloadManager::RemovePolicy DownloadManager::removePolicy() const
+{
+    return m_removePolicy;
+}
+
+void DownloadManager::setRemovePolicy(RemovePolicy policy)
+{
+    if (policy == m_removePolicy)
+        return;
+    m_removePolicy = policy;
+    m_autoSaver->changeOccurred();
+}
+
+void DownloadManager::save() const
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("downloadmanager"));
+    QMetaEnum removePolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("RemovePolicy"));
+    settings.setValue(QLatin1String("removeDownloadsPolicy"), QLatin1String(removePolicyEnum.valueToKey(m_removePolicy)));
+    settings.setValue(QLatin1String("size"), size());
+    if (m_removePolicy == Exit)
+        return;
+
+    for (int i = 0; i < m_downloads.count(); ++i) {
+        QString key = QString(QLatin1String("download_%1_")).arg(i);
+        settings.setValue(key + QLatin1String("url"), m_downloads[i]->m_url);
+        settings.setValue(key + QLatin1String("location"), QFileInfo(m_downloads[i]->m_output).filePath());
+        settings.setValue(key + QLatin1String("done"), m_downloads[i]->downloadedSuccessfully());
+    }
+    int i = m_downloads.count();
+    QString key = QString(QLatin1String("download_%1_")).arg(i);
+    while (settings.contains(key + QLatin1String("url"))) {
+        settings.remove(key + QLatin1String("url"));
+        settings.remove(key + QLatin1String("location"));
+        settings.remove(key + QLatin1String("done"));
+        key = QString(QLatin1String("download_%1_")).arg(++i);
+    }
+}
+
+void DownloadManager::load()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("downloadmanager"));
+    QSize size = settings.value(QLatin1String("size")).toSize();
+    if (size.isValid())
+        resize(size);
+    QByteArray value = settings.value(QLatin1String("removeDownloadsPolicy"), QLatin1String("Never")).toByteArray();
+    QMetaEnum removePolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("RemovePolicy"));
+    m_removePolicy = removePolicyEnum.keyToValue(value) == -1 ?
+                        Never :
+                        static_cast<RemovePolicy>(removePolicyEnum.keyToValue(value));
+
+    int i = 0;
+    QString key = QString(QLatin1String("download_%1_")).arg(i);
+    while (settings.contains(key + QLatin1String("url"))) {
+        QUrl url = settings.value(key + QLatin1String("url")).toUrl();
+        QString fileName = settings.value(key + QLatin1String("location")).toString();
+        bool done = settings.value(key + QLatin1String("done"), true).toBool();
+        if (!url.isEmpty() && !fileName.isEmpty()) {
+            DownloadItem *item = new DownloadItem(0, this);
+            item->m_output.setFileName(fileName);
+            item->fileNameLabel->setText(QFileInfo(item->m_output.fileName()).fileName());
+            item->m_url = url;
+            item->stopButton->setVisible(false);
+            item->stopButton->setEnabled(false);
+            item->tryAgainButton->setVisible(!done);
+            item->tryAgainButton->setEnabled(!done);
+            item->progressBar->setVisible(!done);
+            addItem(item);
+        }
+        key = QString(QLatin1String("download_%1_")).arg(++i);
+    }
+    cleanupButton->setEnabled(m_downloads.count() - activeDownloads() > 0);
+}
+
+void DownloadManager::cleanup()
+{
+    if (m_downloads.isEmpty())
+        return;
+    m_model->removeRows(0, m_downloads.count());
+    updateItemCount();
+    if (m_downloads.isEmpty() && m_iconProvider) {
+        delete m_iconProvider;
+        m_iconProvider = 0;
+    }
+    m_autoSaver->changeOccurred();
+}
+
+void DownloadManager::updateItemCount()
+{
+    int count = m_downloads.count();
+    itemCount->setText(count == 1 ? tr("1 Download") : tr("%1 Downloads").arg(count));
+}
+
+DownloadModel::DownloadModel(DownloadManager *downloadManager, QObject *parent)
+    : QAbstractListModel(parent)
+    , m_downloadManager(downloadManager)
+{
+}
+
+QVariant DownloadModel::data(const QModelIndex &index, int role) const
+{
+    if (index.row() < 0 || index.row() >= rowCount(index.parent()))
+        return QVariant();
+    if (role == Qt::ToolTipRole)
+        if (!m_downloadManager->m_downloads.at(index.row())->downloadedSuccessfully())
+            return m_downloadManager->m_downloads.at(index.row())->downloadInfoLabel->text();
+    return QVariant();
+}
+
+int DownloadModel::rowCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : m_downloadManager->m_downloads.count();
+}
+
+bool DownloadModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (parent.isValid())
+        return false;
+
+    int lastRow = row + count - 1;
+    for (int i = lastRow; i >= row; --i) {
+        if (m_downloadManager->m_downloads.at(i)->downloadedSuccessfully()
+            || m_downloadManager->m_downloads.at(i)->tryAgainButton->isEnabled()) {
+            beginRemoveRows(parent, i, i);
+            m_downloadManager->m_downloads.takeAt(i)->deleteLater();
+            endRemoveRows();
+        }
+    }
+    m_downloadManager->m_autoSaver->changeOccurred();
+    return true;
+}
+
diff --git a/demos/browser/downloadmanager.h b/demos/browser/downloadmanager.h
new file mode 100644
index 0000000..85318da
--- /dev/null
+++ b/demos/browser/downloadmanager.h
@@ -0,0 +1,162 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DOWNLOADMANAGER_H
+#define DOWNLOADMANAGER_H
+
+#include "ui_downloads.h"
+#include "ui_downloaditem.h"
+
+#include <QtNetwork/QNetworkReply>
+
+#include <QtCore/QFile>
+#include <QtCore/QTime>
+
+class DownloadItem : public QWidget, public Ui_DownloadItem
+{
+    Q_OBJECT
+
+signals:
+    void statusChanged();
+
+public:
+    DownloadItem(QNetworkReply *reply = 0, bool requestFileName = false, QWidget *parent = 0);
+    bool downloading() const;
+    bool downloadedSuccessfully() const;
+
+    QUrl m_url;
+
+    QFile m_output;
+    QNetworkReply *m_reply;
+
+private slots:
+    void stop();
+    void tryAgain();
+    void open();
+
+    void downloadReadyRead();
+    void error(QNetworkReply::NetworkError code);
+    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
+    void metaDataChanged();
+    void finished();
+
+private:
+    void getFileName();
+    void init();
+    void updateInfoLabel();
+    QString dataString(int size) const;
+
+    QString saveFileName(const QString &directory) const;
+
+    bool m_requestFileName;
+    qint64 m_bytesReceived;
+    QTime m_downloadTime;
+};
+
+class AutoSaver;
+class DownloadModel;
+QT_BEGIN_NAMESPACE
+class QFileIconProvider;
+QT_END_NAMESPACE
+
+class DownloadManager : public QDialog, public Ui_DownloadDialog
+{
+    Q_OBJECT
+    Q_PROPERTY(RemovePolicy removePolicy READ removePolicy WRITE setRemovePolicy)
+    Q_ENUMS(RemovePolicy)
+
+public:
+    enum RemovePolicy {
+        Never,
+        Exit,
+        SuccessFullDownload
+    };
+
+    DownloadManager(QWidget *parent = 0);
+    ~DownloadManager();
+    int activeDownloads() const;
+
+    RemovePolicy removePolicy() const;
+    void setRemovePolicy(RemovePolicy policy);
+
+public slots:
+    void download(const QNetworkRequest &request, bool requestFileName = false);
+    inline void download(const QUrl &url, bool requestFileName = false)
+        { download(QNetworkRequest(url), requestFileName); }
+    void handleUnsupportedContent(QNetworkReply *reply, bool requestFileName = false);
+    void cleanup();
+
+private slots:
+    void save() const;
+    void updateRow();
+
+private:
+    void addItem(DownloadItem *item);
+    void updateItemCount();
+    void load();
+
+    AutoSaver *m_autoSaver;
+    DownloadModel *m_model;
+    QNetworkAccessManager *m_manager;
+    QFileIconProvider *m_iconProvider;
+    QList<DownloadItem*> m_downloads;
+    RemovePolicy m_removePolicy;
+    friend class DownloadModel;
+};
+
+class DownloadModel : public QAbstractListModel
+{
+    friend class DownloadManager;
+    Q_OBJECT
+
+public:
+    DownloadModel(DownloadManager *downloadManager, QObject *parent = 0);
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+
+private:
+    DownloadManager *m_downloadManager;
+
+};
+
+#endif // DOWNLOADMANAGER_H
+
diff --git a/demos/browser/downloads.ui b/demos/browser/downloads.ui
new file mode 100644
index 0000000..a2e2569
--- /dev/null
+++ b/demos/browser/downloads.ui
@@ -0,0 +1,83 @@
+<ui version="4.0" >
+ <class>DownloadDialog</class>
+ <widget class="QDialog" name="DownloadDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>332</width>
+    <height>252</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Downloads</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" colspan="3" >
+    <widget class="EditTableView" name="downloadsView" />
+   </item>
+   <item row="1" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <widget class="QPushButton" name="cleanupButton" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="text" >
+        <string>Clean up</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>58</width>
+         <height>24</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLabel" name="itemCount" >
+     <property name="text" >
+      <string>0 Items</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" >
+    <spacer name="horizontalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>148</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>EditTableView</class>
+   <extends>QTableView</extends>
+   <header>edittableview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/demos/browser/edittableview.cpp b/demos/browser/edittableview.cpp
new file mode 100644
index 0000000..0d776a7
--- /dev/null
+++ b/demos/browser/edittableview.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "edittableview.h"
+#include <QtGui/QKeyEvent>
+
+EditTableView::EditTableView(QWidget *parent)
+    : QTableView(parent)
+{
+}
+
+void EditTableView::keyPressEvent(QKeyEvent *event)
+{
+    if ((event->key() == Qt::Key_Delete
+        || event->key() == Qt::Key_Backspace)
+        && model()) {
+        removeOne();
+    } else {
+        QAbstractItemView::keyPressEvent(event);
+    }
+}
+
+void EditTableView::removeOne()
+{
+    if (!model() || !selectionModel())
+        return;
+    int row = currentIndex().row();
+    model()->removeRow(row, rootIndex());
+    QModelIndex idx = model()->index(row, 0, rootIndex());
+    if (!idx.isValid())
+        idx = model()->index(row - 1, 0, rootIndex());
+    selectionModel()->select(idx, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+}
+
+void EditTableView::removeAll()
+{
+    if (model())
+        model()->removeRows(0, model()->rowCount(rootIndex()), rootIndex());
+}
+
diff --git a/demos/browser/edittableview.h b/demos/browser/edittableview.h
new file mode 100644
index 0000000..3ae63e0
--- /dev/null
+++ b/demos/browser/edittableview.h
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EDITTABLEVIEW_H
+#define EDITTABLEVIEW_H
+
+#include <QtGui/QTableView>
+
+class EditTableView : public QTableView
+{
+    Q_OBJECT
+
+public:
+    EditTableView(QWidget *parent = 0);
+    void keyPressEvent(QKeyEvent *event);
+
+public slots:
+    void removeOne();
+    void removeAll();
+};
+
+#endif // EDITTABLEVIEW_H
+
diff --git a/demos/browser/edittreeview.cpp b/demos/browser/edittreeview.cpp
new file mode 100644
index 0000000..0331ba7
--- /dev/null
+++ b/demos/browser/edittreeview.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "edittreeview.h"
+
+#include <QtGui/QKeyEvent>
+
+EditTreeView::EditTreeView(QWidget *parent)
+    : QTreeView(parent)
+{
+}
+
+void EditTreeView::keyPressEvent(QKeyEvent *event)
+{
+    if ((event->key() == Qt::Key_Delete
+        || event->key() == Qt::Key_Backspace)
+        && model()) {
+        removeOne();
+    } else {
+        QAbstractItemView::keyPressEvent(event);
+    }
+}
+
+void EditTreeView::removeOne()
+{
+    if (!model())
+        return;
+    QModelIndex ci = currentIndex();
+    int row = ci.row();
+    model()->removeRow(row, ci.parent());
+}
+
+void EditTreeView::removeAll()
+{
+    if (!model())
+        return;
+    model()->removeRows(0, model()->rowCount(rootIndex()), rootIndex());
+}
+
diff --git a/demos/browser/edittreeview.h b/demos/browser/edittreeview.h
new file mode 100644
index 0000000..97b9804
--- /dev/null
+++ b/demos/browser/edittreeview.h
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EDITTREEVIEW_H
+#define EDITTREEVIEW_H
+
+#include <QtGui/QTreeView>
+
+class EditTreeView : public QTreeView
+{
+    Q_OBJECT
+
+public:
+    EditTreeView(QWidget *parent = 0);
+    void keyPressEvent(QKeyEvent *event);
+
+public slots:
+    void removeOne();
+    void removeAll();
+};
+
+#endif // EDITTREEVIEW_H
+
diff --git a/demos/browser/history.cpp b/demos/browser/history.cpp
new file mode 100644
index 0000000..80e7372
--- /dev/null
+++ b/demos/browser/history.cpp
@@ -0,0 +1,1282 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "history.h"
+
+#include "autosaver.h"
+#include "browserapplication.h"
+
+#include <QtCore/QBuffer>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QSettings>
+#include <QtCore/QTemporaryFile>
+#include <QtCore/QTextStream>
+
+#include <QtCore/QtAlgorithms>
+
+#include <QtGui/QClipboard>
+#include <QtGui/QDesktopServices>
+#include <QtGui/QHeaderView>
+#include <QtGui/QStyle>
+
+#include <QtWebKit/QWebHistoryInterface>
+#include <QtWebKit/QWebSettings>
+
+#include <QtCore/QDebug>
+
+static const unsigned int HISTORY_VERSION = 23;
+
+HistoryManager::HistoryManager(QObject *parent)
+    : QWebHistoryInterface(parent)
+    , m_saveTimer(new AutoSaver(this))
+    , m_historyLimit(30)
+    , m_historyModel(0)
+    , m_historyFilterModel(0)
+    , m_historyTreeModel(0)
+{
+    m_expiredTimer.setSingleShot(true);
+    connect(&m_expiredTimer, SIGNAL(timeout()),
+            this, SLOT(checkForExpired()));
+    connect(this, SIGNAL(entryAdded(const HistoryItem &)),
+            m_saveTimer, SLOT(changeOccurred()));
+    connect(this, SIGNAL(entryRemoved(const HistoryItem &)),
+            m_saveTimer, SLOT(changeOccurred()));
+    load();
+
+    m_historyModel = new HistoryModel(this, this);
+    m_historyFilterModel = new HistoryFilterModel(m_historyModel, this);
+    m_historyTreeModel = new HistoryTreeModel(m_historyFilterModel, this);
+
+    // QWebHistoryInterface will delete the history manager
+    QWebHistoryInterface::setDefaultInterface(this);
+}
+
+HistoryManager::~HistoryManager()
+{
+    m_saveTimer->saveIfNeccessary();
+}
+
+QList<HistoryItem> HistoryManager::history() const
+{
+    return m_history;
+}
+
+bool HistoryManager::historyContains(const QString &url) const
+{
+    return m_historyFilterModel->historyContains(url);
+}
+
+void HistoryManager::addHistoryEntry(const QString &url)
+{
+    QUrl cleanUrl(url);
+    cleanUrl.setPassword(QString());
+    cleanUrl.setHost(cleanUrl.host().toLower());
+    HistoryItem item(cleanUrl.toString(), QDateTime::currentDateTime());
+    addHistoryItem(item);
+}
+
+void HistoryManager::setHistory(const QList<HistoryItem> &history, bool loadedAndSorted)
+{
+    m_history = history;
+
+    // verify that it is sorted by date
+    if (!loadedAndSorted)
+        qSort(m_history.begin(), m_history.end());
+
+    checkForExpired();
+
+    if (loadedAndSorted) {
+        m_lastSavedUrl = m_history.value(0).url;
+    } else {
+        m_lastSavedUrl = QString();
+        m_saveTimer->changeOccurred();
+    }
+    emit historyReset();
+}
+
+HistoryModel *HistoryManager::historyModel() const
+{
+    return m_historyModel;
+}
+
+HistoryFilterModel *HistoryManager::historyFilterModel() const
+{
+    return m_historyFilterModel;
+}
+
+HistoryTreeModel *HistoryManager::historyTreeModel() const
+{
+    return m_historyTreeModel;
+}
+
+void HistoryManager::checkForExpired()
+{
+    if (m_historyLimit < 0 || m_history.isEmpty())
+        return;
+
+    QDateTime now = QDateTime::currentDateTime();
+    int nextTimeout = 0;
+
+    while (!m_history.isEmpty()) {
+        QDateTime checkForExpired = m_history.last().dateTime;
+        checkForExpired.setDate(checkForExpired.date().addDays(m_historyLimit));
+        if (now.daysTo(checkForExpired) > 7) {
+            // check at most in a week to prevent int overflows on the timer
+            nextTimeout = 7 * 86400;
+        } else {
+            nextTimeout = now.secsTo(checkForExpired);
+        }
+        if (nextTimeout > 0)
+            break;
+        HistoryItem item = m_history.takeLast();
+        // remove from saved file also
+        m_lastSavedUrl = QString();
+        emit entryRemoved(item);
+    }
+
+    if (nextTimeout > 0)
+        m_expiredTimer.start(nextTimeout * 1000);
+}
+
+void HistoryManager::addHistoryItem(const HistoryItem &item)
+{
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+        return;
+
+    m_history.prepend(item);
+    emit entryAdded(item);
+    if (m_history.count() == 1)
+        checkForExpired();
+}
+
+void HistoryManager::updateHistoryItem(const QUrl &url, const QString &title)
+{
+    for (int i = 0; i < m_history.count(); ++i) {
+        if (url == m_history.at(i).url) {
+            m_history[i].title = title;
+            m_saveTimer->changeOccurred();
+            if (m_lastSavedUrl.isEmpty())
+                m_lastSavedUrl = m_history.at(i).url;
+            emit entryUpdated(i);
+            break;
+        }
+    }
+}
+
+int HistoryManager::historyLimit() const
+{
+    return m_historyLimit;
+}
+
+void HistoryManager::setHistoryLimit(int limit)
+{
+    if (m_historyLimit == limit)
+        return;
+    m_historyLimit = limit;
+    checkForExpired();
+    m_saveTimer->changeOccurred();
+}
+
+void HistoryManager::clear()
+{
+    m_history.clear();
+    m_lastSavedUrl = QString();
+    m_saveTimer->changeOccurred();
+    m_saveTimer->saveIfNeccessary();
+    historyReset();
+}
+
+void HistoryManager::loadSettings()
+{
+    // load settings
+    QSettings settings;
+    settings.beginGroup(QLatin1String("history"));
+    m_historyLimit = settings.value(QLatin1String("historyLimit"), 30).toInt();
+}
+
+void HistoryManager::load()
+{
+    loadSettings();
+
+    QFile historyFile(QDesktopServices::storageLocation(QDesktopServices::DataLocation)
+        + QLatin1String("/history"));
+    if (!historyFile.exists())
+        return;
+    if (!historyFile.open(QFile::ReadOnly)) {
+        qWarning() << "Unable to open history file" << historyFile.fileName();
+        return;
+    }
+
+    QList<HistoryItem> list;
+    QDataStream in(&historyFile);
+    // Double check that the history file is sorted as it is read in
+    bool needToSort = false;
+    HistoryItem lastInsertedItem;
+    QByteArray data;
+    QDataStream stream;
+    QBuffer buffer;
+    stream.setDevice(&buffer);
+    while (!historyFile.atEnd()) {
+        in >> data;
+        buffer.close();
+        buffer.setBuffer(&data);
+        buffer.open(QIODevice::ReadOnly);
+        quint32 ver;
+        stream >> ver;
+        if (ver != HISTORY_VERSION)
+            continue;
+        HistoryItem item;
+        stream >> item.url;
+        stream >> item.dateTime;
+        stream >> item.title;
+
+        if (!item.dateTime.isValid())
+            continue;
+
+        if (item == lastInsertedItem) {
+            if (lastInsertedItem.title.isEmpty() && !list.isEmpty())
+                list[0].title = item.title;
+            continue;
+        }
+
+        if (!needToSort && !list.isEmpty() && lastInsertedItem < item)
+            needToSort = true;
+
+        list.prepend(item);
+        lastInsertedItem = item;
+    }
+    if (needToSort)
+        qSort(list.begin(), list.end());
+
+    setHistory(list, true);
+
+    // If we had to sort re-write the whole history sorted
+    if (needToSort) {
+        m_lastSavedUrl = QString();
+        m_saveTimer->changeOccurred();
+    }
+}
+
+void HistoryManager::save()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("history"));
+    settings.setValue(QLatin1String("historyLimit"), m_historyLimit);
+
+    bool saveAll = m_lastSavedUrl.isEmpty();
+    int first = m_history.count() - 1;
+    if (!saveAll) {
+        // find the first one to save
+        for (int i = 0; i < m_history.count(); ++i) {
+            if (m_history.at(i).url == m_lastSavedUrl) {
+                first = i - 1;
+                break;
+            }
+        }
+    }
+    if (first == m_history.count() - 1)
+        saveAll = true;
+
+    QString directory = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    if (directory.isEmpty())
+        directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName();
+    if (!QFile::exists(directory)) {
+        QDir dir;
+        dir.mkpath(directory);
+    }
+
+    QFile historyFile(directory + QLatin1String("/history"));
+    // When saving everything use a temporary file to prevent possible data loss.
+    QTemporaryFile tempFile;
+    tempFile.setAutoRemove(false);
+    bool open = false;
+    if (saveAll) {
+        open = tempFile.open();
+    } else {
+        open = historyFile.open(QFile::Append);
+    }
+
+    if (!open) {
+        qWarning() << "Unable to open history file for saving"
+                   << (saveAll ? tempFile.fileName() : historyFile.fileName());
+        return;
+    }
+
+    QDataStream out(saveAll ? &tempFile : &historyFile);
+    for (int i = first; i >= 0; --i) {
+        QByteArray data;
+        QDataStream stream(&data, QIODevice::WriteOnly);
+        HistoryItem item = m_history.at(i);
+        stream << HISTORY_VERSION << item.url << item.dateTime << item.title;
+        out << data;
+    }
+    tempFile.close();
+
+    if (saveAll) {
+        if (historyFile.exists() && !historyFile.remove())
+            qWarning() << "History: error removing old history." << historyFile.errorString();
+        if (!tempFile.rename(historyFile.fileName()))
+            qWarning() << "History: error moving new history over old." << tempFile.errorString() << historyFile.fileName();
+    }
+    m_lastSavedUrl = m_history.value(0).url;
+}
+
+HistoryModel::HistoryModel(HistoryManager *history, QObject *parent)
+    : QAbstractTableModel(parent)
+    , m_history(history)
+{
+    Q_ASSERT(m_history);
+    connect(m_history, SIGNAL(historyReset()),
+            this, SLOT(historyReset()));
+    connect(m_history, SIGNAL(entryRemoved(const HistoryItem &)),
+            this, SLOT(historyReset()));
+
+    connect(m_history, SIGNAL(entryAdded(const HistoryItem &)),
+            this, SLOT(entryAdded()));
+    connect(m_history, SIGNAL(entryUpdated(int)),
+            this, SLOT(entryUpdated(int)));
+}
+
+void HistoryModel::historyReset()
+{
+    reset();
+}
+
+void HistoryModel::entryAdded()
+{
+    beginInsertRows(QModelIndex(), 0, 0);
+    endInsertRows();
+}
+
+void HistoryModel::entryUpdated(int offset)
+{
+    QModelIndex idx = index(offset, 0);
+    emit dataChanged(idx, idx);
+}
+
+QVariant HistoryModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (orientation == Qt::Horizontal
+        && role == Qt::DisplayRole) {
+        switch (section) {
+            case 0: return tr("Title");
+            case 1: return tr("Address");
+        }
+    }
+    return QAbstractTableModel::headerData(section, orientation, role);
+}
+
+QVariant HistoryModel::data(const QModelIndex &index, int role) const
+{
+    QList<HistoryItem> lst = m_history->history();
+    if (index.row() < 0 || index.row() >= lst.size())
+        return QVariant();
+
+    const HistoryItem &item = lst.at(index.row());
+    switch (role) {
+    case DateTimeRole:
+        return item.dateTime;
+    case DateRole:
+        return item.dateTime.date();
+    case UrlRole:
+        return QUrl(item.url);
+    case UrlStringRole:
+        return item.url;
+    case Qt::DisplayRole:
+    case Qt::EditRole: {
+        switch (index.column()) {
+            case 0:
+                // when there is no title try to generate one from the url
+                if (item.title.isEmpty()) {
+                    QString page = QFileInfo(QUrl(item.url).path()).fileName();
+                    if (!page.isEmpty())
+                        return page;
+                    return item.url;
+                }
+                return item.title;
+            case 1:
+                return item.url;
+        }
+        }
+    case Qt::DecorationRole:
+        if (index.column() == 0) {
+            return BrowserApplication::instance()->icon(item.url);
+        }
+    }
+    return QVariant();
+}
+
+int HistoryModel::columnCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : 2;
+}
+
+int HistoryModel::rowCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : m_history->history().count();
+}
+
+bool HistoryModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (parent.isValid())
+        return false;
+    int lastRow = row + count - 1;
+    beginRemoveRows(parent, row, lastRow);
+    QList<HistoryItem> lst = m_history->history();
+    for (int i = lastRow; i >= row; --i)
+        lst.removeAt(i);
+    disconnect(m_history, SIGNAL(historyReset()), this, SLOT(historyReset()));
+    m_history->setHistory(lst);
+    connect(m_history, SIGNAL(historyReset()), this, SLOT(historyReset()));
+    endRemoveRows();
+    return true;
+}
+
+#define MOVEDROWS 15
+
+/*
+    Maps the first bunch of items of the source model to the root
+*/
+HistoryMenuModel::HistoryMenuModel(HistoryTreeModel *sourceModel, QObject *parent)
+    : QAbstractProxyModel(parent)
+    , m_treeModel(sourceModel)
+{
+    setSourceModel(sourceModel);
+}
+
+int HistoryMenuModel::bumpedRows() const
+{
+    QModelIndex first = m_treeModel->index(0, 0);
+    if (!first.isValid())
+        return 0;
+    return qMin(m_treeModel->rowCount(first), MOVEDROWS);
+}
+
+int HistoryMenuModel::columnCount(const QModelIndex &parent) const
+{
+    return m_treeModel->columnCount(mapToSource(parent));
+}
+
+int HistoryMenuModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.column() > 0)
+        return 0;
+
+    if (!parent.isValid()) {
+        int folders = sourceModel()->rowCount();
+        int bumpedItems = bumpedRows();
+        if (bumpedItems <= MOVEDROWS
+            && bumpedItems == sourceModel()->rowCount(sourceModel()->index(0, 0)))
+            --folders;
+        return bumpedItems + folders;
+    }
+
+    if (parent.internalId() == -1) {
+        if (parent.row() < bumpedRows())
+            return 0;
+    }
+
+    QModelIndex idx = mapToSource(parent);
+    int defaultCount = sourceModel()->rowCount(idx);
+    if (idx == sourceModel()->index(0, 0))
+        return defaultCount - bumpedRows();
+    return defaultCount;
+}
+
+QModelIndex HistoryMenuModel::mapFromSource(const QModelIndex &sourceIndex) const
+{
+    // currently not used or autotested
+    Q_ASSERT(false);
+    int sr = m_treeModel->mapToSource(sourceIndex).row();
+    return createIndex(sourceIndex.row(), sourceIndex.column(), sr);
+}
+
+QModelIndex HistoryMenuModel::mapToSource(const QModelIndex &proxyIndex) const
+{
+    if (!proxyIndex.isValid())
+        return QModelIndex();
+
+    if (proxyIndex.internalId() == -1) {
+        int bumpedItems = bumpedRows();
+        if (proxyIndex.row() < bumpedItems)
+            return m_treeModel->index(proxyIndex.row(), proxyIndex.column(), m_treeModel->index(0, 0));
+        if (bumpedItems <= MOVEDROWS && bumpedItems == sourceModel()->rowCount(m_treeModel->index(0, 0)))
+            --bumpedItems;
+        return m_treeModel->index(proxyIndex.row() - bumpedItems, proxyIndex.column());
+    }
+
+    QModelIndex historyIndex = m_treeModel->sourceModel()->index(proxyIndex.internalId(), proxyIndex.column());
+    QModelIndex treeIndex = m_treeModel->mapFromSource(historyIndex);
+    return treeIndex;
+}
+
+QModelIndex HistoryMenuModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < 0
+        || column < 0 || column >= columnCount(parent)
+        || parent.column() > 0)
+        return QModelIndex();
+    if (!parent.isValid())
+        return createIndex(row, column, -1);
+
+    QModelIndex treeIndexParent = mapToSource(parent);
+
+    int bumpedItems = 0;
+    if (treeIndexParent == m_treeModel->index(0, 0))
+        bumpedItems = bumpedRows();
+    QModelIndex treeIndex = m_treeModel->index(row + bumpedItems, column, treeIndexParent);
+    QModelIndex historyIndex = m_treeModel->mapToSource(treeIndex);
+    int historyRow = historyIndex.row();
+    if (historyRow == -1)
+        historyRow = treeIndex.row();
+    return createIndex(row, column, historyRow);
+}
+
+QModelIndex HistoryMenuModel::parent(const QModelIndex &index) const
+{
+    int offset = index.internalId();
+    if (offset == -1 || !index.isValid())
+        return QModelIndex();
+
+    QModelIndex historyIndex = m_treeModel->sourceModel()->index(index.internalId(), 0);
+    QModelIndex treeIndex = m_treeModel->mapFromSource(historyIndex);
+    QModelIndex treeIndexParent = treeIndex.parent();
+
+    int sr = m_treeModel->mapToSource(treeIndexParent).row();
+    int bumpedItems = bumpedRows();
+    if (bumpedItems <= MOVEDROWS && bumpedItems == sourceModel()->rowCount(sourceModel()->index(0, 0)))
+        --bumpedItems;
+    return createIndex(bumpedItems + treeIndexParent.row(), treeIndexParent.column(), sr);
+}
+
+
+HistoryMenu::HistoryMenu(QWidget *parent)
+    : ModelMenu(parent)
+    , m_history(0)
+{
+    connect(this, SIGNAL(activated(const QModelIndex &)),
+            this, SLOT(activated(const QModelIndex &)));
+    setHoverRole(HistoryModel::UrlStringRole);
+}
+
+void HistoryMenu::activated(const QModelIndex &index)
+{
+    emit openUrl(index.data(HistoryModel::UrlRole).toUrl());
+}
+
+bool HistoryMenu::prePopulated()
+{
+    if (!m_history) {
+        m_history = BrowserApplication::historyManager();
+        m_historyMenuModel = new HistoryMenuModel(m_history->historyTreeModel(), this);
+        setModel(m_historyMenuModel);
+    }
+    // initial actions
+    for (int i = 0; i < m_initialActions.count(); ++i)
+        addAction(m_initialActions.at(i));
+    if (!m_initialActions.isEmpty())
+        addSeparator();
+    setFirstSeparator(m_historyMenuModel->bumpedRows());
+
+    return false;
+}
+
+void HistoryMenu::postPopulated()
+{
+    if (m_history->history().count() > 0)
+        addSeparator();
+
+    QAction *showAllAction = new QAction(tr("Show All History"), this);
+    connect(showAllAction, SIGNAL(triggered()), this, SLOT(showHistoryDialog()));
+    addAction(showAllAction);
+
+    QAction *clearAction = new QAction(tr("Clear History"), this);
+    connect(clearAction, SIGNAL(triggered()), m_history, SLOT(clear()));
+    addAction(clearAction);
+}
+
+void HistoryMenu::showHistoryDialog()
+{
+    HistoryDialog *dialog = new HistoryDialog(this);
+    connect(dialog, SIGNAL(openUrl(const QUrl&)),
+            this, SIGNAL(openUrl(const QUrl&)));
+    dialog->show();
+}
+
+void HistoryMenu::setInitialActions(QList<QAction*> actions)
+{
+    m_initialActions = actions;
+    for (int i = 0; i < m_initialActions.count(); ++i)
+        addAction(m_initialActions.at(i));
+}
+
+TreeProxyModel::TreeProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
+{
+    setSortRole(HistoryModel::DateTimeRole);
+    setFilterCaseSensitivity(Qt::CaseInsensitive);
+}
+
+bool TreeProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+{
+    if (!source_parent.isValid())
+        return true;
+    return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent);
+}
+
+HistoryDialog::HistoryDialog(QWidget *parent, HistoryManager *setHistory) : QDialog(parent)
+{
+    HistoryManager *history = setHistory;
+    if (!history)
+        history = BrowserApplication::historyManager();
+    setupUi(this);
+    tree->setUniformRowHeights(true);
+    tree->setSelectionBehavior(QAbstractItemView::SelectRows);
+    tree->setTextElideMode(Qt::ElideMiddle);
+    QAbstractItemModel *model = history->historyTreeModel();
+    TreeProxyModel *proxyModel = new TreeProxyModel(this);
+    connect(search, SIGNAL(textChanged(QString)),
+            proxyModel, SLOT(setFilterFixedString(QString)));
+    connect(removeButton, SIGNAL(clicked()), tree, SLOT(removeOne()));
+    connect(removeAllButton, SIGNAL(clicked()), history, SLOT(clear()));
+    proxyModel->setSourceModel(model);
+    tree->setModel(proxyModel);
+    tree->setExpanded(proxyModel->index(0, 0), true);
+    tree->setAlternatingRowColors(true);
+    QFontMetrics fm(font());
+    int header = fm.width(QLatin1Char('m')) * 40;
+    tree->header()->resizeSection(0, header);
+    tree->header()->setStretchLastSection(true);
+    connect(tree, SIGNAL(activated(const QModelIndex&)),
+            this, SLOT(open()));
+    tree->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(tree, SIGNAL(customContextMenuRequested(const QPoint &)),
+            this, SLOT(customContextMenuRequested(const QPoint &)));
+}
+
+void HistoryDialog::customContextMenuRequested(const QPoint &pos)
+{
+    QMenu menu;
+    QModelIndex index = tree->indexAt(pos);
+    index = index.sibling(index.row(), 0);
+    if (index.isValid() && !tree->model()->hasChildren(index)) {
+        menu.addAction(tr("Open"), this, SLOT(open()));
+        menu.addSeparator();
+        menu.addAction(tr("Copy"), this, SLOT(copy()));
+    }
+    menu.addAction(tr("Delete"), tree, SLOT(removeOne()));
+    menu.exec(QCursor::pos());
+}
+
+void HistoryDialog::open()
+{
+    QModelIndex index = tree->currentIndex();
+    if (!index.parent().isValid())
+        return;
+    emit openUrl(index.data(HistoryModel::UrlRole).toUrl());
+}
+
+void HistoryDialog::copy()
+{
+    QModelIndex index = tree->currentIndex();
+    if (!index.parent().isValid())
+        return;
+    QString url = index.data(HistoryModel::UrlStringRole).toString();
+
+    QClipboard *clipboard = QApplication::clipboard();
+    clipboard->setText(url);
+}
+
+HistoryFilterModel::HistoryFilterModel(QAbstractItemModel *sourceModel, QObject *parent)
+    : QAbstractProxyModel(parent),
+    m_loaded(false)
+{
+    setSourceModel(sourceModel);
+}
+
+int HistoryFilterModel::historyLocation(const QString &url) const
+{
+    load();
+    if (!m_historyHash.contains(url))
+        return 0;
+    return sourceModel()->rowCount() - m_historyHash.value(url);
+}
+
+QVariant HistoryFilterModel::data(const QModelIndex &index, int role) const
+{
+    return QAbstractProxyModel::data(index, role);
+}
+
+void HistoryFilterModel::setSourceModel(QAbstractItemModel *newSourceModel)
+{
+    if (sourceModel()) {
+        disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
+        disconnect(sourceModel(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
+                   this, SLOT(dataChanged(const QModelIndex &, const QModelIndex &)));
+        disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
+        disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+    }
+
+    QAbstractProxyModel::setSourceModel(newSourceModel);
+
+    if (sourceModel()) {
+        m_loaded = false;
+        connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
+        connect(sourceModel(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
+                   this, SLOT(sourceDataChanged(const QModelIndex &, const QModelIndex &)));
+        connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
+        connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+    }
+}
+
+void HistoryFilterModel::sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
+{
+    emit dataChanged(mapFromSource(topLeft), mapFromSource(bottomRight));
+}
+
+QVariant HistoryFilterModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    return sourceModel()->headerData(section, orientation, role);
+}
+
+void HistoryFilterModel::sourceReset()
+{
+    m_loaded = false;
+    reset();
+}
+
+int HistoryFilterModel::rowCount(const QModelIndex &parent) const
+{
+    load();
+    if (parent.isValid())
+        return 0;
+    return m_historyHash.count();
+}
+
+int HistoryFilterModel::columnCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : 2;
+}
+
+QModelIndex HistoryFilterModel::mapToSource(const QModelIndex &proxyIndex) const
+{
+    load();
+    int sourceRow = sourceModel()->rowCount() - proxyIndex.internalId();
+    return sourceModel()->index(sourceRow, proxyIndex.column());
+}
+
+QModelIndex HistoryFilterModel::mapFromSource(const QModelIndex &sourceIndex) const
+{
+    load();
+    QString url = sourceIndex.data(HistoryModel::UrlStringRole).toString();
+    if (!m_historyHash.contains(url))
+        return QModelIndex();
+
+    // This can be done in a binary search, but we can't use qBinary find
+    // because it can't take: qBinaryFind(m_sourceRow.end(), m_sourceRow.begin(), v);
+    // so if this is a performance bottlneck then convert to binary search, until then
+    // the cleaner/easier to read code wins the day.
+    int realRow = -1;
+    int sourceModelRow = sourceModel()->rowCount() - sourceIndex.row();
+
+    for (int i = 0; i < m_sourceRow.count(); ++i) {
+        if (m_sourceRow.at(i) == sourceModelRow) {
+            realRow = i;
+            break;
+        }
+    }
+    if (realRow == -1)
+        return QModelIndex();
+
+    return createIndex(realRow, sourceIndex.column(), sourceModel()->rowCount() - sourceIndex.row());
+}
+
+QModelIndex HistoryFilterModel::index(int row, int column, const QModelIndex &parent) const
+{
+    load();
+    if (row < 0 || row >= rowCount(parent)
+        || column < 0 || column >= columnCount(parent))
+        return QModelIndex();
+
+    return createIndex(row, column, m_sourceRow[row]);
+}
+
+QModelIndex HistoryFilterModel::parent(const QModelIndex &) const
+{
+    return QModelIndex();
+}
+
+void HistoryFilterModel::load() const
+{
+    if (m_loaded)
+        return;
+    m_sourceRow.clear();
+    m_historyHash.clear();
+    m_historyHash.reserve(sourceModel()->rowCount());
+    for (int i = 0; i < sourceModel()->rowCount(); ++i) {
+        QModelIndex idx = sourceModel()->index(i, 0);
+        QString url = idx.data(HistoryModel::UrlStringRole).toString();
+        if (!m_historyHash.contains(url)) {
+            m_sourceRow.append(sourceModel()->rowCount() - i);
+            m_historyHash[url] = sourceModel()->rowCount() - i;
+        }
+    }
+    m_loaded = true;
+}
+
+void HistoryFilterModel::sourceRowsInserted(const QModelIndex &parent, int start, int end)
+{
+    Q_ASSERT(start == end && start == 0);
+    Q_UNUSED(end);
+    if (!m_loaded)
+        return;
+    QModelIndex idx = sourceModel()->index(start, 0, parent);
+    QString url = idx.data(HistoryModel::UrlStringRole).toString();
+    if (m_historyHash.contains(url)) {
+        int sourceRow = sourceModel()->rowCount() - m_historyHash[url];
+        int realRow = mapFromSource(sourceModel()->index(sourceRow, 0)).row();
+        beginRemoveRows(QModelIndex(), realRow, realRow);
+        m_sourceRow.removeAt(realRow);
+        m_historyHash.remove(url);
+        endRemoveRows();
+    }
+    beginInsertRows(QModelIndex(), 0, 0);
+    m_historyHash.insert(url, sourceModel()->rowCount() - start);
+    m_sourceRow.insert(0, sourceModel()->rowCount());
+    endInsertRows();
+}
+
+void HistoryFilterModel::sourceRowsRemoved(const QModelIndex &, int start, int end)
+{
+    Q_UNUSED(start);
+    Q_UNUSED(end);
+    sourceReset();
+}
+
+/*
+    Removing a continuous block of rows will remove filtered rows too as this is
+    the users intention.
+*/
+bool HistoryFilterModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (row < 0 || count <= 0 || row + count > rowCount(parent) || parent.isValid())
+        return false;
+    int lastRow = row + count - 1;
+    disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+    beginRemoveRows(parent, row, lastRow);
+    int oldCount = rowCount();
+    int start = sourceModel()->rowCount() - m_sourceRow.value(row);
+    int end = sourceModel()->rowCount() - m_sourceRow.value(lastRow);
+    sourceModel()->removeRows(start, end - start + 1);
+    endRemoveRows();
+    connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+    m_loaded = false;
+    if (oldCount - count != rowCount())
+        reset();
+    return true;
+}
+
+HistoryCompletionModel::HistoryCompletionModel(QObject *parent)
+    : QAbstractProxyModel(parent)
+{
+}
+
+QVariant HistoryCompletionModel::data(const QModelIndex &index, int role) const
+{
+    if (sourceModel()
+        && (role == Qt::EditRole || role == Qt::DisplayRole)
+        && index.isValid()) {
+        QModelIndex idx = mapToSource(index);
+        idx = idx.sibling(idx.row(), 1);
+        QString urlString = idx.data(HistoryModel::UrlStringRole).toString();
+        if (index.row() % 2) {
+            QUrl url = urlString;
+            QString s = url.toString(QUrl::RemoveScheme
+                                     | QUrl::RemoveUserInfo
+                                     | QUrl::StripTrailingSlash);
+            return s.mid(2);  // strip // from the front
+        }
+        return urlString;
+    }
+    return QAbstractProxyModel::data(index, role);
+}
+
+int HistoryCompletionModel::rowCount(const QModelIndex &parent) const
+{
+    return (parent.isValid() || !sourceModel()) ? 0 : sourceModel()->rowCount(parent) * 2;
+}
+
+int HistoryCompletionModel::columnCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : 1;
+}
+
+QModelIndex HistoryCompletionModel::mapFromSource(const QModelIndex &sourceIndex) const
+{
+    int row = sourceIndex.row() * 2;
+    return index(row, sourceIndex.column());
+}
+
+QModelIndex HistoryCompletionModel::mapToSource(const QModelIndex &proxyIndex) const
+{
+    if (!sourceModel())
+        return QModelIndex();
+    int row = proxyIndex.row() / 2;
+    return sourceModel()->index(row, proxyIndex.column());
+}
+
+QModelIndex HistoryCompletionModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < 0 || row >= rowCount(parent)
+        || column < 0 || column >= columnCount(parent))
+        return QModelIndex();
+    return createIndex(row, column, 0);
+}
+
+QModelIndex HistoryCompletionModel::parent(const QModelIndex &) const
+{
+    return QModelIndex();
+}
+
+void HistoryCompletionModel::setSourceModel(QAbstractItemModel *newSourceModel)
+{
+    if (sourceModel()) {
+        disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
+        disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+                this, SLOT(sourceReset()));
+        disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceReset()));
+    }
+
+    QAbstractProxyModel::setSourceModel(newSourceModel);
+
+    if (newSourceModel) {
+        connect(newSourceModel, SIGNAL(modelReset()), this, SLOT(sourceReset()));
+        connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+                this, SLOT(sourceReset()));
+        connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceReset()));
+    }
+
+    reset();
+}
+
+void HistoryCompletionModel::sourceReset()
+{
+    reset();
+}
+
+HistoryTreeModel::HistoryTreeModel(QAbstractItemModel *sourceModel, QObject *parent)
+    : QAbstractProxyModel(parent)
+{
+    setSourceModel(sourceModel);
+}
+
+QVariant HistoryTreeModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    return sourceModel()->headerData(section, orientation, role);
+}
+
+QVariant HistoryTreeModel::data(const QModelIndex &index, int role) const
+{
+    if ((role == Qt::EditRole || role == Qt::DisplayRole)) {
+        int start = index.internalId();
+        if (start == 0) {
+            int offset = sourceDateRow(index.row());
+            if (index.column() == 0) {
+                QModelIndex idx = sourceModel()->index(offset, 0);
+                QDate date = idx.data(HistoryModel::DateRole).toDate();
+                if (date == QDate::currentDate())
+                    return tr("Earlier Today");
+                return date.toString(QLatin1String("dddd, MMMM d, yyyy"));
+            }
+            if (index.column() == 1) {
+                return tr("%1 items").arg(rowCount(index.sibling(index.row(), 0)));
+            }
+        }
+    }
+    if (role == Qt::DecorationRole && index.column() == 0 && !index.parent().isValid())
+        return QIcon(QLatin1String(":history.png"));
+    if (role == HistoryModel::DateRole && index.column() == 0 && index.internalId() == 0) {
+        int offset = sourceDateRow(index.row());
+        QModelIndex idx = sourceModel()->index(offset, 0);
+        return idx.data(HistoryModel::DateRole);
+    }
+
+    return QAbstractProxyModel::data(index, role);
+}
+
+int HistoryTreeModel::columnCount(const QModelIndex &parent) const
+{
+    return sourceModel()->columnCount(mapToSource(parent));
+}
+
+int HistoryTreeModel::rowCount(const QModelIndex &parent) const
+{
+    if ( parent.internalId() != 0
+        || parent.column() > 0
+        || !sourceModel())
+        return 0;
+
+    // row count OF dates
+    if (!parent.isValid()) {
+        if (!m_sourceRowCache.isEmpty())
+            return m_sourceRowCache.count();
+        QDate currentDate;
+        int rows = 0;
+        int totalRows = sourceModel()->rowCount();
+
+        for (int i = 0; i < totalRows; ++i) {
+            QDate rowDate = sourceModel()->index(i, 0).data(HistoryModel::DateRole).toDate();
+            if (rowDate != currentDate) {
+                m_sourceRowCache.append(i);
+                currentDate = rowDate;
+                ++rows;
+            }
+        }
+        Q_ASSERT(m_sourceRowCache.count() == rows);
+        return rows;
+    }
+
+    // row count FOR a date
+    int start = sourceDateRow(parent.row());
+    int end = sourceDateRow(parent.row() + 1);
+    return (end - start);
+}
+
+// Translate the top level date row into the offset where that date starts
+int HistoryTreeModel::sourceDateRow(int row) const
+{
+    if (row <= 0)
+        return 0;
+
+    if (m_sourceRowCache.isEmpty())
+        rowCount(QModelIndex());
+
+    if (row >= m_sourceRowCache.count()) {
+        if (!sourceModel())
+            return 0;
+        return sourceModel()->rowCount();
+    }
+    return m_sourceRowCache.at(row);
+}
+
+QModelIndex HistoryTreeModel::mapToSource(const QModelIndex &proxyIndex) const
+{
+    int offset = proxyIndex.internalId();
+    if (offset == 0)
+        return QModelIndex();
+    int startDateRow = sourceDateRow(offset - 1);
+    return sourceModel()->index(startDateRow + proxyIndex.row(), proxyIndex.column());
+}
+
+QModelIndex HistoryTreeModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < 0
+        || column < 0 || column >= columnCount(parent)
+        || parent.column() > 0)
+        return QModelIndex();
+
+    if (!parent.isValid())
+        return createIndex(row, column, 0);
+    return createIndex(row, column, parent.row() + 1);
+}
+
+QModelIndex HistoryTreeModel::parent(const QModelIndex &index) const
+{
+    int offset = index.internalId();
+    if (offset == 0 || !index.isValid())
+        return QModelIndex();
+    return createIndex(offset - 1, 0, 0);
+}
+
+bool HistoryTreeModel::hasChildren(const QModelIndex &parent) const
+{
+    QModelIndex grandparent = parent.parent();
+    if (!grandparent.isValid())
+        return true;
+    return false;
+}
+
+Qt::ItemFlags HistoryTreeModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::NoItemFlags;
+    return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled;
+}
+
+bool HistoryTreeModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (row < 0 || count <= 0 || row + count > rowCount(parent))
+        return false;
+
+    if (parent.isValid()) {
+        // removing pages
+        int offset = sourceDateRow(parent.row());
+        return sourceModel()->removeRows(offset + row, count);
+    } else {
+        // removing whole dates
+        for (int i = row + count - 1; i >= row; --i) {
+            QModelIndex dateParent = index(i, 0);
+            int offset = sourceDateRow(dateParent.row());
+            if (!sourceModel()->removeRows(offset, rowCount(dateParent)))
+                return false;
+        }
+    }
+    return true;
+}
+
+void HistoryTreeModel::setSourceModel(QAbstractItemModel *newSourceModel)
+{
+    if (sourceModel()) {
+        disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
+        disconnect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
+        disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
+        disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+    }
+
+    QAbstractProxyModel::setSourceModel(newSourceModel);
+
+    if (newSourceModel) {
+        connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
+        connect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
+        connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
+        connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+    }
+
+    reset();
+}
+
+void HistoryTreeModel::sourceReset()
+{
+    m_sourceRowCache.clear();
+    reset();
+}
+
+void HistoryTreeModel::sourceRowsInserted(const QModelIndex &parent, int start, int end)
+{
+    Q_UNUSED(parent); // Avoid warnings when compiling release
+    Q_ASSERT(!parent.isValid());
+    if (start != 0 || start != end) {
+        m_sourceRowCache.clear();
+        reset();
+        return;
+    }
+
+    m_sourceRowCache.clear();
+    QModelIndex treeIndex = mapFromSource(sourceModel()->index(start, 0));
+    QModelIndex treeParent = treeIndex.parent();
+    if (rowCount(treeParent) == 1) {
+        beginInsertRows(QModelIndex(), 0, 0);
+        endInsertRows();
+    } else {
+        beginInsertRows(treeParent, treeIndex.row(), treeIndex.row());
+        endInsertRows();
+    }
+}
+
+QModelIndex HistoryTreeModel::mapFromSource(const QModelIndex &sourceIndex) const
+{
+    if (!sourceIndex.isValid())
+        return QModelIndex();
+
+    if (m_sourceRowCache.isEmpty())
+        rowCount(QModelIndex());
+
+    QList<int>::iterator it;
+    it = qLowerBound(m_sourceRowCache.begin(), m_sourceRowCache.end(), sourceIndex.row());
+    if (*it != sourceIndex.row())
+        --it;
+    int dateRow = qMax(0, it - m_sourceRowCache.begin());
+    int row = sourceIndex.row() - m_sourceRowCache.at(dateRow);
+    return createIndex(row, sourceIndex.column(), dateRow + 1);
+}
+
+void HistoryTreeModel::sourceRowsRemoved(const QModelIndex &parent, int start, int end)
+{
+    Q_UNUSED(parent); // Avoid warnings when compiling release
+    Q_ASSERT(!parent.isValid());
+    if (m_sourceRowCache.isEmpty())
+        return;
+    for (int i = end; i >= start;) {
+        QList<int>::iterator it;
+        it = qLowerBound(m_sourceRowCache.begin(), m_sourceRowCache.end(), i);
+        // playing it safe
+        if (it == m_sourceRowCache.end()) {
+            m_sourceRowCache.clear();
+            reset();
+            return;
+        }
+
+        if (*it != i)
+            --it;
+        int row = qMax(0, it - m_sourceRowCache.begin());
+        int offset = m_sourceRowCache[row];
+        QModelIndex dateParent = index(row, 0);
+        // If we can remove all the rows in the date do that and skip over them
+        int rc = rowCount(dateParent);
+        if (i - rc + 1 == offset && start <= i - rc + 1) {
+            beginRemoveRows(QModelIndex(), row, row);
+            m_sourceRowCache.removeAt(row);
+            i -= rc + 1;
+        } else {
+            beginRemoveRows(dateParent, i - offset, i - offset);
+            ++row;
+            --i;
+        }
+        for (int j = row; j < m_sourceRowCache.count(); ++j)
+            --m_sourceRowCache[j];
+        endRemoveRows();
+    }
+}
+
diff --git a/demos/browser/history.h b/demos/browser/history.h
new file mode 100644
index 0000000..4f4edcd
--- /dev/null
+++ b/demos/browser/history.h
@@ -0,0 +1,350 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HISTORY_H
+#define HISTORY_H
+
+#include "modelmenu.h"
+
+#include <QtCore/QDateTime>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QUrl>
+
+#include <QtGui/QSortFilterProxyModel>
+
+#include <QWebHistoryInterface>
+
+class HistoryItem
+{
+public:
+    HistoryItem() {}
+    HistoryItem(const QString &u,
+                const QDateTime &d = QDateTime(), const QString &t = QString())
+        : title(t), url(u), dateTime(d) {}
+
+    inline bool operator==(const HistoryItem &other) const
+        { return other.title == title
+          && other.url == url && other.dateTime == dateTime; }
+
+    // history is sorted in reverse
+    inline bool operator <(const HistoryItem &other) const
+        { return dateTime > other.dateTime; }
+
+    QString title;
+    QString url;
+    QDateTime dateTime;
+};
+
+class AutoSaver;
+class HistoryModel;
+class HistoryFilterModel;
+class HistoryTreeModel;
+class HistoryManager : public QWebHistoryInterface
+{
+    Q_OBJECT
+    Q_PROPERTY(int historyLimit READ historyLimit WRITE setHistoryLimit)
+
+signals:
+    void historyReset();
+    void entryAdded(const HistoryItem &item);
+    void entryRemoved(const HistoryItem &item);
+    void entryUpdated(int offset);
+
+public:
+    HistoryManager(QObject *parent = 0);
+    ~HistoryManager();
+
+    bool historyContains(const QString &url) const;
+    void addHistoryEntry(const QString &url);
+
+    void updateHistoryItem(const QUrl &url, const QString &title);
+
+    int historyLimit() const;
+    void setHistoryLimit(int limit);
+
+    QList<HistoryItem> history() const;
+    void setHistory(const QList<HistoryItem> &history, bool loadedAndSorted = false);
+
+    // History manager keeps around these models for use by the completer and other classes
+    HistoryModel *historyModel() const;
+    HistoryFilterModel *historyFilterModel() const;
+    HistoryTreeModel *historyTreeModel() const;
+
+public slots:
+    void clear();
+    void loadSettings();
+
+private slots:
+    void save();
+    void checkForExpired();
+
+protected:
+    void addHistoryItem(const HistoryItem &item);
+
+private:
+    void load();
+
+    AutoSaver *m_saveTimer;
+    int m_historyLimit;
+    QTimer m_expiredTimer;
+    QList<HistoryItem> m_history;
+    QString m_lastSavedUrl;
+
+    HistoryModel *m_historyModel;
+    HistoryFilterModel *m_historyFilterModel;
+    HistoryTreeModel *m_historyTreeModel;
+};
+
+class HistoryModel : public QAbstractTableModel
+{
+    Q_OBJECT
+
+public slots:
+    void historyReset();
+    void entryAdded();
+    void entryUpdated(int offset);
+
+public:
+    enum Roles {
+        DateRole = Qt::UserRole + 1,
+        DateTimeRole = Qt::UserRole + 2,
+        UrlRole = Qt::UserRole + 3,
+        UrlStringRole = Qt::UserRole + 4
+    };
+
+    HistoryModel(HistoryManager *history, QObject *parent = 0);
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+
+private:
+    HistoryManager *m_history;
+};
+
+/*!
+    Proxy model that will remove any duplicate entries.
+    Both m_sourceRow and m_historyHash store their offsets not from
+    the front of the list, but as offsets from the back.
+  */
+class HistoryFilterModel : public QAbstractProxyModel
+{
+    Q_OBJECT
+
+public:
+    HistoryFilterModel(QAbstractItemModel *sourceModel, QObject *parent = 0);
+
+    inline bool historyContains(const QString &url) const
+        { load(); return m_historyHash.contains(url); }
+    int historyLocation(const QString &url) const;
+
+    QModelIndex mapFromSource(const QModelIndex &sourceIndex) const;
+    QModelIndex mapToSource(const QModelIndex &proxyIndex) const;
+    void setSourceModel(QAbstractItemModel *sourceModel);
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex index(int, int, const QModelIndex& = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex& index= QModelIndex()) const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+private slots:
+    void sourceReset();
+    void sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+    void sourceRowsInserted(const QModelIndex &parent, int start, int end);
+    void sourceRowsRemoved(const QModelIndex &, int, int);
+
+private:
+    void load() const;
+
+    mutable QList<int> m_sourceRow;
+    mutable QHash<QString, int> m_historyHash;
+    mutable bool m_loaded;
+};
+
+/*
+    The history menu
+    - Removes the first twenty entries and puts them as children of the top level.
+    - If there are less then twenty entries then the first folder is also removed.
+
+    The mapping is done by knowing that HistoryTreeModel is over a table
+    We store that row offset in our index's private data.
+*/
+class HistoryMenuModel : public QAbstractProxyModel
+{
+    Q_OBJECT
+
+public:
+    HistoryMenuModel(HistoryTreeModel *sourceModel, QObject *parent = 0);
+    int columnCount(const QModelIndex &parent) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex mapFromSource(const QModelIndex & sourceIndex) const;
+    QModelIndex mapToSource(const QModelIndex & proxyIndex) const;
+    QModelIndex index(int, int, const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex &index = QModelIndex()) const;
+
+    int bumpedRows() const;
+
+private:
+    HistoryTreeModel *m_treeModel;
+};
+
+// Menu that is dynamically populated from the history
+class HistoryMenu : public ModelMenu
+{
+    Q_OBJECT
+
+signals:
+    void openUrl(const QUrl &url);
+
+public:
+     HistoryMenu(QWidget *parent = 0);
+     void setInitialActions(QList<QAction*> actions);
+
+protected:
+    bool prePopulated();
+    void postPopulated();
+
+private slots:
+    void activated(const QModelIndex &index);
+    void showHistoryDialog();
+
+private:
+    HistoryManager *m_history;
+    HistoryMenuModel *m_historyMenuModel;
+    QList<QAction*> m_initialActions;
+};
+
+// proxy model for the history model that
+// exposes each url http://www.foo.com and it url starting at the host www.foo.com
+class HistoryCompletionModel : public QAbstractProxyModel
+{
+    Q_OBJECT
+
+public:
+    HistoryCompletionModel(QObject *parent = 0);
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex mapFromSource(const QModelIndex &sourceIndex) const;
+    QModelIndex mapToSource(const QModelIndex &proxyIndex) const;
+    QModelIndex index(int, int, const QModelIndex& = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex& index= QModelIndex()) const;
+    void setSourceModel(QAbstractItemModel *sourceModel);
+
+private slots:
+    void sourceReset();
+
+};
+
+// proxy model for the history model that converts the list
+// into a tree, one top level node per day.
+// Used in the HistoryDialog.
+class HistoryTreeModel : public QAbstractProxyModel
+{
+    Q_OBJECT
+
+public:
+    HistoryTreeModel(QAbstractItemModel *sourceModel, QObject *parent = 0);
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int columnCount(const QModelIndex &parent) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex mapFromSource(const QModelIndex &sourceIndex) const;
+    QModelIndex mapToSource(const QModelIndex &proxyIndex) const;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex &index= QModelIndex()) const;
+    bool hasChildren(const QModelIndex &parent = QModelIndex()) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+
+    void setSourceModel(QAbstractItemModel *sourceModel);
+
+private slots:
+    void sourceReset();
+    void sourceRowsInserted(const QModelIndex &parent, int start, int end);
+    void sourceRowsRemoved(const QModelIndex &parent, int start, int end);
+
+private:
+    int sourceDateRow(int row) const;
+    mutable QList<int> m_sourceRowCache;
+
+};
+
+// A modified QSortFilterProxyModel that always accepts the root nodes in the tree
+// so filtering is only done on the children.
+// Used in the HistoryDialog
+class TreeProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+public:
+    TreeProxyModel(QObject *parent = 0);
+
+protected:
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+};
+
+#include "ui_history.h"
+
+class HistoryDialog : public QDialog, public Ui_HistoryDialog
+{
+    Q_OBJECT
+
+signals:
+    void openUrl(const QUrl &url);
+
+public:
+    HistoryDialog(QWidget *parent = 0, HistoryManager *history = 0);
+
+private slots:
+    void customContextMenuRequested(const QPoint &pos);
+    void open();
+    void copy();
+
+};
+
+#endif // HISTORY_H
+
diff --git a/demos/browser/history.ui b/demos/browser/history.ui
new file mode 100644
index 0000000..0944940
--- /dev/null
+++ b/demos/browser/history.ui
@@ -0,0 +1,106 @@
+<ui version="4.0" >
+ <class>HistoryDialog</class>
+ <widget class="QDialog" name="HistoryDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>758</width>
+    <height>450</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>History</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>252</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <widget class="SearchLineEdit" name="search" />
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="EditTreeView" name="tree" />
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="removeButton" >
+       <property name="text" >
+        <string>&amp;Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="removeAllButton" >
+       <property name="text" >
+        <string>Remove &amp;All</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>searchlineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>EditTreeView</class>
+   <extends>QTreeView</extends>
+   <header>edittreeview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>HistoryDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>472</x>
+     <y>329</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>461</x>
+     <y>356</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/htmls/htmls.qrc b/demos/browser/htmls/htmls.qrc
new file mode 100644
index 0000000..03b256c
--- /dev/null
+++ b/demos/browser/htmls/htmls.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>notfound.html</file>
+</qresource>
+</RCC>
diff --git a/demos/browser/htmls/notfound.html b/demos/browser/htmls/notfound.html
new file mode 100644
index 0000000..b04a9f8
--- /dev/null
+++ b/demos/browser/htmls/notfound.html
@@ -0,0 +1,63 @@
+<html>
+<head>
+<title>%1</title>
+<style>
+body {
+  padding: 3em 0em;
+  background: #eeeeee;
+}
+hr {
+  color: lightgray;
+  width: 100%;
+}
+img {
+  float: left;
+  opacity: .8;
+}
+#box {
+  background: white;
+  border: 1px solid lightgray;
+  width: 600px;
+  padding: 60px;
+  margin: auto;
+}
+h1 {
+  font-size: 130%;
+  font-weight: bold;
+  border-bottom: 1px solid lightgray;
+  margin-left: 48px;
+}
+h2 {
+  font-size: 100%;
+  font-weight: normal;
+  border-bottom: 1px solid lightgray;
+  margin-left: 48px;
+}
+ul {
+  font-size: 80%;
+  padding-left: 48px;
+  margin: 0;
+}
+#reloadButton {
+  padding-left: 48px;
+}
+</style>
+</head>
+<body>
+  <div id="box">
+    <img src="data:image/png;base64,IMAGE_BINARY_DATA_HERE" width="32" height="32"/>
+    <h1>%2</h1>
+    <h2>When connecting to: %3.</h2>
+    <ul>
+      <li>Check the address for errors such as <b>ww</b>.trolltech.com
+      instead of <b>www</b>.trolltech.com</li>
+      <li>If the address is correct, try checking the network
+      connection.</li>
+      <li>If your computer or network is protected by a firewall or
+      proxy, make sure that the browser demo is permitted to access
+      the network.</li>
+    </ul>
+    <br/><br/>
+  </div>
+</body>
+</html>
diff --git a/demos/browser/main.cpp b/demos/browser/main.cpp
new file mode 100644
index 0000000..a59b2fb
--- /dev/null
+++ b/demos/browser/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "browserapplication.h"
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(data);
+    BrowserApplication application(argc, argv);
+    if (!application.isTheOnlyBrowser())
+        return 0;
+    application.newMainWindow();
+    return application.exec();
+}
+
diff --git a/demos/browser/modelmenu.cpp b/demos/browser/modelmenu.cpp
new file mode 100644
index 0000000..9403ef1
--- /dev/null
+++ b/demos/browser/modelmenu.cpp
@@ -0,0 +1,227 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "modelmenu.h"
+
+#include <QtCore/QAbstractItemModel>
+#include <qdebug.h>
+
+ModelMenu::ModelMenu(QWidget * parent)
+    : QMenu(parent)
+    , m_maxRows(7)
+    , m_firstSeparator(-1)
+    , m_maxWidth(-1)
+    , m_hoverRole(0)
+    , m_separatorRole(0)
+    , m_model(0)
+{
+    connect(this, SIGNAL(aboutToShow()), this, SLOT(aboutToShow()));
+}
+
+bool ModelMenu::prePopulated()
+{
+    return false;
+}
+
+void ModelMenu::postPopulated()
+{
+}
+
+void ModelMenu::setModel(QAbstractItemModel *model)
+{
+    m_model = model;
+}
+
+QAbstractItemModel *ModelMenu::model() const
+{
+    return m_model;
+}
+
+void ModelMenu::setMaxRows(int max)
+{
+    m_maxRows = max;
+}
+
+int ModelMenu::maxRows() const
+{
+    return m_maxRows;
+}
+
+void ModelMenu::setFirstSeparator(int offset)
+{
+    m_firstSeparator = offset;
+}
+
+int ModelMenu::firstSeparator() const
+{
+    return m_firstSeparator;
+}
+
+void ModelMenu::setRootIndex(const QModelIndex &index)
+{
+    m_root = index;
+}
+
+QModelIndex ModelMenu::rootIndex() const
+{
+    return m_root;
+}
+
+void ModelMenu::setHoverRole(int role)
+{
+    m_hoverRole = role;
+}
+
+int ModelMenu::hoverRole() const
+{
+    return m_hoverRole;
+}
+
+void ModelMenu::setSeparatorRole(int role)
+{
+    m_separatorRole = role;
+}
+
+int ModelMenu::separatorRole() const
+{
+    return m_separatorRole;
+}
+
+Q_DECLARE_METATYPE(QModelIndex)
+void ModelMenu::aboutToShow()
+{
+    if (QMenu *menu = qobject_cast<QMenu*>(sender())) {
+        QVariant v = menu->menuAction()->data();
+        if (v.canConvert<QModelIndex>()) {
+            QModelIndex idx = qvariant_cast<QModelIndex>(v);
+            createMenu(idx, -1, menu, menu);
+            disconnect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShow()));
+            return;
+        }
+    }
+
+    clear();
+    if (prePopulated())
+        addSeparator();
+    int max = m_maxRows;
+    if (max != -1)
+        max += m_firstSeparator;
+    createMenu(m_root, max, this, this);
+    postPopulated();
+}
+
+void ModelMenu::createMenu(const QModelIndex &parent, int max, QMenu *parentMenu, QMenu *menu)
+{
+    if (!menu) {
+        QString title = parent.data().toString();
+        menu = new QMenu(title, this);
+        QIcon icon = qvariant_cast<QIcon>(parent.data(Qt::DecorationRole));
+        menu->setIcon(icon);
+        parentMenu->addMenu(menu);
+        QVariant v;
+        v.setValue(parent);
+        menu->menuAction()->setData(v);
+        connect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShow()));
+        return;
+    }
+
+    int end = m_model->rowCount(parent);
+    if (max != -1)
+        end = qMin(max, end);
+
+    connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(triggered(QAction*)));
+    connect(menu, SIGNAL(hovered(QAction*)), this, SLOT(hovered(QAction*)));
+
+    for (int i = 0; i < end; ++i) {
+        QModelIndex idx = m_model->index(i, 0, parent);
+        if (m_model->hasChildren(idx)) {
+            createMenu(idx, -1, menu);
+        } else {
+            if (m_separatorRole != 0
+                && idx.data(m_separatorRole).toBool())
+                addSeparator();
+            else
+                menu->addAction(makeAction(idx));
+        }
+        if (menu == this && i == m_firstSeparator - 1)
+            addSeparator();
+    }
+}
+
+QAction *ModelMenu::makeAction(const QModelIndex &index)
+{
+    QIcon icon = qvariant_cast<QIcon>(index.data(Qt::DecorationRole));
+    QAction *action = makeAction(icon, index.data().toString(), this);
+    QVariant v;
+    v.setValue(index);
+    action->setData(v);
+    return action;
+}
+
+QAction *ModelMenu::makeAction(const QIcon &icon, const QString &text, QObject *parent)
+{
+    QFontMetrics fm(font());
+    if (-1 == m_maxWidth)
+        m_maxWidth = fm.width(QLatin1Char('m')) * 30;
+    QString smallText = fm.elidedText(text, Qt::ElideMiddle, m_maxWidth);
+    return new QAction(icon, smallText, parent);
+}
+
+void ModelMenu::triggered(QAction *action)
+{
+    QVariant v = action->data();
+    if (v.canConvert<QModelIndex>()) {
+        QModelIndex idx = qvariant_cast<QModelIndex>(v);
+        emit activated(idx);
+    }
+}
+
+void ModelMenu::hovered(QAction *action)
+{
+    QVariant v = action->data();
+    if (v.canConvert<QModelIndex>()) {
+        QModelIndex idx = qvariant_cast<QModelIndex>(v);
+        QString hoveredString = idx.data(m_hoverRole).toString();
+        if (!hoveredString.isEmpty())
+            emit hovered(hoveredString);
+    }
+}
+
diff --git a/demos/browser/modelmenu.h b/demos/browser/modelmenu.h
new file mode 100644
index 0000000..edd2e04
--- /dev/null
+++ b/demos/browser/modelmenu.h
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MODELMENU_H
+#define MODELMENU_H
+
+#include <QtGui/QMenu>
+#include <QtCore/QAbstractItemModel>
+
+// A QMenu that is dynamically populated from a QAbstractItemModel
+class ModelMenu : public QMenu
+{
+    Q_OBJECT
+
+signals:
+    void activated(const QModelIndex &index);
+    void hovered(const QString &text);
+
+public:
+    ModelMenu(QWidget *parent = 0);
+
+    void setModel(QAbstractItemModel *model);
+    QAbstractItemModel *model() const;
+
+    void setMaxRows(int max);
+    int maxRows() const;
+
+    void setFirstSeparator(int offset);
+    int firstSeparator() const;
+
+    void setRootIndex(const QModelIndex &index);
+    QModelIndex rootIndex() const;
+
+    void setHoverRole(int role);
+    int hoverRole() const;
+
+    void setSeparatorRole(int role);
+    int separatorRole() const;
+
+    QAction *makeAction(const QIcon &icon, const QString &text, QObject *parent);
+
+protected:
+    // add any actions before the tree, return true if any actions are added.
+    virtual bool prePopulated();
+    // add any actions after the tree
+    virtual void postPopulated();
+    // put all of the children of parent into menu up to max
+    void createMenu(const QModelIndex &parent, int max, QMenu *parentMenu = 0, QMenu *menu = 0);
+
+private slots:
+    void aboutToShow();
+    void triggered(QAction *action);
+    void hovered(QAction *action);
+
+private:
+    QAction *makeAction(const QModelIndex &index);
+    int m_maxRows;
+    int m_firstSeparator;
+    int m_maxWidth;
+    int m_hoverRole;
+    int m_separatorRole;
+    QAbstractItemModel *m_model;
+    QPersistentModelIndex m_root;
+};
+
+#endif // MODELMENU_H
+
diff --git a/demos/browser/networkaccessmanager.cpp b/demos/browser/networkaccessmanager.cpp
new file mode 100644
index 0000000..2e7b2fd
--- /dev/null
+++ b/demos/browser/networkaccessmanager.cpp
@@ -0,0 +1,171 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "networkaccessmanager.h"
+
+#include "browserapplication.h"
+#include "browsermainwindow.h"
+#include "ui_passworddialog.h"
+#include "ui_proxy.h"
+
+#include <QtCore/QSettings>
+
+#include <QtGui/QDesktopServices>
+#include <QtGui/QDialog>
+#include <QtGui/QMessageBox>
+#include <QtGui/QStyle>
+#include <QtGui/QTextDocument>
+
+#include <QtNetwork/QAuthenticator>
+#include <QtNetwork/QNetworkDiskCache>
+#include <QtNetwork/QNetworkProxy>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QSslError>
+
+NetworkAccessManager::NetworkAccessManager(QObject *parent)
+    : QNetworkAccessManager(parent)
+{
+    connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
+            SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*)));
+    connect(this, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
+            SLOT(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
+#ifndef QT_NO_OPENSSL
+    connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
+            SLOT(sslErrors(QNetworkReply*, const QList<QSslError>&)));
+#endif
+    loadSettings();
+
+    QNetworkDiskCache *diskCache = new QNetworkDiskCache(this);
+    QString location = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
+    diskCache->setCacheDirectory(location);
+    setCache(diskCache);
+}
+
+void NetworkAccessManager::loadSettings()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("proxy"));
+    QNetworkProxy proxy;
+    if (settings.value(QLatin1String("enabled"), false).toBool()) {
+        if (settings.value(QLatin1String("type"), 0).toInt() == 0)
+            proxy = QNetworkProxy::Socks5Proxy;
+        else
+            proxy = QNetworkProxy::HttpProxy;
+        proxy.setHostName(settings.value(QLatin1String("hostName")).toString());
+        proxy.setPort(settings.value(QLatin1String("port"), 1080).toInt());
+        proxy.setUser(settings.value(QLatin1String("userName")).toString());
+        proxy.setPassword(settings.value(QLatin1String("password")).toString());
+    }
+    setProxy(proxy);
+}
+
+void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *auth)
+{
+    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+
+    QDialog dialog(mainWindow);
+    dialog.setWindowFlags(Qt::Sheet);
+
+    Ui::PasswordDialog passwordDialog;
+    passwordDialog.setupUi(&dialog);
+
+    passwordDialog.iconLabel->setText(QString());
+    passwordDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
+
+    QString introMessage = tr("<qt>Enter username and password for \"%1\" at %2</qt>");
+    introMessage = introMessage.arg(Qt::escape(reply->url().toString())).arg(Qt::escape(reply->url().toString()));
+    passwordDialog.introLabel->setText(introMessage);
+    passwordDialog.introLabel->setWordWrap(true);
+
+    if (dialog.exec() == QDialog::Accepted) {
+        auth->setUser(passwordDialog.userNameLineEdit->text());
+        auth->setPassword(passwordDialog.passwordLineEdit->text());
+    }
+}
+
+void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth)
+{
+    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+
+    QDialog dialog(mainWindow);
+    dialog.setWindowFlags(Qt::Sheet);
+
+    Ui::ProxyDialog proxyDialog;
+    proxyDialog.setupUi(&dialog);
+
+    proxyDialog.iconLabel->setText(QString());
+    proxyDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
+
+    QString introMessage = tr("<qt>Connect to proxy \"%1\" using:</qt>");
+    introMessage = introMessage.arg(Qt::escape(proxy.hostName()));
+    proxyDialog.introLabel->setText(introMessage);
+    proxyDialog.introLabel->setWordWrap(true);
+
+    if (dialog.exec() == QDialog::Accepted) {
+        auth->setUser(proxyDialog.userNameLineEdit->text());
+        auth->setPassword(proxyDialog.passwordLineEdit->text());
+    }
+}
+
+#ifndef QT_NO_OPENSSL
+void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error)
+{
+    // check if SSL certificate has been trusted already
+    QString replyHost = reply->url().host() + ":" + reply->url().port();
+    if(! sslTrustedHostList.contains(replyHost)) {
+        BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+
+        QStringList errorStrings;
+        for (int i = 0; i < error.count(); ++i)
+            errorStrings += error.at(i).errorString();
+        QString errors = errorStrings.join(QLatin1String("\n"));
+        int ret = QMessageBox::warning(mainWindow, QCoreApplication::applicationName(),
+                tr("SSL Errors:\n\n%1\n\n%2\n\n"
+                        "Do you want to ignore these errors for this host?").arg(reply->url().toString()).arg(errors),
+                        QMessageBox::Yes | QMessageBox::No,
+                        QMessageBox::No);
+        if (ret == QMessageBox::Yes) {
+            reply->ignoreSslErrors();
+            sslTrustedHostList.append(replyHost);
+        }
+    }
+}
+#endif
diff --git a/demos/browser/networkaccessmanager.h b/demos/browser/networkaccessmanager.h
new file mode 100644
index 0000000..d016e76
--- /dev/null
+++ b/demos/browser/networkaccessmanager.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef NETWORKACCESSMANAGER_H
+#define NETWORKACCESSMANAGER_H
+
+#include <QtNetwork/QNetworkAccessManager>
+
+class NetworkAccessManager : public QNetworkAccessManager
+{
+    Q_OBJECT
+
+public:
+    NetworkAccessManager(QObject *parent = 0);
+
+private:
+    QList<QString> sslTrustedHostList;
+
+public slots:
+    void loadSettings();
+
+private slots:
+    void authenticationRequired(QNetworkReply *reply, QAuthenticator *auth);
+    void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth);
+#ifndef QT_NO_OPENSSL
+    void sslErrors(QNetworkReply *reply, const QList<QSslError> &error);
+#endif
+};
+
+#endif // NETWORKACCESSMANAGER_H
diff --git a/demos/browser/passworddialog.ui b/demos/browser/passworddialog.ui
new file mode 100644
index 0000000..7c16658
--- /dev/null
+++ b/demos/browser/passworddialog.ui
@@ -0,0 +1,111 @@
+<ui version="4.0" >
+ <class>PasswordDialog</class>
+ <widget class="QDialog" name="PasswordDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>399</width>
+    <height>148</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Authentication Required</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QLabel" name="iconLabel" >
+       <property name="text" >
+        <string>DUMMY ICON</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="introLabel" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>INTRO TEXT DUMMY</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Username:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLineEdit" name="userNameLineEdit" />
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="lblPassword" >
+     <property name="text" >
+      <string>Password:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="passwordLineEdit" >
+     <property name="echoMode" >
+      <enum>QLineEdit::Password</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>PasswordDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>PasswordDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/proxy.ui b/demos/browser/proxy.ui
new file mode 100644
index 0000000..62a8be6
--- /dev/null
+++ b/demos/browser/proxy.ui
@@ -0,0 +1,104 @@
+<ui version="4.0" >
+ <class>ProxyDialog</class>
+ <widget class="QDialog" name="ProxyDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>369</width>
+    <height>144</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Proxy Authentication</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="iconLabel" >
+     <property name="text" >
+      <string>ICON</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
+    <widget class="QLabel" name="introLabel" >
+     <property name="text" >
+      <string>Connect to proxy</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="QLabel" name="usernameLabel" >
+     <property name="text" >
+      <string>Username:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" >
+    <widget class="QLineEdit" name="userNameLineEdit" />
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <widget class="QLabel" name="passwordLabel" >
+     <property name="text" >
+      <string>Password:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <widget class="QLineEdit" name="passwordLineEdit" >
+     <property name="echoMode" >
+      <enum>QLineEdit::Password</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="3" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ProxyDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ProxyDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/searchlineedit.cpp b/demos/browser/searchlineedit.cpp
new file mode 100644
index 0000000..8f668e0
--- /dev/null
+++ b/demos/browser/searchlineedit.cpp
@@ -0,0 +1,238 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "searchlineedit.h"
+
+#include <QtGui/QPainter>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QMenu>
+#include <QtGui/QStyle>
+#include <QtGui/QStyleOptionFrameV2>
+
+ClearButton::ClearButton(QWidget *parent)
+  : QAbstractButton(parent)
+{
+    setCursor(Qt::ArrowCursor);
+    setToolTip(tr("Clear"));
+    setVisible(false);
+    setFocusPolicy(Qt::NoFocus);
+}
+
+void ClearButton::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+    QPainter painter(this);
+    int height = this->height();
+
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    QColor color = palette().color(QPalette::Mid);
+    painter.setBrush(isDown()
+                     ? palette().color(QPalette::Dark)
+                     : palette().color(QPalette::Mid));
+    painter.setPen(painter.brush().color());
+    int size = width();
+    int offset = size / 5;
+    int radius = size - offset * 2;
+    painter.drawEllipse(offset, offset, radius, radius);
+
+    painter.setPen(palette().color(QPalette::Base));
+    int border = offset * 2;
+    painter.drawLine(border, border, width() - border, height - border);
+    painter.drawLine(border, height - border, width() - border, border);
+}
+
+void ClearButton::textChanged(const QString &text)
+{
+    setVisible(!text.isEmpty());
+}
+
+/*
+    Search icon on the left hand side of the search widget
+    When a menu is set a down arrow appears
+ */
+class SearchButton : public QAbstractButton {
+public:
+    SearchButton(QWidget *parent = 0);
+    void paintEvent(QPaintEvent *event);
+    QMenu *m_menu;
+
+protected:
+    void mousePressEvent(QMouseEvent *event);
+};
+
+SearchButton::SearchButton(QWidget *parent)
+  : QAbstractButton(parent),
+    m_menu(0)
+{
+    setObjectName(QLatin1String("SearchButton"));
+    setCursor(Qt::ArrowCursor);
+    setFocusPolicy(Qt::NoFocus);
+}
+
+void SearchButton::mousePressEvent(QMouseEvent *event)
+{
+    if (m_menu && event->button() == Qt::LeftButton) {
+        QWidget *p = parentWidget();
+        if (p) {
+            QPoint r = p->mapToGlobal(QPoint(0, p->height()));
+            m_menu->exec(QPoint(r.x() + height() / 2, r.y()));
+        }
+        event->accept();
+    }
+    QAbstractButton::mousePressEvent(event);
+}
+
+void SearchButton::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+    QPainterPath myPath;
+
+    int radius = (height() / 5) * 2;
+    QRect circle(height() / 3 - 1, height() / 4, radius, radius);
+    myPath.addEllipse(circle);
+
+    myPath.arcMoveTo(circle, 300);
+    QPointF c = myPath.currentPosition();
+    int diff = height() / 7;
+    myPath.lineTo(qMin(width() - 2, (int)c.x() + diff), c.y() + diff);
+
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.setPen(QPen(Qt::darkGray, 2));
+    painter.drawPath(myPath);
+
+    if (m_menu) {
+        QPainterPath dropPath;
+        dropPath.arcMoveTo(circle, 320);
+        QPointF c = dropPath.currentPosition();
+        c = QPointF(c.x() + 3.5, c.y() + 0.5);
+        dropPath.moveTo(c);
+        dropPath.lineTo(c.x() + 4, c.y());
+        dropPath.lineTo(c.x() + 2, c.y() + 2);
+        dropPath.closeSubpath();
+        painter.setPen(Qt::darkGray);
+        painter.setBrush(Qt::darkGray);
+        painter.setRenderHint(QPainter::Antialiasing, false);
+        painter.drawPath(dropPath);
+    }
+    painter.end();
+}
+
+/*
+    SearchLineEdit is an enhanced QLineEdit
+    - A Search icon on the left with optional menu
+    - When there is no text and doesn't have focus an "inactive text" is displayed
+    - When there is text a clear button is displayed on the right hand side
+ */
+SearchLineEdit::SearchLineEdit(QWidget *parent) : ExLineEdit(parent),
+    m_searchButton(new SearchButton(this))
+{
+    connect(lineEdit(), SIGNAL(textChanged(const QString &)),
+            this, SIGNAL(textChanged(const QString &)));
+    setLeftWidget(m_searchButton);
+    m_inactiveText = tr("Search");
+
+    QSizePolicy policy = sizePolicy();
+    setSizePolicy(QSizePolicy::Preferred, policy.verticalPolicy());
+}
+
+void SearchLineEdit::paintEvent(QPaintEvent *event)
+{
+    if (lineEdit()->text().isEmpty() && !hasFocus() && !m_inactiveText.isEmpty()) {
+        ExLineEdit::paintEvent(event);
+        QStyleOptionFrameV2 panel;
+        initStyleOption(&panel);
+        QRect r = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this);
+        QFontMetrics fm = fontMetrics();
+        int horizontalMargin = lineEdit()->x();
+        QRect lineRect(horizontalMargin + r.x(), r.y() + (r.height() - fm.height() + 1) / 2,
+                       r.width() - 2 * horizontalMargin, fm.height());
+        QPainter painter(this);
+        painter.setPen(palette().brush(QPalette::Disabled, QPalette::Text).color());
+        painter.drawText(lineRect, Qt::AlignLeft|Qt::AlignVCenter, m_inactiveText);
+    } else {
+        ExLineEdit::paintEvent(event);
+    }
+}
+
+void SearchLineEdit::resizeEvent(QResizeEvent *event)
+{
+    updateGeometries();
+    ExLineEdit::resizeEvent(event);
+}
+
+void SearchLineEdit::updateGeometries()
+{
+    int menuHeight = height();
+    int menuWidth = menuHeight + 1;
+    if (!m_searchButton->m_menu)
+        menuWidth = (menuHeight / 5) * 4;
+    m_searchButton->resize(QSize(menuWidth, menuHeight));
+}
+
+QString SearchLineEdit::inactiveText() const
+{
+    return m_inactiveText;
+}
+
+void SearchLineEdit::setInactiveText(const QString &text)
+{
+    m_inactiveText = text;
+}
+
+void SearchLineEdit::setMenu(QMenu *menu)
+{
+    if (m_searchButton->m_menu)
+        m_searchButton->m_menu->deleteLater();
+    m_searchButton->m_menu = menu;
+    updateGeometries();
+}
+
+QMenu *SearchLineEdit::menu() const
+{
+    if (!m_searchButton->m_menu) {
+        m_searchButton->m_menu = new QMenu(m_searchButton);
+        if (isVisible())
+            (const_cast<SearchLineEdit*>(this))->updateGeometries();
+    }
+    return m_searchButton->m_menu;
+}
+
diff --git a/demos/browser/searchlineedit.h b/demos/browser/searchlineedit.h
new file mode 100644
index 0000000..be17e05
--- /dev/null
+++ b/demos/browser/searchlineedit.h
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SEARCHLINEEDIT_H
+#define SEARCHLINEEDIT_H
+
+#include "urllineedit.h"
+
+#include <QtGui/QLineEdit>
+#include <QtGui/QAbstractButton>
+
+QT_BEGIN_NAMESPACE
+class QMenu;
+QT_END_NAMESPACE
+
+class SearchButton;
+
+/*
+    Clear button on the right hand side of the search widget.
+    Hidden by default
+    "A circle with an X in it"
+ */
+class ClearButton : public QAbstractButton
+{
+    Q_OBJECT
+
+public:
+    ClearButton(QWidget *parent = 0);
+    void paintEvent(QPaintEvent *event);
+
+public slots:
+    void textChanged(const QString &text);
+};
+
+
+class SearchLineEdit : public ExLineEdit
+{
+    Q_OBJECT
+    Q_PROPERTY(QString inactiveText READ inactiveText WRITE setInactiveText)
+
+signals:
+    void textChanged(const QString &text);
+
+public:
+    SearchLineEdit(QWidget *parent = 0);
+
+    QString inactiveText() const;
+    void setInactiveText(const QString &text);
+
+    QMenu *menu() const;
+    void setMenu(QMenu *menu);
+
+protected:
+    void resizeEvent(QResizeEvent *event);
+    void paintEvent(QPaintEvent *event);
+
+private:
+    void updateGeometries();
+
+    SearchButton *m_searchButton;
+    QString m_inactiveText;
+};
+
+#endif // SEARCHLINEEDIT_H
+
diff --git a/demos/browser/settings.cpp b/demos/browser/settings.cpp
new file mode 100644
index 0000000..09f4846
--- /dev/null
+++ b/demos/browser/settings.cpp
@@ -0,0 +1,324 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "settings.h"
+
+#include "browserapplication.h"
+#include "browsermainwindow.h"
+#include "cookiejar.h"
+#include "history.h"
+#include "networkaccessmanager.h"
+#include "webview.h"
+
+#include <QtCore/QSettings>
+#include <QtGui/QtGui>
+#include <QtWebKit/QtWebKit>
+
+SettingsDialog::SettingsDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    setupUi(this);
+    connect(exceptionsButton, SIGNAL(clicked()), this, SLOT(showExceptions()));
+    connect(setHomeToCurrentPageButton, SIGNAL(clicked()), this, SLOT(setHomeToCurrentPage()));
+    connect(cookiesButton, SIGNAL(clicked()), this, SLOT(showCookies()));
+    connect(standardFontButton, SIGNAL(clicked()), this, SLOT(chooseFont()));
+    connect(fixedFontButton, SIGNAL(clicked()), this, SLOT(chooseFixedFont()));
+
+    loadDefaults();
+    loadFromSettings();
+}
+
+void SettingsDialog::loadDefaults()
+{
+    QWebSettings *defaultSettings = QWebSettings::globalSettings();
+    QString standardFontFamily = defaultSettings->fontFamily(QWebSettings::StandardFont);
+    int standardFontSize = defaultSettings->fontSize(QWebSettings::DefaultFontSize);
+    standardFont = QFont(standardFontFamily, standardFontSize);
+    standardLabel->setText(QString(QLatin1String("%1 %2")).arg(standardFont.family()).arg(standardFont.pointSize()));
+
+    QString fixedFontFamily = defaultSettings->fontFamily(QWebSettings::FixedFont);
+    int fixedFontSize = defaultSettings->fontSize(QWebSettings::DefaultFixedFontSize);
+    fixedFont = QFont(fixedFontFamily, fixedFontSize);
+    fixedLabel->setText(QString(QLatin1String("%1 %2")).arg(fixedFont.family()).arg(fixedFont.pointSize()));
+
+    downloadsLocation->setText(QDesktopServices::storageLocation(QDesktopServices::DesktopLocation));
+
+    enableJavascript->setChecked(defaultSettings->testAttribute(QWebSettings::JavascriptEnabled));
+    enablePlugins->setChecked(defaultSettings->testAttribute(QWebSettings::PluginsEnabled));
+}
+
+void SettingsDialog::loadFromSettings()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("MainWindow"));
+    QString defaultHome = QLatin1String("http://qtsoftware.com");
+    homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
+    settings.endGroup();
+
+    settings.beginGroup(QLatin1String("history"));
+    int historyExpire = settings.value(QLatin1String("historyExpire")).toInt();
+    int idx = 0;
+    switch (historyExpire) {
+    case 1: idx = 0; break;
+    case 7: idx = 1; break;
+    case 14: idx = 2; break;
+    case 30: idx = 3; break;
+    case 365: idx = 4; break;
+    case -1: idx = 5; break;
+    default:
+        idx = 5;
+    }
+    expireHistory->setCurrentIndex(idx);
+    settings.endGroup();
+
+    settings.beginGroup(QLatin1String("downloadmanager"));
+    QString downloadDirectory = settings.value(QLatin1String("downloadDirectory"), downloadsLocation->text()).toString();
+    downloadsLocation->setText(downloadDirectory);
+    settings.endGroup();
+
+    settings.beginGroup(QLatin1String("general"));
+    openLinksIn->setCurrentIndex(settings.value(QLatin1String("openLinksIn"), openLinksIn->currentIndex()).toInt());
+
+    settings.endGroup();
+
+    // Appearance
+    settings.beginGroup(QLatin1String("websettings"));
+    fixedFont = qVariantValue<QFont>(settings.value(QLatin1String("fixedFont"), fixedFont));
+    standardFont = qVariantValue<QFont>(settings.value(QLatin1String("standardFont"), standardFont));
+
+    standardLabel->setText(QString(QLatin1String("%1 %2")).arg(standardFont.family()).arg(standardFont.pointSize()));
+    fixedLabel->setText(QString(QLatin1String("%1 %2")).arg(fixedFont.family()).arg(fixedFont.pointSize()));
+
+    enableJavascript->setChecked(settings.value(QLatin1String("enableJavascript"), enableJavascript->isChecked()).toBool());
+    enablePlugins->setChecked(settings.value(QLatin1String("enablePlugins"), enablePlugins->isChecked()).toBool());
+    userStyleSheet->setText(settings.value(QLatin1String("userStyleSheet")).toUrl().toString());
+    settings.endGroup();
+
+    // Privacy
+    settings.beginGroup(QLatin1String("cookies"));
+
+    CookieJar *jar = BrowserApplication::cookieJar();
+    QByteArray value = settings.value(QLatin1String("acceptCookies"), QLatin1String("AcceptOnlyFromSitesNavigatedTo")).toByteArray();
+    QMetaEnum acceptPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("AcceptPolicy"));
+    CookieJar::AcceptPolicy acceptCookies = acceptPolicyEnum.keyToValue(value) == -1 ?
+                        CookieJar::AcceptOnlyFromSitesNavigatedTo :
+                        static_cast<CookieJar::AcceptPolicy>(acceptPolicyEnum.keyToValue(value));
+    switch(acceptCookies) {
+    case CookieJar::AcceptAlways:
+        acceptCombo->setCurrentIndex(0);
+        break;
+    case CookieJar::AcceptNever:
+        acceptCombo->setCurrentIndex(1);
+        break;
+    case CookieJar::AcceptOnlyFromSitesNavigatedTo:
+        acceptCombo->setCurrentIndex(2);
+        break;
+    }
+
+    value = settings.value(QLatin1String("keepCookiesUntil"), QLatin1String("Expire")).toByteArray();
+    QMetaEnum keepPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("KeepPolicy"));
+    CookieJar::KeepPolicy keepCookies = keepPolicyEnum.keyToValue(value) == -1 ?
+                        CookieJar::KeepUntilExpire :
+                        static_cast<CookieJar::KeepPolicy>(keepPolicyEnum.keyToValue(value));
+    switch(keepCookies) {
+    case CookieJar::KeepUntilExpire:
+        keepUntilCombo->setCurrentIndex(0);
+        break;
+    case CookieJar::KeepUntilExit:
+        keepUntilCombo->setCurrentIndex(1);
+        break;
+    case CookieJar::KeepUntilTimeLimit:
+        keepUntilCombo->setCurrentIndex(2);
+        break;
+    }
+    settings.endGroup();
+
+
+    // Proxy
+    settings.beginGroup(QLatin1String("proxy"));
+    proxySupport->setChecked(settings.value(QLatin1String("enabled"), false).toBool());
+    proxyType->setCurrentIndex(settings.value(QLatin1String("type"), 0).toInt());
+    proxyHostName->setText(settings.value(QLatin1String("hostName")).toString());
+    proxyPort->setValue(settings.value(QLatin1String("port"), 1080).toInt());
+    proxyUserName->setText(settings.value(QLatin1String("userName")).toString());
+    proxyPassword->setText(settings.value(QLatin1String("password")).toString());
+    settings.endGroup();
+}
+
+void SettingsDialog::saveToSettings()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("MainWindow"));
+    settings.setValue(QLatin1String("home"), homeLineEdit->text());
+    settings.endGroup();
+
+    settings.beginGroup(QLatin1String("general"));
+    settings.setValue(QLatin1String("openLinksIn"), openLinksIn->currentIndex());
+    settings.endGroup();
+
+    settings.beginGroup(QLatin1String("history"));
+    int historyExpire = expireHistory->currentIndex();
+    int idx = -1;
+    switch (historyExpire) {
+    case 0: idx = 1; break;
+    case 1: idx = 7; break;
+    case 2: idx = 14; break;
+    case 3: idx = 30; break;
+    case 4: idx = 365; break;
+    case 5: idx = -1; break;
+    }
+    settings.setValue(QLatin1String("historyExpire"), idx);
+    settings.endGroup();
+
+    // Appearance
+    settings.beginGroup(QLatin1String("websettings"));
+    settings.setValue(QLatin1String("fixedFont"), fixedFont);
+    settings.setValue(QLatin1String("standardFont"), standardFont);
+    settings.setValue(QLatin1String("enableJavascript"), enableJavascript->isChecked());
+    settings.setValue(QLatin1String("enablePlugins"), enablePlugins->isChecked());
+    QString userStyleSheetString = userStyleSheet->text();
+    if (QFile::exists(userStyleSheetString))
+        settings.setValue(QLatin1String("userStyleSheet"), QUrl::fromLocalFile(userStyleSheetString));
+    else
+        settings.setValue(QLatin1String("userStyleSheet"), QUrl(userStyleSheetString));
+    settings.endGroup();
+
+    //Privacy
+    settings.beginGroup(QLatin1String("cookies"));
+
+    CookieJar::KeepPolicy keepCookies;
+    switch(acceptCombo->currentIndex()) {
+    default:
+    case 0:
+        keepCookies = CookieJar::KeepUntilExpire;
+        break;
+    case 1:
+        keepCookies = CookieJar::KeepUntilExit;
+        break;
+    case 2:
+        keepCookies = CookieJar::KeepUntilTimeLimit;
+        break;
+    }
+    CookieJar *jar = BrowserApplication::cookieJar();
+    QMetaEnum acceptPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("AcceptPolicy"));
+    settings.setValue(QLatin1String("acceptCookies"), QLatin1String(acceptPolicyEnum.valueToKey(keepCookies)));
+
+    CookieJar::KeepPolicy keepPolicy;
+    switch(keepUntilCombo->currentIndex()) {
+        default:
+    case 0:
+        keepPolicy = CookieJar::KeepUntilExpire;
+        break;
+    case 1:
+        keepPolicy = CookieJar::KeepUntilExit;
+        break;
+    case 2:
+        keepPolicy = CookieJar::KeepUntilTimeLimit;
+        break;
+    }
+
+    QMetaEnum keepPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("KeepPolicy"));
+    settings.setValue(QLatin1String("keepCookiesUntil"), QLatin1String(keepPolicyEnum.valueToKey(keepPolicy)));
+
+    settings.endGroup();
+
+    // proxy
+    settings.beginGroup(QLatin1String("proxy"));
+    settings.setValue(QLatin1String("enabled"), proxySupport->isChecked());
+    settings.setValue(QLatin1String("type"), proxyType->currentIndex());
+    settings.setValue(QLatin1String("hostName"), proxyHostName->text());
+    settings.setValue(QLatin1String("port"), proxyPort->text());
+    settings.setValue(QLatin1String("userName"), proxyUserName->text());
+    settings.setValue(QLatin1String("password"), proxyPassword->text());
+    settings.endGroup();
+
+    BrowserApplication::instance()->loadSettings();
+    BrowserApplication::networkAccessManager()->loadSettings();
+    BrowserApplication::cookieJar()->loadSettings();
+    BrowserApplication::historyManager()->loadSettings();
+}
+
+void SettingsDialog::accept()
+{
+    saveToSettings();
+    QDialog::accept();
+}
+
+void SettingsDialog::showCookies()
+{
+    CookiesDialog *dialog = new CookiesDialog(BrowserApplication::cookieJar(), this);
+    dialog->exec();
+}
+
+void SettingsDialog::showExceptions()
+{
+    CookiesExceptionsDialog *dialog = new CookiesExceptionsDialog(BrowserApplication::cookieJar(), this);
+    dialog->exec();
+}
+
+void SettingsDialog::chooseFont()
+{
+    bool ok;
+    QFont font = QFontDialog::getFont(&ok, standardFont, this);
+    if ( ok ) {
+        standardFont = font;
+        standardLabel->setText(QString(QLatin1String("%1 %2")).arg(font.family()).arg(font.pointSize()));
+    }
+}
+
+void SettingsDialog::chooseFixedFont()
+{
+    bool ok;
+    QFont font = QFontDialog::getFont(&ok, fixedFont, this);
+    if ( ok ) {
+        fixedFont = font;
+        fixedLabel->setText(QString(QLatin1String("%1 %2")).arg(font.family()).arg(font.pointSize()));
+    }
+}
+
+void SettingsDialog::setHomeToCurrentPage()
+{
+    BrowserMainWindow *mw = static_cast<BrowserMainWindow*>(parent());
+    WebView *webView = mw->currentTab();
+    if (webView)
+        homeLineEdit->setText(webView->url().toString());
+}
+
diff --git a/demos/browser/settings.h b/demos/browser/settings.h
new file mode 100644
index 0000000..a7a0a35
--- /dev/null
+++ b/demos/browser/settings.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include <QtGui/QDialog>
+#include "ui_settings.h"
+
+class SettingsDialog : public QDialog, public Ui_Settings
+{
+    Q_OBJECT
+
+public:
+    SettingsDialog(QWidget *parent = 0);
+    void accept();
+
+private slots:
+    void loadDefaults();
+    void loadFromSettings();
+    void saveToSettings();
+
+    void setHomeToCurrentPage();
+    void showCookies();
+    void showExceptions();
+
+    void chooseFont();
+    void chooseFixedFont();
+
+private:
+    QFont standardFont;
+    QFont fixedFont;
+};
+
+#endif // SETTINGS_H
+
diff --git a/demos/browser/settings.ui b/demos/browser/settings.ui
new file mode 100644
index 0000000..3491ce0
--- /dev/null
+++ b/demos/browser/settings.ui
@@ -0,0 +1,614 @@
+<ui version="4.0" >
+ <class>Settings</class>
+ <widget class="QDialog" name="Settings" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>657</width>
+    <height>322</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Settings</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="2" column="0" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QTabWidget" name="tabWidget" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>627</width>
+        <height>243</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>General</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_4" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_3" >
+         <property name="text" >
+          <string>Home:</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" colspan="2" >
+        <widget class="QLineEdit" name="homeLineEdit" />
+       </item>
+       <item row="1" column="1" >
+        <widget class="QPushButton" name="setHomeToCurrentPageButton" >
+         <property name="text" >
+          <string>Set to current page</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2" >
+        <spacer name="horizontalSpacer" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>280</width>
+           <height>18</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="label_4" >
+         <property name="text" >
+          <string>Remove history items:</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" colspan="2" >
+        <widget class="QComboBox" name="expireHistory" >
+         <item>
+          <property name="text" >
+           <string>After one day</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>After one week</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>After two weeks</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>After one month</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>After one year</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Manually</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="3" column="0" >
+        <widget class="QLabel" name="label_7" >
+         <property name="text" >
+          <string>Save downloads to:</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1" colspan="2" >
+        <widget class="QLineEdit" name="downloadsLocation" />
+       </item>
+       <item row="4" column="0" >
+        <widget class="QLabel" name="label_8" >
+         <property name="text" >
+          <string>Open links from applications:</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1" colspan="2" >
+        <widget class="QComboBox" name="openLinksIn" >
+         <item>
+          <property name="text" >
+           <string>In a tab in the current window</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>In a new window</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="5" column="1" colspan="2" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>391</width>
+           <height>262</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_3" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>627</width>
+        <height>243</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Appearance</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_3" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_5" >
+         <property name="text" >
+          <string>Standard font:</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLabel" name="standardLabel" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="frameShape" >
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="text" >
+          <string>Times 16</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="2" >
+        <widget class="QPushButton" name="standardFontButton" >
+         <property name="text" >
+          <string>Select...</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="label_6" >
+         <property name="text" >
+          <string>Fixed-width font:</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QLabel" name="fixedLabel" >
+         <property name="frameShape" >
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="text" >
+          <string>Courier 13</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2" >
+        <widget class="QPushButton" name="fixedFontButton" >
+         <property name="text" >
+          <string>Select...</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" >
+        <spacer name="verticalSpacer" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>20</width>
+           <height>93</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>627</width>
+        <height>243</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Privacy</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3" >
+       <item>
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="title" >
+          <string>Web Content</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2" >
+          <item>
+           <widget class="QCheckBox" name="enablePlugins" >
+            <property name="text" >
+             <string>Enable Plugins</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="enableJavascript" >
+            <property name="text" >
+             <string>Enable Javascript</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="cookiesGroupBox" >
+         <property name="title" >
+          <string>Cookies</string>
+         </property>
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label_2" >
+            <property name="text" >
+             <string>Accept Cookies:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QComboBox" name="acceptCombo" >
+            <item>
+             <property name="text" >
+              <string>Always</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Never</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Only from sites you navigate to</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="0" column="2" >
+           <widget class="QPushButton" name="exceptionsButton" >
+            <property name="text" >
+             <string>Exceptions...</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label" >
+            <property name="text" >
+             <string>Keep until:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QComboBox" name="keepUntilCombo" >
+            <item>
+             <property name="text" >
+              <string>They expire</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>I exit the application</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>At most 90 days</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="2" >
+           <widget class="QPushButton" name="cookiesButton" >
+            <property name="text" >
+             <string>Cookies...</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>371</width>
+           <height>177</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_4" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>627</width>
+        <height>243</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Proxy</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout" >
+       <item>
+        <widget class="QGroupBox" name="proxySupport" >
+         <property name="title" >
+          <string>Enable proxy</string>
+         </property>
+         <property name="checkable" >
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_6" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label_9" >
+            <property name="text" >
+             <string>Type:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" colspan="2" >
+           <widget class="QComboBox" name="proxyType" >
+            <item>
+             <property name="text" >
+              <string>Socks5</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Http</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label_10" >
+            <property name="text" >
+             <string>Host:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" colspan="2" >
+           <widget class="QLineEdit" name="proxyHostName" />
+          </item>
+          <item row="2" column="0" >
+           <widget class="QLabel" name="label_11" >
+            <property name="text" >
+             <string>Port:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1" >
+           <widget class="QSpinBox" name="proxyPort" >
+            <property name="maximum" >
+             <number>10000</number>
+            </property>
+            <property name="value" >
+             <number>1080</number>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2" >
+           <spacer name="horizontalSpacer_2" >
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>293</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="3" column="0" >
+           <widget class="QLabel" name="label_12" >
+            <property name="text" >
+             <string>User Name:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1" colspan="2" >
+           <widget class="QLineEdit" name="proxyUserName" />
+          </item>
+          <item row="4" column="0" >
+           <widget class="QLabel" name="label_13" >
+            <property name="text" >
+             <string>Password:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1" colspan="2" >
+           <widget class="QLineEdit" name="proxyPassword" >
+            <property name="echoMode" >
+             <enum>QLineEdit::Password</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0" >
+           <spacer name="verticalSpacer_2" >
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>20</width>
+              <height>8</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_5" >
+      <attribute name="title" >
+       <string>Advanced</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_14" >
+         <property name="text" >
+          <string>Style Sheet:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLineEdit" name="userStyleSheet" />
+       </item>
+       <item row="1" column="1" >
+        <spacer name="verticalSpacer_3" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>20</width>
+           <height>176</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Settings</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Settings</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/squeezelabel.cpp b/demos/browser/squeezelabel.cpp
new file mode 100644
index 0000000..3209e16
--- /dev/null
+++ b/demos/browser/squeezelabel.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "squeezelabel.h"
+
+SqueezeLabel::SqueezeLabel(QWidget *parent) : QLabel(parent)
+{
+}
+
+void SqueezeLabel::paintEvent(QPaintEvent *event)
+{
+    QFontMetrics fm = fontMetrics();
+    if (fm.width(text()) > contentsRect().width()) {
+        QString elided = fm.elidedText(text(), Qt::ElideMiddle, width());
+        QString oldText = text();
+        setText(elided);
+        QLabel::paintEvent(event);
+        setText(oldText);
+    } else {
+        QLabel::paintEvent(event);
+    }
+}
+
diff --git a/demos/browser/squeezelabel.h b/demos/browser/squeezelabel.h
new file mode 100644
index 0000000..2f82240
--- /dev/null
+++ b/demos/browser/squeezelabel.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SQUEEZELABEL_H
+#define SQUEEZELABEL_H
+
+#include <QtGui/QLabel>
+
+class SqueezeLabel : public QLabel
+{
+    Q_OBJECT
+
+public:
+    SqueezeLabel(QWidget *parent = 0);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+};
+
+#endif // SQUEEZELABEL_H
+
diff --git a/demos/browser/tabwidget.cpp b/demos/browser/tabwidget.cpp
new file mode 100644
index 0000000..7a2ee40
--- /dev/null
+++ b/demos/browser/tabwidget.cpp
@@ -0,0 +1,830 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "tabwidget.h"
+
+#include "browserapplication.h"
+#include "browsermainwindow.h"
+#include "history.h"
+#include "urllineedit.h"
+#include "webview.h"
+
+#include <QtGui/QClipboard>
+#include <QtGui/QCompleter>
+#include <QtGui/QListView>
+#include <QtGui/QMenu>
+#include <QtGui/QMessageBox>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QStackedWidget>
+#include <QtGui/QStyle>
+#include <QtGui/QToolButton>
+
+#include <QtCore/QDebug>
+
+TabBar::TabBar(QWidget *parent)
+    : QTabBar(parent)
+{
+    setContextMenuPolicy(Qt::CustomContextMenu);
+    setAcceptDrops(true);
+    connect(this, SIGNAL(customContextMenuRequested(const QPoint &)),
+            this, SLOT(contextMenuRequested(const QPoint &)));
+
+    QString alt = QLatin1String("Alt+%1");
+    for (int i = 1; i <= 10; ++i) {
+        int key = i;
+        if (key == 10)
+            key = 0;
+        QShortcut *shortCut = new QShortcut(alt.arg(key), this);
+        m_tabShortcuts.append(shortCut);
+        connect(shortCut, SIGNAL(activated()), this, SLOT(selectTabAction()));
+    }
+    setTabsClosable(true);
+    connect(this, SIGNAL(tabCloseRequested(int)),
+            this, SIGNAL(closeTab(int)));
+    setSelectionBehaviorOnRemove(QTabBar::SelectPreviousTab);
+    setMovable(true);
+}
+
+void TabBar::selectTabAction()
+{
+    if (QShortcut *shortCut = qobject_cast<QShortcut*>(sender())) {
+        int index = m_tabShortcuts.indexOf(shortCut);
+        if (index == 0)
+            index = 10;
+        setCurrentIndex(index);
+    }
+}
+
+void TabBar::contextMenuRequested(const QPoint &position)
+{
+    QMenu menu;
+    menu.addAction(tr("New &Tab"), this, SIGNAL(newTab()), QKeySequence::AddTab);
+    int index = tabAt(position);
+    if (-1 != index) {
+        QAction *action = menu.addAction(tr("Clone Tab"),
+                this, SLOT(cloneTab()));
+        action->setData(index);
+
+        menu.addSeparator();
+
+        action = menu.addAction(tr("&Close Tab"),
+                this, SLOT(closeTab()), QKeySequence::Close);
+        action->setData(index);
+
+        action = menu.addAction(tr("Close &Other Tabs"),
+                this, SLOT(closeOtherTabs()));
+        action->setData(index);
+
+        menu.addSeparator();
+
+        action = menu.addAction(tr("Reload Tab"),
+                this, SLOT(reloadTab()), QKeySequence::Refresh);
+        action->setData(index);
+    } else {
+        menu.addSeparator();
+    }
+    menu.addAction(tr("Reload All Tabs"), this, SIGNAL(reloadAllTabs()));
+    menu.exec(QCursor::pos());
+}
+
+void TabBar::cloneTab()
+{
+    if (QAction *action = qobject_cast<QAction*>(sender())) {
+        int index = action->data().toInt();
+        emit cloneTab(index);
+    }
+}
+
+void TabBar::closeTab()
+{
+    if (QAction *action = qobject_cast<QAction*>(sender())) {
+        int index = action->data().toInt();
+        emit closeTab(index);
+    }
+}
+
+void TabBar::closeOtherTabs()
+{
+    if (QAction *action = qobject_cast<QAction*>(sender())) {
+        int index = action->data().toInt();
+        emit closeOtherTabs(index);
+    }
+}
+
+void TabBar::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+        m_dragStartPos = event->pos();
+    QTabBar::mousePressEvent(event);
+}
+
+void TabBar::mouseMoveEvent(QMouseEvent *event)
+{
+    if (event->buttons() == Qt::LeftButton) {
+        int diffX = event->pos().x() - m_dragStartPos.x();
+        int diffY = event->pos().y() - m_dragStartPos.y();
+        if ((event->pos() - m_dragStartPos).manhattanLength() > QApplication::startDragDistance()
+            && diffX < 3 && diffX > -3
+            && diffY < -10) {
+            QDrag *drag = new QDrag(this);
+            QMimeData *mimeData = new QMimeData;
+            QList<QUrl> urls;
+            int index = tabAt(event->pos());
+            QUrl url = tabData(index).toUrl();
+            urls.append(url);
+            mimeData->setUrls(urls);
+            mimeData->setText(tabText(index));
+            mimeData->setData(QLatin1String("action"), "tab-reordering");
+            drag->setMimeData(mimeData);
+            drag->exec();
+        }
+    }
+    QTabBar::mouseMoveEvent(event);
+}
+
+// When index is -1 index chooses the current tab
+void TabWidget::reloadTab(int index)
+{
+    if (index < 0)
+        index = currentIndex();
+    if (index < 0 || index >= count())
+        return;
+
+    QWidget *widget = this->widget(index);
+    if (WebView *tab = qobject_cast<WebView*>(widget))
+        tab->reload();
+}
+
+void TabBar::reloadTab()
+{
+    if (QAction *action = qobject_cast<QAction*>(sender())) {
+        int index = action->data().toInt();
+        emit reloadTab(index);
+    }
+}
+
+TabWidget::TabWidget(QWidget *parent)
+    : QTabWidget(parent)
+    , m_recentlyClosedTabsAction(0)
+    , m_newTabAction(0)
+    , m_closeTabAction(0)
+    , m_nextTabAction(0)
+    , m_previousTabAction(0)
+    , m_recentlyClosedTabsMenu(0)
+    , m_lineEditCompleter(0)
+    , m_lineEdits(0)
+    , m_tabBar(new TabBar(this))
+{
+    setElideMode(Qt::ElideRight);
+
+    connect(m_tabBar, SIGNAL(newTab()), this, SLOT(newTab()));
+    connect(m_tabBar, SIGNAL(closeTab(int)), this, SLOT(closeTab(int)));
+    connect(m_tabBar, SIGNAL(cloneTab(int)), this, SLOT(cloneTab(int)));
+    connect(m_tabBar, SIGNAL(closeOtherTabs(int)), this, SLOT(closeOtherTabs(int)));
+    connect(m_tabBar, SIGNAL(reloadTab(int)), this, SLOT(reloadTab(int)));
+    connect(m_tabBar, SIGNAL(reloadAllTabs()), this, SLOT(reloadAllTabs()));
+    connect(m_tabBar, SIGNAL(tabMoved(int, int)), this, SLOT(moveTab(int, int)));
+    setTabBar(m_tabBar);
+    setDocumentMode(true);
+
+    // Actions
+    m_newTabAction = new QAction(QIcon(QLatin1String(":addtab.png")), tr("New &Tab"), this);
+    m_newTabAction->setShortcuts(QKeySequence::AddTab);
+    m_newTabAction->setIconVisibleInMenu(false);
+    connect(m_newTabAction, SIGNAL(triggered()), this, SLOT(newTab()));
+
+    m_closeTabAction = new QAction(QIcon(QLatin1String(":closetab.png")), tr("&Close Tab"), this);
+    m_closeTabAction->setShortcuts(QKeySequence::Close);
+    m_closeTabAction->setIconVisibleInMenu(false);
+    connect(m_closeTabAction, SIGNAL(triggered()), this, SLOT(closeTab()));
+
+    m_nextTabAction = new QAction(tr("Show Next Tab"), this);
+    QList<QKeySequence> shortcuts;
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_BraceRight));
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_PageDown));
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_BracketRight));
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_Less));
+    m_nextTabAction->setShortcuts(shortcuts);
+    connect(m_nextTabAction, SIGNAL(triggered()), this, SLOT(nextTab()));
+
+    m_previousTabAction = new QAction(tr("Show Previous Tab"), this);
+    shortcuts.clear();
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_BraceLeft));
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_PageUp));
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_BracketLeft));
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_Greater));
+    m_previousTabAction->setShortcuts(shortcuts);
+    connect(m_previousTabAction, SIGNAL(triggered()), this, SLOT(previousTab()));
+
+    m_recentlyClosedTabsMenu = new QMenu(this);
+    connect(m_recentlyClosedTabsMenu, SIGNAL(aboutToShow()),
+            this, SLOT(aboutToShowRecentTabsMenu()));
+    connect(m_recentlyClosedTabsMenu, SIGNAL(triggered(QAction *)),
+            this, SLOT(aboutToShowRecentTriggeredAction(QAction *)));
+    m_recentlyClosedTabsAction = new QAction(tr("Recently Closed Tabs"), this);
+    m_recentlyClosedTabsAction->setMenu(m_recentlyClosedTabsMenu);
+    m_recentlyClosedTabsAction->setEnabled(false);
+
+    connect(this, SIGNAL(currentChanged(int)),
+            this, SLOT(currentChanged(int)));
+
+    m_lineEdits = new QStackedWidget(this);
+}
+
+void TabWidget::clear()
+{
+    // clear the recently closed tabs
+    m_recentlyClosedTabs.clear();
+    // clear the line edit history
+    for (int i = 0; i < m_lineEdits->count(); ++i) {
+        QLineEdit *qLineEdit = lineEdit(i);
+        qLineEdit->setText(qLineEdit->text());
+    }
+}
+
+void TabWidget::moveTab(int fromIndex, int toIndex)
+{
+    QWidget *lineEdit = m_lineEdits->widget(fromIndex);
+    m_lineEdits->removeWidget(lineEdit);
+    m_lineEdits->insertWidget(toIndex, lineEdit);
+}
+
+void TabWidget::addWebAction(QAction *action, QWebPage::WebAction webAction)
+{
+    if (!action)
+        return;
+    m_actions.append(new WebActionMapper(action, webAction, this));
+}
+
+void TabWidget::currentChanged(int index)
+{
+    WebView *webView = this->webView(index);
+    if (!webView)
+        return;
+
+    Q_ASSERT(m_lineEdits->count() == count());
+
+    WebView *oldWebView = this->webView(m_lineEdits->currentIndex());
+    if (oldWebView) {
+        disconnect(oldWebView, SIGNAL(statusBarMessage(const QString&)),
+                this, SIGNAL(showStatusBarMessage(const QString&)));
+        disconnect(oldWebView->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
+                this, SIGNAL(linkHovered(const QString&)));
+        disconnect(oldWebView, SIGNAL(loadProgress(int)),
+                this, SIGNAL(loadProgress(int)));
+    }
+
+    connect(webView, SIGNAL(statusBarMessage(const QString&)),
+            this, SIGNAL(showStatusBarMessage(const QString&)));
+    connect(webView->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
+            this, SIGNAL(linkHovered(const QString&)));
+    connect(webView, SIGNAL(loadProgress(int)),
+            this, SIGNAL(loadProgress(int)));
+
+    for (int i = 0; i < m_actions.count(); ++i) {
+        WebActionMapper *mapper = m_actions[i];
+        mapper->updateCurrent(webView->page());
+    }
+    emit setCurrentTitle(webView->title());
+    m_lineEdits->setCurrentIndex(index);
+    emit loadProgress(webView->progress());
+    emit showStatusBarMessage(webView->lastStatusBarText());
+    if (webView->url().isEmpty())
+        m_lineEdits->currentWidget()->setFocus();
+    else
+        webView->setFocus();
+}
+
+QAction *TabWidget::newTabAction() const
+{
+    return m_newTabAction;
+}
+
+QAction *TabWidget::closeTabAction() const
+{
+    return m_closeTabAction;
+}
+
+QAction *TabWidget::recentlyClosedTabsAction() const
+{
+    return m_recentlyClosedTabsAction;
+}
+
+QAction *TabWidget::nextTabAction() const
+{
+    return m_nextTabAction;
+}
+
+QAction *TabWidget::previousTabAction() const
+{
+    return m_previousTabAction;
+}
+
+QWidget *TabWidget::lineEditStack() const
+{
+    return m_lineEdits;
+}
+
+QLineEdit *TabWidget::currentLineEdit() const
+{
+    return lineEdit(m_lineEdits->currentIndex());
+}
+
+WebView *TabWidget::currentWebView() const
+{
+    return webView(currentIndex());
+}
+
+QLineEdit *TabWidget::lineEdit(int index) const
+{
+    UrlLineEdit *urlLineEdit = qobject_cast<UrlLineEdit*>(m_lineEdits->widget(index));
+    if (urlLineEdit)
+        return urlLineEdit->lineEdit();
+    return 0;
+}
+
+WebView *TabWidget::webView(int index) const
+{
+    QWidget *widget = this->widget(index);
+    if (WebView *webView = qobject_cast<WebView*>(widget)) {
+        return webView;
+    } else {
+        // optimization to delay creating the first webview
+        if (count() == 1) {
+            TabWidget *that = const_cast<TabWidget*>(this);
+            that->setUpdatesEnabled(false);
+            that->newTab();
+            that->closeTab(0);
+            that->setUpdatesEnabled(true);
+            return currentWebView();
+        }
+    }
+    return 0;
+}
+
+int TabWidget::webViewIndex(WebView *webView) const
+{
+    int index = indexOf(webView);
+    return index;
+}
+
+WebView *TabWidget::newTab(bool makeCurrent)
+{
+    // line edit
+    UrlLineEdit *urlLineEdit = new UrlLineEdit;
+    QLineEdit *lineEdit = urlLineEdit->lineEdit();
+    if (!m_lineEditCompleter && count() > 0) {
+        HistoryCompletionModel *completionModel = new HistoryCompletionModel(this);
+        completionModel->setSourceModel(BrowserApplication::historyManager()->historyFilterModel());
+        m_lineEditCompleter = new QCompleter(completionModel, this);
+        // Should this be in Qt by default?
+        QAbstractItemView *popup = m_lineEditCompleter->popup();
+        QListView *listView = qobject_cast<QListView*>(popup);
+        if (listView)
+            listView->setUniformItemSizes(true);
+    }
+    lineEdit->setCompleter(m_lineEditCompleter);
+    connect(lineEdit, SIGNAL(returnPressed()), this, SLOT(lineEditReturnPressed()));
+    m_lineEdits->addWidget(urlLineEdit);
+    m_lineEdits->setSizePolicy(lineEdit->sizePolicy());
+
+    // optimization to delay creating the more expensive WebView, history, etc
+    if (count() == 0) {
+        QWidget *emptyWidget = new QWidget;
+        QPalette p = emptyWidget->palette();
+        p.setColor(QPalette::Window, palette().color(QPalette::Base));
+        emptyWidget->setPalette(p);
+        emptyWidget->setAutoFillBackground(true);
+        disconnect(this, SIGNAL(currentChanged(int)),
+            this, SLOT(currentChanged(int)));
+        addTab(emptyWidget, tr("(Untitled)"));
+        connect(this, SIGNAL(currentChanged(int)),
+            this, SLOT(currentChanged(int)));
+        return 0;
+    }
+
+    // webview
+    WebView *webView = new WebView;
+    urlLineEdit->setWebView(webView);
+    connect(webView, SIGNAL(loadStarted()),
+            this, SLOT(webViewLoadStarted()));
+    connect(webView, SIGNAL(loadFinished(bool)),
+            this, SLOT(webViewIconChanged()));
+    connect(webView, SIGNAL(iconChanged()),
+            this, SLOT(webViewIconChanged()));
+    connect(webView, SIGNAL(titleChanged(const QString &)),
+            this, SLOT(webViewTitleChanged(const QString &)));
+    connect(webView, SIGNAL(urlChanged(const QUrl &)),
+            this, SLOT(webViewUrlChanged(const QUrl &)));
+    connect(webView->page(), SIGNAL(windowCloseRequested()),
+            this, SLOT(windowCloseRequested()));
+    connect(webView->page(), SIGNAL(geometryChangeRequested(const QRect &)),
+            this, SIGNAL(geometryChangeRequested(const QRect &)));
+    connect(webView->page(), SIGNAL(printRequested(QWebFrame *)),
+            this, SIGNAL(printRequested(QWebFrame *)));
+    connect(webView->page(), SIGNAL(menuBarVisibilityChangeRequested(bool)),
+            this, SIGNAL(menuBarVisibilityChangeRequested(bool)));
+    connect(webView->page(), SIGNAL(statusBarVisibilityChangeRequested(bool)),
+            this, SIGNAL(statusBarVisibilityChangeRequested(bool)));
+    connect(webView->page(), SIGNAL(toolBarVisibilityChangeRequested(bool)),
+            this, SIGNAL(toolBarVisibilityChangeRequested(bool)));
+    addTab(webView, tr("(Untitled)"));
+    if (makeCurrent)
+        setCurrentWidget(webView);
+
+    // webview actions
+    for (int i = 0; i < m_actions.count(); ++i) {
+        WebActionMapper *mapper = m_actions[i];
+        mapper->addChild(webView->page()->action(mapper->webAction()));
+    }
+
+    if (count() == 1)
+        currentChanged(currentIndex());
+    emit tabsChanged();
+    return webView;
+}
+
+void TabWidget::reloadAllTabs()
+{
+    for (int i = 0; i < count(); ++i) {
+        QWidget *tabWidget = widget(i);
+        if (WebView *tab = qobject_cast<WebView*>(tabWidget)) {
+            tab->reload();
+        }
+    }
+}
+
+void TabWidget::lineEditReturnPressed()
+{
+    if (QLineEdit *lineEdit = qobject_cast<QLineEdit*>(sender())) {
+        emit loadPage(lineEdit->text());
+        if (m_lineEdits->currentWidget() == lineEdit)
+            currentWebView()->setFocus();
+    }
+}
+
+void TabWidget::windowCloseRequested()
+{
+    WebPage *webPage = qobject_cast<WebPage*>(sender());
+    WebView *webView = qobject_cast<WebView*>(webPage->view());
+    int index = webViewIndex(webView);
+    if (index >= 0) {
+        if (count() == 1)
+            webView->webPage()->mainWindow()->close();
+        else
+            closeTab(index);
+    }
+}
+
+void TabWidget::closeOtherTabs(int index)
+{
+    if (-1 == index)
+        return;
+    for (int i = count() - 1; i > index; --i)
+        closeTab(i);
+    for (int i = index - 1; i >= 0; --i)
+        closeTab(i);
+}
+
+// When index is -1 index chooses the current tab
+void TabWidget::cloneTab(int index)
+{
+    if (index < 0)
+        index = currentIndex();
+    if (index < 0 || index >= count())
+        return;
+    WebView *tab = newTab(false);
+    tab->setUrl(webView(index)->url());
+}
+
+// When index is -1 index chooses the current tab
+void TabWidget::closeTab(int index)
+{
+    if (index < 0)
+        index = currentIndex();
+    if (index < 0 || index >= count())
+        return;
+
+    bool hasFocus = false;
+    if (WebView *tab = webView(index)) {
+        if (tab->isModified()) {
+            QMessageBox closeConfirmation(tab);
+            closeConfirmation.setWindowFlags(Qt::Sheet);
+            closeConfirmation.setWindowTitle(tr("Do you really want to close this page?"));
+            closeConfirmation.setInformativeText(tr("You have modified this page and when closing it you would lose the modification.\n"
+                                                     "Do you really want to close this page?\n"));
+            closeConfirmation.setIcon(QMessageBox::Question);
+            closeConfirmation.addButton(QMessageBox::Yes);
+            closeConfirmation.addButton(QMessageBox::No);
+            closeConfirmation.setEscapeButton(QMessageBox::No);
+            if (closeConfirmation.exec() == QMessageBox::No)
+                return;
+        }
+        hasFocus = tab->hasFocus();
+
+        m_recentlyClosedTabsAction->setEnabled(true);
+        m_recentlyClosedTabs.prepend(tab->url());
+        if (m_recentlyClosedTabs.size() >= TabWidget::m_recentlyClosedTabsSize)
+            m_recentlyClosedTabs.removeLast();
+    }
+    QWidget *lineEdit = m_lineEdits->widget(index);
+    m_lineEdits->removeWidget(lineEdit);
+    lineEdit->deleteLater();
+    QWidget *webView = widget(index);
+    removeTab(index);
+    webView->deleteLater();
+    emit tabsChanged();
+    if (hasFocus && count() > 0)
+        currentWebView()->setFocus();
+    if (count() == 0)
+        emit lastTabClosed();
+}
+
+void TabWidget::webViewLoadStarted()
+{
+    WebView *webView = qobject_cast<WebView*>(sender());
+    int index = webViewIndex(webView);
+    if (-1 != index) {
+        QIcon icon(QLatin1String(":loading.gif"));
+        setTabIcon(index, icon);
+    }
+}
+
+void TabWidget::webViewIconChanged()
+{
+    WebView *webView = qobject_cast<WebView*>(sender());
+    int index = webViewIndex(webView);
+    if (-1 != index) {
+        QIcon icon = BrowserApplication::instance()->icon(webView->url());
+        setTabIcon(index, icon);
+    }
+}
+
+void TabWidget::webViewTitleChanged(const QString &title)
+{
+    WebView *webView = qobject_cast<WebView*>(sender());
+    int index = webViewIndex(webView);
+    if (-1 != index) {
+        setTabText(index, title);
+    }
+    if (currentIndex() == index)
+        emit setCurrentTitle(title);
+    BrowserApplication::historyManager()->updateHistoryItem(webView->url(), title);
+}
+
+void TabWidget::webViewUrlChanged(const QUrl &url)
+{
+    WebView *webView = qobject_cast<WebView*>(sender());
+    int index = webViewIndex(webView);
+    if (-1 != index) {
+        m_tabBar->setTabData(index, url);
+    }
+    emit tabsChanged();
+}
+
+void TabWidget::aboutToShowRecentTabsMenu()
+{
+    m_recentlyClosedTabsMenu->clear();
+    for (int i = 0; i < m_recentlyClosedTabs.count(); ++i) {
+        QAction *action = new QAction(m_recentlyClosedTabsMenu);
+        action->setData(m_recentlyClosedTabs.at(i));
+        QIcon icon = BrowserApplication::instance()->icon(m_recentlyClosedTabs.at(i));
+        action->setIcon(icon);
+        action->setText(m_recentlyClosedTabs.at(i).toString());
+        m_recentlyClosedTabsMenu->addAction(action);
+    }
+}
+
+void TabWidget::aboutToShowRecentTriggeredAction(QAction *action)
+{
+    QUrl url = action->data().toUrl();
+    loadUrlInCurrentTab(url);
+}
+
+void TabWidget::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    if (!childAt(event->pos())
+            // Remove the line below when QTabWidget does not have a one pixel frame
+            && event->pos().y() < (tabBar()->y() + tabBar()->height())) {
+        newTab();
+        return;
+    }
+    QTabWidget::mouseDoubleClickEvent(event);
+}
+
+void TabWidget::contextMenuEvent(QContextMenuEvent *event)
+{
+    if (!childAt(event->pos())) {
+        m_tabBar->contextMenuRequested(event->pos());
+        return;
+    }
+    QTabWidget::contextMenuEvent(event);
+}
+
+void TabWidget::mouseReleaseEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::MidButton && !childAt(event->pos())
+            // Remove the line below when QTabWidget does not have a one pixel frame
+            && event->pos().y() < (tabBar()->y() + tabBar()->height())) {
+        QUrl url(QApplication::clipboard()->text(QClipboard::Selection));
+        if (!url.isEmpty() && url.isValid() && !url.scheme().isEmpty()) {
+            WebView *webView = newTab();
+            webView->setUrl(url);
+        }
+    }
+}
+
+void TabWidget::loadUrlInCurrentTab(const QUrl &url)
+{
+    WebView *webView = currentWebView();
+    if (webView) {
+        webView->loadUrl(url);
+        webView->setFocus();
+    }
+}
+
+void TabWidget::nextTab()
+{
+    int next = currentIndex() + 1;
+    if (next == count())
+        next = 0;
+    setCurrentIndex(next);
+}
+
+void TabWidget::previousTab()
+{
+    int next = currentIndex() - 1;
+    if (next < 0)
+        next = count() - 1;
+    setCurrentIndex(next);
+}
+
+static const qint32 TabWidgetMagic = 0xaa;
+
+QByteArray TabWidget::saveState() const
+{
+    int version = 1;
+    QByteArray data;
+    QDataStream stream(&data, QIODevice::WriteOnly);
+
+    stream << qint32(TabWidgetMagic);
+    stream << qint32(version);
+
+    QStringList tabs;
+    for (int i = 0; i < count(); ++i) {
+        if (WebView *tab = qobject_cast<WebView*>(widget(i))) {
+            tabs.append(tab->url().toString());
+        } else {
+            tabs.append(QString::null);
+        }
+    }
+    stream << tabs;
+    stream << currentIndex();
+    return data;
+}
+
+bool TabWidget::restoreState(const QByteArray &state)
+{
+    int version = 1;
+    QByteArray sd = state;
+    QDataStream stream(&sd, QIODevice::ReadOnly);
+    if (stream.atEnd())
+        return false;
+
+    qint32 marker;
+    qint32 v;
+    stream >> marker;
+    stream >> v;
+    if (marker != TabWidgetMagic || v != version)
+        return false;
+
+    QStringList openTabs;
+    stream >> openTabs;
+
+    for (int i = 0; i < openTabs.count(); ++i) {
+        if (i != 0)
+            newTab();
+        loadPage(openTabs.at(i));
+    }
+
+    int currentTab;
+    stream >> currentTab;
+    setCurrentIndex(currentTab);
+
+    return true;
+}
+
+WebActionMapper::WebActionMapper(QAction *root, QWebPage::WebAction webAction, QObject *parent)
+    : QObject(parent)
+    , m_currentParent(0)
+    , m_root(root)
+    , m_webAction(webAction)
+{
+    if (!m_root)
+        return;
+    connect(m_root, SIGNAL(triggered()), this, SLOT(rootTriggered()));
+    connect(root, SIGNAL(destroyed(QObject *)), this, SLOT(rootDestroyed()));
+    root->setEnabled(false);
+}
+
+void WebActionMapper::rootDestroyed()
+{
+    m_root = 0;
+}
+
+void WebActionMapper::currentDestroyed()
+{
+    updateCurrent(0);
+}
+
+void WebActionMapper::addChild(QAction *action)
+{
+    if (!action)
+        return;
+    connect(action, SIGNAL(changed()), this, SLOT(childChanged()));
+}
+
+QWebPage::WebAction WebActionMapper::webAction() const
+{
+    return m_webAction;
+}
+
+void WebActionMapper::rootTriggered()
+{
+    if (m_currentParent) {
+        QAction *gotoAction = m_currentParent->action(m_webAction);
+        gotoAction->trigger();
+    }
+}
+
+void WebActionMapper::childChanged()
+{
+    if (QAction *source = qobject_cast<QAction*>(sender())) {
+        if (m_root
+            && m_currentParent
+            && source->parent() == m_currentParent) {
+            m_root->setChecked(source->isChecked());
+            m_root->setEnabled(source->isEnabled());
+        }
+    }
+}
+
+void WebActionMapper::updateCurrent(QWebPage *currentParent)
+{
+    if (m_currentParent)
+        disconnect(m_currentParent, SIGNAL(destroyed(QObject *)),
+                   this, SLOT(currentDestroyed()));
+
+    m_currentParent = currentParent;
+    if (!m_root)
+        return;
+    if (!m_currentParent) {
+        m_root->setEnabled(false);
+        m_root->setChecked(false);
+        return;
+    }
+    QAction *source = m_currentParent->action(m_webAction);
+    m_root->setChecked(source->isChecked());
+    m_root->setEnabled(source->isEnabled());
+    connect(m_currentParent, SIGNAL(destroyed(QObject *)),
+            this, SLOT(currentDestroyed()));
+}
+
diff --git a/demos/browser/tabwidget.h b/demos/browser/tabwidget.h
new file mode 100644
index 0000000..da3fe42
--- /dev/null
+++ b/demos/browser/tabwidget.h
@@ -0,0 +1,224 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TABWIDGET_H
+#define TABWIDGET_H
+
+#include <QtGui/QTabBar>
+
+#include <QtGui/QShortcut>
+/*
+    Tab bar with a few more features such as a context menu and shortcuts
+ */
+class TabBar : public QTabBar
+{
+    Q_OBJECT
+
+signals:
+    void newTab();
+    void cloneTab(int index);
+    void closeTab(int index);
+    void closeOtherTabs(int index);
+    void reloadTab(int index);
+    void reloadAllTabs();
+    void tabMoveRequested(int fromIndex, int toIndex);
+
+public:
+    TabBar(QWidget *parent = 0);
+
+protected:
+    void mousePressEvent(QMouseEvent* event);
+    void mouseMoveEvent(QMouseEvent* event);
+
+private slots:
+    void selectTabAction();
+    void cloneTab();
+    void closeTab();
+    void closeOtherTabs();
+    void reloadTab();
+    void contextMenuRequested(const QPoint &position);
+
+private:
+    QList<QShortcut*> m_tabShortcuts;
+    friend class TabWidget;
+
+    QPoint m_dragStartPos;
+    int m_dragCurrentIndex;
+};
+
+#include <QtWebKit/QWebPage>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+QT_END_NAMESPACE
+class WebView;
+/*!
+    A proxy object that connects a single browser action
+    to one child webpage action at a time.
+
+    Example usage: used to keep the main window stop action in sync with
+    the current tabs webview's stop action.
+ */
+class WebActionMapper : public QObject
+{
+    Q_OBJECT
+
+public:
+    WebActionMapper(QAction *root, QWebPage::WebAction webAction, QObject *parent);
+    QWebPage::WebAction webAction() const;
+    void addChild(QAction *action);
+    void updateCurrent(QWebPage *currentParent);
+
+private slots:
+    void rootTriggered();
+    void childChanged();
+    void rootDestroyed();
+    void currentDestroyed();
+
+private:
+    QWebPage *m_currentParent;
+    QAction *m_root;
+    QWebPage::WebAction m_webAction;
+};
+
+#include <QtCore/QUrl>
+#include <QtGui/QTabWidget>
+QT_BEGIN_NAMESPACE
+class QCompleter;
+class QLineEdit;
+class QMenu;
+class QStackedWidget;
+QT_END_NAMESPACE
+/*!
+    TabWidget that contains WebViews and a stack widget of associated line edits.
+
+    Connects up the current tab's signals to this class's signal and uses WebActionMapper
+    to proxy the actions.
+ */
+class TabWidget : public QTabWidget
+{
+    Q_OBJECT
+
+signals:
+    // tab widget signals
+    void loadPage(const QString &url);
+    void tabsChanged();
+    void lastTabClosed();
+
+    // current tab signals
+    void setCurrentTitle(const QString &url);
+    void showStatusBarMessage(const QString &message);
+    void linkHovered(const QString &link);
+    void loadProgress(int progress);
+    void geometryChangeRequested(const QRect &geometry);
+    void menuBarVisibilityChangeRequested(bool visible);
+    void statusBarVisibilityChangeRequested(bool visible);
+    void toolBarVisibilityChangeRequested(bool visible);
+    void printRequested(QWebFrame *frame);
+
+public:
+    TabWidget(QWidget *parent = 0);
+    void clear();
+    void addWebAction(QAction *action, QWebPage::WebAction webAction);
+
+    QAction *newTabAction() const;
+    QAction *closeTabAction() const;
+    QAction *recentlyClosedTabsAction() const;
+    QAction *nextTabAction() const;
+    QAction *previousTabAction() const;
+
+    QWidget *lineEditStack() const;
+    QLineEdit *currentLineEdit() const;
+    WebView *currentWebView() const;
+    WebView *webView(int index) const;
+    QLineEdit *lineEdit(int index) const;
+    int webViewIndex(WebView *webView) const;
+
+    QByteArray saveState() const;
+    bool restoreState(const QByteArray &state);
+
+protected:
+    void mouseDoubleClickEvent(QMouseEvent *event);
+    void contextMenuEvent(QContextMenuEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+
+public slots:
+    void loadUrlInCurrentTab(const QUrl &url);
+    WebView *newTab(bool makeCurrent = true);
+    void cloneTab(int index = -1);
+    void closeTab(int index = -1);
+    void closeOtherTabs(int index);
+    void reloadTab(int index = -1);
+    void reloadAllTabs();
+    void nextTab();
+    void previousTab();
+
+private slots:
+    void currentChanged(int index);
+    void aboutToShowRecentTabsMenu();
+    void aboutToShowRecentTriggeredAction(QAction *action);
+    void webViewLoadStarted();
+    void webViewIconChanged();
+    void webViewTitleChanged(const QString &title);
+    void webViewUrlChanged(const QUrl &url);
+    void lineEditReturnPressed();
+    void windowCloseRequested();
+    void moveTab(int fromIndex, int toIndex);
+
+private:
+    QAction *m_recentlyClosedTabsAction;
+    QAction *m_newTabAction;
+    QAction *m_closeTabAction;
+    QAction *m_nextTabAction;
+    QAction *m_previousTabAction;
+
+    QMenu *m_recentlyClosedTabsMenu;
+    static const int m_recentlyClosedTabsSize = 10;
+    QList<QUrl> m_recentlyClosedTabs;
+    QList<WebActionMapper*> m_actions;
+
+    QCompleter *m_lineEditCompleter;
+    QStackedWidget *m_lineEdits;
+    TabBar *m_tabBar;
+};
+
+#endif // TABWIDGET_H
+
diff --git a/demos/browser/toolbarsearch.cpp b/demos/browser/toolbarsearch.cpp
new file mode 100644
index 0000000..255b5e9
--- /dev/null
+++ b/demos/browser/toolbarsearch.cpp
@@ -0,0 +1,161 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "toolbarsearch.h"
+#include "autosaver.h"
+
+#include <QtCore/QSettings>
+#include <QtCore/QUrl>
+
+#include <QtGui/QCompleter>
+#include <QtGui/QMenu>
+#include <QtGui/QStringListModel>
+
+#include <QtWebKit/QWebSettings>
+
+/*
+    ToolbarSearch is a very basic search widget that also contains a small history.
+    Searches are turned into urls that use Google to perform search
+ */
+ToolbarSearch::ToolbarSearch(QWidget *parent)
+    : SearchLineEdit(parent)
+    , m_autosaver(new AutoSaver(this))
+    , m_maxSavedSearches(10)
+    , m_stringListModel(new QStringListModel(this))
+{
+    QMenu *m = menu();
+    connect(m, SIGNAL(aboutToShow()), this, SLOT(aboutToShowMenu()));
+    connect(m, SIGNAL(triggered(QAction*)), this, SLOT(triggeredMenuAction(QAction*)));
+
+    QCompleter *completer = new QCompleter(m_stringListModel, this);
+    completer->setCompletionMode(QCompleter::InlineCompletion);
+    lineEdit()->setCompleter(completer);
+
+    connect(lineEdit(), SIGNAL(returnPressed()), SLOT(searchNow()));
+    setInactiveText(tr("Google"));
+    load();
+}
+
+ToolbarSearch::~ToolbarSearch()
+{
+    m_autosaver->saveIfNeccessary();
+}
+
+void ToolbarSearch::save()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("toolbarsearch"));
+    settings.setValue(QLatin1String("recentSearches"), m_stringListModel->stringList());
+    settings.setValue(QLatin1String("maximumSaved"), m_maxSavedSearches);
+    settings.endGroup();
+}
+
+void ToolbarSearch::load()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("toolbarsearch"));
+    QStringList list = settings.value(QLatin1String("recentSearches")).toStringList();
+    m_maxSavedSearches = settings.value(QLatin1String("maximumSaved"), m_maxSavedSearches).toInt();
+    m_stringListModel->setStringList(list);
+    settings.endGroup();
+}
+
+void ToolbarSearch::searchNow()
+{
+    QString searchText = lineEdit()->text();
+    QStringList newList = m_stringListModel->stringList();
+    if (newList.contains(searchText))
+        newList.removeAt(newList.indexOf(searchText));
+    newList.prepend(searchText);
+    if (newList.size() >= m_maxSavedSearches)
+        newList.removeLast();
+
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (!globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) {
+        m_stringListModel->setStringList(newList);
+        m_autosaver->changeOccurred();
+    }
+
+    QUrl url(QLatin1String("http://www.google.com/search"));
+    url.addQueryItem(QLatin1String("q"), searchText);
+    url.addQueryItem(QLatin1String("ie"), QLatin1String("UTF-8"));
+    url.addQueryItem(QLatin1String("oe"), QLatin1String("UTF-8"));
+    url.addQueryItem(QLatin1String("client"), QLatin1String("qtdemobrowser"));
+    emit search(url);
+}
+
+void ToolbarSearch::aboutToShowMenu()
+{
+    lineEdit()->selectAll();
+    QMenu *m = menu();
+    m->clear();
+    QStringList list = m_stringListModel->stringList();
+    if (list.isEmpty()) {
+        m->addAction(tr("No Recent Searches"));
+        return;
+    }
+
+    QAction *recent = m->addAction(tr("Recent Searches"));
+    recent->setEnabled(false);
+    for (int i = 0; i < list.count(); ++i) {
+        QString text = list.at(i);
+        m->addAction(text)->setData(text);
+    }
+    m->addSeparator();
+    m->addAction(tr("Clear Recent Searches"), this, SLOT(clear()));
+}
+
+void ToolbarSearch::triggeredMenuAction(QAction *action)
+{
+    QVariant v = action->data();
+    if (v.canConvert<QString>()) {
+        QString text = v.toString();
+        lineEdit()->setText(text);
+        searchNow();
+    }
+}
+
+void ToolbarSearch::clear()
+{
+    m_stringListModel->setStringList(QStringList());
+    m_autosaver->changeOccurred();;
+}
+
diff --git a/demos/browser/toolbarsearch.h b/demos/browser/toolbarsearch.h
new file mode 100644
index 0000000..8e1be8d
--- /dev/null
+++ b/demos/browser/toolbarsearch.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TOOLBARSEARCH_H
+#define TOOLBARSEARCH_H
+
+#include "searchlineedit.h"
+
+QT_BEGIN_NAMESPACE
+class QUrl;
+class QAction;
+class QStringListModel;
+QT_END_NAMESPACE
+
+class AutoSaver;
+
+class ToolbarSearch : public SearchLineEdit
+{
+    Q_OBJECT
+
+signals:
+    void search(const QUrl &url);
+
+public:
+    ToolbarSearch(QWidget *parent = 0);
+    ~ToolbarSearch();
+
+public slots:
+    void clear();
+    void searchNow();
+
+private slots:
+    void save();
+    void aboutToShowMenu();
+    void triggeredMenuAction(QAction *action);
+
+private:
+    void load();
+
+    AutoSaver *m_autosaver;
+    int m_maxSavedSearches;
+    QStringListModel *m_stringListModel;
+};
+
+#endif // TOOLBARSEARCH_H
+
diff --git a/demos/browser/urllineedit.cpp b/demos/browser/urllineedit.cpp
new file mode 100644
index 0000000..f7a6345
--- /dev/null
+++ b/demos/browser/urllineedit.cpp
@@ -0,0 +1,340 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "urllineedit.h"
+
+#include "browserapplication.h"
+#include "searchlineedit.h"
+#include "webview.h"
+
+#include <QtCore/QEvent>
+
+#include <QtGui/QApplication>
+#include <QtGui/QCompleter>
+#include <QtGui/QFocusEvent>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPainter>
+#include <QtGui/QStyle>
+#include <QtGui/QStyleOptionFrameV2>
+
+#include <QtCore/QDebug>
+
+ExLineEdit::ExLineEdit(QWidget *parent)
+    : QWidget(parent)
+    , m_leftWidget(0)
+    , m_lineEdit(new QLineEdit(this))
+    , m_clearButton(0)
+{
+    setFocusPolicy(m_lineEdit->focusPolicy());
+    setAttribute(Qt::WA_InputMethodEnabled);
+    setSizePolicy(m_lineEdit->sizePolicy());
+    setBackgroundRole(m_lineEdit->backgroundRole());
+    setMouseTracking(true);
+    setAcceptDrops(true);
+    setAttribute(Qt::WA_MacShowFocusRect, true);
+    QPalette p = m_lineEdit->palette();
+    setPalette(p);
+
+    // line edit
+    m_lineEdit->setFrame(false);
+    m_lineEdit->setFocusProxy(this);
+    m_lineEdit->setAttribute(Qt::WA_MacShowFocusRect, false);
+    QPalette clearPalette = m_lineEdit->palette();
+    clearPalette.setBrush(QPalette::Base, QBrush(Qt::transparent));
+    m_lineEdit->setPalette(clearPalette);
+
+    // clearButton
+    m_clearButton = new ClearButton(this);
+    connect(m_clearButton, SIGNAL(clicked()),
+            m_lineEdit, SLOT(clear()));
+    connect(m_lineEdit, SIGNAL(textChanged(const QString&)),
+            m_clearButton, SLOT(textChanged(const QString&)));
+}
+
+void ExLineEdit::setLeftWidget(QWidget *widget)
+{
+    m_leftWidget = widget;
+}
+
+QWidget *ExLineEdit::leftWidget() const
+{
+    return m_leftWidget;
+}
+
+void ExLineEdit::resizeEvent(QResizeEvent *event)
+{
+    Q_ASSERT(m_leftWidget);
+    updateGeometries();
+    QWidget::resizeEvent(event);
+}
+
+void ExLineEdit::updateGeometries()
+{
+    QStyleOptionFrameV2 panel;
+    initStyleOption(&panel);
+    QRect rect = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this);
+
+    int height = rect.height();
+    int width = rect.width();
+
+    int m_leftWidgetHeight = m_leftWidget->height();
+    m_leftWidget->setGeometry(rect.x() + 2,          rect.y() + (height - m_leftWidgetHeight)/2,
+                              m_leftWidget->width(), m_leftWidget->height());
+
+    int clearButtonWidth = this->height();
+    m_lineEdit->setGeometry(m_leftWidget->x() + m_leftWidget->width(),        0,
+                            width - clearButtonWidth - m_leftWidget->width(), this->height());
+
+    m_clearButton->setGeometry(this->width() - clearButtonWidth, 0,
+                               clearButtonWidth, this->height());
+}
+
+void ExLineEdit::initStyleOption(QStyleOptionFrameV2 *option) const
+{
+    option->initFrom(this);
+    option->rect = contentsRect();
+    option->lineWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth, option, this);
+    option->midLineWidth = 0;
+    option->state |= QStyle::State_Sunken;
+    if (m_lineEdit->isReadOnly())
+        option->state |= QStyle::State_ReadOnly;
+#ifdef QT_KEYPAD_NAVIGATION
+    if (hasEditFocus())
+        option->state |= QStyle::State_HasEditFocus;
+#endif
+    option->features = QStyleOptionFrameV2::None;
+}
+
+QSize ExLineEdit::sizeHint() const
+{
+    m_lineEdit->setFrame(true);
+    QSize size = m_lineEdit->sizeHint();
+    m_lineEdit->setFrame(false);
+    return size;
+}
+
+void ExLineEdit::focusInEvent(QFocusEvent *event)
+{
+    m_lineEdit->event(event);
+    QWidget::focusInEvent(event);
+}
+
+void ExLineEdit::focusOutEvent(QFocusEvent *event)
+{
+    m_lineEdit->event(event);
+
+    if (m_lineEdit->completer()) {
+        connect(m_lineEdit->completer(), SIGNAL(activated(QString)),
+                         m_lineEdit, SLOT(setText(QString)));
+        connect(m_lineEdit->completer(), SIGNAL(highlighted(QString)),
+                         m_lineEdit, SLOT(_q_completionHighlighted(QString)));
+    }
+    QWidget::focusOutEvent(event);
+}
+
+void ExLineEdit::keyPressEvent(QKeyEvent *event)
+{
+    m_lineEdit->event(event);
+}
+
+bool ExLineEdit::event(QEvent *event)
+{
+    if (event->type() == QEvent::ShortcutOverride)
+        return m_lineEdit->event(event);
+    return QWidget::event(event);
+}
+
+void ExLineEdit::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+    QStyleOptionFrameV2 panel;
+    initStyleOption(&panel);
+    style()->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, &p, this);
+}
+
+QVariant ExLineEdit::inputMethodQuery(Qt::InputMethodQuery property) const
+{
+    return m_lineEdit->inputMethodQuery(property);
+}
+
+void ExLineEdit::inputMethodEvent(QInputMethodEvent *e)
+{
+    m_lineEdit->event(e);
+}
+
+
+class UrlIconLabel : public QLabel
+{
+
+public:
+    UrlIconLabel(QWidget *parent);
+
+    WebView *m_webView;
+
+protected:
+    void mousePressEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+
+private:
+    QPoint m_dragStartPos;
+
+};
+
+UrlIconLabel::UrlIconLabel(QWidget *parent)
+    : QLabel(parent)
+    , m_webView(0)
+{
+    setMinimumWidth(16);
+    setMinimumHeight(16);
+}
+
+void UrlIconLabel::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+        m_dragStartPos = event->pos();
+    QLabel::mousePressEvent(event);
+}
+
+void UrlIconLabel::mouseMoveEvent(QMouseEvent *event)
+{
+    if (event->buttons() == Qt::LeftButton
+        && (event->pos() - m_dragStartPos).manhattanLength() > QApplication::startDragDistance()
+         && m_webView) {
+        QDrag *drag = new QDrag(this);
+        QMimeData *mimeData = new QMimeData;
+        mimeData->setText(QString::fromUtf8(m_webView->url().toEncoded()));
+        QList<QUrl> urls;
+        urls.append(m_webView->url());
+        mimeData->setUrls(urls);
+        drag->setMimeData(mimeData);
+        drag->exec();
+    }
+}
+
+UrlLineEdit::UrlLineEdit(QWidget *parent)
+    : ExLineEdit(parent)
+    , m_webView(0)
+    , m_iconLabel(0)
+{
+    // icon
+    m_iconLabel = new UrlIconLabel(this);
+    m_iconLabel->resize(16, 16);
+    setLeftWidget(m_iconLabel);
+    m_defaultBaseColor = palette().color(QPalette::Base);
+
+    webViewIconChanged();
+}
+
+void UrlLineEdit::setWebView(WebView *webView)
+{
+    Q_ASSERT(!m_webView);
+    m_webView = webView;
+    m_iconLabel->m_webView = webView;
+    connect(webView, SIGNAL(urlChanged(const QUrl &)),
+        this, SLOT(webViewUrlChanged(const QUrl &)));
+    connect(webView, SIGNAL(loadFinished(bool)),
+        this, SLOT(webViewIconChanged()));
+    connect(webView, SIGNAL(iconChanged()),
+        this, SLOT(webViewIconChanged()));
+    connect(webView, SIGNAL(loadProgress(int)),
+        this, SLOT(update()));
+}
+
+void UrlLineEdit::webViewUrlChanged(const QUrl &url)
+{
+    m_lineEdit->setText(QString::fromUtf8(url.toEncoded()));
+    m_lineEdit->setCursorPosition(0);
+}
+
+void UrlLineEdit::webViewIconChanged()
+{
+    QUrl url = (m_webView)  ? m_webView->url() : QUrl();
+    QIcon icon = BrowserApplication::instance()->icon(url);
+    QPixmap pixmap(icon.pixmap(16, 16));
+    m_iconLabel->setPixmap(pixmap);
+}
+
+QLinearGradient UrlLineEdit::generateGradient(const QColor &color) const
+{
+    QLinearGradient gradient(0, 0, 0, height());
+    gradient.setColorAt(0, m_defaultBaseColor);
+    gradient.setColorAt(0.15, color.lighter(120));
+    gradient.setColorAt(0.5, color);
+    gradient.setColorAt(0.85, color.lighter(120));
+    gradient.setColorAt(1, m_defaultBaseColor);
+    return gradient;
+}
+
+void UrlLineEdit::focusOutEvent(QFocusEvent *event)
+{
+    if (m_lineEdit->text().isEmpty() && m_webView)
+        m_lineEdit->setText(QString::fromUtf8(m_webView->url().toEncoded()));
+    ExLineEdit::focusOutEvent(event);
+}
+
+void UrlLineEdit::paintEvent(QPaintEvent *event)
+{
+    QPalette p = palette();
+    if (m_webView && m_webView->url().scheme() == QLatin1String("https")) {
+        QColor lightYellow(248, 248, 210);
+        p.setBrush(QPalette::Base, generateGradient(lightYellow));
+    } else {
+        p.setBrush(QPalette::Base, m_defaultBaseColor);
+    }
+    setPalette(p);
+    ExLineEdit::paintEvent(event);
+
+    QPainter painter(this);
+    QStyleOptionFrameV2 panel;
+    initStyleOption(&panel);
+    QRect backgroundRect = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this);
+    if (m_webView && !hasFocus()) {
+        int progress = m_webView->progress();
+        QColor loadingColor = QColor(116, 192, 250);
+        painter.setBrush(generateGradient(loadingColor));
+        painter.setPen(Qt::transparent);
+        int mid = backgroundRect.width() / 100 * progress;
+        QRect progressRect(backgroundRect.x(), backgroundRect.y(), mid, backgroundRect.height());
+        painter.drawRect(progressRect);
+    }
+}
diff --git a/demos/browser/urllineedit.h b/demos/browser/urllineedit.h
new file mode 100644
index 0000000..6a718f0
--- /dev/null
+++ b/demos/browser/urllineedit.h
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef URLLINEEDIT_H
+#define URLLINEEDIT_H
+
+#include <QtCore/QUrl>
+#include <QtGui/QWidget>
+#include <QtGui/QStyleOptionFrame>
+
+QT_BEGIN_NAMESPACE
+class QLineEdit;
+QT_END_NAMESPACE
+
+class ClearButton;
+class ExLineEdit : public QWidget
+{
+    Q_OBJECT
+
+public:
+    ExLineEdit(QWidget *parent = 0);
+
+    inline QLineEdit *lineEdit() const { return m_lineEdit; }
+
+    void setLeftWidget(QWidget *widget);
+    QWidget *leftWidget() const;
+
+    QSize sizeHint() const;
+
+    QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
+protected:
+    void focusInEvent(QFocusEvent *event);
+    void focusOutEvent(QFocusEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+    void paintEvent(QPaintEvent *event);
+    void resizeEvent(QResizeEvent *event);
+    void inputMethodEvent(QInputMethodEvent *e);
+    bool event(QEvent *event);
+
+protected:
+    void updateGeometries();
+    void initStyleOption(QStyleOptionFrameV2 *option) const;
+
+    QWidget *m_leftWidget;
+    QLineEdit *m_lineEdit;
+    ClearButton *m_clearButton;
+};
+
+class UrlIconLabel;
+class WebView;
+class UrlLineEdit : public ExLineEdit
+{
+    Q_OBJECT
+
+public:
+    UrlLineEdit(QWidget *parent = 0);
+    void setWebView(WebView *webView);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void focusOutEvent(QFocusEvent *event);
+
+private slots:
+    void webViewUrlChanged(const QUrl &url);
+    void webViewIconChanged();
+
+private:
+    QLinearGradient generateGradient(const QColor &color) const;
+    WebView *m_webView;
+    UrlIconLabel *m_iconLabel;
+    QColor m_defaultBaseColor;
+
+};
+
+
+#endif // URLLINEEDIT_H
+
diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp
new file mode 100644
index 0000000..6c4d857
--- /dev/null
+++ b/demos/browser/webview.cpp
@@ -0,0 +1,304 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "browserapplication.h"
+#include "browsermainwindow.h"
+#include "cookiejar.h"
+#include "downloadmanager.h"
+#include "networkaccessmanager.h"
+#include "tabwidget.h"
+#include "webview.h"
+
+#include <QtGui/QClipboard>
+#include <QtGui/QMenu>
+#include <QtGui/QMessageBox>
+#include <QtGui/QMouseEvent>
+
+#include <QtWebKit/QWebHitTestResult>
+
+#include <QtUiTools/QUiLoader>
+
+#include <QtCore/QDebug>
+#include <QtCore/QBuffer>
+
+WebPage::WebPage(QObject *parent)
+    : QWebPage(parent)
+    , m_keyboardModifiers(Qt::NoModifier)
+    , m_pressedButtons(Qt::NoButton)
+    , m_openInNewTab(false)
+{
+    setNetworkAccessManager(BrowserApplication::networkAccessManager());
+    connect(this, SIGNAL(unsupportedContent(QNetworkReply *)),
+            this, SLOT(handleUnsupportedContent(QNetworkReply *)));
+}
+
+BrowserMainWindow *WebPage::mainWindow()
+{
+    QObject *w = this->parent();
+    while (w) {
+        if (BrowserMainWindow *mw = qobject_cast<BrowserMainWindow*>(w))
+            return mw;
+        w = w->parent();
+    }
+    return BrowserApplication::instance()->mainWindow();
+}
+
+bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type)
+{
+    // ctrl open in new tab
+    // ctrl-shift open in new tab and select
+    // ctrl-alt open in new window
+    if (type == QWebPage::NavigationTypeLinkClicked
+        && (m_keyboardModifiers & Qt::ControlModifier
+            || m_pressedButtons == Qt::MidButton)) {
+        bool newWindow = (m_keyboardModifiers & Qt::AltModifier);
+        WebView *webView;
+        if (newWindow) {
+            BrowserApplication::instance()->newMainWindow();
+            BrowserMainWindow *newMainWindow = BrowserApplication::instance()->mainWindow();
+            webView = newMainWindow->currentTab();
+            newMainWindow->raise();
+            newMainWindow->activateWindow();
+            webView->setFocus();
+        } else {
+            bool selectNewTab = (m_keyboardModifiers & Qt::ShiftModifier);
+            webView = mainWindow()->tabWidget()->newTab(selectNewTab);
+        }
+        webView->load(request);
+        m_keyboardModifiers = Qt::NoModifier;
+        m_pressedButtons = Qt::NoButton;
+        return false;
+    }
+    if (frame == mainFrame()) {
+        m_loadingUrl = request.url();
+        emit loadingUrl(m_loadingUrl);
+    }
+    return QWebPage::acceptNavigationRequest(frame, request, type);
+}
+
+QWebPage *WebPage::createWindow(QWebPage::WebWindowType type)
+{
+    Q_UNUSED(type);
+    if (m_keyboardModifiers & Qt::ControlModifier || m_pressedButtons == Qt::MidButton)
+        m_openInNewTab = true;
+    if (m_openInNewTab) {
+        m_openInNewTab = false;
+        return mainWindow()->tabWidget()->newTab()->page();
+    }
+    BrowserApplication::instance()->newMainWindow();
+    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+    return mainWindow->currentTab()->page();
+}
+
+#if !defined(QT_NO_UITOOLS)
+QObject *WebPage::createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues)
+{
+    Q_UNUSED(url);
+    Q_UNUSED(paramNames);
+    Q_UNUSED(paramValues);
+    QUiLoader loader;
+    return loader.createWidget(classId, view());
+}
+#endif // !defined(QT_NO_UITOOLS)
+
+void WebPage::handleUnsupportedContent(QNetworkReply *reply)
+{
+    if (reply->error() == QNetworkReply::NoError) {
+        BrowserApplication::downloadManager()->handleUnsupportedContent(reply);
+        return;
+    }
+
+    QFile file(QLatin1String(":/notfound.html"));
+    bool isOpened = file.open(QIODevice::ReadOnly);
+    Q_ASSERT(isOpened);
+    QString title = tr("Error loading page: %1").arg(reply->url().toString());
+    QString html = QString(QLatin1String(file.readAll()))
+                        .arg(title)
+                        .arg(reply->errorString())
+                        .arg(reply->url().toString());
+
+    QBuffer imageBuffer;
+    imageBuffer.open(QBuffer::ReadWrite);
+    QIcon icon = view()->style()->standardIcon(QStyle::SP_MessageBoxWarning, 0, view());
+    QPixmap pixmap = icon.pixmap(QSize(32,32));
+    if (pixmap.save(&imageBuffer, "PNG")) {
+        html.replace(QLatin1String("IMAGE_BINARY_DATA_HERE"),
+                     QString(QLatin1String(imageBuffer.buffer().toBase64())));
+    }
+
+    QList<QWebFrame*> frames;
+    frames.append(mainFrame());
+    while (!frames.isEmpty()) {
+        QWebFrame *frame = frames.takeFirst();
+        if (frame->url() == reply->url()) {
+            frame->setHtml(html, reply->url());
+            return;
+        }
+        QList<QWebFrame *> children = frame->childFrames();
+        foreach(QWebFrame *frame, children)
+            frames.append(frame);
+    }
+    if (m_loadingUrl == reply->url()) {
+        mainFrame()->setHtml(html, reply->url());
+    }
+}
+
+
+WebView::WebView(QWidget* parent)
+    : QWebView(parent)
+    , m_progress(0)
+    , m_page(new WebPage(this))
+{
+    setPage(m_page);
+    connect(page(), SIGNAL(statusBarMessage(const QString&)),
+            SLOT(setStatusBarText(const QString&)));
+    connect(this, SIGNAL(loadProgress(int)),
+            this, SLOT(setProgress(int)));
+    connect(this, SIGNAL(loadFinished(bool)),
+            this, SLOT(loadFinished()));
+    connect(page(), SIGNAL(loadingUrl(const QUrl&)),
+            this, SIGNAL(urlChanged(const QUrl &)));
+    connect(page(), SIGNAL(downloadRequested(const QNetworkRequest &)),
+            this, SLOT(downloadRequested(const QNetworkRequest &)));
+    page()->setForwardUnsupportedContent(true);
+
+}
+
+void WebView::contextMenuEvent(QContextMenuEvent *event)
+{
+    QWebHitTestResult r = page()->mainFrame()->hitTestContent(event->pos());
+    if (!r.linkUrl().isEmpty()) {
+        QMenu menu(this);
+        menu.addAction(pageAction(QWebPage::OpenLinkInNewWindow));
+        menu.addAction(tr("Open in New Tab"), this, SLOT(openLinkInNewTab()));
+        menu.addSeparator();
+        menu.addAction(pageAction(QWebPage::DownloadLinkToDisk));
+        // Add link to bookmarks...
+        menu.addSeparator();
+        menu.addAction(pageAction(QWebPage::CopyLinkToClipboard));
+        if (page()->settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled))
+            menu.addAction(pageAction(QWebPage::InspectElement));
+        menu.exec(mapToGlobal(event->pos()));
+        return;
+    }
+    QWebView::contextMenuEvent(event);
+}
+
+void WebView::wheelEvent(QWheelEvent *event)
+{
+    if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
+        int numDegrees = event->delta() / 8;
+        int numSteps = numDegrees / 15;
+        setTextSizeMultiplier(textSizeMultiplier() + numSteps * 0.1);
+        event->accept();
+        return;
+    }
+    QWebView::wheelEvent(event);
+}
+
+void WebView::openLinkInNewTab()
+{
+    m_page->m_openInNewTab = true;
+    pageAction(QWebPage::OpenLinkInNewWindow)->trigger();
+}
+
+void WebView::setProgress(int progress)
+{
+    m_progress = progress;
+}
+
+void WebView::loadFinished()
+{
+    if (100 != m_progress) {
+        qWarning() << "Recieved finished signal while progress is still:" << progress()
+                   << "Url:" << url();
+    }
+    m_progress = 0;
+}
+
+void WebView::loadUrl(const QUrl &url)
+{
+    m_initialUrl = url;
+    load(url);
+}
+
+QString WebView::lastStatusBarText() const
+{
+    return m_statusBarText;
+}
+
+QUrl WebView::url() const
+{
+    QUrl url = QWebView::url();
+    if (!url.isEmpty())
+        return url;
+
+    return m_initialUrl;
+}
+
+void WebView::mousePressEvent(QMouseEvent *event)
+{
+    m_page->m_pressedButtons = event->buttons();
+    m_page->m_keyboardModifiers = event->modifiers();
+    QWebView::mousePressEvent(event);
+}
+
+void WebView::mouseReleaseEvent(QMouseEvent *event)
+{
+    QWebView::mouseReleaseEvent(event);
+    if (!event->isAccepted() && (m_page->m_pressedButtons & Qt::MidButton)) {
+        QUrl url(QApplication::clipboard()->text(QClipboard::Selection));
+        if (!url.isEmpty() && url.isValid() && !url.scheme().isEmpty()) {
+            setUrl(url);
+        }
+    }
+}
+
+void WebView::setStatusBarText(const QString &string)
+{
+    m_statusBarText = string;
+}
+
+void WebView::downloadRequested(const QNetworkRequest &request)
+{
+    BrowserApplication::downloadManager()->download(request);
+}
+
diff --git a/demos/browser/webview.h b/demos/browser/webview.h
new file mode 100644
index 0000000..a41bcf3
--- /dev/null
+++ b/demos/browser/webview.h
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WEBVIEW_H
+#define WEBVIEW_H
+
+#include <QtWebKit/QWebView>
+
+QT_BEGIN_NAMESPACE
+class QAuthenticator;
+class QMouseEvent;
+class QNetworkProxy;
+class QNetworkReply;
+class QSslError;
+QT_END_NAMESPACE
+
+class BrowserMainWindow;
+class WebPage : public QWebPage {
+    Q_OBJECT
+
+signals:
+    void loadingUrl(const QUrl &url);
+
+public:
+    WebPage(QObject *parent = 0);
+    BrowserMainWindow *mainWindow();
+
+protected:
+    bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type);
+    QWebPage *createWindow(QWebPage::WebWindowType type);
+#if !defined(QT_NO_UITOOLS)
+    QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
+#endif
+
+private slots:
+    void handleUnsupportedContent(QNetworkReply *reply);
+
+private:
+    friend class WebView;
+
+    // set the webview mousepressedevent
+    Qt::KeyboardModifiers m_keyboardModifiers;
+    Qt::MouseButtons m_pressedButtons;
+    bool m_openInNewTab;
+    QUrl m_loadingUrl;
+};
+
+class WebView : public QWebView {
+    Q_OBJECT
+
+public:
+    WebView(QWidget *parent = 0);
+    WebPage *webPage() const { return m_page; }
+
+    void loadUrl(const QUrl &url);
+    QUrl url() const;
+
+    QString lastStatusBarText() const;
+    inline int progress() const { return m_progress; }
+
+protected:
+    void mousePressEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+    void contextMenuEvent(QContextMenuEvent *event);
+    void wheelEvent(QWheelEvent *event);
+
+private slots:
+    void setProgress(int progress);
+    void loadFinished();
+    void setStatusBarText(const QString &string);
+    void downloadRequested(const QNetworkRequest &request);
+    void openLinkInNewTab();
+
+private:
+    QString m_statusBarText;
+    QUrl m_initialUrl;
+    int m_progress;
+    WebPage *m_page;
+};
+
+#endif
diff --git a/demos/browser/xbel.cpp b/demos/browser/xbel.cpp
new file mode 100644
index 0000000..a92b649
--- /dev/null
+++ b/demos/browser/xbel.cpp
@@ -0,0 +1,320 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "xbel.h"
+
+#include <QtCore/QFile>
+
+BookmarkNode::BookmarkNode(BookmarkNode::Type type, BookmarkNode *parent) :
+     expanded(false)
+   , m_parent(parent)
+   , m_type(type)
+{
+    if (parent)
+        parent->add(this);
+}
+
+BookmarkNode::~BookmarkNode()
+{
+    if (m_parent)
+        m_parent->remove(this);
+    qDeleteAll(m_children);
+    m_parent = 0;
+    m_type = BookmarkNode::Root;
+}
+
+bool BookmarkNode::operator==(const BookmarkNode &other)
+{
+    if (url != other.url
+        || title != other.title
+        || desc != other.desc
+        || expanded != other.expanded
+        || m_type != other.m_type
+        || m_children.count() != other.m_children.count())
+        return false;
+
+    for (int i = 0; i < m_children.count(); ++i)
+        if (!((*(m_children[i])) == (*(other.m_children[i]))))
+            return false;
+    return true;
+}
+
+BookmarkNode::Type BookmarkNode::type() const
+{
+    return m_type;
+}
+
+void BookmarkNode::setType(Type type)
+{
+    m_type = type;
+}
+
+QList<BookmarkNode *> BookmarkNode::children() const
+{
+    return m_children;
+}
+
+BookmarkNode *BookmarkNode::parent() const
+{
+    return m_parent;
+}
+
+void BookmarkNode::add(BookmarkNode *child, int offset)
+{
+    Q_ASSERT(child->m_type != Root);
+    if (child->m_parent)
+        child->m_parent->remove(child);
+    child->m_parent = this;
+    if (-1 == offset)
+        offset = m_children.size();
+    m_children.insert(offset, child);
+}
+
+void BookmarkNode::remove(BookmarkNode *child)
+{
+    child->m_parent = 0;
+    m_children.removeAll(child);
+}
+
+
+XbelReader::XbelReader()
+{
+}
+
+BookmarkNode *XbelReader::read(const QString &fileName)
+{
+    QFile file(fileName);
+    if (!file.exists()) {
+        return new BookmarkNode(BookmarkNode::Root);
+    }
+    file.open(QFile::ReadOnly);
+    return read(&file);
+}
+
+BookmarkNode *XbelReader::read(QIODevice *device)
+{
+    BookmarkNode *root = new BookmarkNode(BookmarkNode::Root);
+    setDevice(device);
+    while (!atEnd()) {
+        readNext();
+        if (isStartElement()) {
+            QString version = attributes().value(QLatin1String("version")).toString();
+            if (name() == QLatin1String("xbel")
+                && (version.isEmpty() || version == QLatin1String("1.0"))) {
+                readXBEL(root);
+            } else {
+                raiseError(QObject::tr("The file is not an XBEL version 1.0 file."));
+            }
+        }
+    }
+    return root;
+}
+
+void XbelReader::readXBEL(BookmarkNode *parent)
+{
+    Q_ASSERT(isStartElement() && name() == QLatin1String("xbel"));
+
+    while (!atEnd()) {
+        readNext();
+        if (isEndElement())
+            break;
+
+        if (isStartElement()) {
+            if (name() == QLatin1String("folder"))
+                readFolder(parent);
+            else if (name() == QLatin1String("bookmark"))
+                readBookmarkNode(parent);
+            else if (name() == QLatin1String("separator"))
+                readSeparator(parent);
+            else
+                skipUnknownElement();
+        }
+    }
+}
+
+void XbelReader::readFolder(BookmarkNode *parent)
+{
+    Q_ASSERT(isStartElement() && name() == QLatin1String("folder"));
+
+    BookmarkNode *folder = new BookmarkNode(BookmarkNode::Folder, parent);
+    folder->expanded = (attributes().value(QLatin1String("folded")) == QLatin1String("no"));
+
+    while (!atEnd()) {
+        readNext();
+
+        if (isEndElement())
+            break;
+
+        if (isStartElement()) {
+            if (name() == QLatin1String("title"))
+                readTitle(folder);
+            else if (name() == QLatin1String("desc"))
+                readDescription(folder);
+            else if (name() == QLatin1String("folder"))
+                readFolder(folder);
+            else if (name() == QLatin1String("bookmark"))
+                readBookmarkNode(folder);
+            else if (name() == QLatin1String("separator"))
+                readSeparator(folder);
+            else
+                skipUnknownElement();
+        }
+    }
+}
+
+void XbelReader::readTitle(BookmarkNode *parent)
+{
+    Q_ASSERT(isStartElement() && name() == QLatin1String("title"));
+    parent->title = readElementText();
+}
+
+void XbelReader::readDescription(BookmarkNode *parent)
+{
+    Q_ASSERT(isStartElement() && name() == QLatin1String("desc"));
+    parent->desc = readElementText();
+}
+
+void XbelReader::readSeparator(BookmarkNode *parent)
+{
+    new BookmarkNode(BookmarkNode::Separator, parent);
+    // empty elements have a start and end element
+    readNext();
+}
+
+void XbelReader::readBookmarkNode(BookmarkNode *parent)
+{
+    Q_ASSERT(isStartElement() && name() == QLatin1String("bookmark"));
+    BookmarkNode *bookmark = new BookmarkNode(BookmarkNode::Bookmark, parent);
+    bookmark->url = attributes().value(QLatin1String("href")).toString();
+    while (!atEnd()) {
+        readNext();
+        if (isEndElement())
+            break;
+
+        if (isStartElement()) {
+            if (name() == QLatin1String("title"))
+                readTitle(bookmark);
+            else if (name() == QLatin1String("desc"))
+                readDescription(bookmark);
+            else
+                skipUnknownElement();
+        }
+    }
+    if (bookmark->title.isEmpty())
+        bookmark->title = QObject::tr("Unknown title");
+}
+
+void XbelReader::skipUnknownElement()
+{
+    Q_ASSERT(isStartElement());
+
+    while (!atEnd()) {
+        readNext();
+
+        if (isEndElement())
+            break;
+
+        if (isStartElement())
+            skipUnknownElement();
+    }
+}
+
+
+XbelWriter::XbelWriter()
+{
+    setAutoFormatting(true);
+}
+
+bool XbelWriter::write(const QString &fileName, const BookmarkNode *root)
+{
+    QFile file(fileName);
+    if (!root || !file.open(QFile::WriteOnly))
+        return false;
+    return write(&file, root);
+}
+
+bool XbelWriter::write(QIODevice *device, const BookmarkNode *root)
+{
+    setDevice(device);
+
+    writeStartDocument();
+    writeDTD(QLatin1String("<!DOCTYPE xbel>"));
+    writeStartElement(QLatin1String("xbel"));
+    writeAttribute(QLatin1String("version"), QLatin1String("1.0"));
+    if (root->type() == BookmarkNode::Root) {
+        for (int i = 0; i < root->children().count(); ++i)
+            writeItem(root->children().at(i));
+    } else {
+        writeItem(root);
+    }
+
+    writeEndDocument();
+    return true;
+}
+
+void XbelWriter::writeItem(const BookmarkNode *parent)
+{
+    switch (parent->type()) {
+    case BookmarkNode::Folder:
+        writeStartElement(QLatin1String("folder"));
+        writeAttribute(QLatin1String("folded"), parent->expanded ? QLatin1String("no") : QLatin1String("yes"));
+        writeTextElement(QLatin1String("title"), parent->title);
+        for (int i = 0; i < parent->children().count(); ++i)
+            writeItem(parent->children().at(i));
+        writeEndElement();
+        break;
+    case BookmarkNode::Bookmark:
+        writeStartElement(QLatin1String("bookmark"));
+        if (!parent->url.isEmpty())
+            writeAttribute(QLatin1String("href"), parent->url);
+        writeTextElement(QLatin1String("title"), parent->title);
+        if (!parent->desc.isEmpty())
+            writeAttribute(QLatin1String("desc"), parent->desc);
+        writeEndElement();
+        break;
+    case BookmarkNode::Separator:
+        writeEmptyElement(QLatin1String("separator"));
+        break;
+    default:
+        break;
+    }
+}
+
diff --git a/demos/browser/xbel.h b/demos/browser/xbel.h
new file mode 100644
index 0000000..b736d02
--- /dev/null
+++ b/demos/browser/xbel.h
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef XBEL_H
+#define XBEL_H
+
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QDateTime>
+
+class BookmarkNode
+{
+public:
+    enum Type {
+        Root,
+        Folder,
+        Bookmark,
+        Separator
+    };
+
+    BookmarkNode(Type type = Root, BookmarkNode *parent = 0);
+    ~BookmarkNode();
+    bool operator==(const BookmarkNode &other);
+
+    Type type() const;
+    void setType(Type type);
+    QList<BookmarkNode *> children() const;
+    BookmarkNode *parent() const;
+
+    void add(BookmarkNode *child, int offset = -1);
+    void remove(BookmarkNode *child);
+
+    QString url;
+    QString title;
+    QString desc;
+    bool expanded;
+
+private:
+    BookmarkNode *m_parent;
+    Type m_type;
+    QList<BookmarkNode *> m_children;
+
+};
+
+class XbelReader : public QXmlStreamReader
+{
+public:
+    XbelReader();
+    BookmarkNode *read(const QString &fileName);
+    BookmarkNode *read(QIODevice *device);
+
+private:
+    void skipUnknownElement();
+    void readXBEL(BookmarkNode *parent);
+    void readTitle(BookmarkNode *parent);
+    void readDescription(BookmarkNode *parent);
+    void readSeparator(BookmarkNode *parent);
+    void readFolder(BookmarkNode *parent);
+    void readBookmarkNode(BookmarkNode *parent);
+};
+
+#include <QtCore/QXmlStreamWriter>
+
+class XbelWriter : public QXmlStreamWriter
+{
+public:
+    XbelWriter();
+    bool write(const QString &fileName, const BookmarkNode *root);
+    bool write(QIODevice *device, const BookmarkNode *root);
+
+private:
+    void writeItem(const BookmarkNode *parent);
+};
+
+#endif // XBEL_H
+
diff --git a/demos/chip/chip.cpp b/demos/chip/chip.cpp
new file mode 100644
index 0000000..c2b22da
--- /dev/null
+++ b/demos/chip/chip.cpp
@@ -0,0 +1,182 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "chip.h"
+
+#include <QtGui>
+
+Chip::Chip(const QColor &color, int x, int y)
+{
+    this->x = x;
+    this->y = y;
+    this->color = color;
+    setZValue((x + y) % 2);
+
+    setFlags(ItemIsSelectable | ItemIsMovable);
+    setAcceptsHoverEvents(true);
+}
+
+QRectF Chip::boundingRect() const
+{
+    return QRectF(0, 0, 110, 70);
+}
+
+QPainterPath Chip::shape() const
+{
+    QPainterPath path;
+    path.addRect(14, 14, 82, 42);
+    return path;
+}
+
+void Chip::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(widget);
+
+    QColor fillColor = (option->state & QStyle::State_Selected) ? color.dark(150) : color;
+    if (option->state & QStyle::State_MouseOver)
+        fillColor = fillColor.light(125);
+
+    if (option->levelOfDetail < 0.2) {
+        if (option->levelOfDetail < 0.125) {
+            painter->fillRect(QRectF(0, 0, 110, 70), fillColor);
+            return;
+        }
+
+        QBrush b = painter->brush();
+        painter->setBrush(fillColor);
+        painter->drawRect(13, 13, 97, 57);
+        painter->setBrush(b);
+        return;
+    }
+
+    QPen oldPen = painter->pen();
+    QPen pen = oldPen;
+    int width = 0;
+    if (option->state & QStyle::State_Selected)
+        width += 2;
+
+    pen.setWidth(width);
+    QBrush b = painter->brush();
+    painter->setBrush(QBrush(fillColor.dark(option->state & QStyle::State_Sunken ? 120 : 100)));
+
+    painter->drawRect(QRect(14, 14, 79, 39));
+    painter->setBrush(b);
+
+    if (option->levelOfDetail >= 1) {
+        painter->setPen(QPen(Qt::gray, 1));
+        painter->drawLine(15, 54, 94, 54);
+        painter->drawLine(94, 53, 94, 15);
+        painter->setPen(QPen(Qt::black, 0));
+    }
+
+    // Draw text
+    if (option->levelOfDetail >= 2) {
+        QFont font("Times", 10);
+        font.setStyleStrategy(QFont::ForceOutline);
+        painter->setFont(font);
+        painter->save();
+        painter->scale(0.1, 0.1);
+        painter->drawText(170, 180, QString("Model: VSC-2000 (Very Small Chip) at %1x%2").arg(x).arg(y));
+        painter->drawText(170, 200, QString("Serial number: DLWR-WEER-123L-ZZ33-SDSJ"));
+        painter->drawText(170, 220, QString("Manufacturer: Chip Manufacturer"));
+        painter->restore();
+    }
+
+    // Draw lines
+    QVarLengthArray<QLineF, 36> lines;
+    if (option->levelOfDetail >= 0.5) {
+        for (int i = 0; i <= 10; i += (option->levelOfDetail > 0.5 ? 1 : 2)) {
+            lines.append(QLineF(18 + 7 * i, 13, 18 + 7 * i, 5));
+            lines.append(QLineF(18 + 7 * i, 54, 18 + 7 * i, 62));
+        }
+        for (int i = 0; i <= 6; i += (option->levelOfDetail > 0.5 ? 1 : 2)) {
+            lines.append(QLineF(5, 18 + i * 5, 13, 18 + i * 5));
+            lines.append(QLineF(94, 18 + i * 5, 102, 18 + i * 5));
+        }
+    }
+    if (option->levelOfDetail >= 0.4) {
+        const QLineF lineData[] = {
+            QLineF(25, 35, 35, 35),
+            QLineF(35, 30, 35, 40),
+            QLineF(35, 30, 45, 35),
+            QLineF(35, 40, 45, 35),
+            QLineF(45, 30, 45, 40),
+            QLineF(45, 35, 55, 35)
+        };
+        lines.append(lineData, 6);
+    }
+    painter->drawLines(lines.data(), lines.size());
+
+    // Draw red ink
+    if (stuff.size() > 1) {
+        QPen p = painter->pen();
+        painter->setPen(QPen(Qt::red, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+        painter->setBrush(Qt::NoBrush);
+        QPainterPath path;
+        path.moveTo(stuff.first());
+        for (int i = 1; i < stuff.size(); ++i)
+            path.lineTo(stuff.at(i));
+        painter->drawPath(path);
+        painter->setPen(p);
+    }
+}
+
+void Chip::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsItem::mousePressEvent(event);
+    update();
+}
+
+void Chip::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (event->modifiers() & Qt::ShiftModifier) {
+        stuff << event->pos();
+        update();
+        return;
+    }
+    QGraphicsItem::mouseMoveEvent(event);
+}
+
+void Chip::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsItem::mouseReleaseEvent(event);
+    update();
+}
diff --git a/demos/chip/chip.h b/demos/chip/chip.h
new file mode 100644
index 0000000..9866f80
--- /dev/null
+++ b/demos/chip/chip.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CHIP_H
+#define CHIP_H
+
+#include <QtGui/QColor>
+#include <QtGui/QGraphicsItem>
+
+class Chip : public QGraphicsItem
+{
+public:
+    Chip(const QColor &color, int x, int y);
+
+    QRectF boundingRect() const;
+    QPainterPath shape() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget);
+
+protected:
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+
+private:
+    int x, y;
+    QColor color;
+    QList<QPointF> stuff;
+};
+
+#endif
diff --git a/demos/chip/chip.pro b/demos/chip/chip.pro
new file mode 100644
index 0000000..53fa23b
--- /dev/null
+++ b/demos/chip/chip.pro
@@ -0,0 +1,19 @@
+RESOURCES += images.qrc
+
+HEADERS += mainwindow.h view.h chip.h
+SOURCES += main.cpp
+SOURCES += mainwindow.cpp view.cpp chip.cpp
+
+contains(QT_CONFIG, opengl):QT += opengl
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/chip
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images
+sources.path = $$[QT_INSTALL_DEMOS]/chip
+INSTALLS += target sources
+
diff --git a/demos/chip/fileprint.png b/demos/chip/fileprint.png
new file mode 100644
index 0000000..ba7c02d
--- /dev/null
+++ b/demos/chip/fileprint.png
diff --git a/demos/chip/images.qrc b/demos/chip/images.qrc
new file mode 100644
index 0000000..c7cdf0c
--- /dev/null
+++ b/demos/chip/images.qrc
@@ -0,0 +1,10 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>qt4logo.png</file>
+    <file>zoomin.png</file>
+    <file>zoomout.png</file>
+    <file>rotateleft.png</file>
+    <file>rotateright.png</file>
+    <file>fileprint.png</file>
+</qresource>
+</RCC>
diff --git a/demos/chip/main.cpp b/demos/chip/main.cpp
new file mode 100644
index 0000000..e945026
--- /dev/null
+++ b/demos/chip/main.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(images);
+
+    QApplication app(argc, argv);
+    app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
+
+    MainWindow window;
+    window.show();   
+
+    return app.exec();
+}
diff --git a/demos/chip/mainwindow.cpp b/demos/chip/mainwindow.cpp
new file mode 100644
index 0000000..5222cd4
--- /dev/null
+++ b/demos/chip/mainwindow.cpp
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+#include "view.h"
+#include "chip.h"
+
+#include <QtGui>
+
+MainWindow::MainWindow(QWidget *parent)
+    : QWidget(parent)
+{
+    populateScene();
+
+    h1Splitter = new QSplitter;
+    h2Splitter = new QSplitter;
+    
+    QSplitter *vSplitter = new QSplitter;
+    vSplitter->setOrientation(Qt::Vertical);
+    vSplitter->addWidget(h1Splitter);
+    vSplitter->addWidget(h2Splitter);
+
+    View *view = new View("Top left view");
+    view->view()->setScene(scene);
+    h1Splitter->addWidget(view);
+
+    view = new View("Top right view");
+    view->view()->setScene(scene);
+    h1Splitter->addWidget(view);
+
+    view = new View("Bottom left view");
+    view->view()->setScene(scene);
+    h2Splitter->addWidget(view);
+
+    view = new View("Bottom right view");
+    view->view()->setScene(scene);
+    h2Splitter->addWidget(view);
+
+    QHBoxLayout *layout = new QHBoxLayout;
+    layout->addWidget(vSplitter);
+    setLayout(layout);
+
+    setWindowTitle(tr("Chip Demo"));
+}
+
+void MainWindow::populateScene()
+{
+    scene = new QGraphicsScene;
+
+    QImage image(":/qt4logo.png");
+
+    // Populate scene
+    int xx = 0;
+    int nitems = 0;
+    for (int i = -11000; i < 11000; i += 110) {
+        ++xx;
+        int yy = 0;
+        for (int j = -7000; j < 7000; j += 70) {
+            ++yy;
+            qreal x = (i + 11000) / 22000.0;
+            qreal y = (j + 7000) / 14000.0;
+
+            QColor color(image.pixel(int(image.width() * x), int(image.height() * y)));
+            QGraphicsItem *item = new Chip(color, xx, yy);
+            item->setPos(QPointF(i, j));
+            scene->addItem(item);
+
+            ++nitems;
+        }
+    }
+}
diff --git a/demos/chip/mainwindow.h b/demos/chip/mainwindow.h
new file mode 100644
index 0000000..5decca8
--- /dev/null
+++ b/demos/chip/mainwindow.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QtGui/qwidget.h>
+
+QT_FORWARD_DECLARE_CLASS(QGraphicsScene)
+QT_FORWARD_DECLARE_CLASS(QGraphicsView)
+QT_FORWARD_DECLARE_CLASS(QLabel)
+QT_FORWARD_DECLARE_CLASS(QSlider)
+QT_FORWARD_DECLARE_CLASS(QSplitter)
+
+class MainWindow : public QWidget
+{
+    Q_OBJECT
+public:
+    MainWindow(QWidget *parent = 0);
+    
+private:
+    void setupMatrix();
+    void populateScene();
+    
+    QGraphicsScene *scene;
+    QSplitter *h1Splitter;
+    QSplitter *h2Splitter;
+};
+
+#endif
diff --git a/demos/chip/qt4logo.png b/demos/chip/qt4logo.png
new file mode 100644
index 0000000..157e86e
--- /dev/null
+++ b/demos/chip/qt4logo.png
diff --git a/demos/chip/rotateleft.png b/demos/chip/rotateleft.png
new file mode 100644
index 0000000..8cfa931
--- /dev/null
+++ b/demos/chip/rotateleft.png
diff --git a/demos/chip/rotateright.png b/demos/chip/rotateright.png
new file mode 100644
index 0000000..ec5e866
--- /dev/null
+++ b/demos/chip/rotateright.png
diff --git a/demos/chip/view.cpp b/demos/chip/view.cpp
new file mode 100644
index 0000000..f919af3
--- /dev/null
+++ b/demos/chip/view.cpp
@@ -0,0 +1,234 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "view.h"
+
+#include <QtGui>
+#ifndef QT_NO_OPENGL
+#include <QtOpenGL>
+#endif
+
+#include <qmath.h>
+
+View::View(const QString &name, QWidget *parent)
+    : QFrame(parent)
+{
+    setFrameStyle(Sunken | StyledPanel);
+    graphicsView = new QGraphicsView;
+    graphicsView->setRenderHint(QPainter::Antialiasing, false);
+    graphicsView->setDragMode(QGraphicsView::RubberBandDrag);
+    graphicsView->setOptimizationFlags(QGraphicsView::DontSavePainterState);
+    graphicsView->setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
+
+    int size = style()->pixelMetric(QStyle::PM_ToolBarIconSize);
+    QSize iconSize(size, size);
+
+    QToolButton *zoomInIcon = new QToolButton;
+    zoomInIcon->setAutoRepeat(true);
+    zoomInIcon->setAutoRepeatInterval(33);
+    zoomInIcon->setAutoRepeatDelay(0);
+    zoomInIcon->setIcon(QPixmap(":/zoomin.png"));
+    zoomInIcon->setIconSize(iconSize);
+    QToolButton *zoomOutIcon = new QToolButton;
+    zoomOutIcon->setAutoRepeat(true);
+    zoomOutIcon->setAutoRepeatInterval(33);
+    zoomOutIcon->setAutoRepeatDelay(0);
+    zoomOutIcon->setIcon(QPixmap(":/zoomout.png"));
+    zoomOutIcon->setIconSize(iconSize);
+    zoomSlider = new QSlider;
+    zoomSlider->setMinimum(0);
+    zoomSlider->setMaximum(500);
+    zoomSlider->setValue(250);
+    zoomSlider->setTickPosition(QSlider::TicksRight);
+
+    // Zoom slider layout
+    QVBoxLayout *zoomSliderLayout = new QVBoxLayout;
+    zoomSliderLayout->addWidget(zoomInIcon);
+    zoomSliderLayout->addWidget(zoomSlider);
+    zoomSliderLayout->addWidget(zoomOutIcon);
+
+    QToolButton *rotateLeftIcon = new QToolButton;
+    rotateLeftIcon->setIcon(QPixmap(":/rotateleft.png"));
+    rotateLeftIcon->setIconSize(iconSize);
+    QToolButton *rotateRightIcon = new QToolButton;
+    rotateRightIcon->setIcon(QPixmap(":/rotateright.png"));
+    rotateRightIcon->setIconSize(iconSize);
+    rotateSlider = new QSlider;
+    rotateSlider->setOrientation(Qt::Horizontal);
+    rotateSlider->setMinimum(-360);
+    rotateSlider->setMaximum(360);
+    rotateSlider->setValue(0);
+    rotateSlider->setTickPosition(QSlider::TicksBelow);
+
+    // Rotate slider layout
+    QHBoxLayout *rotateSliderLayout = new QHBoxLayout;
+    rotateSliderLayout->addWidget(rotateLeftIcon);
+    rotateSliderLayout->addWidget(rotateSlider);
+    rotateSliderLayout->addWidget(rotateRightIcon);
+
+    resetButton = new QToolButton;
+    resetButton->setText(tr("0"));
+    resetButton->setEnabled(false);
+
+    // Label layout
+    QHBoxLayout *labelLayout = new QHBoxLayout;
+    label = new QLabel(name);
+    antialiasButton = new QToolButton;
+    antialiasButton->setText(tr("Antialiasing"));
+    antialiasButton->setCheckable(true);
+    antialiasButton->setChecked(false);
+    openGlButton = new QToolButton;
+    openGlButton->setText(tr("OpenGL"));
+    openGlButton->setCheckable(true);
+#ifndef QT_NO_OPENGL
+    openGlButton->setEnabled(QGLFormat::hasOpenGL());
+#else
+    openGlButton->setEnabled(false);
+#endif
+    printButton = new QToolButton;
+    printButton->setIcon(QIcon(QPixmap(":/fileprint.png")));
+
+    labelLayout->addWidget(label);
+    labelLayout->addStretch();
+    labelLayout->addWidget(antialiasButton);
+    labelLayout->addWidget(openGlButton);
+    labelLayout->addWidget(printButton);
+
+    QGridLayout *topLayout = new QGridLayout;
+    topLayout->addLayout(labelLayout, 0, 0);
+    topLayout->addWidget(graphicsView, 1, 0);
+    topLayout->addLayout(zoomSliderLayout, 1, 1);
+    topLayout->addLayout(rotateSliderLayout, 2, 0);
+    topLayout->addWidget(resetButton, 2, 1);
+    setLayout(topLayout);
+
+    connect(resetButton, SIGNAL(clicked()), this, SLOT(resetView()));
+    connect(zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setupMatrix()));
+    connect(rotateSlider, SIGNAL(valueChanged(int)), this, SLOT(setupMatrix()));
+    connect(graphicsView->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(setResetButtonEnabled()));
+    connect(graphicsView->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(setResetButtonEnabled()));
+    connect(antialiasButton, SIGNAL(toggled(bool)), this, SLOT(toggleAntialiasing()));
+    connect(openGlButton, SIGNAL(toggled(bool)), this, SLOT(toggleOpenGL()));
+    connect(rotateLeftIcon, SIGNAL(clicked()), this, SLOT(rotateLeft()));
+    connect(rotateRightIcon, SIGNAL(clicked()), this, SLOT(rotateRight()));
+    connect(zoomInIcon, SIGNAL(clicked()), this, SLOT(zoomIn()));
+    connect(zoomOutIcon, SIGNAL(clicked()), this, SLOT(zoomOut()));
+    connect(printButton, SIGNAL(clicked()), this, SLOT(print()));
+
+    setupMatrix();
+}
+
+QGraphicsView *View::view() const
+{
+    return graphicsView;
+}
+
+void View::resetView()
+{
+    zoomSlider->setValue(250);
+    rotateSlider->setValue(0);
+    setupMatrix();
+    graphicsView->ensureVisible(QRectF(0, 0, 0, 0));
+
+    resetButton->setEnabled(false);
+}
+
+void View::setResetButtonEnabled()
+{
+    resetButton->setEnabled(true);
+}
+
+void View::setupMatrix()
+{
+    qreal scale = qPow(qreal(2), (zoomSlider->value() - 250) / qreal(50));
+
+    QMatrix matrix;
+    matrix.scale(scale, scale);
+    matrix.rotate(rotateSlider->value());
+
+    graphicsView->setMatrix(matrix);
+    setResetButtonEnabled();
+}
+
+void View::toggleOpenGL()
+{
+#ifndef QT_NO_OPENGL
+    graphicsView->setViewport(openGlButton->isChecked() ? new QGLWidget(QGLFormat(QGL::SampleBuffers)) : new QWidget);
+#endif
+}
+
+void View::toggleAntialiasing()
+{
+    graphicsView->setRenderHint(QPainter::Antialiasing, antialiasButton->isChecked());
+}
+
+void View::print()
+{
+#ifndef QT_NO_PRINTER
+    QPrinter printer;
+    QPrintDialog dialog(&printer, this);
+    if (dialog.exec() == QDialog::Accepted) {
+        QPainter painter(&printer);
+        graphicsView->render(&painter);
+    }
+#endif
+}
+
+void View::zoomIn()
+{
+    zoomSlider->setValue(zoomSlider->value() + 1);
+}
+
+void View::zoomOut()
+{
+    zoomSlider->setValue(zoomSlider->value() - 1);
+}
+
+void View::rotateLeft()
+{
+    rotateSlider->setValue(rotateSlider->value() - 10);
+}
+
+void View::rotateRight()
+{
+    rotateSlider->setValue(rotateSlider->value() + 10);
+}
+
diff --git a/demos/chip/view.h b/demos/chip/view.h
new file mode 100644
index 0000000..4987f60
--- /dev/null
+++ b/demos/chip/view.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef VIEW_H
+#define VIEW_H
+
+#include <QFrame>
+
+QT_FORWARD_DECLARE_CLASS(QGraphicsView)
+QT_FORWARD_DECLARE_CLASS(QLabel)
+QT_FORWARD_DECLARE_CLASS(QSlider)
+QT_FORWARD_DECLARE_CLASS(QToolButton)
+
+class View : public QFrame
+{
+    Q_OBJECT
+public:
+    View(const QString &name, QWidget *parent = 0);
+
+    QGraphicsView *view() const;
+
+private slots:
+    void resetView();
+    void setResetButtonEnabled();
+    void setupMatrix();
+    void toggleOpenGL();
+    void toggleAntialiasing();
+    void print();
+
+    void zoomIn();
+    void zoomOut();
+    void rotateLeft();
+    void rotateRight();
+    
+private:
+    QGraphicsView *graphicsView;
+    QLabel *label;
+    QToolButton *openGlButton;
+    QToolButton *antialiasButton;
+    QToolButton *printButton;
+    QToolButton *resetButton;
+    QSlider *zoomSlider;
+    QSlider *rotateSlider;
+};
+
+#endif
diff --git a/demos/chip/zoomin.png b/demos/chip/zoomin.png
new file mode 100644
index 0000000..8b0daee
--- /dev/null
+++ b/demos/chip/zoomin.png
diff --git a/demos/chip/zoomout.png b/demos/chip/zoomout.png
new file mode 100644
index 0000000..1575dd2
--- /dev/null
+++ b/demos/chip/zoomout.png
diff --git a/demos/composition/composition.cpp b/demos/composition/composition.cpp
new file mode 100644
index 0000000..b43c66b
--- /dev/null
+++ b/demos/composition/composition.cpp
@@ -0,0 +1,511 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "composition.h"
+#include <QBoxLayout>
+#include <QRadioButton>
+#include <QTimer>
+#include <QDateTime>
+#include <QSlider>
+#include <QMouseEvent>
+#include <qmath.h>
+
+CompositionWidget::CompositionWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    CompositionRenderer *view = new CompositionRenderer(this);
+
+    QGroupBox *mainGroup = new QGroupBox(parent);
+    mainGroup->setTitle(tr("Composition Modes"));
+
+    QGroupBox *modesGroup = new QGroupBox(mainGroup);
+    modesGroup->setTitle(tr("Mode"));
+
+    rbClear = new QRadioButton(tr("Clear"), modesGroup);
+    connect(rbClear, SIGNAL(clicked()), view, SLOT(setClearMode()));
+    rbSource = new QRadioButton(tr("Source"), modesGroup);
+    connect(rbSource, SIGNAL(clicked()), view, SLOT(setSourceMode()));
+    rbDest = new QRadioButton(tr("Destination"), modesGroup);
+    connect(rbDest, SIGNAL(clicked()), view, SLOT(setDestMode()));
+    rbSourceOver = new QRadioButton(tr("Source Over"), modesGroup);
+    connect(rbSourceOver, SIGNAL(clicked()), view, SLOT(setSourceOverMode()));
+    rbDestOver = new QRadioButton(tr("Destination Over"), modesGroup);
+    connect(rbDestOver, SIGNAL(clicked()), view, SLOT(setDestOverMode()));
+    rbSourceIn = new QRadioButton(tr("Source In"), modesGroup);
+    connect(rbSourceIn, SIGNAL(clicked()), view, SLOT(setSourceInMode()));
+    rbDestIn = new QRadioButton(tr("Dest In"), modesGroup);
+    connect(rbDestIn, SIGNAL(clicked()), view, SLOT(setDestInMode()));
+    rbSourceOut = new QRadioButton(tr("Source Out"), modesGroup);
+    connect(rbSourceOut, SIGNAL(clicked()), view, SLOT(setSourceOutMode()));
+    rbDestOut = new QRadioButton(tr("Dest Out"), modesGroup);
+    connect(rbDestOut, SIGNAL(clicked()), view, SLOT(setDestOutMode()));
+    rbSourceAtop = new QRadioButton(tr("Source Atop"), modesGroup);
+    connect(rbSourceAtop, SIGNAL(clicked()), view, SLOT(setSourceAtopMode()));
+    rbDestAtop = new QRadioButton(tr("Dest Atop"), modesGroup);
+    connect(rbDestAtop, SIGNAL(clicked()), view, SLOT(setDestAtopMode()));
+    rbXor = new QRadioButton(tr("Xor"), modesGroup);
+    connect(rbXor, SIGNAL(clicked()), view, SLOT(setXorMode()));
+
+    rbPlus = new QRadioButton(tr("Plus"), modesGroup);
+    connect(rbPlus, SIGNAL(clicked()), view, SLOT(setPlusMode()));
+    rbMultiply = new QRadioButton(tr("Multiply"), modesGroup);
+    connect(rbMultiply, SIGNAL(clicked()), view, SLOT(setMultiplyMode()));
+    rbScreen = new QRadioButton(tr("Screen"), modesGroup);
+    connect(rbScreen, SIGNAL(clicked()), view, SLOT(setScreenMode()));
+    rbOverlay = new QRadioButton(tr("Overlay"), modesGroup);
+    connect(rbOverlay, SIGNAL(clicked()), view, SLOT(setOverlayMode()));
+    rbDarken = new QRadioButton(tr("Darken"), modesGroup);
+    connect(rbDarken, SIGNAL(clicked()), view, SLOT(setDarkenMode()));
+    rbLighten = new QRadioButton(tr("Lighten"), modesGroup);
+    connect(rbLighten, SIGNAL(clicked()), view, SLOT(setLightenMode()));
+    rbColorDodge = new QRadioButton(tr("Color Dodge"), modesGroup);
+    connect(rbColorDodge, SIGNAL(clicked()), view, SLOT(setColorDodgeMode()));
+    rbColorBurn = new QRadioButton(tr("Color Burn"), modesGroup);
+    connect(rbColorBurn, SIGNAL(clicked()), view, SLOT(setColorBurnMode()));
+    rbHardLight = new QRadioButton(tr("Hard Light"), modesGroup);
+    connect(rbHardLight, SIGNAL(clicked()), view, SLOT(setHardLightMode()));
+    rbSoftLight = new QRadioButton(tr("Soft Light"), modesGroup);
+    connect(rbSoftLight, SIGNAL(clicked()), view, SLOT(setSoftLightMode()));
+    rbDifference = new QRadioButton(tr("Difference"), modesGroup);
+    connect(rbDifference, SIGNAL(clicked()), view, SLOT(setDifferenceMode()));
+    rbExclusion = new QRadioButton(tr("Exclusion"), modesGroup);
+    connect(rbExclusion, SIGNAL(clicked()), view, SLOT(setExclusionMode()));
+
+    QGroupBox *circleColorGroup = new QGroupBox(mainGroup);
+    circleColorGroup->setTitle(tr("Circle color"));
+    QSlider *circleColorSlider = new QSlider(Qt::Horizontal, circleColorGroup);
+    circleColorSlider->setRange(0, 359);
+    circleColorSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    connect(circleColorSlider, SIGNAL(valueChanged(int)), view, SLOT(setCircleColor(int)));
+
+    QGroupBox *circleAlphaGroup = new QGroupBox(mainGroup);
+    circleAlphaGroup->setTitle(tr("Circle alpha"));
+    QSlider *circleAlphaSlider = new QSlider(Qt::Horizontal, circleAlphaGroup);
+    circleAlphaSlider->setRange(0, 255);
+    circleAlphaSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    connect(circleAlphaSlider, SIGNAL(valueChanged(int)), view, SLOT(setCircleAlpha(int)));
+
+    QPushButton *showSourceButton = new QPushButton(mainGroup);
+    showSourceButton->setText(tr("Show Source"));
+#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES)
+    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(true);
+    enableOpenGLButton->setChecked(view->usesOpenGL());
+
+    if (!QGLFormat::hasOpenGL() || !QGLPixelBuffer::hasOpenGLPbuffers())
+        enableOpenGLButton->hide();
+#endif
+    QPushButton *whatsThisButton = new QPushButton(mainGroup);
+    whatsThisButton->setText(tr("What's This?"));
+    whatsThisButton->setCheckable(true);
+
+    QPushButton *animateButton = new QPushButton(mainGroup);
+    animateButton->setText(tr("Animated"));
+    animateButton->setCheckable(true);
+    animateButton->setChecked(true);
+
+    QHBoxLayout *viewLayout = new QHBoxLayout(this);
+    viewLayout->addWidget(view);
+    viewLayout->addWidget(mainGroup);
+
+    QVBoxLayout *mainGroupLayout = new QVBoxLayout(mainGroup);
+    mainGroupLayout->addWidget(circleColorGroup);
+    mainGroupLayout->addWidget(circleAlphaGroup);
+    mainGroupLayout->addWidget(modesGroup);
+    mainGroupLayout->addStretch();
+    mainGroupLayout->addWidget(animateButton);
+    mainGroupLayout->addWidget(whatsThisButton);
+    mainGroupLayout->addWidget(showSourceButton);
+#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES)
+    mainGroupLayout->addWidget(enableOpenGLButton);
+#endif
+
+    QGridLayout *modesLayout = new QGridLayout(modesGroup);
+    modesLayout->addWidget(rbClear,             0,      0);
+    modesLayout->addWidget(rbSource,            1,      0);
+    modesLayout->addWidget(rbDest,              2,      0);
+    modesLayout->addWidget(rbSourceOver,        3,      0);
+    modesLayout->addWidget(rbDestOver,          4,      0);
+    modesLayout->addWidget(rbSourceIn,          5,      0);
+    modesLayout->addWidget(rbDestIn,            6,      0);
+    modesLayout->addWidget(rbSourceOut,         7,      0);
+    modesLayout->addWidget(rbDestOut,           8,      0);
+    modesLayout->addWidget(rbSourceAtop,        9,      0);
+    modesLayout->addWidget(rbDestAtop,         10,      0);
+    modesLayout->addWidget(rbXor,              11,      0);
+
+    modesLayout->addWidget(rbPlus,              0,      1);
+    modesLayout->addWidget(rbMultiply,          1,      1);
+    modesLayout->addWidget(rbScreen,            2,      1);
+    modesLayout->addWidget(rbOverlay,           3,      1);
+    modesLayout->addWidget(rbDarken,            4,      1);
+    modesLayout->addWidget(rbLighten,           5,      1);
+    modesLayout->addWidget(rbColorDodge,        6,      1);
+    modesLayout->addWidget(rbColorBurn,         7,      1);
+    modesLayout->addWidget(rbHardLight,         8,      1);
+    modesLayout->addWidget(rbSoftLight,         9,      1);
+    modesLayout->addWidget(rbDifference,       10,      1);
+    modesLayout->addWidget(rbExclusion,        11,      1);
+
+
+    QVBoxLayout *circleColorLayout = new QVBoxLayout(circleColorGroup);
+    circleColorLayout->addWidget(circleColorSlider);
+
+    QVBoxLayout *circleAlphaLayout = new QVBoxLayout(circleAlphaGroup);
+    circleAlphaLayout->addWidget(circleAlphaSlider);
+
+    view->loadDescription(":res/composition/composition.html");
+    view->loadSourceFile(":res/composition/composition.cpp");
+
+    connect(whatsThisButton, SIGNAL(clicked(bool)), view, SLOT(setDescriptionEnabled(bool)));
+    connect(view, SIGNAL(descriptionEnabledChanged(bool)), whatsThisButton, SLOT(setChecked(bool)));
+    connect(showSourceButton, SIGNAL(clicked()), view, SLOT(showSource()));
+#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES)
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), view, SLOT(enableOpenGL(bool)));
+#endif
+    connect(animateButton, SIGNAL(toggled(bool)), view, SLOT(setAnimationEnabled(bool)));
+
+    circleColorSlider->setValue(270);
+    circleAlphaSlider->setValue(200);
+    rbSourceOut->animateClick();
+
+    setWindowTitle(tr("Composition Modes"));
+}
+
+
+void CompositionWidget::nextMode()
+{
+    /*
+      if (!m_animation_enabled)
+      return;
+      if (rbClear->isChecked()) rbSource->animateClick();
+      if (rbSource->isChecked()) rbDest->animateClick();
+      if (rbDest->isChecked()) rbSourceOver->animateClick();
+      if (rbSourceOver->isChecked()) rbDestOver->animateClick();
+      if (rbDestOver->isChecked()) rbSourceIn->animateClick();
+      if (rbSourceIn->isChecked()) rbDestIn->animateClick();
+      if (rbDestIn->isChecked()) rbSourceOut->animateClick();
+      if (rbSourceOut->isChecked()) rbDestOut->animateClick();
+      if (rbDestOut->isChecked()) rbSourceAtop->animateClick();
+      if (rbSourceAtop->isChecked()) rbDestAtop->animateClick();
+      if (rbDestAtop->isChecked()) rbXor->animateClick();
+      if (rbXor->isChecked()) rbClear->animateClick();
+    */
+}
+
+CompositionRenderer::CompositionRenderer(QWidget *parent)
+    : ArthurFrame(parent)
+{
+    m_animation_enabled = true;
+#ifdef Q_WS_QWS
+    m_image = QPixmap(":res/composition/flower.jpg");
+    m_image.setAlphaChannel(QPixmap(":res/composition/flower_alpha.jpg"));
+#else
+    m_image = QImage(":res/composition/flower.jpg");
+    m_image.setAlphaChannel(QImage(":res/composition/flower_alpha.jpg"));
+#endif
+    m_circle_alpha = 127;
+    m_circle_hue = 255;
+    m_current_object = NoObject;
+    m_composition_mode = QPainter::CompositionMode_SourceOut;
+
+    m_circle_pos = QPoint(200, 100);
+
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+#ifdef QT_OPENGL_SUPPORT
+    m_pbuffer = 0;
+    m_pbuffer_size = 1024;
+#endif
+}
+
+QRectF rectangle_around(const QPointF &p, const QSizeF &size = QSize(250, 200))
+{
+    QRectF rect(p, size);
+    rect.translate(-size.width()/2, -size.height()/2);
+    return rect;
+}
+
+void CompositionRenderer::updateCirclePos()
+{
+    if (m_current_object != NoObject)
+        return;
+    QDateTime dt = QDateTime::currentDateTime();
+    qreal t = (dt.toTime_t() * 1000 + dt.time().msec()) / 1000.0;
+
+    qreal x = width() / qreal(2) + (qCos(t*8/11) + qSin(-t)) * width() / qreal(4);
+    qreal y = height() / qreal(2) + (qSin(t*6/7) + qCos(t * qreal(1.5))) * height() / qreal(4);
+
+    setCirclePos(QLineF(m_circle_pos, QPointF(x, y)).pointAt(0.02));
+}
+
+void CompositionRenderer::drawBase(QPainter &p)
+{
+    p.setPen(Qt::NoPen);
+
+    QLinearGradient rect_gradient(0, 0, 0, height());
+    rect_gradient.setColorAt(0, Qt::red);
+    rect_gradient.setColorAt(.17, Qt::yellow);
+    rect_gradient.setColorAt(.33, Qt::green);
+    rect_gradient.setColorAt(.50, Qt::cyan);
+    rect_gradient.setColorAt(.66, Qt::blue);
+    rect_gradient.setColorAt(.81, Qt::magenta);
+    rect_gradient.setColorAt(1, Qt::red);
+    p.setBrush(rect_gradient);
+    p.drawRect(width() / 2, 0, width() / 2, height());
+
+    QLinearGradient alpha_gradient(0, 0, width(), 0);
+    alpha_gradient.setColorAt(0, Qt::white);
+    alpha_gradient.setColorAt(0.2, Qt::white);
+    alpha_gradient.setColorAt(0.5, Qt::transparent);
+    alpha_gradient.setColorAt(0.8, Qt::white);
+    alpha_gradient.setColorAt(1, Qt::white);
+
+    p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+    p.setBrush(alpha_gradient);
+    p.drawRect(0, 0, width(), height());
+
+    p.setCompositionMode(QPainter::CompositionMode_DestinationOver);
+
+    p.setPen(Qt::NoPen);
+    p.setRenderHint(QPainter::SmoothPixmapTransform);
+#ifdef Q_WS_QWS
+    p.drawPixmap(rect(), m_image);
+#else
+    p.drawImage(rect(), m_image);
+#endif
+}
+
+void CompositionRenderer::drawSource(QPainter &p)
+{
+    p.setPen(Qt::NoPen);
+    p.setRenderHint(QPainter::Antialiasing);
+    p.setCompositionMode(m_composition_mode);
+
+    QRectF circle_rect = rectangle_around(m_circle_pos);
+    QColor color = QColor::fromHsvF(m_circle_hue / 360.0, 1, 1, m_circle_alpha / 255.0);
+    QLinearGradient circle_gradient(circle_rect.topLeft(), circle_rect.bottomRight());
+    circle_gradient.setColorAt(0, color.light());
+    circle_gradient.setColorAt(0.5, color);
+    circle_gradient.setColorAt(1, color.dark());
+    p.setBrush(circle_gradient);
+
+    p.drawEllipse(circle_rect);
+}
+
+void CompositionRenderer::paint(QPainter *painter)
+{
+#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES)
+    if (usesOpenGL()) {
+
+        int new_pbuf_size = m_pbuffer_size;
+        if (size().width() > m_pbuffer_size ||
+            size().height() > m_pbuffer_size)
+            new_pbuf_size *= 2;
+
+        if (size().width() < m_pbuffer_size/2 &&
+            size().height() < m_pbuffer_size/2)
+            new_pbuf_size /= 2;
+
+        if (!m_pbuffer || new_pbuf_size != m_pbuffer_size) {
+            if (m_pbuffer) {
+                m_pbuffer->deleteTexture(m_base_tex);
+                m_pbuffer->deleteTexture(m_compositing_tex);
+                delete m_pbuffer;
+            }
+
+            m_pbuffer = new QGLPixelBuffer(QSize(new_pbuf_size, new_pbuf_size), QGLFormat::defaultFormat(), glWidget());
+            m_pbuffer->makeCurrent();
+            m_base_tex = m_pbuffer->generateDynamicTexture();
+            m_compositing_tex = m_pbuffer->generateDynamicTexture();
+            m_pbuffer_size = new_pbuf_size;
+        }
+
+        if (size() != m_previous_size) {
+            m_previous_size = size();
+            QPainter p(m_pbuffer);
+            p.setCompositionMode(QPainter::CompositionMode_Source);
+            p.fillRect(QRect(0, 0, m_pbuffer->width(), m_pbuffer->height()), Qt::transparent);
+            drawBase(p);
+            p.end();
+            m_pbuffer->updateDynamicTexture(m_base_tex);
+        }
+
+        qreal x_fraction = width()/float(m_pbuffer->width());
+        qreal y_fraction = height()/float(m_pbuffer->height());
+
+        {
+            QPainter p(m_pbuffer);
+            p.setCompositionMode(QPainter::CompositionMode_Source);
+            p.fillRect(QRect(0, 0, m_pbuffer->width(), m_pbuffer->height()), Qt::transparent);
+
+            p.save();
+            glBindTexture(GL_TEXTURE_2D, m_base_tex);
+            glEnable(GL_TEXTURE_2D);
+            glColor4f(1.,1.,1.,1.);
+
+            glBegin(GL_QUADS);
+            {
+                glTexCoord2f(0, 1.0);
+                glVertex2f(0, 0);
+
+                glTexCoord2f(x_fraction, 1.0);
+                glVertex2f(width(), 0);
+
+                glTexCoord2f(x_fraction, 1.0-y_fraction);
+                glVertex2f(width(), height());
+
+                glTexCoord2f(0, 1.0-y_fraction);
+                glVertex2f(0, height());
+            }
+            glEnd();
+
+            glDisable(GL_TEXTURE_2D);
+            p.restore();
+
+            drawSource(p);
+            p.end();
+            m_pbuffer->updateDynamicTexture(m_compositing_tex);
+        }
+
+        glWidget()->makeCurrent();
+        glBindTexture(GL_TEXTURE_2D, m_compositing_tex);
+        glEnable(GL_TEXTURE_2D);
+        glColor4f(1.,1.,1.,1.);
+        glBegin(GL_QUADS);
+        {
+            glTexCoord2f(0, 1.0);
+            glVertex2f(0, 0);
+
+            glTexCoord2f(x_fraction, 1.0);
+            glVertex2f(width(), 0);
+
+            glTexCoord2f(x_fraction, 1.0-y_fraction);
+            glVertex2f(width(), height());
+
+            glTexCoord2f(0, 1.0-y_fraction);
+            glVertex2f(0, height());
+        }
+        glEnd();
+        glDisable(GL_TEXTURE_2D);
+    } else
+#endif
+    {
+        // using a QImage
+        if (m_buffer.size() != size()) {
+#ifdef Q_WS_QWS
+            m_base_buffer = QPixmap(size());
+            m_base_buffer.fill(Qt::transparent);
+#else
+            m_buffer = QImage(size(), QImage::Format_ARGB32_Premultiplied);
+            m_base_buffer = QImage(size(), QImage::Format_ARGB32_Premultiplied);
+
+            m_base_buffer.fill(0);
+#endif
+
+            QPainter p(&m_base_buffer);
+
+            drawBase(p);
+        }
+
+#ifdef Q_WS_QWS
+        m_buffer = m_base_buffer;
+#else
+        memcpy(m_buffer.bits(), m_base_buffer.bits(), m_buffer.numBytes());
+#endif
+
+        {
+            QPainter p(&m_buffer);
+            drawSource(p);
+        }
+
+#ifdef Q_WS_QWS
+        painter->drawPixmap(0, 0, m_buffer);
+#else
+        painter->drawImage(0, 0, m_buffer);
+#endif
+    }
+
+    if (m_animation_enabled && m_current_object == NoObject) {
+        updateCirclePos();
+    }
+}
+
+void CompositionRenderer::mousePressEvent(QMouseEvent *e)
+{
+    setDescriptionEnabled(false);
+
+    QRectF circle = rectangle_around(m_circle_pos);
+
+    if (circle.contains(e->pos())) {
+        m_current_object = Circle;
+        m_offset = circle.center() - e->pos();
+    } else {
+        m_current_object = NoObject;
+    }
+}
+
+void CompositionRenderer::mouseMoveEvent(QMouseEvent *e)
+{
+    if (m_current_object == Circle) setCirclePos(e->pos() + m_offset);
+}
+
+void CompositionRenderer::mouseReleaseEvent(QMouseEvent *)
+{
+    m_current_object = NoObject;
+
+    if (m_animation_enabled)
+        updateCirclePos();
+}
+
+void CompositionRenderer::setCirclePos(const QPointF &pos)
+{
+    const QRect oldRect = rectangle_around(m_circle_pos).toAlignedRect();
+    m_circle_pos = pos;
+    const QRect newRect = rectangle_around(m_circle_pos).toAlignedRect();
+#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES)
+    if (usesOpenGL())
+        update();
+    else
+#endif
+        update(oldRect | newRect);
+}
+
diff --git a/demos/composition/composition.h b/demos/composition/composition.h
new file mode 100644
index 0000000..1d504d0
--- /dev/null
+++ b/demos/composition/composition.h
@@ -0,0 +1,190 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COMPOSITION_H
+#define COMPOSITION_H
+
+#include "arthurwidgets.h"
+
+#include <QPainter>
+#include <QEvent>
+
+QT_FORWARD_DECLARE_CLASS(QPushButton)
+QT_FORWARD_DECLARE_CLASS(QRadioButton)
+
+#ifdef QT_OPENGL_SUPPORT
+#include <QtOpenGL>
+#endif
+
+class CompositionWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    CompositionWidget(QWidget *parent);
+
+public slots:
+void nextMode();
+
+private:
+    bool m_cycle_enabled;
+
+    QRadioButton *rbClear;
+    QRadioButton *rbSource;
+    QRadioButton *rbDest;
+    QRadioButton *rbSourceOver;
+    QRadioButton *rbDestOver;
+    QRadioButton *rbSourceIn;
+    QRadioButton *rbDestIn;
+    QRadioButton *rbSourceOut;
+    QRadioButton *rbDestOut;
+    QRadioButton *rbSourceAtop;
+    QRadioButton *rbDestAtop;
+    QRadioButton *rbXor;
+
+    QRadioButton *rbPlus;
+    QRadioButton *rbMultiply;
+    QRadioButton *rbScreen;
+    QRadioButton *rbOverlay;
+    QRadioButton *rbDarken;
+    QRadioButton *rbLighten;
+    QRadioButton *rbColorDodge;
+    QRadioButton *rbColorBurn;
+    QRadioButton *rbHardLight;
+    QRadioButton *rbSoftLight;
+    QRadioButton *rbDifference;
+    QRadioButton *rbExclusion;
+};
+
+class CompositionRenderer : public ArthurFrame
+{
+    Q_OBJECT
+
+    enum ObjectType { NoObject, Circle, Rectangle, Image };
+
+    Q_PROPERTY(int circleColor READ circleColor WRITE setCircleColor)
+    Q_PROPERTY(int circleAlpha READ circleAlpha WRITE setCircleAlpha)
+    Q_PROPERTY(bool animation READ animationEnabled WRITE setAnimationEnabled)
+
+public:
+    CompositionRenderer(QWidget *parent);
+
+    void paint(QPainter *);
+
+    void mousePressEvent(QMouseEvent *);
+    void mouseMoveEvent(QMouseEvent *);
+    void mouseReleaseEvent(QMouseEvent *);
+
+    void setCirclePos(const QPointF &pos);
+
+    QSize sizeHint() const { return QSize(500, 400); }
+
+    bool animationEnabled() const { return m_animation_enabled; }
+    int circleColor() const { return m_circle_hue; }
+    int circleAlpha() const { return m_circle_alpha; }
+
+public slots:
+    void setClearMode() { m_composition_mode = QPainter::CompositionMode_Clear; update(); }
+    void setSourceMode() { m_composition_mode = QPainter::CompositionMode_Source; update(); }
+    void setDestMode() { m_composition_mode = QPainter::CompositionMode_Destination; update(); }
+    void setSourceOverMode() { m_composition_mode = QPainter::CompositionMode_SourceOver; update(); }
+    void setDestOverMode() { m_composition_mode = QPainter::CompositionMode_DestinationOver; update(); }
+    void setSourceInMode() { m_composition_mode = QPainter::CompositionMode_SourceIn; update(); }
+    void setDestInMode() { m_composition_mode = QPainter::CompositionMode_DestinationIn; update(); }
+    void setSourceOutMode() { m_composition_mode = QPainter::CompositionMode_SourceOut; update(); }
+    void setDestOutMode() { m_composition_mode = QPainter::CompositionMode_DestinationOut; update(); }
+    void setSourceAtopMode() { m_composition_mode = QPainter::CompositionMode_SourceAtop; update(); }
+    void setDestAtopMode() { m_composition_mode = QPainter::CompositionMode_DestinationAtop; update(); }
+    void setXorMode() { m_composition_mode = QPainter::CompositionMode_Xor; update(); }
+
+    void setPlusMode() { m_composition_mode = QPainter::CompositionMode_Plus; update(); }
+    void setMultiplyMode() { m_composition_mode = QPainter::CompositionMode_Multiply; update(); }
+    void setScreenMode() { m_composition_mode = QPainter::CompositionMode_Screen; update(); }
+    void setOverlayMode() { m_composition_mode = QPainter::CompositionMode_Overlay; update(); }
+    void setDarkenMode() { m_composition_mode = QPainter::CompositionMode_Darken; update(); }
+    void setLightenMode() { m_composition_mode = QPainter::CompositionMode_Lighten; update(); }
+    void setColorDodgeMode() { m_composition_mode = QPainter::CompositionMode_ColorDodge; update(); }
+    void setColorBurnMode() { m_composition_mode = QPainter::CompositionMode_ColorBurn; update(); }
+    void setHardLightMode() { m_composition_mode = QPainter::CompositionMode_HardLight; update(); }
+    void setSoftLightMode() { m_composition_mode = QPainter::CompositionMode_SoftLight; update(); }
+    void setDifferenceMode() { m_composition_mode = QPainter::CompositionMode_Difference; update(); }
+    void setExclusionMode() { m_composition_mode = QPainter::CompositionMode_Exclusion; update(); }
+
+    void setCircleAlpha(int alpha) { m_circle_alpha = alpha; update(); }
+    void setCircleColor(int hue) { m_circle_hue = hue; update(); }
+    void setAnimationEnabled(bool enabled) { m_animation_enabled = enabled; update(); }
+
+private:
+    void updateCirclePos();
+    void drawBase(QPainter &p);
+    void drawSource(QPainter &p);
+
+    QPainter::CompositionMode m_composition_mode;
+
+#ifdef Q_WS_QWS
+    QPixmap m_image;
+    QPixmap m_buffer;
+    QPixmap m_base_buffer;
+#else
+    QImage m_image;
+    QImage m_buffer;
+    QImage m_base_buffer;
+#endif
+
+    int m_circle_alpha;
+    int m_circle_hue;
+
+    QPointF m_circle_pos;
+    QPointF m_offset;
+
+    ObjectType m_current_object;
+    bool m_animation_enabled;
+
+#ifdef QT_OPENGL_SUPPORT
+    QGLPixelBuffer *m_pbuffer;
+    GLuint m_base_tex;
+    GLuint m_compositing_tex;
+    int m_pbuffer_size; // width==height==size of pbuffer
+    QSize m_previous_size;
+#endif
+};
+
+#endif // COMPOSITION_H
diff --git a/demos/composition/composition.html b/demos/composition/composition.html
new file mode 100644
index 0000000..1848ad8
--- /dev/null
+++ b/demos/composition/composition.html
@@ -0,0 +1,23 @@
+<html>
+
+<h1>Demo for composition modes</h1>
+
+<p>
+  This demo shows some of the more advanced composition modes supported by Qt.
+</p>
+
+<p>
+  The two most common forms of composition are <b>Source</b> and <b>SourceOver</b>.
+  <b>Source</b> is used to draw opaque objects onto a paint device. In this mode,
+  each pixel in the source replaces the corresponding pixel in the destination.
+  In <b>SourceOver</b> composition mode, the source object is transparent and is
+  drawn on top of the destination.
+</p>
+
+<p>
+  In addition to these standard modes, Qt defines the complete set of composition
+  modes as defined by Thomas Porter and Tom Duff. See the <tt>QPainter</tt> documentation
+  for details.
+</p>
+
+</html>
diff --git a/demos/composition/composition.pro b/demos/composition/composition.pro
new file mode 100644
index 0000000..d5c4a60
--- /dev/null
+++ b/demos/composition/composition.pro
@@ -0,0 +1,27 @@
+SOURCES += main.cpp composition.cpp
+HEADERS += composition.h
+
+SHARED_FOLDER = ../shared
+
+include($$SHARED_FOLDER/shared.pri)
+
+RESOURCES += composition.qrc
+contains(QT_CONFIG, opengl) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/composition
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html
+sources.path = $$[QT_INSTALL_DEMOS]/composition
+INSTALLS += target sources
+
+win32-msvc* {
+    QMAKE_CXXFLAGS += /Zm500
+    QMAKE_CFLAGS += /Zm500
+}
+
+wince* {
+    DEPLOYMENT_PLUGIN += qjpeg
+}
diff --git a/demos/composition/composition.qrc b/demos/composition/composition.qrc
new file mode 100644
index 0000000..d02c397
--- /dev/null
+++ b/demos/composition/composition.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res/composition">
+   <file>composition.cpp</file>
+   <file>composition.html</file>
+   <file>flower.jpg</file>
+   <file>flower_alpha.jpg</file>
+</qresource>
+</RCC>
diff --git a/demos/composition/flower.jpg b/demos/composition/flower.jpg
new file mode 100644
index 0000000..f8e022c
--- /dev/null
+++ b/demos/composition/flower.jpg
diff --git a/demos/composition/flower_alpha.jpg b/demos/composition/flower_alpha.jpg
new file mode 100644
index 0000000..6a3c2a0
--- /dev/null
+++ b/demos/composition/flower_alpha.jpg
diff --git a/demos/composition/main.cpp b/demos/composition/main.cpp
new file mode 100644
index 0000000..74055b2
--- /dev/null
+++ b/demos/composition/main.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "composition.h"
+
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+ //   Q_INIT_RESOURCE(deform);
+
+    QApplication app(argc, argv);
+
+    CompositionWidget compWidget(0);
+    QStyle *arthurStyle = new ArthurStyle();
+    compWidget.setStyle(arthurStyle);
+
+    QList<QWidget *> widgets = qFindChildren<QWidget *>(&compWidget);
+    foreach (QWidget *w, widgets)
+        w->setStyle(arthurStyle);
+    compWidget.show();
+
+    return app.exec();
+}
diff --git a/demos/deform/deform.pro b/demos/deform/deform.pro
new file mode 100644
index 0000000..db8484d
--- /dev/null
+++ b/demos/deform/deform.pro
@@ -0,0 +1,19 @@
+SOURCES += main.cpp pathdeform.cpp
+HEADERS += pathdeform.h
+
+SHARED_FOLDER = ../shared
+
+include($$SHARED_FOLDER/shared.pri)
+
+RESOURCES += deform.qrc
+
+contains(QT_CONFIG, opengl) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/deform
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
+sources.path = $$[QT_INSTALL_DEMOS]/deform
+INSTALLS += target sources
diff --git a/demos/deform/deform.qrc b/demos/deform/deform.qrc
new file mode 100644
index 0000000..2e59ebc
--- /dev/null
+++ b/demos/deform/deform.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res/deform">
+   <file>pathdeform.cpp</file>
+   <file>pathdeform.html</file>
+</qresource>
+</RCC>
diff --git a/demos/deform/main.cpp b/demos/deform/main.cpp
new file mode 100644
index 0000000..e32fa12
--- /dev/null
+++ b/demos/deform/main.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "pathdeform.h"
+
+#include <QApplication>
+#include <QDebug>
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(deform);
+
+    QApplication app(argc, argv);
+
+    bool smallScreen = false;
+    for (int i=0; i<argc; i++)
+        if (QString(argv[i]) == "-small-screen")
+            smallScreen = true;
+
+    PathDeformWidget deformWidget(0, smallScreen);
+
+    QStyle *arthurStyle = new ArthurStyle();
+    deformWidget.setStyle(arthurStyle);
+    QList<QWidget *> widgets = qFindChildren<QWidget *>(&deformWidget);
+    foreach (QWidget *w, widgets)
+        w->setStyle(arthurStyle);
+
+    if (smallScreen)
+        deformWidget.showFullScreen();
+    else
+        deformWidget.show();
+
+    return app.exec();
+}
diff --git a/demos/deform/pathdeform.cpp b/demos/deform/pathdeform.cpp
new file mode 100644
index 0000000..2e1d89a
--- /dev/null
+++ b/demos/deform/pathdeform.cpp
@@ -0,0 +1,647 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "pathdeform.h"
+
+#include <QApplication>
+#include <QtDebug>
+#include <QMouseEvent>
+#include <QTimerEvent>
+#include <QLayout>
+#include <QLineEdit>
+#include <QPainter>
+#include <QSlider>
+#include <QLabel>
+#include <QDesktopWidget>
+#include <qmath.h>
+
+
+PathDeformControls::PathDeformControls(QWidget *parent, PathDeformRenderer* renderer, bool smallScreen)
+      : QWidget(parent)
+{
+    m_renderer = renderer;
+
+    if (smallScreen)
+        layoutForSmallScreen();
+    else
+        layoutForDesktop();
+}
+
+
+void PathDeformControls::layoutForDesktop()
+{
+    QGroupBox* mainGroup = new QGroupBox(this);
+    mainGroup->setTitle(tr("Controls"));
+
+    QGroupBox *radiusGroup = new QGroupBox(mainGroup);
+    radiusGroup->setTitle(tr("Lens Radius"));
+    QSlider *radiusSlider = new QSlider(Qt::Horizontal, radiusGroup);
+    radiusSlider->setRange(15, 150);
+    radiusSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    QGroupBox *deformGroup = new QGroupBox(mainGroup);
+    deformGroup->setTitle(tr("Deformation"));
+    QSlider *deformSlider = new QSlider(Qt::Horizontal, deformGroup);
+    deformSlider->setRange(-100, 100);
+    deformSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    QGroupBox *fontSizeGroup = new QGroupBox(mainGroup);
+    fontSizeGroup->setTitle(tr("Font Size"));
+    QSlider *fontSizeSlider = new QSlider(Qt::Horizontal, fontSizeGroup);
+    fontSizeSlider->setRange(16, 200);
+    fontSizeSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    QGroupBox *textGroup = new QGroupBox(mainGroup);
+    textGroup->setTitle(tr("Text"));
+    QLineEdit *textInput = new QLineEdit(textGroup);
+
+    QPushButton *animateButton = new QPushButton(mainGroup);
+    animateButton->setText(tr("Animated"));
+    animateButton->setCheckable(true);
+
+    QPushButton *showSourceButton = new QPushButton(mainGroup);
+    showSourceButton->setText(tr("Show Source"));
+
+#ifdef QT_OPENGL_SUPPORT
+    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(true);
+    enableOpenGLButton->setChecked(m_renderer->usesOpenGL());
+    if (!QGLFormat::hasOpenGL())
+        enableOpenGLButton->hide();
+#endif
+
+    QPushButton *whatsThisButton = new QPushButton(mainGroup);
+    whatsThisButton->setText(tr("What's This?"));
+    whatsThisButton->setCheckable(true);
+
+
+    mainGroup->setFixedWidth(180);
+
+    QVBoxLayout *mainGroupLayout = new QVBoxLayout(mainGroup);
+    mainGroupLayout->addWidget(radiusGroup);
+    mainGroupLayout->addWidget(deformGroup);
+    mainGroupLayout->addWidget(fontSizeGroup);
+    mainGroupLayout->addWidget(textGroup);
+    mainGroupLayout->addWidget(animateButton);
+    mainGroupLayout->addStretch(1);
+#ifdef QT_OPENGL_SUPPORT
+    mainGroupLayout->addWidget(enableOpenGLButton);
+#endif
+    mainGroupLayout->addWidget(showSourceButton);
+    mainGroupLayout->addWidget(whatsThisButton);
+
+    QVBoxLayout *radiusGroupLayout = new QVBoxLayout(radiusGroup);
+    radiusGroupLayout->addWidget(radiusSlider);
+
+    QVBoxLayout *deformGroupLayout = new QVBoxLayout(deformGroup);
+    deformGroupLayout->addWidget(deformSlider);
+
+    QVBoxLayout *fontSizeGroupLayout = new QVBoxLayout(fontSizeGroup);
+    fontSizeGroupLayout->addWidget(fontSizeSlider);
+
+    QVBoxLayout *textGroupLayout = new QVBoxLayout(textGroup);
+    textGroupLayout->addWidget(textInput);
+
+    QVBoxLayout * mainLayout = new QVBoxLayout(this);
+    mainLayout->addWidget(mainGroup);
+    mainLayout->setMargin(0);
+
+    connect(radiusSlider, SIGNAL(valueChanged(int)), m_renderer, SLOT(setRadius(int)));
+    connect(deformSlider, SIGNAL(valueChanged(int)), m_renderer, SLOT(setIntensity(int)));
+    connect(fontSizeSlider, SIGNAL(valueChanged(int)), m_renderer, SLOT(setFontSize(int)));
+    connect(animateButton, SIGNAL(clicked(bool)), m_renderer, SLOT(setAnimated(bool)));
+#ifdef QT_OPENGL_SUPPORT
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer, SLOT(enableOpenGL(bool)));
+#endif
+
+    connect(textInput, SIGNAL(textChanged(QString)), m_renderer, SLOT(setText(QString)));
+    connect(m_renderer, SIGNAL(descriptionEnabledChanged(bool)),
+            whatsThisButton, SLOT(setChecked(bool)));
+    connect(whatsThisButton, SIGNAL(clicked(bool)), m_renderer, SLOT(setDescriptionEnabled(bool)));
+    connect(showSourceButton, SIGNAL(clicked()), m_renderer, SLOT(showSource()));
+
+    animateButton->animateClick();
+    deformSlider->setValue(80);
+    fontSizeSlider->setValue(120);
+    radiusSlider->setValue(100);
+    textInput->setText(tr("Qt"));
+}
+
+void PathDeformControls::layoutForSmallScreen()
+{
+    QGroupBox* mainGroup = new QGroupBox(this);
+    mainGroup->setTitle(tr("Controls"));
+
+    QLabel *radiusLabel = new QLabel(mainGroup);
+    radiusLabel->setText(tr("Lens Radius:"));
+    QSlider *radiusSlider = new QSlider(Qt::Horizontal, mainGroup);
+    radiusSlider->setRange(15, 150);
+    radiusSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+    QLabel *deformLabel = new QLabel(mainGroup);
+    deformLabel->setText(tr("Deformation:"));
+    QSlider *deformSlider = new QSlider(Qt::Horizontal, mainGroup);
+    deformSlider->setRange(-100, 100);
+    deformSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+    QLabel *fontSizeLabel = new QLabel(mainGroup);
+    fontSizeLabel->setText(tr("Font Size:"));
+    QSlider *fontSizeSlider = new QSlider(Qt::Horizontal, mainGroup);
+    fontSizeSlider->setRange(16, 200);
+    fontSizeSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+    QPushButton *animateButton = new QPushButton(tr("Animated"), mainGroup);
+    animateButton->setCheckable(true);
+
+#ifdef QT_OPENGL_SUPPORT
+    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(mainGroup);
+    enableOpenGLButton->setChecked(m_renderer->usesOpenGL());
+    if (!QGLFormat::hasOpenGL())
+        enableOpenGLButton->hide();
+#endif
+
+    QPushButton *quitButton = new QPushButton(tr("Quit"), mainGroup);
+    QPushButton *okButton = new QPushButton(tr("OK"), mainGroup);
+
+
+    QGridLayout *mainGroupLayout = new QGridLayout(mainGroup);
+    mainGroupLayout->setMargin(0);
+    mainGroupLayout->addWidget(radiusLabel, 0, 0, Qt::AlignRight);
+    mainGroupLayout->addWidget(radiusSlider, 0, 1);
+    mainGroupLayout->addWidget(deformLabel, 1, 0, Qt::AlignRight);
+    mainGroupLayout->addWidget(deformSlider, 1, 1);
+    mainGroupLayout->addWidget(fontSizeLabel, 2, 0, Qt::AlignRight);
+    mainGroupLayout->addWidget(fontSizeSlider, 2, 1);
+    mainGroupLayout->addWidget(animateButton, 3,0, 1,2);
+#ifdef QT_OPENGL_SUPPORT
+    mainGroupLayout->addWidget(enableOpenGLButton, 4,0, 1,2);
+#endif
+
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+    mainLayout->addWidget(mainGroup);
+    mainLayout->addStretch(1);
+    mainLayout->addWidget(okButton);
+    mainLayout->addWidget(quitButton);
+
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(emitQuitSignal()));
+    connect(okButton, SIGNAL(clicked()), this, SLOT(emitOkSignal()));
+    connect(radiusSlider, SIGNAL(valueChanged(int)), m_renderer, SLOT(setRadius(int)));
+    connect(deformSlider, SIGNAL(valueChanged(int)), m_renderer, SLOT(setIntensity(int)));
+    connect(fontSizeSlider, SIGNAL(valueChanged(int)), m_renderer, SLOT(setFontSize(int)));
+    connect(animateButton, SIGNAL(clicked(bool)), m_renderer, SLOT(setAnimated(bool)));
+#ifdef QT_OPENGL_SUPPORT
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer, SLOT(enableOpenGL(bool)));
+#endif
+
+
+    animateButton->animateClick();
+    deformSlider->setValue(80);
+    fontSizeSlider->setValue(120);
+
+    QRect screen_size = QApplication::desktop()->screenGeometry();
+    radiusSlider->setValue(qMin(screen_size.width(), screen_size.height())/5);
+    m_renderer->setText(tr("Qt"));
+}
+
+
+void PathDeformControls::emitQuitSignal()
+{   emit quitPressed();  }
+
+void PathDeformControls::emitOkSignal()
+{   emit okPressed();   }
+
+
+PathDeformWidget::PathDeformWidget(QWidget *parent, bool smallScreen)
+    : QWidget(parent)
+{
+    setWindowTitle(tr("Vector Deformation"));
+
+    m_renderer = new PathDeformRenderer(this, smallScreen);
+    m_renderer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+    // Layouts
+    QHBoxLayout *mainLayout = new QHBoxLayout(this);
+    mainLayout->addWidget(m_renderer);
+
+    m_controls = new PathDeformControls(0, m_renderer, smallScreen);
+    m_controls->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+
+    if (!smallScreen)
+        mainLayout->addWidget(m_controls);
+
+    m_renderer->loadSourceFile(":res/deform/pathdeform.cpp");
+    m_renderer->loadDescription(":res/deform/pathdeform.html");
+    m_renderer->setDescriptionEnabled(false);
+
+    connect(m_renderer, SIGNAL(clicked()), this, SLOT(showControls()));
+    connect(m_controls, SIGNAL(okPressed()), this, SLOT(hideControls()));
+    connect(m_controls, SIGNAL(quitPressed()), QApplication::instance(), SLOT(quit()));
+}
+
+
+void PathDeformWidget::showControls()
+{
+    m_controls->showFullScreen();
+}
+
+void PathDeformWidget::hideControls()
+{
+    m_controls->hide();
+}
+
+void PathDeformWidget::setStyle( QStyle * style )
+{
+    QWidget::setStyle(style);
+    if (m_controls != 0)
+    {
+        m_controls->setStyle(style);
+        
+        QList<QWidget *> widgets = qFindChildren<QWidget *>(m_controls);
+        foreach (QWidget *w, widgets)
+            w->setStyle(style);
+    }
+}
+
+static inline QRect circle_bounds(const QPointF &center, qreal radius, qreal compensation)
+{
+    return QRect(qRound(center.x() - radius - compensation),
+                 qRound(center.y() - radius - compensation),
+                 qRound((radius + compensation) * 2),
+                 qRound((radius + compensation) * 2));
+
+}
+
+const int LENS_EXTENT = 10;
+
+PathDeformRenderer::PathDeformRenderer(QWidget *widget, bool smallScreen)
+    : ArthurFrame(widget)
+{
+    m_radius = 100;
+    m_pos = QPointF(m_radius, m_radius);
+    m_direction = QPointF(1, 1);
+    m_fontSize = 24;
+    m_animated = true;
+    m_repaintTimer.start(25, this);
+    m_repaintTracker.start();
+    m_intensity = 100;
+    m_smallScreen = smallScreen;
+
+//     m_fpsTimer.start(1000, this);
+//     m_fpsCounter = 0;
+
+    generateLensPixmap();
+}
+
+void PathDeformRenderer::setText(const QString &text)
+{
+    m_text = text;
+
+    QFont f("times new roman,utopia");
+    f.setStyleStrategy(QFont::ForceOutline);
+    f.setPointSize(m_fontSize);
+    f.setStyleHint(QFont::Times);
+
+    QFontMetrics fm(f);
+
+    m_paths.clear();
+    m_pathBounds = QRect();
+
+    QPointF advance(0, 0);
+
+    bool do_quick = true;
+    for (int i=0; i<text.size(); ++i) {
+        if (text.at(i).unicode() >= 0x4ff && text.at(i).unicode() <= 0x1e00) {
+            do_quick = false;
+            break;
+        }
+    }
+
+    if (do_quick) {
+        for (int i=0; i<text.size(); ++i) {
+            QPainterPath path;
+            path.addText(advance, f, text.mid(i, 1));
+            m_pathBounds |= path.boundingRect();
+            m_paths << path;
+            advance += QPointF(fm.width(text.mid(i, 1)), 0);
+        }
+    } else {
+        QPainterPath path;
+        path.addText(advance, f, text);
+        m_pathBounds |= path.boundingRect();
+        m_paths << path;
+    }
+
+    for (int i=0; i<m_paths.size(); ++i)
+        m_paths[i] = m_paths[i] * QMatrix(1, 0, 0, 1, -m_pathBounds.x(), -m_pathBounds.y());
+
+    update();
+}
+
+
+void PathDeformRenderer::generateLensPixmap()
+{
+    qreal rad = m_radius + LENS_EXTENT;
+
+    QRect bounds = circle_bounds(QPointF(), rad, 0);
+
+    QPainter painter;
+
+    if (preferImage()) {
+        m_lens_image = QImage(bounds.size(), QImage::Format_ARGB32_Premultiplied);
+        m_lens_image.fill(0);
+        painter.begin(&m_lens_image);
+    } else {
+        m_lens_pixmap = QPixmap(bounds.size());
+        m_lens_pixmap.fill(Qt::transparent);
+        painter.begin(&m_lens_pixmap);
+    }
+
+    QRadialGradient gr(rad, rad, rad, 3 * rad / 5, 3 * rad / 5);
+    gr.setColorAt(0.0, QColor(255, 255, 255, 191));
+    gr.setColorAt(0.2, QColor(255, 255, 127, 191));
+    gr.setColorAt(0.9, QColor(150, 150, 200, 63));
+    gr.setColorAt(0.95, QColor(0, 0, 0, 127));
+    gr.setColorAt(1, QColor(0, 0, 0, 0));
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.setBrush(gr);
+    painter.setPen(Qt::NoPen);
+    painter.drawEllipse(0, 0, bounds.width(), bounds.height());
+}
+
+
+void PathDeformRenderer::setAnimated(bool animated)
+{
+    m_animated = animated;
+
+    if (m_animated) {
+//         m_fpsTimer.start(1000, this);
+//         m_fpsCounter = 0;
+        m_repaintTimer.start(25, this);
+        m_repaintTracker.start();
+    } else {
+//         m_fpsTimer.stop();
+        m_repaintTimer.stop();
+    }
+}
+
+void PathDeformRenderer::timerEvent(QTimerEvent *e)
+{
+
+    if (e->timerId() == m_repaintTimer.timerId()) {
+
+        if (QLineF(QPointF(0,0), m_direction).length() > 1)
+            m_direction *= 0.995;
+        qreal time = m_repaintTracker.restart();
+
+        QRect rectBefore = circle_bounds(m_pos, m_radius, m_fontSize);
+
+        qreal dx = m_direction.x();
+        qreal dy = m_direction.y();
+        if (time > 0) {
+            dx = dx * time * .1;
+            dy = dy * time * .1;
+        }
+
+        m_pos += QPointF(dx, dy);
+
+
+
+        if (m_pos.x() - m_radius < 0) {
+            m_direction.setX(-m_direction.x());
+            m_pos.setX(m_radius);
+        } else if (m_pos.x() + m_radius > width()) {
+            m_direction.setX(-m_direction.x());
+            m_pos.setX(width() - m_radius);
+        }
+
+        if (m_pos.y() - m_radius < 0) {
+            m_direction.setY(-m_direction.y());
+            m_pos.setY(m_radius);
+        } else if (m_pos.y() + m_radius > height()) {
+            m_direction.setY(-m_direction.y());
+            m_pos.setY(height() - m_radius);
+        }
+
+#ifdef QT_OPENGL_SUPPORT
+        if (usesOpenGL()) {
+            update();
+        } else
+#endif
+        {
+            QRect rectAfter = circle_bounds(m_pos, m_radius, m_fontSize);
+            update(rectAfter | rectBefore);
+            QApplication::syncX();
+        }
+    }
+//     else if (e->timerId() == m_fpsTimer.timerId()) {
+//         printf("fps: %d\n", m_fpsCounter);
+//         emit frameRate(m_fpsCounter);
+//         m_fpsCounter = 0;
+
+//     }
+}
+
+void PathDeformRenderer::mousePressEvent(QMouseEvent *e)
+{
+    setDescriptionEnabled(false);
+
+    m_repaintTimer.stop();
+    m_offset = QPointF();
+    if (QLineF(m_pos, e->pos()).length() <= m_radius)
+        m_offset = m_pos - e->pos();
+
+    m_mousePress = e->pos();
+    
+    // If we're not running in small screen mode, always assume we're dragging
+    m_mouseDrag = !m_smallScreen;
+
+    mouseMoveEvent(e);
+}
+
+void PathDeformRenderer::mouseReleaseEvent(QMouseEvent *e)
+{
+    if (e->buttons() == Qt::NoButton && m_animated) {
+        m_repaintTimer.start(10, this);
+        m_repaintTracker.start();
+    }
+
+    if (!m_mouseDrag && m_smallScreen)
+        emit clicked();
+}
+
+void PathDeformRenderer::mouseMoveEvent(QMouseEvent *e)
+{
+    if (!m_mouseDrag && (QLineF(m_mousePress, e->pos()).length() > 25.0) )
+        m_mouseDrag = true;
+
+    if (m_mouseDrag) {
+        QRect rectBefore = circle_bounds(m_pos, m_radius, m_fontSize);
+        if (e->type() == QEvent::MouseMove) {
+            QLineF line(m_pos, e->pos() + m_offset);
+            line.setLength(line.length() * .1);
+            QPointF dir(line.dx(), line.dy());
+            m_direction = (m_direction + dir) / 2;
+        }
+        m_pos = e->pos() + m_offset;
+#ifdef QT_OPENGL_SUPPORT
+        if (usesOpenGL()) {
+            update();
+        } else
+#endif
+        {
+            QRect rectAfter = circle_bounds(m_pos, m_radius, m_fontSize);
+            update(rectBefore | rectAfter);
+        }
+    }
+}
+
+QPainterPath PathDeformRenderer::lensDeform(const QPainterPath &source, const QPointF &offset)
+{
+    QPainterPath path;
+    path.addPath(source);
+
+    qreal flip = m_intensity / qreal(100);
+
+    for (int i=0; i<path.elementCount(); ++i) {
+        const QPainterPath::Element &e = path.elementAt(i);
+
+        qreal x = e.x + offset.x();
+        qreal y = e.y + offset.y();
+
+        qreal dx = x - m_pos.x();
+        qreal dy = y - m_pos.y();
+        qreal len = m_radius - qSqrt(dx * dx + dy * dy);
+
+        if (len > 0) {
+            path.setElementPositionAt(i,
+                                      x + flip * dx * len / m_radius,
+                                      y + flip * dy * len / m_radius);
+        } else {
+            path.setElementPositionAt(i, x, y);
+        }
+
+    }
+
+    return path;
+}
+
+
+void PathDeformRenderer::paint(QPainter *painter)
+{
+    int pad_x = 5;
+    int pad_y = 5;
+
+    int skip_x = qRound(m_pathBounds.width() + pad_x + m_fontSize/2);
+    int skip_y = qRound(m_pathBounds.height() + pad_y);
+
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(Qt::black);
+
+    QRectF clip(painter->clipPath().boundingRect());
+
+    int overlap = pad_x / 2;
+
+    for (int start_y=0; start_y < height(); start_y += skip_y) {
+
+        if (start_y > clip.bottom())
+            break;
+
+        int start_x = -overlap;
+        for (; start_x < width(); start_x += skip_x) {
+
+            if (start_y + skip_y >= clip.top() &&
+                start_x + skip_x >= clip.left() &&
+                start_x <= clip.right()) {
+                for (int i=0; i<m_paths.size(); ++i) {
+                    QPainterPath path = lensDeform(m_paths[i], QPointF(start_x, start_y));
+                    painter->drawPath(path);
+                }
+            }
+        }
+        overlap = skip_x - (start_x - width());
+
+    }
+
+    if (preferImage()) {
+        painter->drawImage(m_pos - QPointF(m_radius + LENS_EXTENT, m_radius + LENS_EXTENT),
+                           m_lens_image);
+    } else {
+        painter->drawPixmap(m_pos - QPointF(m_radius + LENS_EXTENT, m_radius + LENS_EXTENT),
+                            m_lens_pixmap);
+    }
+}
+
+
+
+void PathDeformRenderer::setRadius(int radius)
+{
+    qreal max = qMax(m_radius, (qreal)radius);
+    m_radius = radius;
+    generateLensPixmap();
+    if (!m_animated || m_radius < max) {
+#ifdef QT_OPENGL_SUPPORT
+        if (usesOpenGL()) {
+            update();
+        } else
+#endif
+        {
+            update(circle_bounds(m_pos, max, m_fontSize));
+        }
+    }
+}
+
+void PathDeformRenderer::setIntensity(int intensity)
+{
+    m_intensity = intensity;
+    if (!m_animated) {
+#ifdef QT_OPENGL_SUPPORT
+        if (usesOpenGL()) {
+            update();
+        } else
+#endif
+        {
+            update(circle_bounds(m_pos, m_radius, m_fontSize));
+        }
+    }
+}
diff --git a/demos/deform/pathdeform.h b/demos/deform/pathdeform.h
new file mode 100644
index 0000000..45edb26
--- /dev/null
+++ b/demos/deform/pathdeform.h
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PATHDEFORM_H
+#define PATHDEFORM_H
+
+#include "arthurwidgets.h"
+
+#include <QPainterPath>
+#include <QBasicTimer>
+#include <QDateTime>
+
+class PathDeformRenderer : public ArthurFrame
+{
+    Q_OBJECT
+    Q_PROPERTY(bool animated READ animated WRITE setAnimated)
+    Q_PROPERTY(int radius READ radius WRITE setRadius)
+    Q_PROPERTY(int fontSize READ fontSize WRITE setFontSize)
+    Q_PROPERTY(int intensity READ intensity WRITE setIntensity)
+    Q_PROPERTY(QString text READ text WRITE setText)
+
+public:
+    PathDeformRenderer(QWidget *widget, bool smallScreen = false);
+
+    void paint(QPainter *painter);
+
+    void mousePressEvent(QMouseEvent *e);
+    void mouseReleaseEvent(QMouseEvent *e);
+    void mouseMoveEvent(QMouseEvent *e);
+    void timerEvent(QTimerEvent *e);
+
+    QSize sizeHint() const { return QSize(600, 500); }
+
+    bool animated() const { return m_animated; }
+    int radius() const { return int(m_radius); }
+    int fontSize() const { return m_fontSize; }
+    int intensity() const { return int(m_intensity); }
+    QString text() const { return m_text; }
+
+public slots:
+    void setRadius(int radius);
+    void setFontSize(int fontSize) { m_fontSize = fontSize; setText(m_text); }
+    void setText(const QString &text);
+    void setIntensity(int intensity);
+
+    void setAnimated(bool animated);
+
+signals:
+    void clicked();
+//     void frameRate(double fps);
+
+private:
+    void generateLensPixmap();
+    QPainterPath lensDeform(const QPainterPath &source, const QPointF &offset);
+
+    QBasicTimer m_repaintTimer;
+//     QBasicTimer m_fpsTimer;
+//     int m_fpsCounter;
+    QTime m_repaintTracker;
+
+    QVector<QPainterPath> m_paths;
+    QVector<QPointF> m_advances;
+    QRectF m_pathBounds;
+    QString m_text;
+
+    QPixmap m_lens_pixmap;
+    QImage m_lens_image;
+
+    int m_fontSize;
+    bool m_animated;
+
+    qreal m_intensity;
+    qreal m_radius;
+    QPointF m_pos;
+    QPointF m_offset;
+    QPointF m_direction;
+    QPointF m_mousePress;
+    bool    m_mouseDrag;
+    bool    m_smallScreen;
+};
+
+class PathDeformControls : public QWidget
+{
+    Q_OBJECT
+public:
+    PathDeformControls(QWidget *parent, PathDeformRenderer* renderer, bool smallScreen);
+signals:
+    void okPressed();
+    void quitPressed();
+private:
+    PathDeformRenderer* m_renderer;
+    void layoutForDesktop();
+    void layoutForSmallScreen();
+private slots:
+    void emitQuitSignal();
+    void emitOkSignal();
+};
+
+class PathDeformWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    PathDeformWidget(QWidget *parent, bool smallScreen);
+    void setStyle ( QStyle * style );
+
+private:
+    PathDeformRenderer *m_renderer;
+    PathDeformControls *m_controls;
+
+private slots:
+    void showControls();
+    void hideControls();
+};
+
+#endif // PATHDEFORM_H
diff --git a/demos/deform/pathdeform.html b/demos/deform/pathdeform.html
new file mode 100644
index 0000000..b3f63a8
--- /dev/null
+++ b/demos/deform/pathdeform.html
@@ -0,0 +1,24 @@
+<html>
+<center>
+<h2>Vector deformation</h2>
+</center>
+
+<p>This demo shows how to use advanced vector techniques to draw text 
+using a <code>QPainterPath</code>.</p>
+
+<p>We define a vector deformation field in the shape of a lens and apply
+this to all points in a path. This means that what is rendered on
+screen is not pixel manipulation, but modified vector representations of
+the glyphs themselves. This is visible from the high quality of the
+antialiased edges for the deformed glyphs.</p>
+
+<p>To get a fairly complex path we allow the user to type in text and
+convert the text to paths. This is done using the
+<code>QPainterPath::addText()</code> function.</p>
+
+<p>The lens is drawn using a single call to <code>drawEllipse()</code>, using
+a <code>QRadialGradient</code> to fill it with a specialized color table,
+giving the effect of the Sun's reflection and a drop shadow. The lens
+is cached as a pixmap for better performance.</p>
+
+</html>
diff --git a/demos/demos.pro b/demos/demos.pro
new file mode 100644
index 0000000..9248ab8
--- /dev/null
+++ b/demos/demos.pro
@@ -0,0 +1,73 @@
+TEMPLATE    = subdirs
+SUBDIRS     = \
+	demos_shared \
+	demos_deform \
+	demos_gradients \
+	demos_pathstroke \
+	demos_affine \
+	demos_composition \
+        demos_books \
+        demos_interview \
+        demos_mainwindow \
+        demos_spreadsheet \
+        demos_textedit \
+        demos_chip \
+        demos_embeddeddialogs \
+        demos_undo 
+
+contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl):!contains(QT_CONFIG, opengles2):{
+SUBDIRS += demos_boxes
+}
+
+mac*: SUBDIRS += demos_macmainwindow
+wince*|embedded: SUBDIRS += embedded
+
+!contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin
+
+!cross_compile:{
+contains(QT_BUILD_PARTS, tools):{
+!wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo
+wince*: SUBDIRS += demos_sqlbrowser
+}
+}
+contains(QT_CONFIG, phonon)!static:SUBDIRS += demos_mediaplayer
+contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):SUBDIRS += demos_browser
+
+# install
+sources.files = README *.pro
+sources.path = $$[QT_INSTALL_DEMOS]
+INSTALLS += sources
+
+demos_chip.subdir = chip
+demos_embeddeddialogs.subdir = embeddeddialogs
+demos_shared.subdir = shared
+demos_deform.subdir = deform
+demos_gradients.subdir = gradients
+demos_pathstroke.subdir = pathstroke
+demos_affine.subdir = affine
+demos_composition.subdir = composition
+demos_books.subdir = books
+demos_interview.subdir = interview
+demos_macmainwindow.subdir = macmainwindow
+demos_mainwindow.subdir = mainwindow
+demos_spreadsheet.subdir = spreadsheet
+demos_textedit.subdir = textedit
+demos_arthurplugin.subdir = arthurplugin
+demos_sqlbrowser.subdir = sqlbrowser
+demos_undo.subdir = undo
+demos_qtdemo.subdir = qtdemo
+demos_mediaplayer.subdir = mediaplayer
+
+demos_browser.subdir = browser
+
+demos_boxes.subdir = boxes
+
+#CONFIG += ordered
+!ordered {
+     demos_affine.depends = demos_shared
+     demos_deform.depends = demos_shared
+     demos_gradients.depends = demos_shared
+     demos_composition.depends = demos_shared
+     demos_arthurplugin.depends = demos_shared
+     demos_pathstroke.depends = demos_shared
+}
diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro
new file mode 100644
index 0000000..7428b9f
--- /dev/null
+++ b/demos/embedded/embedded.pro
@@ -0,0 +1,13 @@
+TEMPLATE  = subdirs
+SUBDIRS   = styledemo
+
+contains(QT_CONFIG, svg) {
+    SUBDIRS += embeddedsvgviewer \
+               fluidlauncher
+}
+
+# install
+sources.files = README *.pro
+sources.path = $$[QT_INSTALL_DEMOS]/embedded
+INSTALLS += sources
+
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
new file mode 100644
index 0000000..1bd99c9
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QPainter>
+#include <QApplication>
+
+#include "embeddedsvgviewer.h"
+
+
+
+EmbeddedSvgViewer::EmbeddedSvgViewer(const QString &filePath)
+{
+    qApp->setStyleSheet(" QSlider:vertical { width: 50px; } \
+                          QSlider::groove:vertical { border: 1px solid black; border-radius: 3px; width: 6px; } \
+                          QSlider::handle:vertical { height: 25px; margin: 0 -22px; image: url(':/files/v-slider-handle.svg'); } \
+                       ");
+
+    m_renderer = new QSvgRenderer(filePath);
+    m_imageSize = m_renderer->viewBox().size();
+
+    m_viewBoxCenter = (QPointF(m_imageSize.width() / qreal(2.0), m_imageSize.height() / qreal(2.0)));
+
+    m_zoomSlider = new QSlider(Qt::Vertical, this);
+    m_zoomSlider->setMaximum(150);
+    m_zoomSlider->setMinimum(1);
+
+    connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoom(int)));
+    m_zoomSlider->setValue(100);
+
+    m_quitButton = new QPushButton("Quit", this);
+
+    connect(m_quitButton, SIGNAL(pressed()), QApplication::instance(), SLOT(quit()));
+
+    if (m_renderer->animated())
+        connect(m_renderer, SIGNAL(repaintNeeded()), this, SLOT(update()));
+
+}
+
+void EmbeddedSvgViewer::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event)
+    QPainter painter(this);
+    m_renderer->setViewBox(m_viewBox);
+    m_renderer->render(&painter);
+}
+
+
+void EmbeddedSvgViewer::mouseMoveEvent ( QMouseEvent * event )
+{
+    int incX = int((event->globalX() - m_mousePress.x()) * m_imageScale);
+    int incY = int((event->globalY() - m_mousePress.y()) * m_imageScale);
+
+    QPointF newCenter;
+    newCenter.setX(m_viewBoxCenterOnMousePress.x() - incX);
+    newCenter.setY(m_viewBoxCenterOnMousePress.y() - incY);
+  
+    QRectF newViewBox = getViewBox(newCenter);
+
+
+    // Do a bounded move on the horizontal:
+    if ( (newViewBox.left() >= m_viewBoxBounds.left()) &&
+         (newViewBox.right() <= m_viewBoxBounds.right()) ) 
+    {
+        m_viewBoxCenter.setX(newCenter.x());
+        m_viewBox.setLeft(newViewBox.left());
+        m_viewBox.setRight(newViewBox.right());
+    }
+
+    // do a bounded move on the vertical:
+    if (  (newViewBox.top() >= m_viewBoxBounds.top()) &&
+          (newViewBox.bottom() <= m_viewBoxBounds.bottom()) )
+    {
+        m_viewBoxCenter.setY(newCenter.y());
+        m_viewBox.setTop(newViewBox.top());
+        m_viewBox.setBottom(newViewBox.bottom());
+    }
+
+    update();
+}
+
+void EmbeddedSvgViewer::mousePressEvent ( QMouseEvent * event )
+{
+    m_viewBoxCenterOnMousePress = m_viewBoxCenter;
+    m_mousePress = event->globalPos();
+}
+
+
+QRectF EmbeddedSvgViewer::getViewBox(QPointF viewBoxCenter)
+{
+    QRectF result;
+    result.setLeft(viewBoxCenter.x() - (m_viewBoxSize.width() / 2));
+    result.setTop(viewBoxCenter.y() - (m_viewBoxSize.height() / 2));
+    result.setRight(viewBoxCenter.x() + (m_viewBoxSize.width() / 2));
+    result.setBottom(viewBoxCenter.y() + (m_viewBoxSize.height() / 2));
+    return result;
+}
+
+void EmbeddedSvgViewer::updateImageScale()
+{
+    m_imageScale = qMax( (qreal)m_imageSize.width() / (qreal)width(), 
+                               (qreal)m_imageSize.height() / (qreal)height())*m_zoomLevel;
+
+    m_viewBoxSize.setWidth((qreal)width() * m_imageScale);
+    m_viewBoxSize.setHeight((qreal)height() * m_imageScale);
+}
+
+
+void EmbeddedSvgViewer::resizeEvent ( QResizeEvent * event )
+{
+    qreal origZoom = m_zoomLevel;
+
+    // Get the new bounds:
+    m_zoomLevel = 1.0;
+    updateImageScale();
+    m_viewBoxBounds = getViewBox(QPointF(m_imageSize.width() / 2.0, m_imageSize.height() / 2.0));
+
+    m_zoomLevel = origZoom;
+    updateImageScale();
+    m_viewBox = getViewBox(m_viewBoxCenter);
+
+    QRect sliderRect;
+    sliderRect.setLeft(width() - m_zoomSlider->sizeHint().width());
+    sliderRect.setRight(width());
+    sliderRect.setTop(height()/4);
+    sliderRect.setBottom(height() - (height()/4));
+    m_zoomSlider->setGeometry(sliderRect);
+}
+
+
+void EmbeddedSvgViewer::setZoom(int newZoom)
+{
+    m_zoomLevel = qreal(newZoom) / qreal(100);
+    
+    updateImageScale();
+    m_viewBox = getViewBox(m_viewBoxCenter);
+
+    update();
+}
+
+
+
+
+
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h
new file mode 100644
index 0000000..c0af3cf
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EMBEDDED_SVG_VIEWER_H
+#define EMBEDDED_SVG_VIEWER_H
+
+#include <QWidget>
+#include <QString>
+#include <QSvgRenderer>
+#include <QSize>
+#include <QMouseEvent>
+#include <QSlider>
+#include <QPushButton>
+
+class EmbeddedSvgViewer : public QWidget
+{
+    Q_OBJECT
+public:
+    EmbeddedSvgViewer(const QString& filePath);
+    virtual void paintEvent(QPaintEvent *event);
+    void mouseMoveEvent ( QMouseEvent * event );
+    void mousePressEvent ( QMouseEvent * event );
+    void resizeEvent ( QResizeEvent * event );
+
+public slots:
+    void setZoom(int); // 100 <= newZoom < 0
+
+private:
+    QSvgRenderer* m_renderer;
+    QSlider* m_zoomSlider;
+    QPushButton* m_quitButton;
+    QSize m_imageSize;
+    qreal m_zoomLevel;
+    qreal m_imageScale; // How many Image coords 1 widget pixel is worth
+
+    QRectF m_viewBox;
+    QRectF m_viewBoxBounds;
+    QSizeF m_viewBoxSize;
+    QPointF m_viewBoxCenter;
+    QPointF m_viewBoxCenterOnMousePress;
+    QPoint m_mousePress;
+
+    void updateImageScale();
+    QRectF getViewBox(QPointF viewBoxCenter);
+};
+
+
+
+#endif
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
new file mode 100644
index 0000000..505e607
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+QT += svg
+
+# Input
+HEADERS += embeddedsvgviewer.h
+SOURCES += embeddedsvgviewer.cpp main.cpp
+RESOURCES += embeddedsvgviewer.qrc
+
+target.path = $$[QT_INSTALL_DEMOS]/embedded/embeddedsvgviewer
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.svg files
+sources.path = $$[QT_INSTALL_DEMOS]/embedded/embeddedsvgviewer
+INSTALLS += target sources 
+
+wince*: {
+   DEPLOYMENT_PLUGIN += qsvg
+}
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.qrc b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.qrc
new file mode 100644
index 0000000..bb02118
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+    <file>files/v-slider-handle.svg</file>
+    <file>files/default.svg</file>
+</qresource>
+</RCC>
+
diff --git a/demos/embedded/embeddedsvgviewer/files/default.svg b/demos/embedded/embeddedsvgviewer/files/default.svg
new file mode 100644
index 0000000..c28a711
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/files/default.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="400px"
+   height="400px"
+   baseProfile="tiny"
+   id="svg8268"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="simple2.svg"
+   sodipodi:docbase="/nfs/OpenMoko/SVGs"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata8283">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8281" />
+  <sodipodi:namedview
+     inkscape:window-height="917"
+     inkscape:window-width="1324"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="2.1452345"
+     inkscape:cx="185.25"
+     inkscape:cy="214.75"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:current-layer="svg8268" />
+  <g
+     stroke="DarkBlue"
+     stroke-width="10"
+     id="g8270">
+    <rect
+       fill="blue"
+       fill-opacity="0.5"
+       x="25"
+       y="25"
+       width="175"
+       height="175"
+       id="rect8272" />
+  </g>
+  <circle
+     cx="200"
+     cy="200"
+     r="75"
+     id="circle8274"
+     sodipodi:cx="200"
+     sodipodi:cy="200"
+     sodipodi:rx="75"
+     sodipodi:ry="75"
+     transform="translate(-26.104372,21.909027)"
+     style="fill:#ffff00;fill-opacity:0.5;stroke:#000000" />
+  <polygon
+     fill="green"
+     stroke="black"
+     fill-opacity="0.5"
+     stroke-width="1"
+     points="200,225 350,225 275,350"
+     id="polygon8276" />
+  <path
+     style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50196081"
+     d="M 303.7037,50.705207 C 173.88522,56.588264 90.320951,92.710345 162.85059,120.82533 C 211.91719,139.84524 196.63811,214.12391 233.86243,192.59259 C 284.31755,163.4083 299.34345,193.75691 311.11111,187.30159 C 347.88407,167.12924 269.34382,134.85785 303.81608,114.5167 C 394.71183,60.881583 332.47907,46.043712 303.7037,50.705207 z "
+     id="path8289"
+     sodipodi:nodetypes="cssssc" />
+</svg>
diff --git a/demos/embedded/embeddedsvgviewer/files/v-slider-handle.svg b/demos/embedded/embeddedsvgviewer/files/v-slider-handle.svg
new file mode 100644
index 0000000..4ee87f8
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/files/v-slider-handle.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="50"
+   height="25"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tcooksey/Projects/qt-4.4/demos/embedded/embeddedsvgviewer/files"
+   sodipodi:docname="v-slider-handle.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2158">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2160" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2162" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2158"
+       id="linearGradient2164"
+       x1="26.10779"
+       y1="9.1025448"
+       x2="26.10779"
+       y2="-0.01334004"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9876687,0,0,2.5969342,0.3086332,-0.476397)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="12.256878"
+     inkscape:cx="42.920885"
+     inkscape:cy="4.2252457"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="50px"
+     height="25px"
+     inkscape:window-width="1282"
+     inkscape:window-height="879"
+     inkscape:window-x="137"
+     inkscape:window-y="30" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:url(#linearGradient2164);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.60153389px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 10.191803,24.254577 C 26.804559,24.254577 25.309299,24.303278 39.985656,24.303278 C 52.503796,24.303278 51.963217,0.91536797 40.722957,0.91536797 C 13.837108,0.91536797 16.298612,0.86901372 10.385089,0.86901372 C -2.0345215,0.86901372 -2.5249912,24.254577 10.191803,24.254577 z "
+       id="path2162"
+       sodipodi:nodetypes="csssc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#868686;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="path2166"
+       sodipodi:cx="9.4232807"
+       sodipodi:cy="13.169908"
+       sodipodi:rx="2.2436383"
+       sodipodi:ry="1.9580842"
+       d="M 9.4232808,15.127992 A 2.2436383,1.9580842 0 1 1 9.4232808,11.211823 L 9.4232807,13.169908 z"
+       sodipodi:start="1.5707963"
+       sodipodi:end="4.712389"
+       transform="matrix(4.3804554,0,0,2.228386,-25.247974,-16.463284)" />
+  </g>
+</svg>
diff --git a/demos/embedded/embeddedsvgviewer/main.cpp b/demos/embedded/embeddedsvgviewer/main.cpp
new file mode 100644
index 0000000..80f92d6
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/main.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QDebug>
+
+#include "embeddedsvgviewer.h"
+
+int main(int argc, char** argv)
+{
+    QApplication app(argc, argv);
+    Q_INIT_RESOURCE(embeddedsvgviewer);
+
+    QString filePath;
+
+    if (argc == 1)
+      filePath = QLatin1String(":/files/default.svg");
+    else if (argc == 2)
+      filePath = argv[1];
+    else {
+        qDebug() << QLatin1String("Please specify an svg file!");
+        return -1;
+    }
+
+    EmbeddedSvgViewer viewer(filePath);
+
+    viewer.showFullScreen();
+
+    return app.exec();
+} 
diff --git a/demos/embedded/embeddedsvgviewer/shapes.svg b/demos/embedded/embeddedsvgviewer/shapes.svg
new file mode 100644
index 0000000..c28a711
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/shapes.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="400px"
+   height="400px"
+   baseProfile="tiny"
+   id="svg8268"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="simple2.svg"
+   sodipodi:docbase="/nfs/OpenMoko/SVGs"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata8283">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8281" />
+  <sodipodi:namedview
+     inkscape:window-height="917"
+     inkscape:window-width="1324"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="2.1452345"
+     inkscape:cx="185.25"
+     inkscape:cy="214.75"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:current-layer="svg8268" />
+  <g
+     stroke="DarkBlue"
+     stroke-width="10"
+     id="g8270">
+    <rect
+       fill="blue"
+       fill-opacity="0.5"
+       x="25"
+       y="25"
+       width="175"
+       height="175"
+       id="rect8272" />
+  </g>
+  <circle
+     cx="200"
+     cy="200"
+     r="75"
+     id="circle8274"
+     sodipodi:cx="200"
+     sodipodi:cy="200"
+     sodipodi:rx="75"
+     sodipodi:ry="75"
+     transform="translate(-26.104372,21.909027)"
+     style="fill:#ffff00;fill-opacity:0.5;stroke:#000000" />
+  <polygon
+     fill="green"
+     stroke="black"
+     fill-opacity="0.5"
+     stroke-width="1"
+     points="200,225 350,225 275,350"
+     id="polygon8276" />
+  <path
+     style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50196081"
+     d="M 303.7037,50.705207 C 173.88522,56.588264 90.320951,92.710345 162.85059,120.82533 C 211.91719,139.84524 196.63811,214.12391 233.86243,192.59259 C 284.31755,163.4083 299.34345,193.75691 311.11111,187.30159 C 347.88407,167.12924 269.34382,134.85785 303.81608,114.5167 C 394.71183,60.881583 332.47907,46.043712 303.7037,50.705207 z "
+     id="path8289"
+     sodipodi:nodetypes="cssssc" />
+</svg>
diff --git a/demos/embedded/embeddedsvgviewer/spheres.svg b/demos/embedded/embeddedsvgviewer/spheres.svg
new file mode 100644
index 0000000..e108777
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/spheres.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" standalone="no"?>
+<svg width="8cm" height="8cm" viewBox="0 0 400 400"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink/"
+    baseProfile="tiny" version="1.2">
+  <title>Spheres</title>
+  <desc>Gradient filled spheres with different colors.</desc>
+    <defs>
+      <!-- Create radial gradients for each circle to make them look like
+           spheres. -->
+      <radialGradient id="blueSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="blue" />
+        <stop offset="100%" stop-color="#222244" />
+      </radialGradient>
+      <radialGradient id="redSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="red" />
+        <stop offset="100%" stop-color="#442222" />
+      </radialGradient>
+      <radialGradient id="greenSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="green" />
+        <stop offset="100%" stop-color="#113311" />
+      </radialGradient>
+      <radialGradient id="yellowSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="yellow" />
+        <stop offset="100%" stop-color="#444422" />
+      </radialGradient>
+      <radialGradient id="shadowGrad" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="50">
+        <stop offset="0%" stop-color="black" stop-opacity="1.0" />
+        <stop offset="100%" stop-color="white" stop-opacity="0.0" />
+      </radialGradient>
+
+      <!-- Define a shadow for each sphere. -->
+      <circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" />
+    </defs>
+  <g fill="#ffee99" stroke="none" >
+    <rect x="0" y="0" width="400" height="400" />
+  </g>
+  <g fill="white" stroke="none" >
+    <rect x="0" y="175" width="400" height="225" />
+  </g>
+  <g transform="translate(200,290) scale(2.0,1.0) rotate(45)" >
+    <rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" />
+    <circle fill="black" cx="0" cy="0" r="50" />
+    <circle fill="#a6ce39" cx="0" cy="0" r="33" />
+    <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
+                          L -11,22 L -1,12 Z" />
+    <animateTransform attributeName="transform"  type="rotate" values="0; 360"
+	       begin="0s" dur="10s" fill="freeze" />
+  </g>
+  <g transform="translate(200,175)">
+    <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+    <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />
+  </g>
+  <g transform="translate(315,240)">
+    <g transform="scale(0.5,0.5)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#redSphere)" cx="0" cy="0" r="100" />
+    </g>
+  </g>
+  <g transform="translate(80,275)">
+    <g transform="scale(0.65,0.65)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#greenSphere)" cx="0" cy="0" r="100" />
+    </g>
+  </g>
+  <g transform="translate(255,325)">
+    <g transform="scale(0.3,0.3)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#yellowSphere)" cx="0" cy="0" r="100" />
+    </g>
+  </g>
+</svg>
diff --git a/demos/embedded/fluidlauncher/config.xml b/demos/embedded/fluidlauncher/config.xml
new file mode 100644
index 0000000..6cb4be7
--- /dev/null
+++ b/demos/embedded/fluidlauncher/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<demolauncher>
+  <demos>
+    <example filename="../embeddedsvgviewer/embeddedsvgviewer" name="SVG Viewer" image="screenshots/embeddedsvgviewer.png" args="../embeddedsvgviewer/shapes.svg"/>
+    <example filename="../styledemo/styledemo" name="Stylesheets" image="screenshots/styledemo.png"/>
+    <example filename="../../deform/deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/>
+    <example filename="../../pathstroke/pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/>
+    <example filename="../../../examples/widgets/wiggly/wiggly" name="Wiggly Text" image="screenshots/wiggly.png"/>
+    <example filename="../../../examples/painting/concentriccircles/concentriccircles" name="Concentric Circles" image="screenshots/concentriccircles.png"/>
+<!--
+    <example filename="../../../examples/graphicsview/elasticnodes/elasticnodes" name="Elastic Nodes" image="screenshots/elasticnodes.png" args="-maximize"/>
+    <example filename="../../../examples/assistant/simpletextviewer/simpletextviewer" name="Simple Text Viewer" image="../../../doc/html/images/simpletextviewer-mainwindow.png"/>
+    <example filename="../../../examples/dialogs/trivialwizard/trivialwizard" name="Trivial Wizard" image="../../../doc/html/images/trivialwizard-example-conclusion.png"/>
+    <example filename="../../../examples/draganddrop/draggableicons/draggableicons" name="Draggable Icons" image="../../../doc/html/images/draggableicons-example.png"/>
+    <example filename="../../../examples/draganddrop/draggabletext/draggabletext" name="Draggable Text" image="../../../doc/html/images/draggabletext-example.png"/>
+    <example filename="../../../examples/draganddrop/fridgemagnets/fridgemagnets" name="Fridge Magnets" image="../../../doc/html/images/fridgemagnets-example.png"/>
+    <example filename="../../../examples/graphicsview/collidingmice/collidingmice" name="Colliding Mice" image="../../../doc/html/images/collidingmice-example.png"/>
+    <example filename="../../../examples/graphicsview/padnavigator/padnavigator" name="Pad Navigator" image="../../../doc/html/images/padnavigator-example.png"/>
+    <example filename="../../../examples/itemviews/coloreditorfactory/coloreditorfactory" name="Color Editor" image="../../../doc/html/images/coloreditorfactoryimage.png"/>
+-->    
+    
+  </demos>
+  <slideshow timeout="60000" interval="10000">
+    <imagedir dir="slides"/>
+  </slideshow>
+</demolauncher>
diff --git a/demos/embedded/fluidlauncher/config_wince/config.xml b/demos/embedded/fluidlauncher/config_wince/config.xml
new file mode 100644
index 0000000..3b57770
--- /dev/null
+++ b/demos/embedded/fluidlauncher/config_wince/config.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<demolauncher>
+  <demos>
+    <example filename="embeddedsvgviewer" name="SVG Viewer" image="screenshots/embeddedsvgviewer.png" args="shapes.svg"/>
+    <example filename="styledemo" name="Stylesheets" image="screenshots/styledemo.png"/>
+    <example filename="deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/>
+    <example filename="pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/>
+    <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly.png"/>
+  </demos>
+  <slideshow timeout="60000" interval="10000">
+    <imagedir dir="slides"/>
+  </slideshow>
+</demolauncher>
diff --git a/demos/embedded/fluidlauncher/demoapplication.cpp b/demos/embedded/fluidlauncher/demoapplication.cpp
new file mode 100644
index 0000000..c5abfb9
--- /dev/null
+++ b/demos/embedded/fluidlauncher/demoapplication.cpp
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDebug>
+#include <QDir>
+ 
+#include "demoapplication.h"
+
+
+
+DemoApplication::DemoApplication(QString executableName, QString caption, QString imageName, QStringList args)
+{
+    imagePath = imageName;
+    appCaption = caption;
+
+    if (executableName[0] == QLatin1Char('/'))
+        executablePath = executableName;
+    else
+        executablePath = QDir::cleanPath(QDir::currentPath() + QLatin1Char('/') + executableName);
+  
+    arguments = args;
+
+    process.setProcessChannelMode(QProcess::ForwardedChannels);
+
+    QObject::connect( &process, SIGNAL(finished(int, QProcess::ExitStatus)), 
+                      this, SLOT(processFinished(int, QProcess::ExitStatus)));
+
+    QObject::connect( &process, SIGNAL(error(QProcess::ProcessError)), 
+                      this, SLOT(processError(QProcess::ProcessError)));
+
+    QObject::connect( &process, SIGNAL(started()), this, SLOT(processStarted()));
+}
+
+
+void DemoApplication::launch()
+{
+    process.start(executablePath, arguments);
+}
+
+QImage* DemoApplication::getImage()
+{
+    return new QImage(imagePath);
+}
+
+QString DemoApplication::getCaption()
+{
+    return appCaption;
+}
+
+void DemoApplication::processFinished(int exitCode, QProcess::ExitStatus exitStatus)
+{
+    Q_UNUSED(exitCode);
+    Q_UNUSED(exitStatus);
+
+    emit demoFinished();
+
+    QObject::disconnect(this, SIGNAL(demoStarted()), 0, 0);
+    QObject::disconnect(this, SIGNAL(demoFinished()), 0, 0);
+}
+
+void DemoApplication::processError(QProcess::ProcessError err)
+{
+    qDebug() << "Process error: " << err;
+    if (err == QProcess::Crashed)
+        emit demoFinished();
+}
+
+
+void DemoApplication::processStarted()
+{
+    emit demoStarted();
+}
+
+
+
+
+
+
diff --git a/demos/embedded/fluidlauncher/demoapplication.h b/demos/embedded/fluidlauncher/demoapplication.h
new file mode 100644
index 0000000..84ce1d4
--- /dev/null
+++ b/demos/embedded/fluidlauncher/demoapplication.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DEMO_APPLICATION_H 
+#define DEMO_APPLICATION_H
+
+#include <QPixmap>
+#include <QImage>
+#include <QProcess>
+#include <QObject>
+
+class DemoApplication : public QObject
+{
+  Q_OBJECT
+
+public:
+    DemoApplication(QString executableName, QString caption, QString imageName, QStringList args);
+    void launch();
+    QImage* getImage();
+    QString getCaption();
+
+public slots:
+    void processStarted();
+    void processFinished(int exitCode, QProcess::ExitStatus exitStatus);
+    void processError(QProcess::ProcessError err);
+
+signals:
+    void demoStarted();
+    void demoFinished();
+
+private:
+    QString imagePath;
+    QString appCaption;
+    QString executablePath;
+    QStringList arguments;
+    QProcess process;
+};
+
+
+
+
+#endif
+
+
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.cpp b/demos/embedded/fluidlauncher/fluidlauncher.cpp
new file mode 100644
index 0000000..f80e6ca
--- /dev/null
+++ b/demos/embedded/fluidlauncher/fluidlauncher.cpp
@@ -0,0 +1,221 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtXml>
+
+#include "fluidlauncher.h"
+
+
+#define DEFAULT_INPUT_TIMEOUT 10000
+
+FluidLauncher::FluidLauncher(QStringList* args)
+{
+    pictureFlowWidget = new PictureFlow();
+    slideShowWidget = new SlideShow();
+    inputTimer = new QTimer();
+
+    QRect screen_size = QApplication::desktop()->screenGeometry();
+
+    QObject::connect(pictureFlowWidget, SIGNAL(itemActivated(int)), this, SLOT(launchApplication(int)));
+    QObject::connect(pictureFlowWidget, SIGNAL(inputReceived()),    this, SLOT(resetInputTimeout()));
+    QObject::connect(slideShowWidget,   SIGNAL(inputReceived()),    this, SLOT(switchToLauncher()));
+    QObject::connect(inputTimer,        SIGNAL(timeout()),          this, SLOT(inputTimedout()));
+
+    inputTimer->setSingleShot(true);
+    inputTimer->setInterval(DEFAULT_INPUT_TIMEOUT);
+
+    pictureFlowWidget->setSlideSize(QSize( (screen_size.width()*2)/5, (screen_size.height()*2)/5 ));
+
+    bool success;
+    int configIndex = args->indexOf("-config");
+    if ( (configIndex != -1) && (configIndex != args->count()-1) )
+        success = loadConfig(args->at(configIndex+1));
+    else
+        success = loadConfig("config.xml");
+
+    if (success) {
+      populatePictureFlow();
+
+      pictureFlowWidget->showFullScreen();
+      inputTimer->start();
+    } else {
+        pictureFlowWidget->setAttribute(Qt::WA_DeleteOnClose, true);
+        pictureFlowWidget->close();
+    }
+
+}
+
+FluidLauncher::~FluidLauncher()
+{
+    delete pictureFlowWidget;
+    delete slideShowWidget;
+}
+
+bool FluidLauncher::loadConfig(QString configPath)
+{
+    QFile xmlFile(configPath);
+
+    if (!xmlFile.exists() || (xmlFile.error() != QFile::NoError)) {
+        qDebug() << "ERROR: Unable to open config file " << configPath;
+        return false;
+    }
+
+    slideShowWidget->clearImages();
+
+    QDomDocument xmlDoc;
+    xmlDoc.setContent(&xmlFile, true);
+
+    QDomElement rootElement = xmlDoc.documentElement();
+
+    // Process the demos node:
+    QDomNodeList demoNodes = rootElement.firstChildElement("demos").elementsByTagName("example");
+    for (int i=0; i<demoNodes.size(); i++) {
+        QDomElement element = demoNodes.item(i).toElement();
+
+        if (element.hasAttribute("filename")) {
+            DemoApplication* newDemo = new DemoApplication( 
+                                                     element.attribute("filename"), 
+                                                     element.attribute("name", "Unamed Demo"),
+                                                     element.attribute("image"),
+                                                     element.attribute("args").split(" "));
+            demoList.append(newDemo);
+        }
+    }
+
+
+    // Process the slideshow node:
+    QDomElement slideshowElement = rootElement.firstChildElement("slideshow");
+
+    if (slideshowElement.hasAttribute("timeout")) {
+          bool valid;
+          int timeout = slideshowElement.attribute("timeout").toInt(&valid);
+          if (valid)
+            inputTimer->setInterval(timeout);
+    }
+
+    if (slideshowElement.hasAttribute("interval")) {
+          bool valid;
+          int interval = slideshowElement.attribute("interval").toInt(&valid);
+          if (valid)
+            slideShowWidget->setSlideInterval(interval);
+    }
+
+    for (QDomNode node=slideshowElement.firstChild(); !node.isNull(); node=node.nextSibling()) {
+        QDomElement element = node.toElement();
+
+        if (element.tagName() == "imagedir")
+            slideShowWidget->addImageDir(element.attribute("dir"));
+        else if (element.tagName() == "image")
+            slideShowWidget->addImage(element.attribute("image"));
+    }
+
+    // Append an exit Item
+    DemoApplication* exitItem = new DemoApplication(QString(), QLatin1String("Exit Embedded Demo"), QString(), QStringList());
+    demoList.append(exitItem);
+
+    return true;
+}
+
+
+void FluidLauncher::populatePictureFlow()
+{
+    pictureFlowWidget->setSlideCount(demoList.count());
+
+    for (int i=demoList.count()-1; i>=0; --i) {
+        pictureFlowWidget->setSlide(i, *(demoList[i]->getImage()));
+        pictureFlowWidget->setSlideCaption(i, demoList[i]->getCaption());
+    }
+
+    pictureFlowWidget->setCurrentSlide(demoList.count()/2);
+}
+
+
+void FluidLauncher::launchApplication(int index)
+{
+    // NOTE: Clearing the caches will free up more memory for the demo but will cause
+    // a delay upon returning, as items are reloaded.
+    //pictureFlowWidget->clearCaches();
+
+    if (index == demoList.size() -1) {
+        qApp->quit();
+        return;
+    }
+
+    inputTimer->stop();
+    pictureFlowWidget->hide();
+
+    QObject::connect(demoList[index], SIGNAL(demoFinished()), this, SLOT(demoFinished()));
+
+    demoList[index]->launch();
+}
+
+
+void FluidLauncher::switchToLauncher()
+{
+    slideShowWidget->stopShow();
+    inputTimer->start();
+}
+
+
+void FluidLauncher::resetInputTimeout()
+{
+    if (inputTimer->isActive())
+        inputTimer->start();
+}
+
+void FluidLauncher::inputTimedout()
+{
+    switchToSlideshow();
+}
+
+
+void FluidLauncher::switchToSlideshow()
+{
+    inputTimer->stop();
+    slideShowWidget->startShow();
+}
+
+void FluidLauncher::demoFinished()
+{
+    pictureFlowWidget->showFullScreen();
+    inputTimer->start();
+}
+
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.h b/demos/embedded/fluidlauncher/fluidlauncher.h
new file mode 100644
index 0000000..3f4c1fe
--- /dev/null
+++ b/demos/embedded/fluidlauncher/fluidlauncher.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FLUID_LAUNCHER_H
+#define FLUID_LAUNCHER_H
+
+#include <QtGui>
+#include <QTimer>
+
+#include "pictureflow.h"
+#include "slideshow.h"
+#include "demoapplication.h"
+
+class FluidLauncher : public QObject
+{
+    Q_OBJECT
+
+public:
+    FluidLauncher(QStringList* args);
+    ~FluidLauncher();
+
+public slots:
+    void launchApplication(int index);
+    void switchToLauncher();
+    void resetInputTimeout();
+    void inputTimedout();
+    void demoFinished();
+
+private:
+    PictureFlow* pictureFlowWidget;
+    SlideShow* slideShowWidget;
+    QTimer* inputTimer;
+    QList<DemoApplication*> demoList;
+
+    bool loadConfig(QString configPath);
+    void populatePictureFlow();
+    void switchToSlideshow();
+
+
+};
+
+
+#endif
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
new file mode 100644
index 0000000..76d12ad
--- /dev/null
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -0,0 +1,56 @@
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += xml
+
+# Input
+HEADERS += \
+           demoapplication.h \
+           fluidlauncher.h \
+           pictureflow.h \
+           slideshow.h
+
+SOURCES += \
+           demoapplication.cpp \
+           fluidlauncher.cpp \
+           main.cpp \
+           pictureflow.cpp \
+           slideshow.cpp
+
+embedded{
+    target.path = $$[QT_INSTALL_DEMOS]/embedded/fluidlauncher
+    sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html config.xml screenshots slides
+    sources.path = $$[QT_INSTALL_DEMOS]/embedded/fluidlauncher
+    INSTALLS += target sources
+}
+
+wince*{
+    QT += svg
+
+    BUILD_DIR = release
+    if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
+        BUILD_DIR = debug
+    }
+
+    executables.sources = \
+        $$QT_BUILD_TREE/demos/embedded/embeddedsvgviewer/$${BUILD_DIR}/embeddedsvgviewer.exe \
+        $$QT_BUILD_TREE/demos/embedded/styledemo/$${BUILD_DIR}/styledemo.exe \
+        $$QT_BUILD_TREE/demos/deform/$${BUILD_DIR}/deform.exe \
+        $$QT_BUILD_TREE/demos/pathstroke/$${BUILD_DIR}/pathstroke.exe \
+        $$QT_BUILD_TREE/examples/graphicsview/elasticnodes/$${BUILD_DIR}/elasticnodes.exe \
+        $$QT_BUILD_TREE/examples/widgets/wiggly/$${BUILD_DIR}/wiggly.exe \
+        $$QT_BUILD_TREE/examples/painting/concentriccircles/$${BUILD_DIR}/concentriccircles.exe
+
+    executables.path = .
+
+    files.sources = $$PWD/screenshots $$PWD/slides $$PWD/../embeddedsvgviewer/shapes.svg
+    files.path = .
+
+    config.sources = $$PWD/config_wince/config.xml
+    config.path = .
+
+    DEPLOYMENT += config files executables
+
+    DEPLOYMENT_PLUGIN += qgif qjpeg qmng qsvg
+}
diff --git a/demos/embedded/fluidlauncher/main.cpp b/demos/embedded/fluidlauncher/main.cpp
new file mode 100644
index 0000000..05e820e
--- /dev/null
+++ b/demos/embedded/fluidlauncher/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QStringList>
+
+#include "fluidlauncher.h"
+
+
+int main(int argc, char** argv)
+{
+    QStringList originalArgs;
+
+    for (int i=0; i<argc; i++)
+      originalArgs << argv[i];
+
+    QApplication app(argc, argv);
+    FluidLauncher launcher(&originalArgs);
+
+
+    return app.exec();
+} 
diff --git a/demos/embedded/fluidlauncher/pictureflow.cpp b/demos/embedded/fluidlauncher/pictureflow.cpp
new file mode 100644
index 0000000..04bbf05
--- /dev/null
+++ b/demos/embedded/fluidlauncher/pictureflow.cpp
@@ -0,0 +1,1420 @@
+/****************************************************************************
+**
+* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+* This is version of the Pictureflow animated image show widget modified by Nokia.
+*
+*  $QT_BEGIN_LICENSE:LGPL$
+*  No Commercial Usage
+*  This file contains pre-release code and may not be distributed.
+*  You may use this file in accordance with the terms and conditions
+*  contained in the either Technology Preview License Agreement or the
+*  Beta Release License Agreement.
+* 
+*  GNU Lesser General Public License Usage
+*  Alternatively, this file may be used under the terms of the GNU Lesser
+*  General Public License version 2.1 as published by the Free Software
+*  Foundation and appearing in the file LICENSE.LGPL included in the
+*  packaging of this file.  Please review the following information to
+*  ensure the GNU Lesser General Public License version 2.1 requirements
+*  will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* 
+*  In addition, as a special exception, Nokia gives you certain
+*  additional rights. These rights are described in the Nokia Qt LGPL
+*  Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+*  package.
+* 
+*  GNU General Public License Usage
+*  Alternatively, this file may be used under the terms of the GNU
+*  General Public License version 3.0 as published by the Free Software
+*  Foundation and appearing in the file LICENSE.GPL included in the
+*  packaging of this file.  Please review the following information to
+*  ensure the GNU General Public License version 3.0 requirements will be
+*  met: http://www.gnu.org/copyleft/gpl.html.
+* 
+*  If you are unsure which license is appropriate for your use, please
+*  contact the sales department at qt-sales@nokia.com.
+*  $QT_END_LICENSE$
+*
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the <organization> nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY TROLLTECH ASA ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+****************************************************************************/
+
+/* 
+  ORIGINAL COPYRIGHT HEADER
+  PictureFlow - animated image show widget
+  http://pictureflow.googlecode.com
+
+  Copyright (C) 2007 Ariya Hidayat (ariya@kde.org)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#include "pictureflow.h"
+
+#include <QBasicTimer>
+#include <QCache>
+#include <QImage>
+#include <QKeyEvent>
+#include <QPainter>
+#include <QPixmap>
+#include <QTimer>
+#include <QVector>
+#include <QWidget>
+#include <QTime>
+
+#ifdef Q_WS_QWS
+#include <QScreen>
+#endif
+
+#include <QDebug>
+
+// uncomment this to enable bilinear filtering for texture mapping
+// gives much better rendering, at the cost of memory space
+// #define PICTUREFLOW_BILINEAR_FILTER
+
+// for fixed-point arithmetic, we need minimum 32-bit long
+// long long (64-bit) might be useful for multiplication and division
+typedef long PFreal;
+
+typedef unsigned short QRgb565;
+
+#define RGB565_RED_MASK 0xF800
+#define RGB565_GREEN_MASK 0x07E0
+#define RGB565_BLUE_MASK 0x001F
+
+#define RGB565_RED(col) ((col&RGB565_RED_MASK)>>11)
+#define RGB565_GREEN(col) ((col&RGB565_GREEN_MASK)>>5)
+#define RGB565_BLUE(col) (col&RGB565_BLUE_MASK)
+
+#define PFREAL_SHIFT 10
+#define PFREAL_FACTOR (1 << PFREAL_SHIFT)
+#define PFREAL_ONE (1 << PFREAL_SHIFT)
+#define PFREAL_HALF (PFREAL_ONE >> 1)
+
+inline PFreal fmul(PFreal a, PFreal b)
+{
+  return ((long long)(a))*((long long)(b)) >> PFREAL_SHIFT;
+}
+
+inline PFreal fdiv(PFreal num, PFreal den)
+{
+  long long p = (long long)(num) << (PFREAL_SHIFT*2);
+  long long q = p / (long long)den;
+  long long r = q >> PFREAL_SHIFT;
+
+  return r;
+}
+
+inline float fixedToFloat(PFreal val)
+{
+  return ((float)val) / (float)PFREAL_ONE;
+}
+
+inline PFreal floatToFixed(float val)
+{
+  return (PFreal)(val*PFREAL_ONE);
+}
+
+#define IANGLE_MAX 1024
+#define IANGLE_MASK 1023
+
+// warning: regenerate the table if IANGLE_MAX and PFREAL_SHIFT are changed!
+static const PFreal sinTable[IANGLE_MAX] = {
+     3,      9,     15,     21,     28,     34,     40,     47, 
+    53,     59,     65,     72,     78,     84,     90,     97, 
+   103,    109,    115,    122,    128,    134,    140,    147, 
+   153,    159,    165,    171,    178,    184,    190,    196, 
+   202,    209,    215,    221,    227,    233,    239,    245, 
+   251,    257,    264,    270,    276,    282,    288,    294, 
+   300,    306,    312,    318,    324,    330,    336,    342, 
+   347,    353,    359,    365,    371,    377,    383,    388, 
+   394,    400,    406,    412,    417,    423,    429,    434, 
+   440,    446,    451,    457,    463,    468,    474,    479, 
+   485,    491,    496,    501,    507,    512,    518,    523, 
+   529,    534,    539,    545,    550,    555,    561,    566, 
+   571,    576,    581,    587,    592,    597,    602,    607, 
+   612,    617,    622,    627,    632,    637,    642,    647, 
+   652,    656,    661,    666,    671,    675,    680,    685, 
+   690,    694,    699,    703,    708,    712,    717,    721, 
+   726,    730,    735,    739,    743,    748,    752,    756, 
+   760,    765,    769,    773,    777,    781,    785,    789, 
+   793,    797,    801,    805,    809,    813,    816,    820, 
+   824,    828,    831,    835,    839,    842,    846,    849, 
+   853,    856,    860,    863,    866,    870,    873,    876, 
+   879,    883,    886,    889,    892,    895,    898,    901, 
+   904,    907,    910,    913,    916,    918,    921,    924, 
+   927,    929,    932,    934,    937,    939,    942,    944, 
+   947,    949,    951,    954,    956,    958,    960,    963, 
+   965,    967,    969,    971,    973,    975,    977,    978, 
+   980,    982,    984,    986,    987,    989,    990,    992, 
+   994,    995,    997,    998,    999,   1001,   1002,   1003, 
+  1004,   1006,   1007,   1008,   1009,   1010,   1011,   1012, 
+  1013,   1014,   1015,   1015,   1016,   1017,   1018,   1018, 
+  1019,   1019,   1020,   1020,   1021,   1021,   1022,   1022, 
+  1022,   1023,   1023,   1023,   1023,   1023,   1023,   1023, 
+  1023,   1023,   1023,   1023,   1023,   1023,   1023,   1022, 
+  1022,   1022,   1021,   1021,   1020,   1020,   1019,   1019, 
+  1018,   1018,   1017,   1016,   1015,   1015,   1014,   1013, 
+  1012,   1011,   1010,   1009,   1008,   1007,   1006,   1004, 
+  1003,   1002,   1001,    999,    998,    997,    995,    994, 
+   992,    990,    989,    987,    986,    984,    982,    980, 
+   978,    977,    975,    973,    971,    969,    967,    965, 
+   963,    960,    958,    956,    954,    951,    949,    947, 
+   944,    942,    939,    937,    934,    932,    929,    927, 
+   924,    921,    918,    916,    913,    910,    907,    904, 
+   901,    898,    895,    892,    889,    886,    883,    879, 
+   876,    873,    870,    866,    863,    860,    856,    853, 
+   849,    846,    842,    839,    835,    831,    828,    824, 
+   820,    816,    813,    809,    805,    801,    797,    793, 
+   789,    785,    781,    777,    773,    769,    765,    760, 
+   756,    752,    748,    743,    739,    735,    730,    726, 
+   721,    717,    712,    708,    703,    699,    694,    690, 
+   685,    680,    675,    671,    666,    661,    656,    652, 
+   647,    642,    637,    632,    627,    622,    617,    612, 
+   607,    602,    597,    592,    587,    581,    576,    571, 
+   566,    561,    555,    550,    545,    539,    534,    529, 
+   523,    518,    512,    507,    501,    496,    491,    485, 
+   479,    474,    468,    463,    457,    451,    446,    440, 
+   434,    429,    423,    417,    412,    406,    400,    394, 
+   388,    383,    377,    371,    365,    359,    353,    347, 
+   342,    336,    330,    324,    318,    312,    306,    300, 
+   294,    288,    282,    276,    270,    264,    257,    251, 
+   245,    239,    233,    227,    221,    215,    209,    202, 
+   196,    190,    184,    178,    171,    165,    159,    153, 
+   147,    140,    134,    128,    122,    115,    109,    103, 
+    97,     90,     84,     78,     72,     65,     59,     53, 
+    47,     40,     34,     28,     21,     15,      9,      3, 
+    -4,    -10,    -16,    -22,    -29,    -35,    -41,    -48, 
+   -54,    -60,    -66,    -73,    -79,    -85,    -91,    -98, 
+  -104,   -110,   -116,   -123,   -129,   -135,   -141,   -148, 
+  -154,   -160,   -166,   -172,   -179,   -185,   -191,   -197, 
+  -203,   -210,   -216,   -222,   -228,   -234,   -240,   -246, 
+  -252,   -258,   -265,   -271,   -277,   -283,   -289,   -295, 
+  -301,   -307,   -313,   -319,   -325,   -331,   -337,   -343, 
+  -348,   -354,   -360,   -366,   -372,   -378,   -384,   -389, 
+  -395,   -401,   -407,   -413,   -418,   -424,   -430,   -435, 
+  -441,   -447,   -452,   -458,   -464,   -469,   -475,   -480, 
+  -486,   -492,   -497,   -502,   -508,   -513,   -519,   -524, 
+  -530,   -535,   -540,   -546,   -551,   -556,   -562,   -567, 
+  -572,   -577,   -582,   -588,   -593,   -598,   -603,   -608, 
+  -613,   -618,   -623,   -628,   -633,   -638,   -643,   -648, 
+  -653,   -657,   -662,   -667,   -672,   -676,   -681,   -686, 
+  -691,   -695,   -700,   -704,   -709,   -713,   -718,   -722, 
+  -727,   -731,   -736,   -740,   -744,   -749,   -753,   -757, 
+  -761,   -766,   -770,   -774,   -778,   -782,   -786,   -790, 
+  -794,   -798,   -802,   -806,   -810,   -814,   -817,   -821, 
+  -825,   -829,   -832,   -836,   -840,   -843,   -847,   -850, 
+  -854,   -857,   -861,   -864,   -867,   -871,   -874,   -877, 
+  -880,   -884,   -887,   -890,   -893,   -896,   -899,   -902, 
+  -905,   -908,   -911,   -914,   -917,   -919,   -922,   -925, 
+  -928,   -930,   -933,   -935,   -938,   -940,   -943,   -945, 
+  -948,   -950,   -952,   -955,   -957,   -959,   -961,   -964, 
+  -966,   -968,   -970,   -972,   -974,   -976,   -978,   -979, 
+  -981,   -983,   -985,   -987,   -988,   -990,   -991,   -993, 
+  -995,   -996,   -998,   -999,  -1000,  -1002,  -1003,  -1004, 
+ -1005,  -1007,  -1008,  -1009,  -1010,  -1011,  -1012,  -1013, 
+ -1014,  -1015,  -1016,  -1016,  -1017,  -1018,  -1019,  -1019, 
+ -1020,  -1020,  -1021,  -1021,  -1022,  -1022,  -1023,  -1023, 
+ -1023,  -1024,  -1024,  -1024,  -1024,  -1024,  -1024,  -1024, 
+ -1024,  -1024,  -1024,  -1024,  -1024,  -1024,  -1024,  -1023, 
+ -1023,  -1023,  -1022,  -1022,  -1021,  -1021,  -1020,  -1020, 
+ -1019,  -1019,  -1018,  -1017,  -1016,  -1016,  -1015,  -1014, 
+ -1013,  -1012,  -1011,  -1010,  -1009,  -1008,  -1007,  -1005, 
+ -1004,  -1003,  -1002,  -1000,   -999,   -998,   -996,   -995, 
+  -993,   -991,   -990,   -988,   -987,   -985,   -983,   -981, 
+  -979,   -978,   -976,   -974,   -972,   -970,   -968,   -966, 
+  -964,   -961,   -959,   -957,   -955,   -952,   -950,   -948, 
+  -945,   -943,   -940,   -938,   -935,   -933,   -930,   -928, 
+  -925,   -922,   -919,   -917,   -914,   -911,   -908,   -905, 
+  -902,   -899,   -896,   -893,   -890,   -887,   -884,   -880, 
+  -877,   -874,   -871,   -867,   -864,   -861,   -857,   -854, 
+  -850,   -847,   -843,   -840,   -836,   -832,   -829,   -825, 
+  -821,   -817,   -814,   -810,   -806,   -802,   -798,   -794, 
+  -790,   -786,   -782,   -778,   -774,   -770,   -766,   -761, 
+  -757,   -753,   -749,   -744,   -740,   -736,   -731,   -727, 
+  -722,   -718,   -713,   -709,   -704,   -700,   -695,   -691, 
+  -686,   -681,   -676,   -672,   -667,   -662,   -657,   -653, 
+  -648,   -643,   -638,   -633,   -628,   -623,   -618,   -613, 
+  -608,   -603,   -598,   -593,   -588,   -582,   -577,   -572, 
+  -567,   -562,   -556,   -551,   -546,   -540,   -535,   -530, 
+  -524,   -519,   -513,   -508,   -502,   -497,   -492,   -486, 
+  -480,   -475,   -469,   -464,   -458,   -452,   -447,   -441, 
+  -435,   -430,   -424,   -418,   -413,   -407,   -401,   -395, 
+  -389,   -384,   -378,   -372,   -366,   -360,   -354,   -348, 
+  -343,   -337,   -331,   -325,   -319,   -313,   -307,   -301, 
+  -295,   -289,   -283,   -277,   -271,   -265,   -258,   -252, 
+  -246,   -240,   -234,   -228,   -222,   -216,   -210,   -203, 
+  -197,   -191,   -185,   -179,   -172,   -166,   -160,   -154, 
+  -148,   -141,   -135,   -129,   -123,   -116,   -110,   -104, 
+   -98,    -91,    -85,    -79,    -73,    -66,    -60,    -54, 
+   -48,    -41,    -35,    -29,    -22,    -16,    -10,     -4 
+};
+
+// this is the program the generate the above table
+#if 0
+#include <stdio.h>
+#include <math.h>
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+#define PFREAL_ONE 1024
+#define IANGLE_MAX 1024
+
+int main(int, char**)
+{
+  FILE*f = fopen("table.c","wt");
+  fprintf(f,"PFreal sinTable[] = {\n");
+  for(int i = 0; i < 128; i++)
+  {
+    for(int j = 0; j < 8; j++)
+    {
+      int iang = j+i*8;
+      double ii = (double)iang + 0.5;
+      double angle = ii * 2 * M_PI / IANGLE_MAX;
+      double sinAngle = sin(angle);
+      fprintf(f,"%6d, ", (int)(floor(PFREAL_ONE*sinAngle)));
+    }
+    fprintf(f,"\n");
+  }
+  fprintf(f,"};\n");
+  fclose(f);
+
+  return 0;
+}
+#endif
+
+inline PFreal fsin(int iangle)
+{
+  while(iangle < 0)
+    iangle += IANGLE_MAX;
+  return sinTable[iangle & IANGLE_MASK];
+}  
+
+inline PFreal fcos(int iangle)
+{
+  // quarter phase shift
+  return fsin(iangle + (IANGLE_MAX >> 2));
+}
+
+struct SlideInfo
+{
+  int slideIndex;
+  int angle;
+  PFreal cx;
+  PFreal cy;
+};
+
+class PictureFlowPrivate
+{
+public:
+  PictureFlowPrivate(PictureFlow* widget);
+
+  int slideCount() const;
+  void setSlideCount(int count);
+
+  QSize slideSize() const;
+  void setSlideSize(QSize size);
+
+  int zoomFactor() const;
+  void setZoomFactor(int z);
+
+  QImage slide(int index) const;
+  void setSlide(int index, const QImage& image);
+
+  int currentSlide() const;
+  void setCurrentSlide(int index);
+
+  int getTarget() const;
+
+  void showPrevious();
+  void showNext();
+  void showSlide(int index);
+
+  void resize(int w, int h);
+
+  void render();
+  void startAnimation();
+  void updateAnimation();
+
+  void clearSurfaceCache();
+
+  QImage buffer;
+  QBasicTimer animateTimer;
+
+  bool   singlePress;
+  int    singlePressThreshold;
+  QPoint firstPress;
+  QPoint previousPos;
+  QTime  previousPosTimestamp;
+  int    pixelDistanceMoved;
+  int    pixelsToMovePerSlide;
+
+  QVector<QString> captions;
+
+private:
+  PictureFlow* widget;
+
+  int slideWidth;
+  int slideHeight;
+  int zoom;
+
+  QVector<QImage> slideImages;
+  int centerIndex;
+  SlideInfo centerSlide;
+  QVector<SlideInfo> leftSlides;
+  QVector<SlideInfo> rightSlides;
+
+  QVector<PFreal> rays;
+  int itilt;
+  int spacing;
+  PFreal offsetX;
+  PFreal offsetY;
+
+  QImage blankSurface;
+  QCache<int, QImage> surfaceCache;
+  QTimer triggerTimer;
+
+  int slideFrame;
+  int step;
+  int target;
+  int fade;
+
+  void recalc(int w, int h);
+  QRect renderSlide(const SlideInfo &slide, int alpha=256, int col1=-1, int col=-1);
+  QImage* surface(int slideIndex);
+  void triggerRender();
+  void resetSlides();
+};
+
+PictureFlowPrivate::PictureFlowPrivate(PictureFlow* w)
+{
+  widget = w;
+
+  slideWidth = 200;
+  slideHeight = 200;
+  zoom = 100;
+
+  centerIndex = 0;
+
+  slideFrame = 0;
+  step = 0;
+  target = 0;
+  fade = 256;
+
+  triggerTimer.setSingleShot(true);
+  triggerTimer.setInterval(0);
+  QObject::connect(&triggerTimer, SIGNAL(timeout()), widget, SLOT(render()));
+  
+  recalc(200, 200);
+  resetSlides();
+}
+
+int PictureFlowPrivate::slideCount() const
+{
+  return slideImages.count();
+}
+
+void PictureFlowPrivate::setSlideCount(int count)
+{
+  slideImages.resize(count);
+  captions.resize(count);
+  surfaceCache.clear();
+  resetSlides();
+  triggerRender();
+}
+
+QSize PictureFlowPrivate::slideSize() const
+{
+  return QSize(slideWidth, slideHeight);
+}
+
+void PictureFlowPrivate::setSlideSize(QSize size)
+{
+  slideWidth = size.width();
+  slideHeight = size.height();
+  recalc(buffer.width(), buffer.height());
+  triggerRender();
+}
+
+int PictureFlowPrivate::zoomFactor() const
+{
+  return zoom;
+}
+
+void PictureFlowPrivate::setZoomFactor(int z)
+{
+  if(z <= 0)
+    return;
+
+  zoom = z;
+  recalc(buffer.width(), buffer.height());
+  triggerRender();
+}
+
+QImage PictureFlowPrivate::slide(int index) const
+{
+  return slideImages[index];
+}
+
+void PictureFlowPrivate::setSlide(int index, const QImage& image)
+{
+  if((index >= 0) && (index < slideImages.count()))
+  {
+    slideImages[index] = image;
+    surfaceCache.remove(index);
+    triggerRender();
+  }  
+}
+
+int PictureFlowPrivate::getTarget() const
+{
+  return target;
+}
+
+int PictureFlowPrivate::currentSlide() const
+{
+  return centerIndex;
+} 
+
+void PictureFlowPrivate::setCurrentSlide(int index)
+{
+  step = 0;
+  centerIndex = qBound(index, 0, slideImages.count()-1);
+  target = centerIndex;
+  slideFrame = index << 16;
+  resetSlides();
+  triggerRender();
+}
+
+void PictureFlowPrivate::showPrevious()
+{
+  if(step >= 0)
+  {
+    if(centerIndex > 0)
+    {
+      target--;
+      startAnimation();
+    }
+  }
+  else
+  {
+    target = qMax(0, centerIndex - 2);
+  }
+}
+
+void PictureFlowPrivate::showNext()
+{
+  if(step <= 0)
+  {
+    if(centerIndex < slideImages.count()-1)
+    {
+      target++;
+      startAnimation();
+    }
+  }
+  else
+  {
+    target = qMin(centerIndex + 2, slideImages.count()-1);
+  }
+}
+
+void PictureFlowPrivate::showSlide(int index)
+{
+  index = qMax(index, 0);
+  index = qMin(slideImages.count()-1, index);
+  if(index == centerSlide.slideIndex)
+    return;
+
+  target = index;
+  startAnimation();
+}
+
+void PictureFlowPrivate::resize(int w, int h)
+{
+  recalc(w, h);
+  resetSlides();
+  triggerRender();
+}
+
+
+// adjust slides so that they are in "steady state" position
+void PictureFlowPrivate::resetSlides()
+{
+  centerSlide.angle = 0;
+  centerSlide.cx = 0;
+  centerSlide.cy = 0;
+  centerSlide.slideIndex = centerIndex;
+
+  leftSlides.clear();
+  leftSlides.resize(3);
+  for(int i = 0; i < leftSlides.count(); i++)
+  {
+    SlideInfo& si = leftSlides[i];
+    si.angle = itilt;
+    si.cx = -(offsetX + spacing*i*PFREAL_ONE);
+    si.cy = offsetY;
+    si.slideIndex = centerIndex-1-i;
+    //qDebug() << "Left[" << i << "] x=" << fixedToFloat(si.cx) << ", y=" << fixedToFloat(si.cy) ;
+  }
+
+  rightSlides.clear();
+  rightSlides.resize(3);
+  for(int i = 0; i < rightSlides.count(); i++)
+  {
+    SlideInfo& si = rightSlides[i];
+    si.angle = -itilt;
+    si.cx = offsetX + spacing*i*PFREAL_ONE;
+    si.cy = offsetY;
+    si.slideIndex = centerIndex+1+i;
+    //qDebug() << "Right[" << i << "] x=" << fixedToFloat(si.cx) << ", y=" << fixedToFloat(si.cy) ;
+  }
+}
+
+#define BILINEAR_STRETCH_HOR 4
+#define BILINEAR_STRETCH_VER 4
+
+static QImage prepareSurface(QImage img, int w, int h)
+{
+  Qt::TransformationMode mode = Qt::SmoothTransformation;
+  img = img.scaled(w, h, Qt::IgnoreAspectRatio, mode);
+
+  // slightly larger, to accomodate for the reflection
+  int hs = h * 2;
+  int hofs = h / 3;
+
+  // offscreen buffer: black is sweet
+  QImage result(hs, w, QImage::Format_RGB16);  
+  result.fill(0);
+
+  // transpose the image, this is to speed-up the rendering
+  // because we process one column at a time
+  // (and much better and faster to work row-wise, i.e in one scanline)
+  for(int x = 0; x < w; x++)
+    for(int y = 0; y < h; y++)
+      result.setPixel(hofs + y, x, img.pixel(x, y));
+
+  // create the reflection
+  int ht = hs - h - hofs;
+  int hte = ht;
+  for(int x = 0; x < w; x++)
+    for(int y = 0; y < ht; y++)
+    {
+      QRgb color = img.pixel(x, img.height()-y-1);
+      //QRgb565 color = img.scanLine(img.height()-y-1) + x*sizeof(QRgb565); //img.pixel(x, img.height()-y-1);
+      int a = qAlpha(color);
+      int r = qRed(color)   * a / 256 * (hte - y) / hte * 3/5;
+      int g = qGreen(color) * a / 256 * (hte - y) / hte * 3/5;
+      int b = qBlue(color)  * a / 256 * (hte - y) / hte * 3/5;
+      result.setPixel(h+hofs+y, x, qRgb(r, g, b));
+    }
+
+#ifdef PICTUREFLOW_BILINEAR_FILTER
+  int hh = BILINEAR_STRETCH_VER*hs;
+  int ww = BILINEAR_STRETCH_HOR*w;
+  result = result.scaled(hh, ww, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+#endif
+
+  return result;
+}
+
+
+// get transformed image for specified slide
+// if it does not exist, create it and place it in the cache
+QImage* PictureFlowPrivate::surface(int slideIndex)
+{
+  if(slideIndex < 0)
+    return 0;
+  if(slideIndex >= slideImages.count())
+    return 0;
+
+  if(surfaceCache.contains(slideIndex))
+    return surfaceCache[slideIndex];
+
+  QImage img = widget->slide(slideIndex);
+  if(img.isNull())
+  {
+    if(blankSurface.isNull())
+    {
+      blankSurface = QImage(slideWidth, slideHeight, QImage::Format_RGB16);
+
+      QPainter painter(&blankSurface);
+      QPoint p1(slideWidth*4/10, 0);
+      QPoint p2(slideWidth*6/10, slideHeight);
+      QLinearGradient linearGrad(p1, p2);
+      linearGrad.setColorAt(0, Qt::black);
+      linearGrad.setColorAt(1, Qt::white); 
+      painter.setBrush(linearGrad);
+      painter.fillRect(0, 0, slideWidth, slideHeight, QBrush(linearGrad));
+
+      painter.setPen(QPen(QColor(64,64,64), 4));
+      painter.setBrush(QBrush());
+      painter.drawRect(2, 2, slideWidth-3, slideHeight-3);
+      painter.end();
+      blankSurface = prepareSurface(blankSurface, slideWidth, slideHeight);
+    }
+    return &blankSurface;
+  }
+
+  surfaceCache.insert(slideIndex, new QImage(prepareSurface(img, slideWidth, slideHeight)));
+  return surfaceCache[slideIndex];
+}
+
+
+// Schedules rendering the slides. Call this function to avoid immediate 
+// render and thus cause less flicker.
+void PictureFlowPrivate::triggerRender()
+{
+  triggerTimer.start();
+}
+
+// Render the slides. Updates only the offscreen buffer.
+void PictureFlowPrivate::render()
+{
+  buffer.fill(0);
+
+  int nleft = leftSlides.count();
+  int nright = rightSlides.count();
+
+  QRect r = renderSlide(centerSlide);
+  int c1 = r.left();
+  int c2 = r.right();
+
+  if(step == 0)
+  {
+    // no animation, boring plain rendering
+    for(int index = 0; index < nleft-1; index++)
+    {
+      int alpha = (index < nleft-2) ? 256 : 128;
+      QRect rs = renderSlide(leftSlides[index], alpha, 0, c1-1);
+      if(!rs.isEmpty())
+        c1 = rs.left();
+    }  
+    for(int index = 0; index < nright-1; index++)
+    {
+      int alpha = (index < nright-2) ? 256 : 128;
+      QRect rs = renderSlide(rightSlides[index], alpha, c2+1, buffer.width());
+      if(!rs.isEmpty())
+        c2 = rs.right();
+    }
+
+    QPainter painter;
+    painter.begin(&buffer);
+
+    QFont font("Arial", 14);
+    font.setBold(true);
+    painter.setFont(font);
+    painter.setPen(Qt::white);
+    //painter.setPen(QColor(255,255,255,127));
+
+    if (!captions.isEmpty())
+        painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/2),
+        Qt::AlignCenter, captions[centerIndex]);
+
+    painter.end();
+
+  }
+  else
+  {
+    // the first and last slide must fade in/fade out
+    for(int index = 0; index < nleft; index++)
+    {
+      int alpha = 256;
+      if(index == nleft-1)
+        alpha = (step > 0) ? 0 : 128-fade/2;
+      if(index == nleft-2)
+        alpha = (step > 0) ? 128-fade/2 : 256-fade/2;
+      if(index == nleft-3)
+        alpha = (step > 0) ? 256-fade/2 : 256;
+      QRect rs = renderSlide(leftSlides[index], alpha, 0, c1-1);
+      if(!rs.isEmpty())
+        c1 = rs.left();
+
+      alpha = (step > 0) ? 256-fade/2 : 256;
+    }  
+    for(int index = 0; index < nright; index++)
+    {
+      int alpha = (index < nright-2) ? 256 : 128;
+      if(index == nright-1)
+        alpha = (step > 0) ? fade/2 : 0;
+      if(index == nright-2)
+        alpha = (step > 0) ? 128+fade/2 : fade/2;
+      if(index == nright-3)
+        alpha = (step > 0) ? 256 : 128+fade/2;
+      QRect rs = renderSlide(rightSlides[index], alpha, c2+1, buffer.width());
+      if(!rs.isEmpty())
+        c2 = rs.right();
+    }
+
+
+
+    QPainter painter;
+    painter.begin(&buffer);
+
+    QFont font("Arial", 14);
+    font.setBold(true);
+    painter.setFont(font);
+
+    int leftTextIndex = (step>0) ? centerIndex : centerIndex-1;
+
+    painter.setPen(QColor(255,255,255, (255-fade) ));
+    painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/2),
+                      Qt::AlignCenter, captions[leftTextIndex]);
+
+    painter.setPen(QColor(255,255,255, fade));
+    painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/2),
+                      Qt::AlignCenter, captions[leftTextIndex+1]);
+
+
+    painter.end();
+  }
+}
+
+
+static inline uint BYTE_MUL_RGB16(uint x, uint a) {
+    a += 1;
+    uint t = (((x & 0x07e0)*a) >> 8) & 0x07e0;
+    t |= (((x & 0xf81f)*(a>>2)) >> 6) & 0xf81f;
+    return t;
+}
+
+static inline uint BYTE_MUL_RGB16_32(uint x, uint a) {
+    uint t = (((x & 0xf81f07e0) >> 5)*a) & 0xf81f07e0;
+    t |= (((x & 0x07e0f81f)*a) >> 5) & 0x07e0f81f;
+    return t;
+}
+
+
+// Renders a slide to offscreen buffer. Returns a rect of the rendered area.
+// alpha=256 means normal, alpha=0 is fully black, alpha=128 half transparent
+// col1 and col2 limit the column for rendering.
+QRect PictureFlowPrivate::renderSlide(const SlideInfo &slide, int alpha, 
+int col1, int col2)
+{
+  QImage* src = surface(slide.slideIndex);
+  if(!src)
+    return QRect();
+
+  QRect rect(0, 0, 0, 0);  
+  
+#ifdef PICTUREFLOW_BILINEAR_FILTER
+  int sw = src->height() / BILINEAR_STRETCH_HOR;
+  int sh = src->width() / BILINEAR_STRETCH_VER;
+#else
+  int sw = src->height();
+  int sh = src->width();
+#endif
+  int h = buffer.height();
+  int w = buffer.width();
+
+  if(col1 > col2)
+  {
+    int c = col2;
+    col2 = col1;
+    col1 = c;
+  }
+
+  col1 = (col1 >= 0) ? col1 : 0;
+  col2 = (col2 >= 0) ? col2 : w-1;
+  col1 = qMin(col1, w-1);
+  col2 = qMin(col2, w-1);
+
+  int distance = h * 100 / zoom;
+  PFreal sdx = fcos(slide.angle);
+  PFreal sdy = fsin(slide.angle);
+  PFreal xs = slide.cx - slideWidth * sdx/2;
+  PFreal ys = slide.cy - slideWidth * sdy/2;
+  PFreal dist = distance * PFREAL_ONE;
+
+  int xi = qMax((PFreal)0, ((w*PFREAL_ONE/2) + fdiv(xs*h, dist+ys)) >> PFREAL_SHIFT);
+  if(xi >= w)
+    return rect;
+
+  bool flag = false;
+  rect.setLeft(xi);
+  for(int x = qMax(xi, col1); x <= col2; x++)
+  {
+    PFreal hity = 0;
+    PFreal fk = rays[x];
+    if(sdy)
+    {
+      fk = fk - fdiv(sdx,sdy);
+      hity = -fdiv((rays[x]*distance - slide.cx + slide.cy*sdx/sdy), fk);
+    }
+
+    dist = distance*PFREAL_ONE + hity;
+    if(dist < 0)
+      continue;
+
+    PFreal hitx = fmul(dist, rays[x]);
+    PFreal hitdist = fdiv(hitx - slide.cx, sdx);
+
+#ifdef PICTUREFLOW_BILINEAR_FILTER
+    int column = sw*BILINEAR_STRETCH_HOR/2 + (hitdist*BILINEAR_STRETCH_HOR >> PFREAL_SHIFT);
+    if(column >= sw*BILINEAR_STRETCH_HOR)
+      break;
+#else
+    int column = sw/2 + (hitdist >> PFREAL_SHIFT);
+    if(column >= sw)
+      break;
+#endif
+    if(column < 0)
+      continue;
+
+    rect.setRight(x);  
+    if(!flag)
+      rect.setLeft(x);
+    flag = true;  
+
+    int y1 = h/2;
+    int y2 = y1+ 1;
+    QRgb565* pixel1 = (QRgb565*)(buffer.scanLine(y1)) + x;
+    QRgb565* pixel2 = (QRgb565*)(buffer.scanLine(y2)) + x;
+    int pixelstep = pixel2 - pixel1;
+
+#ifdef PICTUREFLOW_BILINEAR_FILTER
+    int center = (sh*BILINEAR_STRETCH_VER/2);
+    int dy = dist*BILINEAR_STRETCH_VER / h;
+#else
+    int center = (sh/2);
+    int dy = dist / h;
+#endif
+    int p1 = center*PFREAL_ONE - dy/2;
+    int p2 = center*PFREAL_ONE + dy/2;
+
+    const QRgb565 *ptr = (const QRgb565*)(src->scanLine(column));
+    if(alpha == 256)
+      while((y1 >= 0) && (y2 < h) && (p1 >= 0))
+      {
+        *pixel1 = ptr[p1 >> PFREAL_SHIFT];
+        *pixel2 = ptr[p2 >> PFREAL_SHIFT];
+        p1 -= dy;
+        p2 += dy;
+        y1--;
+        y2++;
+        pixel1 -= pixelstep;
+        pixel2 += pixelstep;
+      }  
+    else
+      while((y1 >= 0) && (y2 < h) && (p1 >= 0))
+      {
+        QRgb565 c1 = ptr[p1 >> PFREAL_SHIFT];
+        QRgb565 c2 = ptr[p2 >> PFREAL_SHIFT];
+
+        *pixel1 = BYTE_MUL_RGB16(c1, alpha);
+        *pixel2 = BYTE_MUL_RGB16(c2, alpha);
+
+/*
+        int r1 = qRed(c1) * alpha/256;
+        int g1 = qGreen(c1) * alpha/256;
+        int b1 = qBlue(c1) * alpha/256;
+        int r2 = qRed(c2) * alpha/256;
+        int g2 = qGreen(c2) * alpha/256;
+        int b2 = qBlue(c2) * alpha/256;
+        *pixel1 = qRgb(r1, g1, b1);
+        *pixel2 = qRgb(r2, g2, b2);
+*/
+        p1 -= dy;
+        p2 += dy;
+        y1--;
+        y2++;
+        pixel1 -= pixelstep;
+        pixel2 += pixelstep;
+     }  
+   }  
+
+   rect.setTop(0);
+   rect.setBottom(h-1);
+   return rect;
+}
+
+// Updates look-up table and other stuff necessary for the rendering.
+// Call this when the viewport size or slide dimension is changed.
+void PictureFlowPrivate::recalc(int ww, int wh)
+{
+  int w = (ww+1)/2;
+  int h = (wh+1)/2;
+  buffer = QImage(ww, wh, QImage::Format_RGB16);
+  buffer.fill(0);
+
+  rays.resize(w*2);
+
+  for(int i = 0; i < w; i++)
+  {
+    PFreal gg = (PFREAL_HALF + i * PFREAL_ONE) / (2*h);
+    rays[w-i-1] = -gg;
+    rays[w+i] = gg;
+  }
+
+  // pointer must move more than 1/15 of the window to enter drag mode
+  singlePressThreshold = ww / 15;
+//  qDebug() << "singlePressThreshold now set to " << singlePressThreshold;
+
+  pixelsToMovePerSlide = ww / 3;
+//  qDebug() << "pixelsToMovePerSlide now set to " << pixelsToMovePerSlide;
+
+  itilt = 80 * IANGLE_MAX / 360;  // approx. 80 degrees tilted
+
+  offsetY = slideWidth/2 * fsin(itilt);
+  offsetY += slideWidth * PFREAL_ONE / 4;
+
+//  offsetX = slideWidth/2 * (PFREAL_ONE-fcos(itilt));
+//  offsetX += slideWidth * PFREAL_ONE;
+
+  //         center slide             +         side slide
+  offsetX = slideWidth*PFREAL_ONE;
+//  offsetX = 150*PFREAL_ONE;//(slideWidth/2)*PFREAL_ONE + ( slideWidth*fcos(itilt) )/2;
+//  qDebug() << "center width = " << slideWidth;
+//  qDebug() << "side width = " << fixedToFloat(slideWidth/2 * (PFREAL_ONE-fcos(itilt)));
+//  qDebug() << "offsetX now " << fixedToFloat(offsetX);
+
+  spacing = slideWidth/5;
+
+  surfaceCache.clear();
+  blankSurface = QImage();
+}
+
+void PictureFlowPrivate::startAnimation()
+{
+  if(!animateTimer.isActive())
+  {
+    step = (target < centerSlide.slideIndex) ? -1 : 1;
+    animateTimer.start(30, widget);
+  }
+}
+
+// Updates the animation effect. Call this periodically from a timer.
+void PictureFlowPrivate::updateAnimation()
+{
+  if(!animateTimer.isActive())
+    return;
+  if(step == 0)
+    return;
+
+  int speed = 16384;
+
+  // deaccelerate when approaching the target
+  if(true)
+  {
+    const int max = 2 * 65536;
+
+    int fi = slideFrame;
+    fi -= (target << 16);  
+    if(fi < 0)
+      fi = -fi;
+    fi = qMin(fi, max);
+
+    int ia = IANGLE_MAX * (fi-max/2) / (max*2);
+    speed = 512 + 16384 * (PFREAL_ONE+fsin(ia))/PFREAL_ONE;
+  }
+
+  slideFrame += speed*step;
+
+  int index = slideFrame >> 16;
+  int pos = slideFrame & 0xffff;
+  int neg = 65536 - pos;
+  int tick = (step < 0) ? neg : pos;
+  PFreal ftick = (tick * PFREAL_ONE) >> 16;  
+
+  // the leftmost and rightmost slide must fade away
+  fade = pos / 256;
+
+  if(step < 0)
+    index++;
+  if(centerIndex != index)
+  {
+    centerIndex = index;
+    slideFrame = index << 16;
+    centerSlide.slideIndex = centerIndex;
+    for(int i = 0; i < leftSlides.count(); i++)
+      leftSlides[i].slideIndex = centerIndex-1-i;
+    for(int i = 0; i < rightSlides.count(); i++)
+      rightSlides[i].slideIndex = centerIndex+1+i;
+  }
+
+  centerSlide.angle = (step * tick * itilt) >> 16;
+  centerSlide.cx = -step * fmul(offsetX, ftick);
+  centerSlide.cy = fmul(offsetY, ftick);
+
+  if(centerIndex == target)
+  {
+    resetSlides();
+    animateTimer.stop();
+    triggerRender();
+    step = 0;
+    fade = 256;
+    return;
+  }  
+
+  for(int i = 0; i < leftSlides.count(); i++)
+  {
+    SlideInfo& si = leftSlides[i];
+    si.angle = itilt;
+    si.cx = -(offsetX + spacing*i*PFREAL_ONE + step*spacing*ftick);
+    si.cy = offsetY;
+  }
+
+  for(int i = 0; i < rightSlides.count(); i++)
+  {
+    SlideInfo& si = rightSlides[i];
+    si.angle = -itilt;
+    si.cx = offsetX + spacing*i*PFREAL_ONE - step*spacing*ftick;
+    si.cy = offsetY;
+  }
+
+  if(step > 0)
+  {
+    PFreal ftick = (neg * PFREAL_ONE) >> 16;
+    rightSlides[0].angle = -(neg * itilt) >> 16;
+    rightSlides[0].cx = fmul(offsetX, ftick);
+    rightSlides[0].cy = fmul(offsetY, ftick);
+  }
+  else
+  {
+    PFreal ftick = (pos * PFREAL_ONE) >> 16;
+    leftSlides[0].angle = (pos * itilt) >> 16;
+    leftSlides[0].cx = -fmul(offsetX, ftick);
+    leftSlides[0].cy = fmul(offsetY, ftick);
+  } 
+
+  // must change direction ?
+  if(target < index) if(step > 0)
+    step = -1;
+  if(target > index) if(step < 0)
+    step = 1;
+
+  triggerRender();
+}
+
+
+void PictureFlowPrivate::clearSurfaceCache()
+{
+  surfaceCache.clear();
+}
+
+// -----------------------------------------
+
+PictureFlow::PictureFlow(QWidget* parent): QWidget(parent)
+{
+  d = new PictureFlowPrivate(this);
+
+  setAttribute(Qt::WA_StaticContents, true);
+  setAttribute(Qt::WA_OpaquePaintEvent, true);
+  setAttribute(Qt::WA_NoSystemBackground, true);
+
+#ifdef Q_WS_QWS
+  if (QScreen::instance()->pixelFormat() != QImage::Format_Invalid)
+    setAttribute(Qt::WA_PaintOnScreen, true);
+#endif
+}
+
+PictureFlow::~PictureFlow()
+{
+  delete d;
+}  
+
+int PictureFlow::slideCount() const
+{
+  return d->slideCount();
+}
+
+void PictureFlow::setSlideCount(int count)
+{
+  d->setSlideCount(count);
+}
+
+QSize PictureFlow::slideSize() const
+{
+  return d->slideSize();
+}
+
+void PictureFlow::setSlideSize(QSize size)
+{
+  d->setSlideSize(size);
+}
+
+int PictureFlow::zoomFactor() const
+{
+  return d->zoomFactor();
+}
+
+void PictureFlow::setZoomFactor(int z)
+{
+  d->setZoomFactor(z);
+}
+
+QImage PictureFlow::slide(int index) const
+{
+  return d->slide(index);
+}
+
+void PictureFlow::setSlide(int index, const QImage& image)
+{
+  d->setSlide(index, image);
+}
+
+void PictureFlow::setSlide(int index, const QPixmap& pixmap)
+{
+  d->setSlide(index, pixmap.toImage());
+}
+
+void PictureFlow::setSlideCaption(int index, QString caption)
+{
+  d->captions[index] = caption;
+}
+
+
+int PictureFlow::currentSlide() const
+{
+  return d->currentSlide();
+}
+
+void PictureFlow::setCurrentSlide(int index)
+{
+  d->setCurrentSlide(index);
+}
+
+void PictureFlow::clear()
+{
+  d->setSlideCount(0);
+}
+
+void PictureFlow::clearCaches()
+{
+  d->clearSurfaceCache();
+}
+
+void PictureFlow::render()
+{
+  d->render();
+  update();
+}
+
+void PictureFlow::showPrevious()
+{
+  d->showPrevious();
+}
+
+void PictureFlow::showNext()
+{
+  d->showNext();
+}
+
+void PictureFlow::showSlide(int index)
+{
+  d->showSlide(index);
+}
+
+void PictureFlow::keyPressEvent(QKeyEvent* event)
+{
+  if(event->key() == Qt::Key_Left)
+  {
+    if(event->modifiers() == Qt::ControlModifier)
+      showSlide(currentSlide()-10);
+    else  
+      showPrevious();
+    event->accept();
+    return;
+  }
+
+  if(event->key() == Qt::Key_Right)
+  {
+    if(event->modifiers() == Qt::ControlModifier)
+      showSlide(currentSlide()+10);
+    else
+      showNext();
+    event->accept();
+    return;
+  }
+
+  event->ignore();
+}
+
+#define SPEED_LOWER_THRESHOLD 10
+#define SPEED_UPPER_LIMIT 40
+
+void PictureFlow::mouseMoveEvent(QMouseEvent* event)
+{
+  int distanceMovedSinceLastEvent = event->pos().x() - d->previousPos.x();
+
+  // Check to see if we need to switch from single press mode to a drag mode
+  if (d->singlePress)
+  {
+    // Increment the distance moved for this event
+    d->pixelDistanceMoved += distanceMovedSinceLastEvent;
+
+    // Check against threshold
+    if (qAbs(d->pixelDistanceMoved) > d->singlePressThreshold)
+    {
+      d->singlePress = false;
+//      qDebug() << "DRAG MODE ON";
+    }
+  }
+
+  if (!d->singlePress)
+  {
+    int speed;
+    // Calculate velocity in a 10th of a window width per second
+    if (d->previousPosTimestamp.elapsed() == 0)
+      speed = SPEED_LOWER_THRESHOLD;
+    else
+    {
+      speed = ((qAbs(event->pos().x()-d->previousPos.x())*1000) / d->previousPosTimestamp.elapsed())
+                    / (d->buffer.width() / 10);
+  
+      if (speed < SPEED_LOWER_THRESHOLD)
+        speed = SPEED_LOWER_THRESHOLD;
+      else if (speed > SPEED_UPPER_LIMIT)
+        speed = SPEED_UPPER_LIMIT;
+      else {
+        speed = SPEED_LOWER_THRESHOLD + (speed / 3);
+//        qDebug() << "ACCELERATION ENABLED Speed = " << speed << ", Distance = " << distanceMovedSinceLastEvent;
+        
+      }
+    }
+  
+
+//    qDebug() << "Speed = " << speed;
+
+//    int incr = ((event->pos().x() - d->previousPos.x())/10) * speed;
+    
+//    qDebug() << "Incremented by " << incr;
+
+    int incr = (distanceMovedSinceLastEvent * speed);
+    
+    //qDebug() << "(distanceMovedSinceLastEvent * speed) = " << incr;
+
+    if (incr > d->pixelsToMovePerSlide*2) {
+      incr = d->pixelsToMovePerSlide*2;
+      //qDebug() << "Limiting incr to " << incr;
+    }
+
+
+    d->pixelDistanceMoved += (distanceMovedSinceLastEvent * speed);
+ //   qDebug() << "distance: " << d->pixelDistanceMoved;
+
+    int slideInc;
+
+    slideInc = d->pixelDistanceMoved / (d->pixelsToMovePerSlide * 10);
+
+    if (slideInc != 0) {
+      int targetSlide = d->getTarget() - slideInc;
+      showSlide(targetSlide);
+//      qDebug() << "TargetSlide = " << targetSlide;
+
+      //qDebug() << "Decrementing pixelDistanceMoved by " << (d->pixelsToMovePerSlide *10) * slideInc;
+
+      d->pixelDistanceMoved -= (d->pixelsToMovePerSlide *10) * slideInc;
+
+/*
+      if ( (targetSlide <= 0) || (targetSlide >= d->slideCount()-1) )
+        d->pixelDistanceMoved = 0;
+*/
+    }
+
+    
+  }
+
+  d->previousPos = event->pos();
+  d->previousPosTimestamp.restart();
+
+  emit inputReceived();
+}
+
+void PictureFlow::mousePressEvent(QMouseEvent* event)
+{
+  d->firstPress = event->pos();
+  d->previousPos = event->pos();
+  d->previousPosTimestamp.start();
+  d->singlePress = true; // Initially assume a single press
+//  d->dragStartSlide = d->getTarget();
+  d->pixelDistanceMoved = 0;
+
+  emit inputReceived();
+}
+
+void PictureFlow::mouseReleaseEvent(QMouseEvent* event)
+{
+  int sideWidth = (d->buffer.width() - slideSize().width()) /2;
+
+  if (d->singlePress)
+  {
+    if (event->x() < sideWidth )
+    {
+      showPrevious();
+    } else if ( event->x() > sideWidth + slideSize().width() ) {
+      showNext();
+    } else {
+      emit itemActivated(d->getTarget());
+    }
+
+    event->accept();
+  }
+
+  emit inputReceived();
+}
+
+
+void PictureFlow::paintEvent(QPaintEvent* event)
+{
+  Q_UNUSED(event);
+  QPainter painter(this);
+  painter.setRenderHint(QPainter::Antialiasing, false);
+  painter.drawImage(QPoint(0,0), d->buffer);
+}
+
+void PictureFlow::resizeEvent(QResizeEvent* event)
+{
+  d->resize(width(), height());
+  QWidget::resizeEvent(event);
+}
+
+void PictureFlow::timerEvent(QTimerEvent* event)
+{
+  if(event->timerId() == d->animateTimer.timerId())
+  {
+//    QTime now = QTime::currentTime();
+    d->updateAnimation();
+//    d->animateTimer.start(qMax(0, 30-now.elapsed() ), this);
+  }
+  else
+    QWidget::timerEvent(event);
+}
diff --git a/demos/embedded/fluidlauncher/pictureflow.h b/demos/embedded/fluidlauncher/pictureflow.h
new file mode 100644
index 0000000..fccc7a3
--- /dev/null
+++ b/demos/embedded/fluidlauncher/pictureflow.h
@@ -0,0 +1,237 @@
+/****************************************************************************
+*
+* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+* This is version of the Pictureflow animated image show widget modified by Nokia.
+*
+*  $QT_BEGIN_LICENSE:LGPL$
+*  No Commercial Usage
+*  This file contains pre-release code and may not be distributed.
+*  You may use this file in accordance with the terms and conditions
+*  contained in the either Technology Preview License Agreement or the
+*  Beta Release License Agreement.
+* 
+*  GNU Lesser General Public License Usage
+*  Alternatively, this file may be used under the terms of the GNU Lesser
+*  General Public License version 2.1 as published by the Free Software
+*  Foundation and appearing in the file LICENSE.LGPL included in the
+*  packaging of this file.  Please review the following information to
+*  ensure the GNU Lesser General Public License version 2.1 requirements
+*  will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* 
+*  In addition, as a special exception, Nokia gives you certain
+*  additional rights. These rights are described in the Nokia Qt LGPL
+*  Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+*  package.
+* 
+*  GNU General Public License Usage
+*  Alternatively, this file may be used under the terms of the GNU
+*  General Public License version 3.0 as published by the Free Software
+*  Foundation and appearing in the file LICENSE.GPL included in the
+*  packaging of this file.  Please review the following information to
+*  ensure the GNU General Public License version 3.0 requirements will be
+*  met: http://www.gnu.org/copyleft/gpl.html.
+* 
+*  If you are unsure which license is appropriate for your use, please
+*  contact the sales department at qt-sales@nokia.com.
+*  $QT_END_LICENSE$
+*
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the <organization> nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY TROLLTECH ASA ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+****************************************************************************/
+/*
+  ORIGINAL COPYRIGHT HEADER
+  PictureFlow - animated image show widget
+  http://pictureflow.googlecode.com
+
+  Copyright (C) 2007 Ariya Hidayat (ariya@kde.org)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#ifndef PICTUREFLOW_H
+#define PICTUREFLOW_H
+
+#include <QWidget>
+
+class PictureFlowPrivate;
+
+/*!
+  Class PictureFlow implements an image show widget with animation effect 
+  like Apple's CoverFlow (in iTunes and iPod). Images are arranged in form 
+  of slides, one main slide is shown at the center with few slides on 
+  the left and right sides of the center slide. When the next or previous 
+  slide is brought to the front, the whole slides flow to the right or 
+  the right with smooth animation effect; until the new slide is finally 
+  placed at the center.
+
+ */ 
+class PictureFlow : public QWidget
+{
+Q_OBJECT
+
+  Q_PROPERTY(int slideCount READ slideCount WRITE setSlideCount)
+  Q_PROPERTY(int currentSlide READ currentSlide WRITE setCurrentSlide)
+  Q_PROPERTY(QSize slideSize READ slideSize WRITE setSlideSize)
+  Q_PROPERTY(int zoomFactor READ zoomFactor WRITE setZoomFactor)
+
+public:
+  /*!
+    Creates a new PictureFlow widget.
+  */  
+  PictureFlow(QWidget* parent = 0);
+
+  /*!
+    Destroys the widget.
+  */
+  ~PictureFlow();
+
+  /*!
+    Returns the total number of slides.
+  */
+  int slideCount() const;
+
+  /*!
+    Sets the total number of slides.
+  */
+  void setSlideCount(int count);
+
+  /*!
+    Returns the dimension of each slide (in pixels).
+  */  
+  QSize slideSize() const;
+
+  /*!
+    Sets the dimension of each slide (in pixels).
+  */  
+  void setSlideSize(QSize size);
+
+  /*!
+    Sets the zoom factor (in percent).
+  */ 
+  void setZoomFactor(int zoom);
+
+  /*!
+    Returns the zoom factor (in percent).
+  */
+  int zoomFactor() const;
+
+  /*!
+    Clears any caches held to free up memory
+  */
+  void clearCaches();
+
+  /*!
+    Returns QImage of specified slide.
+    This function will be called only whenever necessary, e.g. the 100th slide
+    will not be retrived when only the first few slides are visible.
+  */  
+  virtual QImage slide(int index) const;
+
+  /*!
+    Sets an image for specified slide. If the slide already exists,
+    it will be replaced.
+  */  
+  virtual void setSlide(int index, const QImage& image);
+
+  virtual void setSlideCaption(int index, QString caption);
+
+  /*!
+    Sets a pixmap for specified slide. If the slide already exists,
+    it will be replaced.
+  */  
+  virtual void setSlide(int index, const QPixmap& pixmap);
+
+  /*!
+    Returns the index of slide currently shown in the middle of the viewport.
+  */  
+  int currentSlide() const;
+
+public slots:
+
+  /*!
+    Sets slide to be shown in the middle of the viewport. No animation 
+    effect will be produced, unlike using showSlide.
+  */  
+  void setCurrentSlide(int index);
+
+  /*!
+    Clears images of all slides.
+  */
+  void clear();
+
+  /*!
+    Rerender the widget. Normally this function will be automatically invoked
+    whenever necessary, e.g. during the transition animation.
+  */
+  void render();
+
+  /*!
+    Shows previous slide using animation effect.
+  */
+  void showPrevious();
+
+  /*!
+    Shows next slide using animation effect.
+  */
+  void showNext();
+
+  /*!
+    Go to specified slide using animation effect.
+  */
+  void showSlide(int index);
+
+signals:
+  void itemActivated(int index);
+  void inputReceived();
+
+protected:
+  void paintEvent(QPaintEvent *event);
+  void keyPressEvent(QKeyEvent* event);
+  void mouseMoveEvent(QMouseEvent* event);
+  void mousePressEvent(QMouseEvent* event);
+  void mouseReleaseEvent(QMouseEvent* event);
+  void resizeEvent(QResizeEvent* event);
+  void timerEvent(QTimerEvent* event);
+
+private:
+  PictureFlowPrivate* d;
+};
+
+#endif // PICTUREFLOW_H
diff --git a/demos/embedded/fluidlauncher/screenshots/concentriccircles.png b/demos/embedded/fluidlauncher/screenshots/concentriccircles.png
new file mode 100644
index 0000000..fd308b5
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/concentriccircles.png
diff --git a/demos/embedded/fluidlauncher/screenshots/deform.png b/demos/embedded/fluidlauncher/screenshots/deform.png
new file mode 100644
index 0000000..c22f2ae
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/deform.png
diff --git a/demos/embedded/fluidlauncher/screenshots/elasticnodes.png b/demos/embedded/fluidlauncher/screenshots/elasticnodes.png
new file mode 100644
index 0000000..bc157e5
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/elasticnodes.png
diff --git a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png
new file mode 100644
index 0000000..522f13b
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png
diff --git a/demos/embedded/fluidlauncher/screenshots/mediaplayer.png b/demos/embedded/fluidlauncher/screenshots/mediaplayer.png
new file mode 100644
index 0000000..1304a19
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/mediaplayer.png
diff --git a/demos/embedded/fluidlauncher/screenshots/pathstroke.png b/demos/embedded/fluidlauncher/screenshots/pathstroke.png
new file mode 100644
index 0000000..c3d727e
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/pathstroke.png
diff --git a/demos/embedded/fluidlauncher/screenshots/styledemo.png b/demos/embedded/fluidlauncher/screenshots/styledemo.png
new file mode 100644
index 0000000..669c488
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/styledemo.png
diff --git a/demos/embedded/fluidlauncher/screenshots/wiggly.png b/demos/embedded/fluidlauncher/screenshots/wiggly.png
new file mode 100644
index 0000000..b20fbc4
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/wiggly.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_1.png b/demos/embedded/fluidlauncher/slides/demo_1.png
new file mode 100644
index 0000000..d2952e5
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slides/demo_1.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_2.png b/demos/embedded/fluidlauncher/slides/demo_2.png
new file mode 100644
index 0000000..1899825
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slides/demo_2.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_3.png b/demos/embedded/fluidlauncher/slides/demo_3.png
new file mode 100644
index 0000000..8369bc0
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slides/demo_3.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_4.png b/demos/embedded/fluidlauncher/slides/demo_4.png
new file mode 100644
index 0000000..377e369
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slides/demo_4.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_5.png b/demos/embedded/fluidlauncher/slides/demo_5.png
new file mode 100644
index 0000000..239f08a
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slides/demo_5.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_6.png b/demos/embedded/fluidlauncher/slides/demo_6.png
new file mode 100644
index 0000000..0addf37
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slides/demo_6.png
diff --git a/demos/embedded/fluidlauncher/slideshow.cpp b/demos/embedded/fluidlauncher/slideshow.cpp
new file mode 100644
index 0000000..8f643b4
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slideshow.cpp
@@ -0,0 +1,233 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QBasicTimer>
+#include <QList>
+#include <QImage>
+#include <QDir>
+#include <QPainter>
+#include <QPaintEvent>
+
+#include <QDebug>
+
+
+#include "slideshow.h"
+
+
+class SlideShowPrivate
+{
+public:
+    SlideShowPrivate();
+
+    int currentSlide;
+    int slideInterval;
+    QBasicTimer interSlideTimer;
+    QStringList imagePaths;
+
+    void showNextSlide();
+};
+
+
+
+SlideShowPrivate::SlideShowPrivate()
+{
+    currentSlide = 0;
+    slideInterval = 10000; // Default to 10 sec interval
+}
+
+
+void SlideShowPrivate::showNextSlide()
+{
+    currentSlide++;
+    if (currentSlide >= imagePaths.size())
+      currentSlide = 0;
+}
+
+
+
+SlideShow::SlideShow()
+{
+    d = new SlideShowPrivate;
+
+    setAttribute(Qt::WA_StaticContents, true);
+    setAttribute(Qt::WA_OpaquePaintEvent, true);
+    setAttribute(Qt::WA_NoSystemBackground, true);
+
+    setMouseTracking(true);
+}
+
+
+SlideShow::~SlideShow()
+{
+    delete d;
+}
+
+
+void SlideShow::addImageDir(QString dirName)
+{
+    QDir dir(dirName);
+
+    QStringList fileNames = dir.entryList(QDir::Files | QDir::Readable, QDir::Name);
+
+    for (int i=0; i<fileNames.count(); i++)
+        d->imagePaths << dir.absoluteFilePath(fileNames[i]);
+}
+
+void SlideShow::addImage(QString filename)
+{
+    d->imagePaths << filename;
+}
+
+
+void SlideShow::clearImages()
+{
+    d->imagePaths.clear();
+}
+
+
+void SlideShow::startShow()
+{
+    showFullScreen();
+    d->interSlideTimer.start(d->slideInterval, this);
+    d->showNextSlide();
+    update();
+}
+
+
+void SlideShow::stopShow()
+{
+    hide();
+    d->interSlideTimer.stop();
+}
+
+
+int SlideShow::slideInterval()
+{
+    return d->slideInterval;
+}
+
+void SlideShow::setSlideInterval(int val)
+{
+    d->slideInterval = val;
+}
+
+
+void SlideShow::timerEvent(QTimerEvent* event)
+{
+    Q_UNUSED(event);
+    d->showNextSlide();
+    update();
+}
+
+
+void SlideShow::paintEvent(QPaintEvent *event)
+{
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing, false);
+
+    if (d->imagePaths.size() > 0) {
+        QPixmap slide = QPixmap(d->imagePaths[d->currentSlide]);
+        QSize slideSize = slide.size();
+        QSize scaledSize = QSize(qMin(slideSize.width(), size().width()),
+            qMin(slideSize.height(), size().height()));
+        if (slideSize != scaledSize)
+            slide = slide.scaled(scaledSize, Qt::KeepAspectRatio);
+
+        QRect pixmapRect(qMax( (size().width() - slide.width())/2, 0),
+                         qMax( (size().height() - slide.height())/2, 0),
+                         slide.width(),
+                         slide.height());
+
+        if (pixmapRect.top() > 0) {
+            // Fill in top & bottom rectangles:
+            painter.fillRect(0, 0, size().width(), pixmapRect.top(), Qt::black);
+            painter.fillRect(0, pixmapRect.bottom(), size().width(), size().height(), Qt::black);
+        }
+
+        if (pixmapRect.left() > 0) {
+            // Fill in left & right rectangles:
+            painter.fillRect(0, 0, pixmapRect.left(), size().height(), Qt::black);
+            painter.fillRect(pixmapRect.right(), 0, size().width(), size().height(), Qt::black);
+        }
+
+        painter.drawPixmap(pixmapRect, slide);
+
+    } else
+        painter.fillRect(event->rect(), Qt::black);
+}
+
+
+void SlideShow::keyPressEvent(QKeyEvent* event)
+{
+    Q_UNUSED(event);
+    emit inputReceived();
+}
+
+
+void SlideShow::mouseMoveEvent(QMouseEvent* event)
+{
+    Q_UNUSED(event);
+    emit inputReceived();
+}
+
+
+void SlideShow::mousePressEvent(QMouseEvent* event)
+{
+    Q_UNUSED(event);
+    emit inputReceived();
+}
+
+
+void SlideShow::mouseReleaseEvent(QMouseEvent* event)
+{
+    Q_UNUSED(event);
+    emit inputReceived();
+}
+
+
+void SlideShow::showEvent(QShowEvent * event )
+{
+    Q_UNUSED(event);
+#ifndef QT_NO_CURSOR
+    setCursor(Qt::BlankCursor);
+#endif
+}
+
diff --git a/demos/embedded/fluidlauncher/slideshow.h b/demos/embedded/fluidlauncher/slideshow.h
new file mode 100644
index 0000000..27fb87b
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slideshow.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SLIDESHOW_H 
+#define SLIDESHOW_H
+
+#include <QWidget>
+
+class SlideShowPrivate;
+
+class SlideShow : public QWidget
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int slideInterval READ slideInterval WRITE setSlideInterval)
+
+public:
+    SlideShow();
+    ~SlideShow();
+    void addImage(QString filename);
+    void addImageDir(QString dirName);
+    void clearImages();
+    void startShow();
+    void stopShow();
+
+
+    int slideInterval();
+    void setSlideInterval(int val);
+
+signals:
+    void inputReceived();
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void keyPressEvent(QKeyEvent* event);
+    void mouseMoveEvent(QMouseEvent* event);
+    void mousePressEvent(QMouseEvent* event);
+    void mouseReleaseEvent(QMouseEvent* event);
+    void timerEvent(QTimerEvent* event);
+    void showEvent(QShowEvent * event );
+
+
+private:
+    SlideShowPrivate* d;
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+#endif
diff --git a/demos/embedded/styledemo/files/add.png b/demos/embedded/styledemo/files/add.png
new file mode 100755
index 0000000..fc5c16d
--- /dev/null
+++ b/demos/embedded/styledemo/files/add.png
diff --git a/demos/embedded/styledemo/files/application.qss b/demos/embedded/styledemo/files/application.qss
new file mode 100644
index 0000000..a632ad1
--- /dev/null
+++ b/demos/embedded/styledemo/files/application.qss
@@ -0,0 +1,125 @@
+QWidget#StyleWidget
+{
+	background-color: none;
+	background-image: url(icons:nature_1.jpg);
+}
+
+QLabel, QAbstractButton 
+{
+	font: 18px bold;
+	color: beige;
+}
+
+QAbstractButton 
+{
+	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(173,216,230,60%), stop:1 rgba(0,0,139,60%) );
+	border-color: black;
+	border-style: solid;
+	border-width: 3px;
+	border-radius: 6px;
+}
+
+QAbstractButton:pressed, QAbstractButton:checked
+{
+	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0,0,139,60%), stop:1 rgba(173,216,230,60%) );
+}
+
+QSpinBox {
+	padding-left: 24px;
+	padding-right: 24px;
+	border-color: darkkhaki;
+	border-style: solid;
+	border-radius: 5;
+	border-width: 3;
+}
+
+QSpinBox::up-button 
+{
+	subcontrol-origin: padding;
+	subcontrol-position: right; /* position at the top right corner */
+	width: 24px;
+	height: 24px;
+	border-width: 3px;
+	
+}
+
+QSpinBox::up-arrow 
+{
+	image: url(icons:add.png);
+	width: 18px;
+	height: 18px;
+}
+
+
+QSpinBox::down-button 
+{
+	subcontrol-origin: border;
+	subcontrol-position: left;
+	width: 24px;
+	height: 24px;
+	border-width: 3px;
+}
+
+QSpinBox::down-arrow 
+{
+	image: url(icons:remove.png);
+	width: 18px;
+	height: 18px;
+}
+
+
+QScrollBar:horizontal 
+{
+	border: 1px solid black;
+	background: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0,0,139,60%), stop:1 rgba(173,216,230,60%) );
+	height: 15px;
+	margin: 0px 20px 0 20px;
+}
+
+QScrollBar::handle:horizontal 
+{
+	border: 1px solid black;
+	background: rgba(0,0,139,60%);
+	min-width: 20px;
+}
+
+QScrollBar::add-line:horizontal 
+{
+	border: 1px solid black;
+	background: rgba(0,0,139,60%);
+	width: 20px;
+	subcontrol-position: right;
+	subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:horizontal 
+{
+	border: 1px solid black;
+	background: rgba(0,0,139,60%);
+	width: 20px;
+	subcontrol-position: left;
+	subcontrol-origin: margin;
+}
+
+QScrollBar:left-arrow:horizontal, QScrollBar::right-arrow:horizontal 
+{
+	border: none;
+	width: 16px;
+	height: 16px;
+}
+
+QScrollBar:left-arrow:horizontal 
+{
+	image: url(icons:add.png)
+}
+
+QScrollBar::right-arrow:horizontal 
+{
+	image: url(icons:remove.png)
+}
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal 
+{
+	background: none;
+}
+
diff --git a/demos/embedded/styledemo/files/blue.qss b/demos/embedded/styledemo/files/blue.qss
new file mode 100644
index 0000000..aa87277
--- /dev/null
+++ b/demos/embedded/styledemo/files/blue.qss
@@ -0,0 +1,39 @@
+*
+{
+	color: beige;
+}
+
+QLabel, QAbstractButton 
+{
+    font: 10pt bold;
+	color: yellow;
+}
+
+QFrame
+{
+    background-color: rgba(96,96,255,60%);
+    border-color: rgb(32,32,196);
+    border-width: 3px;
+    border-style: solid;
+    border-radius: 5;
+    padding: 3px;
+}
+
+QAbstractButton
+{
+    background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+                             stop:0 lightblue, stop:0.5 darkblue);
+    border-width: 3px;
+    border-color: darkblue;
+    border-style: solid;
+    border-radius: 5;
+    padding: 3px;
+	qproperty-focusPolicy: NoFocus;
+}
+
+QAbstractButton:pressed
+{
+    background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+                             stop:0.5 darkblue, stop:1 lightblue);
+    border-color: beige;
+}
diff --git a/demos/embedded/styledemo/files/khaki.qss b/demos/embedded/styledemo/files/khaki.qss
new file mode 100644
index 0000000..9c0f77c
--- /dev/null
+++ b/demos/embedded/styledemo/files/khaki.qss
@@ -0,0 +1,100 @@
+
+QWidget#StartScreen, QWidget#MainWidget {
+   border: none;
+}
+
+QWidget#StartScreen, .QFrame {
+   background-color: beige;
+}
+
+QPushButton, QToolButton {
+    background-color: palegoldenrod;
+    border-width: 2px;
+    border-color: darkkhaki;
+    border-style: solid;
+    border-radius: 5;
+    padding: 3px;
+    /* min-width: 96px; */
+    /* min-height: 48px; */
+	qproperty-focusPolicy: NoFocus
+}
+
+QPushButton:hover, QToolButton:hover {
+   background-color: khaki;
+}
+
+QPushButton:pressed, QToolButton:pressed {
+    padding-left: 5px;
+    padding-top: 5px;
+    background-color: #d0d67c;
+}
+
+QLabel, QAbstractButton {
+    font: italic 11pt "Times New Roman";
+}
+
+QFrame, QLabel#title {
+    border-width: 2px;
+    padding: 1px;
+    border-style: solid;
+    border-color: darkkhaki;
+    border-radius: 5px;
+}
+
+QFrame:focus {
+    border-width: 3px;
+    padding: 0px;
+}
+
+
+QLabel {
+    border: none;
+    padding: 0;
+    background: none;
+}
+
+QLabel#title {
+	font: 32px bold;
+}
+
+QSpinBox {
+     padding-left: 24px;
+     padding-right: 24px;
+	 border-color: darkkhaki;
+	 border-style: solid;
+	 border-radius: 5;
+     border-width: 3;
+}
+
+QSpinBox::up-button 
+{
+     subcontrol-origin: padding;
+     subcontrol-position: right; /* position at the top right corner */
+     width: 24px;
+     height: 24px;
+     border-width: 3px;
+	 border-image: url(:/files/spindownpng) 1;
+}
+
+QSpinBox::up-arrow {
+     image: url(:/files/add.png);
+     width: 12px;
+     height: 12px;
+ }
+
+
+QSpinBox::down-button 
+{
+     subcontrol-origin: border;
+     subcontrol-position: left;
+     width: 24px;
+     height: 24px;
+     border-width: 3px;
+	 border-image: url(:/files/spindownpng) 1;
+}
+
+QSpinBox::down-arrow {
+     image: url(:/files/remove.png);
+     width: 12px;
+     height: 12px;
+ }
diff --git a/demos/embedded/styledemo/files/nature_1.jpg b/demos/embedded/styledemo/files/nature_1.jpg
new file mode 100644
index 0000000..3a04edb
--- /dev/null
+++ b/demos/embedded/styledemo/files/nature_1.jpg
diff --git a/demos/embedded/styledemo/files/nostyle.qss b/demos/embedded/styledemo/files/nostyle.qss
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/demos/embedded/styledemo/files/nostyle.qss
diff --git a/demos/embedded/styledemo/files/remove.png b/demos/embedded/styledemo/files/remove.png
new file mode 100755
index 0000000..a0ab1fa
--- /dev/null
+++ b/demos/embedded/styledemo/files/remove.png
diff --git a/demos/embedded/styledemo/files/transparent.qss b/demos/embedded/styledemo/files/transparent.qss
new file mode 100644
index 0000000..e3a9912
--- /dev/null
+++ b/demos/embedded/styledemo/files/transparent.qss
@@ -0,0 +1,140 @@
+QWidget#StyleWidget
+{
+	background-color: none;
+	background-image: url(:/files/nature_1.jpg);
+}
+
+QLabel, QAbstractButton 
+{
+	font: 13pt;
+	color: beige;
+}
+
+QFrame, QLabel#title {
+    border-width: 2px;
+    padding: 1px;
+    border-style: solid;
+    border-color: black;
+    border-radius: 5px;
+}
+
+QFrame:focus {
+    border-width: 3px;
+    padding: 0px;
+}
+
+
+
+QAbstractButton 
+{
+	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(173,216,230,60%), stop:1 rgba(0,0,139,60%) );
+	border-color: black;
+	border-style: solid;
+	border-width: 3px;
+	border-radius: 6px;
+}
+
+QAbstractButton:pressed, QAbstractButton:checked
+{
+	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0,0,139,60%), stop:1 rgba(173,216,230,60%) );
+}
+
+QSpinBox {
+	padding-left: 24px;
+	padding-right: 24px;
+	border-color: darkkhaki;
+	border-style: solid;
+	border-radius: 5;
+	border-width: 3;
+}
+
+QSpinBox::up-button 
+{
+	subcontrol-origin: padding;
+	subcontrol-position: right; /* position at the top right corner */
+	width: 24px;
+	height: 24px;
+	border-width: 3px;
+	
+}
+
+QSpinBox::up-arrow 
+{
+	image: url(:/files/add.png);
+	width: 18px;
+	height: 18px;
+}
+
+
+QSpinBox::down-button 
+{
+	subcontrol-origin: border;
+	subcontrol-position: left;
+	width: 24px;
+	height: 24px;
+	border-width: 3px;
+}
+
+QSpinBox::down-arrow 
+{
+	image: url(:/files/remove.png);
+	width: 18px;
+	height: 18px;
+}
+
+
+QScrollBar:horizontal 
+{
+	border: 1px solid black;
+	background: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0,0,139,60%), stop:1 rgba(173,216,230,60%) );
+	height: 15px;
+	margin: 0px 20px 0 20px;
+}
+
+QScrollBar::handle:horizontal 
+{
+	border: 1px solid black;
+	background: rgba(0,0,139,60%);
+	min-width: 20px;
+}
+
+QScrollBar::add-line:horizontal 
+{
+	border: 1px solid black;
+	background: rgba(0,0,139,60%);
+	width: 20px;
+	subcontrol-position: right;
+	subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:horizontal 
+{
+	border: 1px solid black;
+	background: rgba(0,0,139,60%);
+	width: 20px;
+	subcontrol-position: left;
+	subcontrol-origin: margin;
+}
+
+QScrollBar:left-arrow:horizontal, QScrollBar::right-arrow:horizontal 
+{
+	border: none;
+	width: 16px;
+	height: 16px;
+}
+
+QScrollBar:left-arrow:horizontal 
+{
+	image: url(:/files/add.png)
+}
+
+QScrollBar::right-arrow:horizontal 
+{
+	image: url(:/files/remove.png)
+}
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal 
+{
+	background: none;
+}
+
diff --git a/demos/embedded/styledemo/main.cpp b/demos/embedded/styledemo/main.cpp
new file mode 100644
index 0000000..6a7472e
--- /dev/null
+++ b/demos/embedded/styledemo/main.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QApplication>
+
+#include "stylewidget.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Q_INIT_RESOURCE(styledemo);
+
+    app.setApplicationName("style");
+    app.setOrganizationName("Trolltech");
+    app.setOrganizationDomain("com.trolltech");
+
+    StyleWidget widget;
+    widget.showFullScreen();
+
+    return app.exec();
+}
+
diff --git a/demos/embedded/styledemo/styledemo.pro b/demos/embedded/styledemo/styledemo.pro
new file mode 100644
index 0000000..ee5e4d6
--- /dev/null
+++ b/demos/embedded/styledemo/styledemo.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+
+# Input
+HEADERS += stylewidget.h
+FORMS += stylewidget.ui
+SOURCES += main.cpp stylewidget.cpp
+RESOURCES += styledemo.qrc
+
+target.path = $$[QT_INSTALL_DEMOS]/embedded/styledemo
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html
+sources.path = $$[QT_INSTALL_DEMOS]/embedded/styledemo
+INSTALLS += target sources
diff --git a/demos/embedded/styledemo/styledemo.qrc b/demos/embedded/styledemo/styledemo.qrc
new file mode 100644
index 0000000..96237d4
--- /dev/null
+++ b/demos/embedded/styledemo/styledemo.qrc
@@ -0,0 +1,13 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+    <file>files/add.png</file>
+    <file>files/blue.qss</file>
+    <file>files/khaki.qss</file>
+    <file>files/nostyle.qss</file>
+    <file>files/transparent.qss</file>
+    <file>files/application.qss</file>
+    <file>files/nature_1.jpg</file>
+    <file>files/remove.png</file>
+</qresource>
+</RCC>
+
diff --git a/demos/embedded/styledemo/stylewidget.cpp b/demos/embedded/styledemo/stylewidget.cpp
new file mode 100644
index 0000000..304dd36
--- /dev/null
+++ b/demos/embedded/styledemo/stylewidget.cpp
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QApplication>
+#include <QString>
+#include <QFile>
+
+#include "stylewidget.h"
+
+
+
+StyleWidget::StyleWidget(QWidget *parent)
+ : QFrame(parent)
+{
+	m_ui.setupUi(this);
+}
+
+
+void StyleWidget::on_close_clicked()
+{
+    close();
+}
+
+void StyleWidget::on_blueStyle_clicked()
+{
+    QFile styleSheet(":/files/blue.qss");
+
+    if (!styleSheet.open(QIODevice::ReadOnly)) {
+        qWarning("Unable to open :/files/blue.qss");
+        return;
+    }
+
+    qApp->setStyleSheet(styleSheet.readAll());
+}
+
+void StyleWidget::on_khakiStyle_clicked()
+{
+    QFile styleSheet(":/files/khaki.qss");
+
+    if (!styleSheet.open(QIODevice::ReadOnly)) {
+        qWarning("Unable to open :/files/khaki.qss");
+        return;
+    }
+
+    qApp->setStyleSheet(styleSheet.readAll());
+}
+
+
+void StyleWidget::on_noStyle_clicked()
+{
+    QFile styleSheet(":/files/nostyle.qss");
+
+    if (!styleSheet.open(QIODevice::ReadOnly)) {
+        qWarning("Unable to open :/files/nostyle.qss");
+        return;
+    }
+
+    qApp->setStyleSheet(styleSheet.readAll());
+}
+
+
+void StyleWidget::on_transparentStyle_clicked()
+{
+    QFile styleSheet(":/files/transparent.qss");
+
+    if (!styleSheet.open(QIODevice::ReadOnly)) {
+        qWarning("Unable to open :/files/transparent.qss");
+        return;
+    }
+
+    qApp->setStyleSheet(styleSheet.readAll());
+}
+
+
+
diff --git a/demos/embedded/styledemo/stylewidget.h b/demos/embedded/styledemo/stylewidget.h
new file mode 100644
index 0000000..5ccb418
--- /dev/null
+++ b/demos/embedded/styledemo/stylewidget.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef STYLEWIDGET_H
+#define STYLEWIDGET_H
+
+#include <QFrame>
+
+#include "ui_stylewidget.h"
+
+class StyleWidget : public QFrame
+{
+    Q_OBJECT
+public:
+    StyleWidget(QWidget *parent = 0);
+
+private:
+    Ui_StyleWidget m_ui;
+
+private slots:
+    void on_close_clicked();
+    void on_blueStyle_clicked();
+    void on_khakiStyle_clicked();
+    void on_noStyle_clicked();
+    void on_transparentStyle_clicked();
+};
+
+#endif
diff --git a/demos/embedded/styledemo/stylewidget.ui b/demos/embedded/styledemo/stylewidget.ui
new file mode 100644
index 0000000..586faea
--- /dev/null
+++ b/demos/embedded/styledemo/stylewidget.ui
@@ -0,0 +1,429 @@
+<ui version="4.0" >
+ <class>StyleWidget</class>
+ <widget class="QWidget" name="StyleWidget" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>339</width>
+    <height>230</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" >
+   <property name="margin" >
+    <number>3</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Styles</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="spacing" >
+       <number>3</number>
+      </property>
+      <property name="margin" >
+       <number>3</number>
+      </property>
+      <item>
+       <widget class="QPushButton" name="noStyle" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="focusPolicy" >
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text" >
+         <string>No-Style</string>
+        </property>
+        <property name="checkable" >
+         <bool>true</bool>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+        <property name="autoExclusive" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="blueStyle" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="focusPolicy" >
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text" >
+         <string>Blue</string>
+        </property>
+        <property name="checkable" >
+         <bool>true</bool>
+        </property>
+        <property name="checked" >
+         <bool>false</bool>
+        </property>
+        <property name="autoExclusive" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="khakiStyle" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="focusPolicy" >
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text" >
+         <string>Khaki</string>
+        </property>
+        <property name="checkable" >
+         <bool>true</bool>
+        </property>
+        <property name="checked" >
+         <bool>false</bool>
+        </property>
+        <property name="autoExclusive" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="transparentStyle" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="focusPolicy" >
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text" >
+         <string>Transparent</string>
+        </property>
+        <property name="checkable" >
+         <bool>true</bool>
+        </property>
+        <property name="checked" >
+         <bool>false</bool>
+        </property>
+        <property name="autoExclusive" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer_3" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QFrame" name="frame" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="frameShape" >
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="frameLayout" >
+      <property name="margin" >
+       <number>3</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout" >
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>My Value is:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="spinBox" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="focusPolicy" >
+           <enum>Qt::NoFocus</enum>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+          </property>
+          <property name="keyboardTracking" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout" >
+        <item row="0" column="0" >
+         <widget class="QScrollBar" name="horizontalScrollBar" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize" >
+           <size>
+            <width>0</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" >
+         <widget class="QPushButton" name="pushButton_2" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="focusPolicy" >
+           <enum>Qt::NoFocus</enum>
+          </property>
+          <property name="text" >
+           <string>Show Scroller</string>
+          </property>
+          <property name="checkable" >
+           <bool>true</bool>
+          </property>
+          <property name="checked" >
+           <bool>true</bool>
+          </property>
+          <property name="flat" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" >
+         <widget class="QScrollBar" name="horizontalScrollBar_2" >
+          <property name="minimumSize" >
+           <size>
+            <width>0</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QPushButton" name="pushButton" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="focusPolicy" >
+           <enum>Qt::NoFocus</enum>
+          </property>
+          <property name="text" >
+           <string>Enable Scroller</string>
+          </property>
+          <property name="checkable" >
+           <bool>true</bool>
+          </property>
+          <property name="checked" >
+           <bool>true</bool>
+          </property>
+          <property name="flat" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="close" >
+       <property name="focusPolicy" >
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text" >
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="StyleDemo.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>horizontalScrollBar</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>horizontalScrollBar_2</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>134</x>
+     <y>196</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>523</x>
+     <y>193</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>horizontalScrollBar_2</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>horizontalScrollBar</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>577</x>
+     <y>199</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>127</x>
+     <y>207</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushButton</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>horizontalScrollBar_2</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>566</x>
+     <y>241</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>492</x>
+     <y>207</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushButton_2</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>horizontalScrollBar</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>123</x>
+     <y>239</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>123</x>
+     <y>184</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>spinBox</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>horizontalScrollBar_2</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>603</x>
+     <y>136</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>575</x>
+     <y>199</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/embeddeddialogs/No-Ones-Laughing-3.jpg b/demos/embeddeddialogs/No-Ones-Laughing-3.jpg
new file mode 100644
index 0000000..445567f
--- /dev/null
+++ b/demos/embeddeddialogs/No-Ones-Laughing-3.jpg
diff --git a/demos/embeddeddialogs/customproxy.cpp b/demos/embeddeddialogs/customproxy.cpp
new file mode 100644
index 0000000..ed2fc76
--- /dev/null
+++ b/demos/embeddeddialogs/customproxy.cpp
@@ -0,0 +1,163 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "customproxy.h"
+
+#include <QtGui>
+
+CustomProxy::CustomProxy(QGraphicsItem *parent, Qt::WindowFlags wFlags)
+    : QGraphicsProxyWidget(parent, wFlags), popupShown(false)
+{
+    timeLine = new QTimeLine(250, this);
+    connect(timeLine, SIGNAL(valueChanged(qreal)),
+            this, SLOT(updateStep(qreal)));
+    connect(timeLine, SIGNAL(stateChanged(QTimeLine::State)),
+            this, SLOT(stateChanged(QTimeLine::State)));
+}
+
+QRectF CustomProxy::boundingRect() const
+{
+    return QGraphicsProxyWidget::boundingRect().adjusted(0, 0, 10, 10);
+}
+
+void CustomProxy::paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option,
+                                   QWidget *widget)
+{
+    const QColor color(0, 0, 0, 64);
+   
+    QRectF r = windowFrameRect();
+    QRectF right(r.right(), r.top() + 10, 10, r.height() - 10);
+    QRectF bottom(r.left() + 10, r.bottom(), r.width(), 10);
+    bool intersectsRight = right.intersects(option->exposedRect);
+    bool intersectsBottom = bottom.intersects(option->exposedRect);
+    if (intersectsRight && intersectsBottom) {
+        QPainterPath path;
+        path.addRect(right);
+        path.addRect(bottom);
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(color);
+        painter->drawPath(path);
+    } else if (intersectsBottom) {
+        painter->fillRect(bottom, color);
+    } else if (intersectsRight) {
+        painter->fillRect(right, color);
+    }
+
+    QGraphicsProxyWidget::paintWindowFrame(painter, option, widget);
+}
+
+void CustomProxy::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+{
+    QGraphicsProxyWidget::hoverEnterEvent(event);
+    scene()->setActiveWindow(this);
+    if (timeLine->currentValue() != 1)
+        zoomIn();
+}
+
+void CustomProxy::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+    QGraphicsProxyWidget::hoverLeaveEvent(event);
+    if (!popupShown && (timeLine->direction() != QTimeLine::Backward || timeLine->currentValue() != 0))
+        zoomOut();
+}
+
+bool CustomProxy::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
+{
+    if (watched->isWindow() && (event->type() == QEvent::UngrabMouse || event->type() == QEvent::GrabMouse)) {
+        popupShown = watched->isVisible();
+        if (!popupShown && !isUnderMouse())
+            zoomOut();
+    }
+    return QGraphicsProxyWidget::sceneEventFilter(watched, event);
+}
+
+QVariant CustomProxy::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    if (change == ItemChildAddedChange || change == ItemChildRemovedChange) {
+        QGraphicsItem *item = qVariantValue<QGraphicsItem *>(value);
+        if (change == ItemChildAddedChange) {
+            item->setCacheMode(ItemCoordinateCache);
+            item->installSceneEventFilter(this);
+        } else {
+            item->removeSceneEventFilter(this);
+        }
+    }
+    return QGraphicsProxyWidget::itemChange(change, value);
+}
+
+void CustomProxy::updateStep(qreal step)
+{
+    QRectF r = boundingRect();
+    setTransform(QTransform()
+                 .translate(r.width() / 2, r.height() / 2)
+                 .rotate(step * 30, Qt::XAxis)
+                 .rotate(step * 10, Qt::YAxis)
+                 .rotate(step * 5, Qt::ZAxis)
+                 .scale(1 + 1.5 * step, 1 + 1.5 * step)
+                 .translate(-r.width() / 2, -r.height() / 2));
+}
+
+void CustomProxy::stateChanged(QTimeLine::State state)
+{
+    if (state == QTimeLine::Running) {
+	if (timeLine->direction() == QTimeLine::Forward)
+            setCacheMode(ItemCoordinateCache);
+    } else if (state == QTimeLine::NotRunning) {
+	if (timeLine->direction() == QTimeLine::Backward)
+            setCacheMode(DeviceCoordinateCache);
+    }
+}
+
+void CustomProxy::zoomIn()
+{
+    if (timeLine->direction() != QTimeLine::Forward)
+        timeLine->setDirection(QTimeLine::Forward);
+    if (timeLine->state() == QTimeLine::NotRunning) 
+        timeLine->start();
+}
+
+void CustomProxy::zoomOut()
+{
+    if (timeLine->direction() != QTimeLine::Backward)
+        timeLine->setDirection(QTimeLine::Backward);
+    if (timeLine->state() == QTimeLine::NotRunning) 
+        timeLine->start();
+}
diff --git a/demos/embeddeddialogs/customproxy.h b/demos/embeddeddialogs/customproxy.h
new file mode 100644
index 0000000..0a5fbaf
--- /dev/null
+++ b/demos/embeddeddialogs/customproxy.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CUSTOMPROXY_H
+#define CUSTOMPROXY_H
+
+#include <QtCore/qtimeline.h>
+#include <QtGui/qgraphicsproxywidget.h>
+
+class CustomProxy : public QGraphicsProxyWidget
+{
+    Q_OBJECT
+public:
+    CustomProxy(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
+
+    QRectF boundingRect() const;
+    void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option,
+                          QWidget *widget);                          
+
+protected:
+    void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+    bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+
+private slots:
+    void updateStep(qreal step);
+    void stateChanged(QTimeLine::State);
+    void zoomIn();
+    void zoomOut();
+
+private:
+    QTimeLine *timeLine;
+    bool popupShown;
+};
+
+#endif
diff --git a/demos/embeddeddialogs/embeddeddialog.cpp b/demos/embeddeddialogs/embeddeddialog.cpp
new file mode 100644
index 0000000..40f361c
--- /dev/null
+++ b/demos/embeddeddialogs/embeddeddialog.cpp
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "embeddeddialog.h"
+#include "ui_embeddeddialog.h"
+
+#include <QtGui>
+
+EmbeddedDialog::EmbeddedDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    ui = new Ui_embeddedDialog;
+    ui->setupUi(this);
+    ui->layoutDirection->setCurrentIndex(layoutDirection() != Qt::LeftToRight);
+
+    foreach (QString styleName, QStyleFactory::keys()) {
+        ui->style->addItem(styleName);
+        if (style()->objectName().toLower() == styleName.toLower())
+            ui->style->setCurrentIndex(ui->style->count() - 1);
+    }
+
+    connect(ui->layoutDirection, SIGNAL(activated(int)),
+            this, SLOT(layoutDirectionChanged(int)));
+    connect(ui->spacing, SIGNAL(valueChanged(int)),
+            this, SLOT(spacingChanged(int)));
+    connect(ui->fontComboBox, SIGNAL(currentFontChanged(const QFont &)),
+            this, SLOT(fontChanged(const QFont &)));
+    connect(ui->style, SIGNAL(activated(QString)),
+            this, SLOT(styleChanged(QString)));
+}
+
+EmbeddedDialog::~EmbeddedDialog()
+{
+    delete ui;
+}
+
+void EmbeddedDialog::layoutDirectionChanged(int index)
+{
+    setLayoutDirection(index == 0 ? Qt::LeftToRight : Qt::RightToLeft);
+}
+
+void EmbeddedDialog::spacingChanged(int spacing)
+{
+    layout()->setSpacing(spacing);
+    adjustSize();
+}
+
+void EmbeddedDialog::fontChanged(const QFont &font)
+{
+    setFont(font);
+}
+
+static void setStyleHelper(QWidget *widget, QStyle *style)
+{
+    widget->setStyle(style);
+    widget->setPalette(style->standardPalette());
+    foreach (QObject *child, widget->children()) {
+        if (QWidget *childWidget = qobject_cast<QWidget *>(child))
+            setStyleHelper(childWidget, style);
+    }
+}
+
+void EmbeddedDialog::styleChanged(const QString &styleName)
+{
+    QStyle *style = QStyleFactory::create(styleName);
+    if (style)
+        setStyleHelper(this, style);
+}
diff --git a/demos/embeddeddialogs/embeddeddialog.h b/demos/embeddeddialogs/embeddeddialog.h
new file mode 100644
index 0000000..787196c
--- /dev/null
+++ b/demos/embeddeddialogs/embeddeddialog.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EMBEDDEDDIALOG_H
+#define EMBEDDEDDIALOG_H
+
+#include <QtGui/qdialog.h>
+
+QT_FORWARD_DECLARE_CLASS(Ui_embeddedDialog);
+
+class EmbeddedDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    EmbeddedDialog(QWidget *parent = 0);
+    ~EmbeddedDialog();
+
+private slots:
+    void layoutDirectionChanged(int index);
+    void spacingChanged(int spacing);
+    void fontChanged(const QFont &font);
+    void styleChanged(const QString &styleName);
+
+private:
+    Ui_embeddedDialog *ui;
+};
+
+#endif
diff --git a/demos/embeddeddialogs/embeddeddialog.ui b/demos/embeddeddialogs/embeddeddialog.ui
new file mode 100644
index 0000000..f967b10
--- /dev/null
+++ b/demos/embeddeddialogs/embeddeddialog.ui
@@ -0,0 +1,87 @@
+<ui version="4.0" >
+ <class>embeddedDialog</class>
+ <widget class="QDialog" name="embeddedDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>407</width>
+    <height>134</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Embedded Dialog</string>
+  </property>
+  <layout class="QFormLayout" name="formLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Layout Direction:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>layoutDirection</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="layoutDirection" >
+     <item>
+      <property name="text" >
+       <string>Left to Right</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>Right to Left</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label_2" >
+     <property name="text" >
+      <string>Select Font:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>fontComboBox</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QFontComboBox" name="fontComboBox" />
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="label_3" >
+     <property name="text" >
+      <string>Style:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>style</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QComboBox" name="style" />
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="label_4" >
+     <property name="text" >
+      <string>Layout spacing:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>spacing</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="QSlider" name="spacing" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/demos/embeddeddialogs/embeddeddialogs.pro b/demos/embeddeddialogs/embeddeddialogs.pro
new file mode 100644
index 0000000..a38e3e8
--- /dev/null
+++ b/demos/embeddeddialogs/embeddeddialogs.pro
@@ -0,0 +1,17 @@
+SOURCES += main.cpp
+SOURCES += customproxy.cpp embeddeddialog.cpp
+HEADERS += customproxy.h embeddeddialog.h
+
+FORMS += embeddeddialog.ui
+RESOURCES += embeddeddialogs.qrc
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/embeddeddialogs
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.png *.jpg *.plist *.icns *.ico *.rc *.pro *.html *.doc images
+sources.path = $$[QT_INSTALL_DEMOS]/embeddeddialogs
+INSTALLS += target sources
diff --git a/demos/embeddeddialogs/embeddeddialogs.qrc b/demos/embeddeddialogs/embeddeddialogs.qrc
new file mode 100644
index 0000000..33be503
--- /dev/null
+++ b/demos/embeddeddialogs/embeddeddialogs.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource>
+        <file>No-Ones-Laughing-3.jpg</file>
+    </qresource>
+</RCC>
diff --git a/demos/embeddeddialogs/main.cpp b/demos/embeddeddialogs/main.cpp
new file mode 100644
index 0000000..cfb31c4
--- /dev/null
+++ b/demos/embeddeddialogs/main.cpp
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "customproxy.h"
+#include "embeddeddialog.h"
+
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(embeddeddialogs);
+    QApplication app(argc, argv);
+
+    QGraphicsScene scene;
+    scene.setStickyFocus(true);
+#ifndef Q_OS_WINCE
+    const int gridSize = 10;
+#else
+    const int gridSize = 5;
+#endif
+
+    for (int y = 0; y < gridSize; ++y) {
+        for (int x = 0; x < gridSize; ++x) {
+            CustomProxy *proxy = new CustomProxy(0, Qt::Window);
+            proxy->setWidget(new EmbeddedDialog);
+
+            QRectF rect = proxy->boundingRect();
+
+            proxy->setPos(x * rect.width() * 1.05, y * rect.height() * 1.05);
+            proxy->setCacheMode(QGraphicsItem::DeviceCoordinateCache);
+
+            scene.addItem(proxy);
+        }
+    }
+    scene.setSceneRect(scene.itemsBoundingRect());
+
+    QGraphicsView view(&scene);
+    view.scale(0.5, 0.5);
+    view.setRenderHints(view.renderHints() | QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+    view.setBackgroundBrush(QPixmap(":/No-Ones-Laughing-3.jpg"));
+    view.setCacheMode(QGraphicsView::CacheBackground);
+    view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+    view.show();
+    view.setWindowTitle("Embedded Dialogs Demo");
+    return app.exec();
+}
diff --git a/demos/gradients/gradients.cpp b/demos/gradients/gradients.cpp
new file mode 100644
index 0000000..6256ba9
--- /dev/null
+++ b/demos/gradients/gradients.cpp
@@ -0,0 +1,516 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "gradients.h"
+#include "hoverpoints.h"
+
+ShadeWidget::ShadeWidget(ShadeType type, QWidget *parent)
+    : QWidget(parent), m_shade_type(type), m_alpha_gradient(QLinearGradient(0, 0, 0, 0))
+{
+
+    // Checkers background
+    if (m_shade_type == ARGBShade) {
+        QPixmap pm(20, 20);
+        QPainter pmp(&pm);
+        pmp.fillRect(0, 0, 10, 10, Qt::lightGray);
+        pmp.fillRect(10, 10, 10, 10, Qt::lightGray);
+        pmp.fillRect(0, 10, 10, 10, Qt::darkGray);
+        pmp.fillRect(10, 0, 10, 10, Qt::darkGray);
+        pmp.end();
+        QPalette pal = palette();
+        pal.setBrush(backgroundRole(), QBrush(pm));
+        setAutoFillBackground(true);
+        setPalette(pal);
+
+    } else {
+        setAttribute(Qt::WA_NoBackground);
+
+    }
+
+    QPolygonF points;
+    points << QPointF(0, sizeHint().height())
+           << QPointF(sizeHint().width(), 0);
+
+    m_hoverPoints = new HoverPoints(this, HoverPoints::CircleShape);
+//     m_hoverPoints->setConnectionType(HoverPoints::LineConnection);
+    m_hoverPoints->setPoints(points);
+    m_hoverPoints->setPointLock(0, HoverPoints::LockToLeft);
+    m_hoverPoints->setPointLock(1, HoverPoints::LockToRight);
+    m_hoverPoints->setSortType(HoverPoints::XSort);
+
+    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    connect(m_hoverPoints, SIGNAL(pointsChanged(const QPolygonF &)), this, SIGNAL(colorsChanged()));
+}
+
+
+QPolygonF ShadeWidget::points() const
+{
+    return m_hoverPoints->points();
+}
+
+
+uint ShadeWidget::colorAt(int x)
+{
+    generateShade();
+
+    QPolygonF pts = m_hoverPoints->points();
+    for (int i=1; i < pts.size(); ++i) {
+        if (pts.at(i-1).x() <= x && pts.at(i).x() >= x) {
+            QLineF l(pts.at(i-1), pts.at(i));
+            l.setLength(l.length() * ((x - l.x1()) / l.dx()));
+            return m_shade.pixel(qRound(qMin(l.x2(), (qreal(m_shade.width() - 1)))),
+                                 qRound(qMin(l.y2(), qreal(m_shade.height() - 1))));
+        }
+    }
+    return 0;
+}
+
+
+void ShadeWidget::setGradientStops(const QGradientStops &stops)
+{
+    if (m_shade_type == ARGBShade) {
+        m_alpha_gradient = QLinearGradient(0, 0, width(), 0);
+
+        for (int i=0; i<stops.size(); ++i) {
+            QColor c = stops.at(i).second;
+            m_alpha_gradient.setColorAt(stops.at(i).first, QColor(c.red(), c.green(), c.blue()));
+        }
+
+        m_shade = QImage();
+        generateShade();
+        update();
+    }
+}
+
+
+void ShadeWidget::paintEvent(QPaintEvent *)
+{
+    generateShade();
+
+    QPainter p(this);
+    p.drawImage(0, 0, m_shade);
+
+    p.setPen(QColor(146, 146, 146));
+    p.drawRect(0, 0, width() - 1, height() - 1);
+}
+
+
+void ShadeWidget::generateShade()
+{
+    if (m_shade.isNull() || m_shade.size() != size()) {
+
+        if (m_shade_type == ARGBShade) {
+            m_shade = QImage(size(), QImage::Format_ARGB32_Premultiplied);
+            m_shade.fill(0);
+
+            QPainter p(&m_shade);
+            p.fillRect(rect(), m_alpha_gradient);
+
+            p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+            QLinearGradient fade(0, 0, 0, height());
+            fade.setColorAt(0, QColor(0, 0, 0, 255));
+            fade.setColorAt(1, QColor(0, 0, 0, 0));
+            p.fillRect(rect(), fade);
+
+        } else {
+            m_shade = QImage(size(), QImage::Format_RGB32);
+            QLinearGradient shade(0, 0, 0, height());
+            shade.setColorAt(1, Qt::black);
+
+            if (m_shade_type == RedShade)
+                shade.setColorAt(0, Qt::red);
+            else if (m_shade_type == GreenShade)
+                shade.setColorAt(0, Qt::green);
+            else
+                shade.setColorAt(0, Qt::blue);
+
+            QPainter p(&m_shade);
+            p.fillRect(rect(), shade);
+        }
+    }
+
+
+}
+
+
+GradientEditor::GradientEditor(QWidget *parent)
+    : QWidget(parent)
+{
+    QVBoxLayout *vbox = new QVBoxLayout(this);
+    vbox->setSpacing(1);
+    vbox->setMargin(1);
+
+    m_red_shade = new ShadeWidget(ShadeWidget::RedShade, this);
+    m_green_shade = new ShadeWidget(ShadeWidget::GreenShade, this);
+    m_blue_shade = new ShadeWidget(ShadeWidget::BlueShade, this);
+    m_alpha_shade = new ShadeWidget(ShadeWidget::ARGBShade, this);
+
+    vbox->addWidget(m_red_shade);
+    vbox->addWidget(m_green_shade);
+    vbox->addWidget(m_blue_shade);
+    vbox->addWidget(m_alpha_shade);
+
+    connect(m_red_shade, SIGNAL(colorsChanged()), this, SLOT(pointsUpdated()));
+    connect(m_green_shade, SIGNAL(colorsChanged()), this, SLOT(pointsUpdated()));
+    connect(m_blue_shade, SIGNAL(colorsChanged()), this, SLOT(pointsUpdated()));
+    connect(m_alpha_shade, SIGNAL(colorsChanged()), this, SLOT(pointsUpdated()));
+}
+
+
+inline static bool x_less_than(const QPointF &p1, const QPointF &p2)
+{
+    return p1.x() < p2.x();
+}
+
+
+void GradientEditor::pointsUpdated()
+{
+    qreal w = m_alpha_shade->width();
+
+    QGradientStops stops;
+
+    QPolygonF points;
+
+    points += m_red_shade->points();
+    points += m_green_shade->points();
+    points += m_blue_shade->points();
+    points += m_alpha_shade->points();
+
+    qSort(points.begin(), points.end(), x_less_than);
+
+    for (int i=0; i<points.size(); ++i) {
+        qreal x = int(points.at(i).x());
+        if (i < points.size() - 1 && x == points.at(i+1).x())
+            continue;
+        QColor color((0x00ff0000 & m_red_shade->colorAt(int(x))) >> 16,
+                     (0x0000ff00 & m_green_shade->colorAt(int(x))) >> 8,
+                     (0x000000ff & m_blue_shade->colorAt(int(x))),
+                     (0xff000000 & m_alpha_shade->colorAt(int(x))) >> 24);
+
+        if (x / w > 1)
+            return;
+
+        stops << QGradientStop(x / w, color);
+    }
+
+    m_alpha_shade->setGradientStops(stops);
+
+    emit gradientStopsChanged(stops);
+}
+
+
+static void set_shade_points(const QPolygonF &points, ShadeWidget *shade)
+{
+    shade->hoverPoints()->setPoints(points);
+    shade->hoverPoints()->setPointLock(0, HoverPoints::LockToLeft);
+    shade->hoverPoints()->setPointLock(points.size() - 1, HoverPoints::LockToRight);
+    shade->update();
+}
+
+void GradientEditor::setGradientStops(const QGradientStops &stops)
+{
+    QPolygonF pts_red, pts_green, pts_blue, pts_alpha;
+
+    qreal h_red = m_red_shade->height();
+    qreal h_green = m_green_shade->height();
+    qreal h_blue = m_blue_shade->height();
+    qreal h_alpha = m_alpha_shade->height();
+
+    for (int i=0; i<stops.size(); ++i) {
+        qreal pos = stops.at(i).first;
+        QRgb color = stops.at(i).second.rgba();
+        pts_red << QPointF(pos * m_red_shade->width(), h_red - qRed(color) * h_red / 255);
+        pts_green << QPointF(pos * m_green_shade->width(), h_green - qGreen(color) * h_green / 255);
+        pts_blue << QPointF(pos * m_blue_shade->width(), h_blue - qBlue(color) * h_blue / 255);
+        pts_alpha << QPointF(pos * m_alpha_shade->width(), h_alpha - qAlpha(color) * h_alpha / 255);
+    }
+
+    set_shade_points(pts_red, m_red_shade);
+    set_shade_points(pts_green, m_green_shade);
+    set_shade_points(pts_blue, m_blue_shade);
+    set_shade_points(pts_alpha, m_alpha_shade);
+
+}
+
+GradientWidget::GradientWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    setWindowTitle(tr("Gradients"));
+
+    m_renderer = new GradientRenderer(this);
+
+    QGroupBox *mainGroup = new QGroupBox(this);
+    mainGroup->setTitle(tr("Gradients"));
+
+    QGroupBox *editorGroup = new QGroupBox(mainGroup);
+    editorGroup->setTitle(tr("Color Editor"));
+    m_editor = new GradientEditor(editorGroup);
+
+    QGroupBox *typeGroup = new QGroupBox(mainGroup);
+    typeGroup->setTitle(tr("Gradient Type"));
+    m_linearButton = new QRadioButton(tr("Linear Gradient"), typeGroup);
+    m_radialButton = new QRadioButton(tr("Radial Gradient"), typeGroup);
+    m_conicalButton = new QRadioButton(tr("Conical Gradient"), typeGroup);
+
+    QGroupBox *spreadGroup = new QGroupBox(mainGroup);
+    spreadGroup->setTitle(tr("Spread Method"));
+    m_padSpreadButton = new QRadioButton(tr("Pad Spread"), spreadGroup);
+    m_reflectSpreadButton = new QRadioButton(tr("Reflect Spread"), spreadGroup);
+    m_repeatSpreadButton = new QRadioButton(tr("Repeat Spread"), spreadGroup);
+
+    QGroupBox *defaultsGroup = new QGroupBox(mainGroup);
+    defaultsGroup->setTitle(tr("Defaults"));
+    QPushButton *default1Button = new QPushButton(tr("1"), defaultsGroup);
+    QPushButton *default2Button = new QPushButton(tr("2"), defaultsGroup);
+    QPushButton *default3Button = new QPushButton(tr("3"), defaultsGroup);
+    QPushButton *default4Button = new QPushButton(tr("Reset"), editorGroup);
+
+    QPushButton *showSourceButton = new QPushButton(mainGroup);
+    showSourceButton->setText(tr("Show Source"));
+#ifdef QT_OPENGL_SUPPORT
+    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(true);
+    enableOpenGLButton->setChecked(m_renderer->usesOpenGL());
+    if (!QGLFormat::hasOpenGL())
+        enableOpenGLButton->hide();
+#endif
+    QPushButton *whatsThisButton = new QPushButton(mainGroup);
+    whatsThisButton->setText(tr("What's This?"));
+    whatsThisButton->setCheckable(true);
+
+    // Layouts
+    QHBoxLayout *mainLayout = new QHBoxLayout(this);
+    mainLayout->addWidget(m_renderer);
+    mainLayout->addWidget(mainGroup);
+
+    mainGroup->setFixedWidth(180);
+    QVBoxLayout *mainGroupLayout = new QVBoxLayout(mainGroup);
+    mainGroupLayout->addWidget(editorGroup);
+    mainGroupLayout->addWidget(typeGroup);
+    mainGroupLayout->addWidget(spreadGroup);
+    mainGroupLayout->addWidget(defaultsGroup);
+    mainGroupLayout->addStretch(1);
+    mainGroupLayout->addWidget(showSourceButton);
+#ifdef QT_OPENGL_SUPPORT
+    mainGroupLayout->addWidget(enableOpenGLButton);
+#endif
+    mainGroupLayout->addWidget(whatsThisButton);
+
+    QVBoxLayout *editorGroupLayout = new QVBoxLayout(editorGroup);
+    editorGroupLayout->addWidget(m_editor);
+
+    QVBoxLayout *typeGroupLayout = new QVBoxLayout(typeGroup);
+    typeGroupLayout->addWidget(m_linearButton);
+    typeGroupLayout->addWidget(m_radialButton);
+    typeGroupLayout->addWidget(m_conicalButton);
+
+    QVBoxLayout *spreadGroupLayout = new QVBoxLayout(spreadGroup);
+    spreadGroupLayout->addWidget(m_padSpreadButton);
+    spreadGroupLayout->addWidget(m_repeatSpreadButton);
+    spreadGroupLayout->addWidget(m_reflectSpreadButton);
+
+    QHBoxLayout *defaultsGroupLayout = new QHBoxLayout(defaultsGroup);
+    defaultsGroupLayout->addWidget(default1Button);
+    defaultsGroupLayout->addWidget(default2Button);
+    defaultsGroupLayout->addWidget(default3Button);
+    editorGroupLayout->addWidget(default4Button);
+
+    connect(m_editor, SIGNAL(gradientStopsChanged(const QGradientStops &)),
+            m_renderer, SLOT(setGradientStops(const QGradientStops &)));
+
+    connect(m_linearButton, SIGNAL(clicked()), m_renderer, SLOT(setLinearGradient()));
+    connect(m_radialButton, SIGNAL(clicked()), m_renderer, SLOT(setRadialGradient()));
+    connect(m_conicalButton, SIGNAL(clicked()), m_renderer, SLOT(setConicalGradient()));
+
+    connect(m_padSpreadButton, SIGNAL(clicked()), m_renderer, SLOT(setPadSpread()));
+    connect(m_reflectSpreadButton, SIGNAL(clicked()), m_renderer, SLOT(setReflectSpread()));
+    connect(m_repeatSpreadButton, SIGNAL(clicked()), m_renderer, SLOT(setRepeatSpread()));
+
+    connect(default1Button, SIGNAL(clicked()), this, SLOT(setDefault1()));
+    connect(default2Button, SIGNAL(clicked()), this, SLOT(setDefault2()));
+    connect(default3Button, SIGNAL(clicked()), this, SLOT(setDefault3()));
+    connect(default4Button, SIGNAL(clicked()), this, SLOT(setDefault4()));
+
+    connect(showSourceButton, SIGNAL(clicked()), m_renderer, SLOT(showSource()));
+#ifdef QT_OPENGL_SUPPORT
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer, SLOT(enableOpenGL(bool)));
+#endif    
+    connect(whatsThisButton, SIGNAL(clicked(bool)), m_renderer, SLOT(setDescriptionEnabled(bool)));
+    connect(whatsThisButton, SIGNAL(clicked(bool)),
+            m_renderer->hoverPoints(), SLOT(setDisabled(bool)));
+    connect(m_renderer, SIGNAL(descriptionEnabledChanged(bool)),
+            whatsThisButton, SLOT(setChecked(bool)));
+    connect(m_renderer, SIGNAL(descriptionEnabledChanged(bool)),
+            m_renderer->hoverPoints(), SLOT(setDisabled(bool)));
+
+    m_renderer->loadSourceFile(":res/gradients/gradients.cpp");
+    m_renderer->loadDescription(":res/gradients/gradients.html");
+
+    QTimer::singleShot(50, this, SLOT(setDefault1()));
+}
+
+void GradientWidget::setDefault(int config)
+{
+    QGradientStops stops;
+    QPolygonF points;
+    switch (config) {
+    case 1:
+        stops << QGradientStop(0.00, QColor::fromRgba(0));
+        stops << QGradientStop(0.04, QColor::fromRgba(0xff131360));
+        stops << QGradientStop(0.08, QColor::fromRgba(0xff202ccc));
+        stops << QGradientStop(0.42, QColor::fromRgba(0xff93d3f9));
+        stops << QGradientStop(0.51, QColor::fromRgba(0xffb3e6ff));
+        stops << QGradientStop(0.73, QColor::fromRgba(0xffffffec));
+        stops << QGradientStop(0.92, QColor::fromRgba(0xff5353d9));
+        stops << QGradientStop(0.96, QColor::fromRgba(0xff262666));
+        stops << QGradientStop(1.00, QColor::fromRgba(0));
+        m_linearButton->animateClick();
+        m_repeatSpreadButton->animateClick();
+        break;
+
+    case 2:
+        stops << QGradientStop(0.00, QColor::fromRgba(0xffffffff));
+        stops << QGradientStop(0.11, QColor::fromRgba(0xfff9ffa0));
+        stops << QGradientStop(0.13, QColor::fromRgba(0xfff9ff99));
+        stops << QGradientStop(0.14, QColor::fromRgba(0xfff3ff86));
+        stops << QGradientStop(0.49, QColor::fromRgba(0xff93b353));
+        stops << QGradientStop(0.87, QColor::fromRgba(0xff264619));
+        stops << QGradientStop(0.96, QColor::fromRgba(0xff0c1306));
+        stops << QGradientStop(1.00, QColor::fromRgba(0));
+        m_radialButton->animateClick();
+        m_padSpreadButton->animateClick();
+        break;
+
+    case 3:
+        stops << QGradientStop(0.00, QColor::fromRgba(0));
+        stops << QGradientStop(0.10, QColor::fromRgba(0xffe0cc73));
+        stops << QGradientStop(0.17, QColor::fromRgba(0xffc6a006));
+        stops << QGradientStop(0.46, QColor::fromRgba(0xff600659));
+        stops << QGradientStop(0.72, QColor::fromRgba(0xff0680ac));
+        stops << QGradientStop(0.92, QColor::fromRgba(0xffb9d9e6));
+        stops << QGradientStop(1.00, QColor::fromRgba(0));
+        m_conicalButton->animateClick();
+        m_padSpreadButton->animateClick();
+        break;
+
+    case 4:
+        stops << QGradientStop(0.00, QColor::fromRgba(0xff000000));
+        stops << QGradientStop(1.00, QColor::fromRgba(0xffffffff));
+        break;
+
+    default:
+        qWarning("bad default: %d\n", config);
+        break;
+    }
+
+    QPolygonF pts;
+    int h_off = m_renderer->width() / 10;
+    int v_off = m_renderer->height() / 8;
+    pts << QPointF(m_renderer->width() / 2, m_renderer->height() / 2)
+        << QPointF(m_renderer->width() / 2 - h_off, m_renderer->height() / 2 - v_off);
+
+    m_editor->setGradientStops(stops);
+    m_renderer->hoverPoints()->setPoints(pts);
+    m_renderer->setGradientStops(stops);
+}
+
+
+GradientRenderer::GradientRenderer(QWidget *parent)
+    : ArthurFrame(parent)
+{
+    m_hoverPoints = new HoverPoints(this, HoverPoints::CircleShape);
+    m_hoverPoints->setPointSize(QSize(20, 20));
+    m_hoverPoints->setConnectionType(HoverPoints::NoConnection);
+    m_hoverPoints->setEditable(false);
+
+    QVector<QPointF> points;
+    points << QPointF(100, 100) << QPointF(200, 200);
+    m_hoverPoints->setPoints(points);
+
+    m_spread = QGradient::PadSpread;
+    m_gradientType = Qt::LinearGradientPattern;
+}
+
+void GradientRenderer::setGradientStops(const QGradientStops &stops)
+{
+    m_stops = stops;
+    update();
+}
+
+
+void GradientRenderer::mousePressEvent(QMouseEvent *)
+{
+    setDescriptionEnabled(false);
+}
+
+void GradientRenderer::paint(QPainter *p)
+{
+    QPolygonF pts = m_hoverPoints->points();
+
+    QGradient g;
+
+    if (m_gradientType == Qt::LinearGradientPattern) {
+        g = QLinearGradient(pts.at(0), pts.at(1));
+
+    } else if (m_gradientType == Qt::RadialGradientPattern) {
+        g = QRadialGradient(pts.at(0), qMin(width(), height()) / 3.0, pts.at(1));
+
+    } else {
+        QLineF l(pts.at(0), pts.at(1));
+        qreal angle = l.angle(QLineF(0, 0, 1, 0));
+        if (l.dy() > 0)
+            angle = 360 - angle;
+        g = QConicalGradient(pts.at(0), angle);
+    }
+
+    for (int i=0; i<m_stops.size(); ++i)
+        g.setColorAt(m_stops.at(i).first, m_stops.at(i).second);
+
+    g.setSpread(m_spread);
+
+    p->setBrush(g);
+    p->setPen(Qt::NoPen);
+
+    p->drawRect(rect());
+
+}
diff --git a/demos/gradients/gradients.h b/demos/gradients/gradients.h
new file mode 100644
index 0000000..74e8417
--- /dev/null
+++ b/demos/gradients/gradients.h
@@ -0,0 +1,170 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GRADIENTS_H
+#define GRADIENTS_H
+
+#include "arthurwidgets.h"
+
+#include <QtGui>
+
+class HoverPoints;
+
+
+class ShadeWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    enum ShadeType {
+        RedShade,
+        GreenShade,
+        BlueShade,
+        ARGBShade
+    };
+
+    ShadeWidget(ShadeType type, QWidget *parent);
+
+    void setGradientStops(const QGradientStops &stops);
+
+    void paintEvent(QPaintEvent *e);
+
+    QSize sizeHint() const { return QSize(150, 40); }
+    QPolygonF points() const;
+
+    HoverPoints *hoverPoints() const { return m_hoverPoints; }
+
+    uint colorAt(int x);
+
+signals:
+    void colorsChanged();
+
+private:
+    void generateShade();
+
+    ShadeType m_shade_type;
+    QImage m_shade;
+    HoverPoints *m_hoverPoints;
+    QLinearGradient m_alpha_gradient;
+};
+
+class GradientEditor : public QWidget
+{
+    Q_OBJECT
+public:
+    GradientEditor(QWidget *parent);
+
+    void setGradientStops(const QGradientStops &stops);
+
+public slots:
+    void pointsUpdated();
+
+signals:
+    void gradientStopsChanged(const QGradientStops &stops);
+
+private:
+    ShadeWidget *m_red_shade;
+    ShadeWidget *m_green_shade;
+    ShadeWidget *m_blue_shade;
+    ShadeWidget *m_alpha_shade;
+};
+
+
+class GradientRenderer : public ArthurFrame
+{
+    Q_OBJECT
+public:
+    GradientRenderer(QWidget *parent);
+    void paint(QPainter *p);
+
+    QSize sizeHint() const { return QSize(400, 400); }
+
+    HoverPoints *hoverPoints() const { return m_hoverPoints; }
+    void mousePressEvent(QMouseEvent *e);
+
+public slots:
+    void setGradientStops(const QGradientStops &stops);
+
+    void setPadSpread() { m_spread = QGradient::PadSpread; update(); }
+    void setRepeatSpread() { m_spread = QGradient::RepeatSpread; update(); }
+    void setReflectSpread() { m_spread = QGradient::ReflectSpread; update(); }
+
+    void setLinearGradient() { m_gradientType = Qt::LinearGradientPattern; update(); }
+    void setRadialGradient() { m_gradientType = Qt::RadialGradientPattern; update(); }
+    void setConicalGradient() { m_gradientType = Qt::ConicalGradientPattern; update(); }
+
+
+private:
+    QGradientStops m_stops;
+    HoverPoints *m_hoverPoints;
+
+    QGradient::Spread m_spread;
+    Qt::BrushStyle m_gradientType;
+};
+
+
+class GradientWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    GradientWidget(QWidget *parent);
+
+public slots:
+    void setDefault1() { setDefault(1); }
+    void setDefault2() { setDefault(2); }
+    void setDefault3() { setDefault(3); }
+    void setDefault4() { setDefault(4); }
+
+private:
+    void setDefault(int i);
+
+    GradientRenderer *m_renderer;
+    GradientEditor *m_editor;
+
+    QRadioButton *m_linearButton;
+    QRadioButton *m_radialButton;
+    QRadioButton *m_conicalButton;
+    QRadioButton *m_padSpreadButton;
+    QRadioButton *m_reflectSpreadButton;
+    QRadioButton *m_repeatSpreadButton;
+
+};
+
+#endif // GRADIENTS_H
diff --git a/demos/gradients/gradients.html b/demos/gradients/gradients.html
new file mode 100644
index 0000000..1ea2c0e
--- /dev/null
+++ b/demos/gradients/gradients.html
@@ -0,0 +1,31 @@
+<html>
+<center>
+<h2>Gradients</h2>
+</center>
+
+<p>In this demo we show the various types of gradients that can
+be used in Qt.</p>
+
+<p>There are three types of gradients:
+
+<ul>
+  <li><b>Linear</b> gradients interpolate colors between start and end
+  points.</li>
+  <li><b>Radial</b> gradients interpolate colors between a focal point and the
+  points on a circle surrounding it.</li>
+  <li><b>Conical</b> gradients interpolate colors around a center point.</li>
+</ul>
+
+</p>
+
+<p>The panel on the right contains a color table editor that defines
+the colors in the gradient. The three topmost controls determine the red,
+green and blue components while the last defines the alpha of the
+gradient. You can move points, and add new ones, by clicking with the left
+mouse button, and remove points by clicking with the right button.</p>
+
+<p>There are three default configurations available at the bottom of
+the page that are provided as suggestions on how a color table could be
+configured.</p>
+
+</html>
diff --git a/demos/gradients/gradients.pro b/demos/gradients/gradients.pro
new file mode 100644
index 0000000..167572b
--- /dev/null
+++ b/demos/gradients/gradients.pro
@@ -0,0 +1,18 @@
+SOURCES += main.cpp gradients.cpp
+HEADERS += gradients.h
+
+SHARED_FOLDER = ../shared
+
+include($$SHARED_FOLDER/shared.pri)
+
+RESOURCES += gradients.qrc
+contains(QT_CONFIG, opengl) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/gradients
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
+sources.path = $$[QT_INSTALL_DEMOS]/gradients
+INSTALLS += target sources
diff --git a/demos/gradients/gradients.qrc b/demos/gradients/gradients.qrc
new file mode 100644
index 0000000..fb971eb
--- /dev/null
+++ b/demos/gradients/gradients.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res/gradients">
+   <file>gradients.cpp</file>
+   <file>gradients.html</file>
+</qresource>
+</RCC>
diff --git a/demos/gradients/main.cpp b/demos/gradients/main.cpp
new file mode 100644
index 0000000..f880510
--- /dev/null
+++ b/demos/gradients/main.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "gradients.h"
+
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(gradients);
+
+    QApplication app(argc, argv);
+
+    GradientWidget gradientWidget(0);
+    QStyle *arthurStyle = new ArthurStyle();
+    gradientWidget.setStyle(arthurStyle);
+    QList<QWidget *> widgets = qFindChildren<QWidget *>(&gradientWidget);
+    foreach (QWidget *w, widgets)
+        w->setStyle(arthurStyle);
+    gradientWidget.show();
+
+    return app.exec();
+}
diff --git a/demos/interview/README b/demos/interview/README
new file mode 100644
index 0000000..5089442
--- /dev/null
+++ b/demos/interview/README
@@ -0,0 +1,2 @@
+The interview example shows the same model and selection being shared
+between three different views.
diff --git a/demos/interview/images/folder.png b/demos/interview/images/folder.png
new file mode 100644
index 0000000..589fd2d
--- /dev/null
+++ b/demos/interview/images/folder.png
diff --git a/demos/interview/images/interview.png b/demos/interview/images/interview.png
new file mode 100644
index 0000000..0c3d690
--- /dev/null
+++ b/demos/interview/images/interview.png
diff --git a/demos/interview/images/services.png b/demos/interview/images/services.png
new file mode 100644
index 0000000..6b2ad96
--- /dev/null
+++ b/demos/interview/images/services.png
diff --git a/demos/interview/interview.pro b/demos/interview/interview.pro
new file mode 100644
index 0000000..c013755
--- /dev/null
+++ b/demos/interview/interview.pro
@@ -0,0 +1,18 @@
+TEMPLATE = app
+
+CONFIG += qt warn_on
+HEADERS += model.h
+SOURCES += model.cpp main.cpp
+RESOURCES += interview.qrc
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/interview
+sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images
+sources.path = $$[QT_INSTALL_DEMOS]/interview
+INSTALLS += target sources
+
diff --git a/demos/interview/interview.qrc b/demos/interview/interview.qrc
new file mode 100644
index 0000000..b28ea34
--- /dev/null
+++ b/demos/interview/interview.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+	<file>images/folder.png</file>
+	<file>images/services.png</file>
+	<file>images/interview.png</file>
+</qresource>
+</RCC>
diff --git a/demos/interview/main.cpp b/demos/interview/main.cpp
new file mode 100644
index 0000000..9682322
--- /dev/null
+++ b/demos/interview/main.cpp
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "model.h"
+
+#include <QApplication>
+#include <QTableView>
+#include <QTreeView>
+#include <QListView>
+#include <QSplitter>
+#include <QHeaderView>
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(interview);
+
+    QApplication app(argc, argv);
+    QSplitter page;
+
+    QAbstractItemModel *data = new Model(1000, 10, &page);
+    QItemSelectionModel *selections = new QItemSelectionModel(data);
+
+    QTableView *table = new QTableView;
+    table->setModel(data);
+    table->setSelectionModel(selections);
+    table->horizontalHeader()->setMovable(true);
+    table->verticalHeader()->setMovable(true);
+    // Set StaticContents to enable minimal repaints on resizes.
+    table->viewport()->setAttribute(Qt::WA_StaticContents);
+    page.addWidget(table);
+
+    QTreeView *tree = new QTreeView;
+    tree->setModel(data);
+    tree->setSelectionModel(selections);
+    tree->setUniformRowHeights(true);
+    tree->header()->setStretchLastSection(false);
+    tree->viewport()->setAttribute(Qt::WA_StaticContents);
+    // Disable the focus rect to get minimal repaints when scrolling on Mac.
+    tree->setAttribute(Qt::WA_MacShowFocusRect, false);
+    page.addWidget(tree);
+
+    QListView *list = new QListView;
+    list->setModel(data);
+    list->setSelectionModel(selections);
+    list->setViewMode(QListView::IconMode);
+    list->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    list->setAlternatingRowColors(false);
+    list->viewport()->setAttribute(Qt::WA_StaticContents);
+    list->setAttribute(Qt::WA_MacShowFocusRect, false);
+    page.addWidget(list);
+
+    page.setWindowIcon(QPixmap(":/images/interview.png"));
+    page.setWindowTitle("Interview");
+    page.show();
+
+    return app.exec();
+}
diff --git a/demos/interview/model.cpp b/demos/interview/model.cpp
new file mode 100644
index 0000000..1d5040c
--- /dev/null
+++ b/demos/interview/model.cpp
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "model.h"
+#include <QIcon>
+#include <QPixmap>
+
+Model::Model(int rows, int columns, QObject *parent)
+    : QAbstractItemModel(parent),
+      rc(rows), cc(columns),
+      tree(new QVector<Node>(rows, Node(0)))
+{
+
+}
+
+Model::~Model()
+{
+    delete tree;
+}
+
+QModelIndex Model::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < rc && row >= 0 && column < cc && column >= 0) {
+        Node *p = static_cast<Node*>(parent.internalPointer());
+        Node *n = node(row, p);
+	if (n)
+	    return createIndex(row, column, n);
+    }
+    return QModelIndex();
+}
+
+QModelIndex Model::parent(const QModelIndex &child) const
+{
+    if (child.isValid()) {
+        Node *n = static_cast<Node*>(child.internalPointer());
+        Node *p = parent(n);
+        if (p)
+            return createIndex(row(p), 0, p);
+    }
+    return QModelIndex();
+}
+
+int Model::rowCount(const QModelIndex &parent) const
+{
+    return (parent.isValid() && parent.column() != 0) ? 0 : rc;
+}
+
+int Model::columnCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return cc;
+}
+
+QVariant Model::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+    if (role == Qt::DisplayRole)
+	return "Item " + QString::number(index.row()) + ":" + QString::number(index.column());
+    if (role == Qt::DecorationRole) {
+        if (index.column() == 0)
+            return iconProvider.icon(QFileIconProvider::Folder);
+        return iconProvider.icon(QFileIconProvider::File);
+    }
+    return QVariant();
+}
+
+QVariant Model::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    static QIcon services(QPixmap(":/images/services.png"));
+    if (role == Qt::DisplayRole)
+        return QString::number(section);
+    if (role == Qt::DecorationRole)
+        return qVariantFromValue(services);
+    return QAbstractItemModel::headerData(section, orientation, role);
+}
+
+bool Model::hasChildren(const QModelIndex &parent) const
+{
+    if (parent.isValid() && parent.column() != 0)
+        return false;
+    return rc > 0 && cc > 0;
+}
+
+Qt::ItemFlags Model::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return 0;
+    return (Qt::ItemIsDragEnabled|Qt::ItemIsSelectable|Qt::ItemIsEnabled);
+}
+
+Model::Node *Model::node(int row, Node *parent) const
+{
+    if (parent && !parent->children)
+	parent->children = new QVector<Node>(rc, Node(parent));
+    QVector<Node> *v = parent ? parent->children : tree;
+    return const_cast<Node*>(&(v->at(row)));
+}
+
+Model::Node *Model::parent(Node *child) const
+{
+    return child ? child->parent : 0;
+}
+
+int Model::row(Node *node) const
+{
+     const Node *first = node->parent ? &(node->parent->children->at(0)) : &(tree->at(0));
+     return (node - first);
+}
diff --git a/demos/interview/model.h b/demos/interview/model.h
new file mode 100644
index 0000000..96e6aea
--- /dev/null
+++ b/demos/interview/model.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MODEL_H
+#define MODEL_H
+
+#include <QAbstractItemModel>
+#include <QFileIconProvider>
+#include <QVector>
+
+class Model : public QAbstractItemModel
+{
+    Q_OBJECT
+
+public:
+    Model(int rows, int columns, QObject *parent = 0);
+    ~Model();
+
+    QModelIndex index(int row, int column, const QModelIndex &parent) const;
+    QModelIndex parent(const QModelIndex &child) const;
+
+    int rowCount(const QModelIndex &parent) const;
+    int columnCount(const QModelIndex &parent) const;
+
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+
+    bool hasChildren(const QModelIndex &parent) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+
+private:
+
+    struct Node
+    {
+	Node(Node *parent = 0) : parent(parent), children(0) {}
+	~Node() { delete children; }
+	Node *parent;
+	QVector<Node> *children;
+    };
+
+    Node *node(int row, Node *parent) const;
+    Node *parent(Node *child) const;
+    int row(Node *node) const;
+
+    int rc, cc;
+    QVector<Node> *tree;
+    QFileIconProvider iconProvider;
+};
+
+#endif
diff --git a/demos/macmainwindow/macmainwindow.h b/demos/macmainwindow/macmainwindow.h
new file mode 100644
index 0000000..b5e4740
--- /dev/null
+++ b/demos/macmainwindow/macmainwindow.h
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef MACMAINWINDOW_H
+#define MACMAINWINDOW_H
+
+#include <QtGui>
+
+#ifdef Q_WS_MAC
+
+#import <qmaccocoaviewcontainer_mac.h>
+
+#ifdef QT_MAC_USE_COCOA
+class SearchWidget : public QMacCocoaViewContainer
+{
+    Q_OBJECT
+public:
+    SearchWidget(QWidget *parent = 0);
+    ~SearchWidget();
+
+    QSize sizeHint() const;
+private:
+};
+
+#else
+#include <Carbon/Carbon.h>
+
+// The SearchWidget class wraps a native HISearchField.
+class SearchWidget : public QWidget
+{
+    Q_OBJECT
+private:
+    HIViewRef searchField;
+    CFStringRef searchFieldText;
+
+public:
+    QSize sizeHint() const;
+    SearchWidget(QWidget *parent = 0);
+    ~SearchWidget();
+};
+
+#endif
+
+QMenu *createMenu(QWidget *parent);
+
+class SearchWrapper : public QWidget
+{
+Q_OBJECT
+public:
+    SearchWrapper(QWidget *parent = 0);
+    QSize sizeHint() const;
+    QWidget *s;
+};
+
+class Spacer : public QWidget
+{
+Q_OBJECT
+public:
+    Spacer(QWidget *parent = 0);
+    QSize sizeHint() const;
+};
+
+class MacSplitterHandle : public QSplitterHandle
+{
+Q_OBJECT
+public:
+    MacSplitterHandle(Qt::Orientation orientation, QSplitter *parent);
+    void paintEvent(QPaintEvent *);
+    QSize sizeHint() const;
+};
+
+class MacSplitter : public QSplitter
+{
+public:
+    QSplitterHandle *createHandle();
+};
+
+class MacMainWindow : public QMainWindow
+{
+Q_OBJECT
+public:
+    MacMainWindow();
+    ~MacMainWindow();
+    QAbstractItemModel *createItemModel();
+    void resizeEvent(QResizeEvent *e);
+    QAbstractItemModel *createDocumentModel();
+public:
+    QSplitter *splitter;
+    QSplitter *horizontalSplitter;
+    QTreeView *sidebar;
+    QListView *documents;
+    QTextEdit *textedit;
+    QVBoxLayout *layout;
+    SearchWidget *searchWidget;
+    QToolBar * toolBar;
+};
+
+#endif // Q_WS_MAC
+
+#endif //MACMAINWINDOW_H
diff --git a/demos/macmainwindow/macmainwindow.mm b/demos/macmainwindow/macmainwindow.mm
new file mode 100644
index 0000000..156e793
--- /dev/null
+++ b/demos/macmainwindow/macmainwindow.mm
@@ -0,0 +1,347 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "macmainwindow.h"
+#import <Cocoa/Cocoa.h>
+#include <QtGui>
+
+
+#ifdef Q_WS_MAC
+
+#include <Carbon/Carbon.h>
+
+#ifdef QT_MAC_USE_COCOA
+
+//![0]
+SearchWidget::SearchWidget(QWidget *parent)
+    : QMacCocoaViewContainer(0, parent)
+{
+    // Many Cocoa objects create temporary autorelease objects,
+    // so create a pool to catch them.
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    // Create the NSSearchField, set it on the QCocoaViewContainer.
+    NSSearchField *search = [[NSSearchField alloc] init];
+    setCocoaView(search);
+
+    // Use a Qt menu for the search field menu.
+    QMenu *qtMenu = createMenu(this);
+    NSMenu *nsMenu = qtMenu->macMenu(0);
+    [[search cell] setSearchMenuTemplate:nsMenu];
+
+    // Release our reference, since our super class takes ownership and we
+    // don't need it anymore.
+    [search release];
+
+    // Clean up our pool as we no longer need it.
+    [pool release];
+}
+//![0]
+
+SearchWidget::~SearchWidget()
+{
+}
+
+QSize SearchWidget::sizeHint() const
+{
+    return QSize(150, 40);
+}
+
+#else
+
+// The SearchWidget class wraps a native HISearchField.
+SearchWidget::SearchWidget(QWidget *parent)
+    :QWidget(parent)
+{
+
+    // Create a native search field and pass its window id to QWidget::create.
+    searchFieldText = CFStringCreateWithCString(0, "search", 0);
+    HISearchFieldCreate(NULL/*bounds*/, kHISearchFieldAttributesSearchIcon | kHISearchFieldAttributesCancel,
+                        NULL/*menu ref*/, searchFieldText, &searchField);
+    create(reinterpret_cast<WId>(searchField));
+
+    // Use a Qt menu for the search field menu.
+    QMenu *searchMenu = createMenu(this);
+    MenuRef menuRef = searchMenu->macMenu(0);
+    HISearchFieldSetSearchMenu(searchField, menuRef);
+    setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+}
+
+SearchWidget::~SearchWidget()
+{
+    CFRelease(searchField);
+    CFRelease(searchFieldText);
+}
+
+// Get the size hint from the search field.
+QSize SearchWidget::sizeHint() const
+{
+    EventRef event;
+    HIRect optimalBounds;
+    CreateEvent(0, kEventClassControl,
+        kEventControlGetOptimalBounds,
+        GetCurrentEventTime(),
+        kEventAttributeUserEvent, &event);
+
+    SendEventToEventTargetWithOptions(event,
+        HIObjectGetEventTarget(HIObjectRef(winId())),
+        kEventTargetDontPropagate);
+
+    GetEventParameter(event,
+        kEventParamControlOptimalBounds, typeHIRect,
+        0, sizeof(HIRect), 0, &optimalBounds);
+
+    ReleaseEvent(event);
+    return QSize(optimalBounds.size.width + 100, // make it a bit wider.
+                 optimalBounds.size.height);
+}
+
+#endif
+
+QMenu *createMenu(QWidget *parent)
+{
+    QMenu *searchMenu = new QMenu(parent);
+    
+    QAction * indexAction = searchMenu->addAction("Index Search");
+    indexAction->setCheckable(true);
+    indexAction->setChecked(true);
+
+    QAction * fulltextAction = searchMenu->addAction("Full Text Search");
+    fulltextAction->setCheckable(true);
+
+    QActionGroup *searchActionGroup = new QActionGroup(parent);
+    searchActionGroup->addAction(indexAction);
+    searchActionGroup->addAction(fulltextAction);
+    searchActionGroup->setExclusive(true);
+    
+    return searchMenu;
+}
+
+SearchWrapper::SearchWrapper(QWidget *parent)
+:QWidget(parent)
+{
+    s = new SearchWidget(this);
+    s->move(2,2);
+    setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+}
+
+QSize SearchWrapper::sizeHint() const
+{
+    return s->sizeHint() + QSize(6, 2);
+}
+
+Spacer::Spacer(QWidget *parent)
+:QWidget(parent)
+{
+    QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    setSizePolicy(sizePolicy);
+}
+
+QSize Spacer::sizeHint() const
+{
+    return QSize(1, 1);
+}
+
+MacSplitterHandle::MacSplitterHandle(Qt::Orientation orientation, QSplitter *parent)
+: QSplitterHandle(orientation, parent) {   }
+
+// Paint the horizontal handle as a gradient, paint
+// the vertical handle as a line.
+void MacSplitterHandle::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+
+    QColor topColor(145, 145, 145);
+    QColor bottomColor(142, 142, 142);
+    QColor gradientStart(252, 252, 252);
+    QColor gradientStop(223, 223, 223);
+
+    if (orientation() == Qt::Vertical) {
+        painter.setPen(topColor);
+        painter.drawLine(0, 0, width(), 0);
+        painter.setPen(bottomColor);
+        painter.drawLine(0, height() - 1, width(), height() - 1);
+
+        QLinearGradient linearGrad(QPointF(0, 0), QPointF(0, height() -3));
+        linearGrad.setColorAt(0, gradientStart);
+        linearGrad.setColorAt(1, gradientStop);
+        painter.fillRect(QRect(QPoint(0,1), size() - QSize(0, 2)), QBrush(linearGrad));
+    } else {
+        painter.setPen(topColor);
+        painter.drawLine(0, 0, 0, height());
+    }
+}
+
+QSize MacSplitterHandle::sizeHint() const
+{
+    QSize parent = QSplitterHandle::sizeHint();
+    if (orientation() == Qt::Vertical) {
+        return parent + QSize(0, 3);
+    } else {
+        return QSize(1, parent.height());
+    }
+}
+
+QSplitterHandle *MacSplitter::createHandle()
+{
+    return new MacSplitterHandle(orientation(), this);
+}
+
+MacMainWindow::MacMainWindow()
+{
+    QSettings settings;
+    restoreGeometry(settings.value("Geometry").toByteArray());
+
+    setWindowTitle("Mac Main Window");
+
+    splitter = new MacSplitter();
+
+    // Set up the left-hand side blue side bar.
+    sidebar = new QTreeView();
+    sidebar->setFrameStyle(QFrame::NoFrame);
+    sidebar->setAttribute(Qt::WA_MacShowFocusRect, false);
+    sidebar->setAutoFillBackground(true);
+    
+    // Set the palette.
+    QPalette palette = sidebar->palette();
+    QColor macSidebarColor(231, 237, 246);
+    QColor macSidebarHighlightColor(168, 183, 205);
+    palette.setColor(QPalette::Base, macSidebarColor);
+    palette.setColor(QPalette::Highlight, macSidebarHighlightColor);
+    sidebar->setPalette(palette);
+
+    sidebar->setModel(createItemModel());
+    sidebar->header()->hide();
+    sidebar->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    sidebar->setTextElideMode(Qt::ElideMiddle);
+
+    splitter->addWidget(sidebar);
+
+    horizontalSplitter = new MacSplitter();
+    horizontalSplitter->setOrientation(Qt::Vertical);
+    splitter->addWidget(horizontalSplitter);
+    
+    splitter->setStretchFactor(0, 0);
+    splitter->setStretchFactor(1, 1);
+
+    // Set up the top document list view.
+    documents = new QListView();
+    documents->setFrameStyle(QFrame::NoFrame);
+    documents->setAttribute(Qt::WA_MacShowFocusRect, false);
+    documents->setModel(createDocumentModel());
+    documents->setAlternatingRowColors(true);
+    documents->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+    horizontalSplitter->addWidget(documents);
+    horizontalSplitter->setStretchFactor(0, 0);
+
+    // Set up the text view.
+    textedit = new QTextEdit();
+    textedit->setFrameStyle(QFrame::NoFrame);
+    textedit->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+    textedit->setText("<br><br><br><br><br><br><center><b>This demo shows how to create a \
+                       Qt main window application that has the same appearance as other \
+                       Mac OS X applications such as Mail or iTunes. This includes \
+                       customizing the item views and QSplitter and wrapping native widgets \
+                       such as the search field.</b></center>");
+
+    horizontalSplitter->addWidget(textedit);
+
+    setCentralWidget(splitter);
+
+    toolBar = addToolBar(tr("Search"));
+    toolBar->addWidget(new Spacer());
+    toolBar->addWidget(new SearchWrapper());
+    
+    setUnifiedTitleAndToolBarOnMac(true);
+}
+
+MacMainWindow::~MacMainWindow()
+{
+    QSettings settings;
+    settings.setValue("Geometry", saveGeometry());
+}
+
+QAbstractItemModel *MacMainWindow::createItemModel()
+{
+    QStandardItemModel *model = new QStandardItemModel();
+    QStandardItem *parentItem = model->invisibleRootItem();
+
+    QStandardItem *documentationItem = new QStandardItem("Documentation"); 
+    parentItem->appendRow(documentationItem);
+
+    QStandardItem *assistantItem = new QStandardItem("Qt MainWindow Manual"); 
+    documentationItem->appendRow(assistantItem);
+
+    QStandardItem *designerItem = new QStandardItem("Qt Designer Manual"); 
+    documentationItem->appendRow(designerItem);
+
+    QStandardItem *qtItem = new QStandardItem("Qt Reference Documentation"); 
+    qtItem->appendRow(new QStandardItem("Classes"));
+    qtItem->appendRow(new QStandardItem("Overviews"));
+    qtItem->appendRow(new QStandardItem("Tutorial & Examples"));
+    documentationItem->appendRow(qtItem);
+
+    QStandardItem *bookmarksItem = new QStandardItem("Bookmarks"); 
+    parentItem->appendRow(bookmarksItem);
+    bookmarksItem->appendRow(new QStandardItem("QWidget"));
+    bookmarksItem->appendRow(new QStandardItem("QObject"));
+    bookmarksItem->appendRow(new QStandardItem("QWizard"));
+
+    return model;
+}
+
+void MacMainWindow::resizeEvent(QResizeEvent *)
+{
+    if (toolBar)
+        toolBar->updateGeometry();
+}
+
+QAbstractItemModel *MacMainWindow::createDocumentModel()
+{
+    QStandardItemModel *model = new QStandardItemModel();
+    QStandardItem *parentItem = model->invisibleRootItem(); 
+    parentItem->appendRow(new QStandardItem("QWidget Class Reference"));
+    parentItem->appendRow(new QStandardItem("QObject Class Reference"));
+    parentItem->appendRow(new QStandardItem("QListView Class Reference"));
+
+    return model;
+}
+
+#endif // Q_WS_MAC
diff --git a/demos/macmainwindow/macmainwindow.pro b/demos/macmainwindow/macmainwindow.pro
new file mode 100644
index 0000000..f5165a7
--- /dev/null
+++ b/demos/macmainwindow/macmainwindow.pro
@@ -0,0 +1,23 @@
+TEMPLATE        = app
+TARGET          = macmainwindow
+
+CONFIG          += qt warn_on console
+
+OBJECTIVE_SOURCES += macmainwindow.mm
+SOURCES += main.cpp 
+HEADERS += macmainwindow.h
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+LIBS += -framework Cocoa
+
+# install
+mac {
+target.path = $$[QT_INSTALL_DEMOS]/macmainwindow
+sources.files = $$SOURCES  *.pro *.html
+sources.path = $$[QT_INSTALL_DEMOS]/macmainwindow
+INSTALLS += target sources
+}
diff --git a/demos/macmainwindow/main.cpp b/demos/macmainwindow/main.cpp
new file mode 100644
index 0000000..2b01cfe
--- /dev/null
+++ b/demos/macmainwindow/main.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "macmainwindow.h"
+
+#ifdef Q_WS_MAC
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    MacMainWindow mainWindow;
+    mainWindow.show();
+    return app.exec();
+}
+
+#else
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    QLabel label;
+    label.resize(300, 200);
+    label.setText(" This demo requires Mac OS X.");
+    label.show();
+    return app.exec();
+}
+
+#endif
diff --git a/demos/mainwindow/colorswatch.cpp b/demos/mainwindow/colorswatch.cpp
new file mode 100644
index 0000000..ba6a076
--- /dev/null
+++ b/demos/mainwindow/colorswatch.cpp
@@ -0,0 +1,746 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "colorswatch.h"
+
+#include <QAction>
+#include <QtEvents>
+#include <QFrame>
+#include <QMainWindow>
+#include <QMenu>
+#include <QPainter>
+#include <QImage>
+#include <QColor>
+#include <QDialog>
+#include <QGridLayout>
+#include <QSpinBox>
+#include <QLabel>
+#include <QPainterPath>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QBitmap>
+#include <QtDebug>
+
+#undef DEBUG_SIZEHINTS
+
+QColor bgColorForName(const QString &name)
+{
+    if (name == "Black")
+        return QColor("#D8D8D8");
+    else if (name == "White")
+        return QColor("#F1F1F1");
+    else if (name == "Red")
+        return QColor("#F1D8D8");
+    else if (name == "Green")
+        return QColor("#D8E4D8");
+    else if (name == "Blue")
+        return QColor("#D8D8F1");
+    else if (name == "Yellow")
+        return QColor("#F1F0D8");
+    return QColor(name).light(110);
+}
+
+QColor fgColorForName(const QString &name)
+{
+    if (name == "Black")
+        return QColor("#6C6C6C");
+    else if (name == "White")
+        return QColor("#F8F8F8");
+    else if (name == "Red")
+        return QColor("#F86C6C");
+    else if (name == "Green")
+        return QColor("#6CB26C");
+    else if (name == "Blue")
+        return QColor("#6C6CF8");
+    else if (name == "Yellow")
+        return QColor("#F8F76C");
+    return QColor(name);
+}
+
+class ColorDock : public QFrame
+{
+    Q_OBJECT
+public:
+    ColorDock(const QString &c, QWidget *parent);
+
+    virtual QSize sizeHint() const;
+    virtual QSize minimumSizeHint() const;
+
+    void setCustomSizeHint(const QSize &size);
+
+public slots:
+    void changeSizeHints();
+
+protected:
+    void paintEvent(QPaintEvent *);
+    QString color;
+    QSize szHint, minSzHint;
+};
+
+ColorDock::ColorDock(const QString &c, QWidget *parent)
+    : QFrame(parent) , color(c)
+{
+    QFont font = this->font();
+    font.setPointSize(8);
+    setFont(font);
+    szHint = QSize(-1, -1);
+    minSzHint = QSize(125, 75);
+}
+
+QSize ColorDock::sizeHint() const
+{
+    return szHint;
+}
+
+QSize ColorDock::minimumSizeHint() const
+{
+    return minSzHint;
+}
+
+void ColorDock::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+    p.setRenderHint(QPainter::Antialiasing);
+    p.fillRect(rect(), bgColorForName(color));
+
+    p.save();
+
+    extern void render_qt_text(QPainter *, int, int, const QColor &);
+    render_qt_text(&p, width(), height(), fgColorForName(color));
+
+    p.restore();
+
+#ifdef DEBUG_SIZEHINTS
+    p.setRenderHint(QPainter::Antialiasing, false);
+
+    QSize sz = size();
+    QSize szHint = sizeHint();
+    QSize minSzHint = minimumSizeHint();
+    QSize maxSz = maximumSize();
+    QString text = QString::fromLatin1("sz: %1x%2\nszHint: %3x%4\nminSzHint: %5x%6\n"
+                                        "maxSz: %8x%9")
+                    .arg(sz.width()).arg(sz.height())
+                    .arg(szHint.width()).arg(szHint.height())
+                    .arg(minSzHint.width()).arg(minSzHint.height())
+                    .arg(maxSz.width()).arg(maxSz.height());
+
+    QRect r = fontMetrics().boundingRect(rect(), Qt::AlignLeft|Qt::AlignTop, text);
+    r.adjust(-2, -2, 1, 1);
+    p.translate(4, 4);
+    QColor bg = Qt::yellow;
+    bg.setAlpha(120);
+    p.setBrush(bg);
+    p.setPen(Qt::black);
+    p.drawRect(r);
+    p.drawText(rect(), Qt::AlignLeft|Qt::AlignTop, text);
+#endif // DEBUG_SIZEHINTS
+}
+
+static QSpinBox *createSpinBox(int value, QWidget *parent, int max = 1000)
+{
+    QSpinBox *result = new QSpinBox(parent);
+    result->setMinimum(-1);
+    result->setMaximum(max);
+    result->setValue(value);
+    return result;
+}
+
+void ColorDock::changeSizeHints()
+{
+    QDialog dialog(this);
+    dialog.setWindowTitle(color);
+
+    QVBoxLayout *topLayout = new QVBoxLayout(&dialog);
+
+    QGridLayout *inputLayout = new QGridLayout();
+    topLayout->addLayout(inputLayout);
+
+    inputLayout->addWidget(new QLabel(tr("Size Hint:"), &dialog), 0, 0);
+    inputLayout->addWidget(new QLabel(tr("Min Size Hint:"), &dialog), 1, 0);
+    inputLayout->addWidget(new QLabel(tr("Max Size:"), &dialog), 2, 0);
+    inputLayout->addWidget(new QLabel(tr("Dockwgt Max Size:"), &dialog), 3, 0);
+
+    QSpinBox *szHintW = createSpinBox(szHint.width(), &dialog);
+    inputLayout->addWidget(szHintW, 0, 1);
+    QSpinBox *szHintH = createSpinBox(szHint.height(), &dialog);
+    inputLayout->addWidget(szHintH, 0, 2);
+
+    QSpinBox *minSzHintW = createSpinBox(minSzHint.width(), &dialog);
+    inputLayout->addWidget(minSzHintW, 1, 1);
+    QSpinBox *minSzHintH = createSpinBox(minSzHint.height(), &dialog);
+    inputLayout->addWidget(minSzHintH, 1, 2);
+
+    QSize maxSz = maximumSize();
+    QSpinBox *maxSzW = createSpinBox(maxSz.width(), &dialog, QWIDGETSIZE_MAX);
+    inputLayout->addWidget(maxSzW, 2, 1);
+    QSpinBox *maxSzH = createSpinBox(maxSz.height(), &dialog, QWIDGETSIZE_MAX);
+    inputLayout->addWidget(maxSzH, 2, 2);
+
+    QSize dwMaxSz = parentWidget()->maximumSize();
+    QSpinBox *dwMaxSzW = createSpinBox(dwMaxSz.width(), &dialog, QWIDGETSIZE_MAX);
+    inputLayout->addWidget(dwMaxSzW, 3, 1);
+    QSpinBox *dwMaxSzH = createSpinBox(dwMaxSz.height(), &dialog, QWIDGETSIZE_MAX);
+    inputLayout->addWidget(dwMaxSzH, 3, 2);
+
+    inputLayout->setColumnStretch(1, 1);
+    inputLayout->setColumnStretch(2, 1);
+
+    topLayout->addStretch();
+
+    QHBoxLayout *buttonBox = new QHBoxLayout();
+    topLayout->addLayout(buttonBox);
+
+    QPushButton *okButton = new QPushButton(tr("Ok"), &dialog);
+    QPushButton *cancelButton = new QPushButton(tr("Cancel"), &dialog);
+    connect(okButton, SIGNAL(clicked()), &dialog, SLOT(accept()));
+    connect(cancelButton, SIGNAL(clicked()), &dialog, SLOT(reject()));
+    buttonBox->addStretch();
+    buttonBox->addWidget(cancelButton);
+    buttonBox->addWidget(okButton);
+
+
+    if (!dialog.exec())
+        return;
+
+    szHint = QSize(szHintW->value(), szHintH->value());
+    minSzHint = QSize(minSzHintW->value(), minSzHintH->value());
+    maxSz = QSize(maxSzW->value(), maxSzH->value());
+    setMaximumSize(maxSz);
+    dwMaxSz = QSize(dwMaxSzW->value(), dwMaxSzH->value());
+    parentWidget()->setMaximumSize(dwMaxSz);
+    updateGeometry();
+    update();
+}
+
+void ColorDock::setCustomSizeHint(const QSize &size)
+{
+    szHint = size;
+    updateGeometry();
+}
+
+ColorSwatch::ColorSwatch(const QString &colorName, QWidget *parent, Qt::WindowFlags flags)
+    : QDockWidget(parent, flags)
+{
+    setObjectName(colorName + QLatin1String(" Dock Widget"));
+    setWindowTitle(objectName() + QLatin1String(" [*]"));
+
+    QFrame *swatch = new ColorDock(colorName, this);
+    swatch->setFrameStyle(QFrame::Box | QFrame::Sunken);
+
+    setWidget(swatch);
+
+    changeSizeHintsAction = new QAction(tr("Change Size Hints"), this);
+    connect(changeSizeHintsAction, SIGNAL(triggered()), swatch, SLOT(changeSizeHints()));
+
+    closableAction = new QAction(tr("Closable"), this);
+    closableAction->setCheckable(true);
+    connect(closableAction, SIGNAL(triggered(bool)), SLOT(changeClosable(bool)));
+
+    movableAction = new QAction(tr("Movable"), this);
+    movableAction->setCheckable(true);
+    connect(movableAction, SIGNAL(triggered(bool)), SLOT(changeMovable(bool)));
+
+    floatableAction = new QAction(tr("Floatable"), this);
+    floatableAction->setCheckable(true);
+    connect(floatableAction, SIGNAL(triggered(bool)), SLOT(changeFloatable(bool)));
+
+    verticalTitleBarAction = new QAction(tr("Vertical title bar"), this);
+    verticalTitleBarAction->setCheckable(true);
+    connect(verticalTitleBarAction, SIGNAL(triggered(bool)),
+            SLOT(changeVerticalTitleBar(bool)));
+
+    floatingAction = new QAction(tr("Floating"), this);
+    floatingAction->setCheckable(true);
+    connect(floatingAction, SIGNAL(triggered(bool)), SLOT(changeFloating(bool)));
+
+    allowedAreasActions = new QActionGroup(this);
+    allowedAreasActions->setExclusive(false);
+
+    allowLeftAction = new QAction(tr("Allow on Left"), this);
+    allowLeftAction->setCheckable(true);
+    connect(allowLeftAction, SIGNAL(triggered(bool)), SLOT(allowLeft(bool)));
+
+    allowRightAction = new QAction(tr("Allow on Right"), this);
+    allowRightAction->setCheckable(true);
+    connect(allowRightAction, SIGNAL(triggered(bool)), SLOT(allowRight(bool)));
+
+    allowTopAction = new QAction(tr("Allow on Top"), this);
+    allowTopAction->setCheckable(true);
+    connect(allowTopAction, SIGNAL(triggered(bool)), SLOT(allowTop(bool)));
+
+    allowBottomAction = new QAction(tr("Allow on Bottom"), this);
+    allowBottomAction->setCheckable(true);
+    connect(allowBottomAction, SIGNAL(triggered(bool)), SLOT(allowBottom(bool)));
+
+    allowedAreasActions->addAction(allowLeftAction);
+    allowedAreasActions->addAction(allowRightAction);
+    allowedAreasActions->addAction(allowTopAction);
+    allowedAreasActions->addAction(allowBottomAction);
+
+    areaActions = new QActionGroup(this);
+    areaActions->setExclusive(true);
+
+    leftAction = new QAction(tr("Place on Left") , this);
+    leftAction->setCheckable(true);
+    connect(leftAction, SIGNAL(triggered(bool)), SLOT(placeLeft(bool)));
+
+    rightAction = new QAction(tr("Place on Right") , this);
+    rightAction->setCheckable(true);
+    connect(rightAction, SIGNAL(triggered(bool)), SLOT(placeRight(bool)));
+
+    topAction = new QAction(tr("Place on Top") , this);
+    topAction->setCheckable(true);
+    connect(topAction, SIGNAL(triggered(bool)), SLOT(placeTop(bool)));
+
+    bottomAction = new QAction(tr("Place on Bottom") , this);
+    bottomAction->setCheckable(true);
+    connect(bottomAction, SIGNAL(triggered(bool)), SLOT(placeBottom(bool)));
+
+    areaActions->addAction(leftAction);
+    areaActions->addAction(rightAction);
+    areaActions->addAction(topAction);
+    areaActions->addAction(bottomAction);
+
+    connect(movableAction, SIGNAL(triggered(bool)), areaActions, SLOT(setEnabled(bool)));
+
+    connect(movableAction, SIGNAL(triggered(bool)), allowedAreasActions, SLOT(setEnabled(bool)));
+
+    connect(floatableAction, SIGNAL(triggered(bool)), floatingAction, SLOT(setEnabled(bool)));
+
+    connect(floatingAction, SIGNAL(triggered(bool)), floatableAction, SLOT(setDisabled(bool)));
+    connect(movableAction, SIGNAL(triggered(bool)), floatableAction, SLOT(setEnabled(bool)));
+
+    tabMenu = new QMenu(this);
+    tabMenu->setTitle(tr("Tab into"));
+    connect(tabMenu, SIGNAL(triggered(QAction*)), this, SLOT(tabInto(QAction*)));
+
+    splitHMenu = new QMenu(this);
+    splitHMenu->setTitle(tr("Split horizontally into"));
+    connect(splitHMenu, SIGNAL(triggered(QAction*)), this, SLOT(splitInto(QAction*)));
+
+    splitVMenu = new QMenu(this);
+    splitVMenu->setTitle(tr("Split vertically into"));
+    connect(splitVMenu, SIGNAL(triggered(QAction*)), this, SLOT(splitInto(QAction*)));
+
+    windowModifiedAction = new QAction(tr("Modified"), this);
+    windowModifiedAction->setCheckable(true);
+    windowModifiedAction->setChecked(false);
+    connect(windowModifiedAction, SIGNAL(toggled(bool)), this, SLOT(setWindowModified(bool)));
+
+    menu = new QMenu(colorName, this);
+    menu->addAction(toggleViewAction());
+    QAction *action = menu->addAction(tr("Raise"));
+    connect(action, SIGNAL(triggered()), this, SLOT(raise()));
+    menu->addAction(changeSizeHintsAction);
+    menu->addSeparator();
+    menu->addAction(closableAction);
+    menu->addAction(movableAction);
+    menu->addAction(floatableAction);
+    menu->addAction(floatingAction);
+    menu->addAction(verticalTitleBarAction);
+    menu->addSeparator();
+    menu->addActions(allowedAreasActions->actions());
+    menu->addSeparator();
+    menu->addActions(areaActions->actions());
+    menu->addSeparator();
+    menu->addMenu(splitHMenu);
+    menu->addMenu(splitVMenu);
+    menu->addMenu(tabMenu);
+    menu->addSeparator();
+    menu->addAction(windowModifiedAction);
+
+    connect(menu, SIGNAL(aboutToShow()), this, SLOT(updateContextMenu()));
+
+    if(colorName == "Black") {
+        leftAction->setShortcut(Qt::CTRL|Qt::Key_W);
+        rightAction->setShortcut(Qt::CTRL|Qt::Key_E);
+        toggleViewAction()->setShortcut(Qt::CTRL|Qt::Key_R);
+    }
+}
+
+void ColorSwatch::updateContextMenu()
+{
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    const Qt::DockWidgetArea area = mainWindow->dockWidgetArea(this);
+    const Qt::DockWidgetAreas areas = allowedAreas();
+
+    closableAction->setChecked(features() & QDockWidget::DockWidgetClosable);
+    if (windowType() == Qt::Drawer) {
+        floatableAction->setEnabled(false);
+        floatingAction->setEnabled(false);
+        movableAction->setEnabled(false);
+        verticalTitleBarAction->setChecked(false);
+    } else {
+        floatableAction->setChecked(features() & QDockWidget::DockWidgetFloatable);
+        floatingAction->setChecked(isWindow());
+        // done after floating, to get 'floatable' correctly initialized
+        movableAction->setChecked(features() & QDockWidget::DockWidgetMovable);
+        verticalTitleBarAction
+            ->setChecked(features() & QDockWidget::DockWidgetVerticalTitleBar);
+    }
+
+    allowLeftAction->setChecked(isAreaAllowed(Qt::LeftDockWidgetArea));
+    allowRightAction->setChecked(isAreaAllowed(Qt::RightDockWidgetArea));
+    allowTopAction->setChecked(isAreaAllowed(Qt::TopDockWidgetArea));
+    allowBottomAction->setChecked(isAreaAllowed(Qt::BottomDockWidgetArea));
+
+    if (allowedAreasActions->isEnabled()) {
+        allowLeftAction->setEnabled(area != Qt::LeftDockWidgetArea);
+        allowRightAction->setEnabled(area != Qt::RightDockWidgetArea);
+        allowTopAction->setEnabled(area != Qt::TopDockWidgetArea);
+        allowBottomAction->setEnabled(area != Qt::BottomDockWidgetArea);
+    }
+
+    leftAction->blockSignals(true);
+    rightAction->blockSignals(true);
+    topAction->blockSignals(true);
+    bottomAction->blockSignals(true);
+
+    leftAction->setChecked(area == Qt::LeftDockWidgetArea);
+    rightAction->setChecked(area == Qt::RightDockWidgetArea);
+    topAction->setChecked(area == Qt::TopDockWidgetArea);
+    bottomAction->setChecked(area == Qt::BottomDockWidgetArea);
+
+    leftAction->blockSignals(false);
+    rightAction->blockSignals(false);
+    topAction->blockSignals(false);
+    bottomAction->blockSignals(false);
+
+    if (areaActions->isEnabled()) {
+        leftAction->setEnabled(areas & Qt::LeftDockWidgetArea);
+        rightAction->setEnabled(areas & Qt::RightDockWidgetArea);
+        topAction->setEnabled(areas & Qt::TopDockWidgetArea);
+        bottomAction->setEnabled(areas & Qt::BottomDockWidgetArea);
+    }
+
+    tabMenu->clear();
+    splitHMenu->clear();
+    splitVMenu->clear();
+    QList<ColorSwatch*> dock_list = qFindChildren<ColorSwatch*>(mainWindow);
+    foreach (ColorSwatch *dock, dock_list) {
+//        if (!dock->isVisible() || dock->isFloating())
+//            continue;
+        tabMenu->addAction(dock->objectName());
+        splitHMenu->addAction(dock->objectName());
+        splitVMenu->addAction(dock->objectName());
+    }
+}
+
+void ColorSwatch::splitInto(QAction *action)
+{
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    QList<ColorSwatch*> dock_list = qFindChildren<ColorSwatch*>(mainWindow);
+    ColorSwatch *target = 0;
+    foreach (ColorSwatch *dock, dock_list) {
+        if (action->text() == dock->objectName()) {
+            target = dock;
+            break;
+        }
+    }
+    if (target == 0)
+        return;
+
+    Qt::Orientation o = action->parent() == splitHMenu
+                        ? Qt::Horizontal : Qt::Vertical;
+    mainWindow->splitDockWidget(target, this, o);
+}
+
+void ColorSwatch::tabInto(QAction *action)
+{
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    QList<ColorSwatch*> dock_list = qFindChildren<ColorSwatch*>(mainWindow);
+    ColorSwatch *target = 0;
+    foreach (ColorSwatch *dock, dock_list) {
+        if (action->text() == dock->objectName()) {
+            target = dock;
+            break;
+        }
+    }
+    if (target == 0)
+        return;
+
+    mainWindow->tabifyDockWidget(target, this);
+}
+
+void ColorSwatch::contextMenuEvent(QContextMenuEvent *event)
+{
+    event->accept();
+    menu->exec(event->globalPos());
+}
+
+void ColorSwatch::resizeEvent(QResizeEvent *e)
+{
+    if (BlueTitleBar *btb = qobject_cast<BlueTitleBar*>(titleBarWidget()))
+        btb->updateMask();
+
+    QDockWidget::resizeEvent(e);
+}
+
+
+void ColorSwatch::allow(Qt::DockWidgetArea area, bool a)
+{
+    Qt::DockWidgetAreas areas = allowedAreas();
+    areas = a ? areas | area : areas & ~area;
+    setAllowedAreas(areas);
+
+    if (areaActions->isEnabled()) {
+        leftAction->setEnabled(areas & Qt::LeftDockWidgetArea);
+        rightAction->setEnabled(areas & Qt::RightDockWidgetArea);
+        topAction->setEnabled(areas & Qt::TopDockWidgetArea);
+        bottomAction->setEnabled(areas & Qt::BottomDockWidgetArea);
+    }
+}
+
+void ColorSwatch::place(Qt::DockWidgetArea area, bool p)
+{
+    if (!p) return;
+
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    mainWindow->addDockWidget(area, this);
+
+    if (allowedAreasActions->isEnabled()) {
+        allowLeftAction->setEnabled(area != Qt::LeftDockWidgetArea);
+        allowRightAction->setEnabled(area != Qt::RightDockWidgetArea);
+        allowTopAction->setEnabled(area != Qt::TopDockWidgetArea);
+        allowBottomAction->setEnabled(area != Qt::BottomDockWidgetArea);
+    }
+}
+
+void ColorSwatch::setCustomSizeHint(const QSize &size)
+{
+    if (ColorDock *dock = qobject_cast<ColorDock*>(widget()))
+        dock->setCustomSizeHint(size);
+}
+
+void ColorSwatch::changeClosable(bool on)
+{ setFeatures(on ? features() | DockWidgetClosable : features() & ~DockWidgetClosable); }
+
+void ColorSwatch::changeMovable(bool on)
+{ setFeatures(on ? features() | DockWidgetMovable : features() & ~DockWidgetMovable); }
+
+void ColorSwatch::changeFloatable(bool on)
+{ setFeatures(on ? features() | DockWidgetFloatable : features() & ~DockWidgetFloatable); }
+
+void ColorSwatch::changeFloating(bool floating)
+{ setFloating(floating); }
+
+void ColorSwatch::allowLeft(bool a)
+{ allow(Qt::LeftDockWidgetArea, a); }
+
+void ColorSwatch::allowRight(bool a)
+{ allow(Qt::RightDockWidgetArea, a); }
+
+void ColorSwatch::allowTop(bool a)
+{ allow(Qt::TopDockWidgetArea, a); }
+
+void ColorSwatch::allowBottom(bool a)
+{ allow(Qt::BottomDockWidgetArea, a); }
+
+void ColorSwatch::placeLeft(bool p)
+{ place(Qt::LeftDockWidgetArea, p); }
+
+void ColorSwatch::placeRight(bool p)
+{ place(Qt::RightDockWidgetArea, p); }
+
+void ColorSwatch::placeTop(bool p)
+{ place(Qt::TopDockWidgetArea, p); }
+
+void ColorSwatch::placeBottom(bool p)
+{ place(Qt::BottomDockWidgetArea, p); }
+
+void ColorSwatch::changeVerticalTitleBar(bool on)
+{
+    setFeatures(on ? features() | DockWidgetVerticalTitleBar
+                    : features() & ~DockWidgetVerticalTitleBar);
+}
+
+QSize BlueTitleBar::minimumSizeHint() const
+{
+    QDockWidget *dw = qobject_cast<QDockWidget*>(parentWidget());
+    Q_ASSERT(dw != 0);
+    QSize result(leftPm.width() + rightPm.width(), centerPm.height());
+    if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar)
+        result.transpose();
+    return result;
+}
+
+BlueTitleBar::BlueTitleBar(QWidget *parent)
+    : QWidget(parent)
+{
+    leftPm = QPixmap(":/res/titlebarLeft.png");
+    centerPm = QPixmap(":/res/titlebarCenter.png");
+    rightPm = QPixmap(":/res/titlebarRight.png");
+}
+
+void BlueTitleBar::paintEvent(QPaintEvent*)
+{
+    QPainter painter(this);
+    QRect rect = this->rect();
+
+    QDockWidget *dw = qobject_cast<QDockWidget*>(parentWidget());
+    Q_ASSERT(dw != 0);
+
+    if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar) {
+        QSize s = rect.size();
+        s.transpose();
+        rect.setSize(s);
+
+        painter.translate(rect.left(), rect.top() + rect.width());
+        painter.rotate(-90);
+        painter.translate(-rect.left(), -rect.top());
+    }
+
+    painter.drawPixmap(rect.topLeft(), leftPm);
+    painter.drawPixmap(rect.topRight() - QPoint(rightPm.width() - 1, 0), rightPm);
+    QBrush brush(centerPm);
+    painter.fillRect(rect.left() + leftPm.width(), rect.top(),
+                        rect.width() - leftPm.width() - rightPm.width(),
+                        centerPm.height(), centerPm);
+}
+
+void BlueTitleBar::mousePressEvent(QMouseEvent *event)
+{
+    QPoint pos = event->pos();
+
+    QRect rect = this->rect();
+
+    QDockWidget *dw = qobject_cast<QDockWidget*>(parentWidget());
+    Q_ASSERT(dw != 0);
+
+    if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar) {
+        QPoint p = pos;
+        pos.setX(rect.left() + rect.bottom() - p.y());
+        pos.setY(rect.top() + p.x() - rect.left());
+
+        QSize s = rect.size();
+        s.transpose();
+        rect.setSize(s);
+    }
+
+    const int buttonRight = 7;
+    const int buttonWidth = 20;
+    int right = rect.right() - pos.x();
+    int button = (right - buttonRight)/buttonWidth;
+    switch (button) {
+        case 0:
+            event->accept();
+            dw->close();
+            break;
+        case 1:
+            event->accept();
+            dw->setFloating(!dw->isFloating());
+            break;
+        case 2: {
+            event->accept();
+            QDockWidget::DockWidgetFeatures features = dw->features();
+            if (features & QDockWidget::DockWidgetVerticalTitleBar)
+                features &= ~QDockWidget::DockWidgetVerticalTitleBar;
+            else
+                features |= QDockWidget::DockWidgetVerticalTitleBar;
+            dw->setFeatures(features);
+            break;
+        }
+        default:
+            event->ignore();
+            break;
+    }
+}
+
+void BlueTitleBar::updateMask()
+{
+    QDockWidget *dw = qobject_cast<QDockWidget*>(parent());
+    Q_ASSERT(dw != 0);
+
+    QRect rect = dw->rect();
+    QPixmap bitmap(dw->size());
+
+    {
+        QPainter painter(&bitmap);
+
+        ///initialize to transparent
+        painter.fillRect(rect, Qt::color0);
+
+        QRect contents = rect;
+        contents.setTopLeft(geometry().bottomLeft());
+        contents.setRight(geometry().right());
+        contents.setBottom(contents.bottom()-y());
+        painter.fillRect(contents, Qt::color1);
+
+
+
+        //let's pait the titlebar
+
+        QRect titleRect = this->geometry();
+
+        if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar) {
+            QSize s = rect.size();
+            s.transpose();
+            rect.setSize(s);
+
+            QSize s2 = size();
+            s2.transpose();
+            titleRect.setSize(s2);
+
+            painter.translate(rect.left(), rect.top() + rect.width());
+            painter.rotate(-90);
+            painter.translate(-rect.left(), -rect.top());
+        }
+
+        contents.setTopLeft(titleRect.bottomLeft());
+        contents.setRight(titleRect.right());
+        contents.setBottom(rect.bottom()-y());
+
+        QRect rect = titleRect;
+
+
+        painter.drawPixmap(rect.topLeft(), leftPm.mask());
+        painter.fillRect(rect.left() + leftPm.width(), rect.top(),
+            rect.width() - leftPm.width() - rightPm.width(),
+            centerPm.height(), Qt::color1);
+        painter.drawPixmap(rect.topRight() - QPoint(rightPm.width() - 1, 0), rightPm.mask());
+
+        painter.fillRect(contents, Qt::color1);
+    }
+
+    dw->setMask(bitmap);
+}
+
+#include "colorswatch.moc"
diff --git a/demos/mainwindow/colorswatch.h b/demos/mainwindow/colorswatch.h
new file mode 100644
index 0000000..57c5ac6
--- /dev/null
+++ b/demos/mainwindow/colorswatch.h
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COLORSWATCH_H
+#define COLORSWATCH_H
+
+#include <QDockWidget>
+
+QT_FORWARD_DECLARE_CLASS(QAction)
+QT_FORWARD_DECLARE_CLASS(QActionGroup)
+QT_FORWARD_DECLARE_CLASS(QMenu)
+
+class ColorSwatch : public QDockWidget
+{
+    Q_OBJECT
+
+    QAction *closableAction;
+    QAction *movableAction;
+    QAction *floatableAction;
+    QAction *floatingAction;
+    QAction *verticalTitleBarAction;
+
+    QActionGroup *allowedAreasActions;
+    QAction *allowLeftAction;
+    QAction *allowRightAction;
+    QAction *allowTopAction;
+    QAction *allowBottomAction;
+
+    QActionGroup *areaActions;
+    QAction *leftAction;
+    QAction *rightAction;
+    QAction *topAction;
+    QAction *bottomAction;
+
+    QAction *changeSizeHintsAction;
+
+    QMenu *tabMenu;
+    QMenu *splitHMenu;
+    QMenu *splitVMenu;
+
+    QAction *windowModifiedAction;
+
+public:
+    ColorSwatch(const QString &colorName, QWidget *parent = 0, Qt::WindowFlags flags = 0);
+
+    QMenu *menu;
+    void setCustomSizeHint(const QSize &size);
+
+protected:
+    virtual void contextMenuEvent(QContextMenuEvent *event);
+    virtual void resizeEvent(QResizeEvent *e);
+
+private:
+    void allow(Qt::DockWidgetArea area, bool allow);
+    void place(Qt::DockWidgetArea area, bool place);
+
+private slots:
+    void changeClosable(bool on);
+    void changeMovable(bool on);
+    void changeFloatable(bool on);
+    void changeFloating(bool on);
+    void changeVerticalTitleBar(bool on);
+    void updateContextMenu();
+
+    void allowLeft(bool a);
+    void allowRight(bool a);
+    void allowTop(bool a);
+    void allowBottom(bool a);
+
+    void placeLeft(bool p);
+    void placeRight(bool p);
+    void placeTop(bool p);
+    void placeBottom(bool p);
+
+    void splitInto(QAction *action);
+    void tabInto(QAction *action);
+};
+
+class BlueTitleBar : public QWidget
+{
+    Q_OBJECT
+public:
+    BlueTitleBar(QWidget *parent = 0);
+
+    QSize sizeHint() const { return minimumSizeHint(); }
+    QSize minimumSizeHint() const;
+protected:
+    void paintEvent(QPaintEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+public slots:
+    void updateMask();
+
+private:
+    QPixmap leftPm, centerPm, rightPm;
+};
+
+
+#endif
diff --git a/demos/mainwindow/main.cpp b/demos/mainwindow/main.cpp
new file mode 100644
index 0000000..46268b5
--- /dev/null
+++ b/demos/mainwindow/main.cpp
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+
+#include <QApplication>
+#include <QPainterPath>
+#include <QPainter>
+#include <QMap>
+#include <qdebug.h>
+
+void render_qt_text(QPainter *painter, int w, int h, const QColor &color) {
+    QPainterPath path;
+    path.moveTo(-0.083695, 0.283849);
+    path.cubicTo(-0.049581, 0.349613, -0.012720, 0.397969, 0.026886, 0.428917);
+    path.cubicTo(0.066493, 0.459865, 0.111593, 0.477595, 0.162186, 0.482108);
+    path.lineTo(0.162186, 0.500000);
+    path.cubicTo(0.115929, 0.498066, 0.066565, 0.487669, 0.014094, 0.468810);
+    path.cubicTo(-0.038378, 0.449952, -0.088103, 0.423839, -0.135082, 0.390474);
+    path.cubicTo(-0.182061, 0.357108, -0.222608, 0.321567, -0.256722, 0.283849);
+    path.cubicTo(-0.304712, 0.262250, -0.342874, 0.239362, -0.371206, 0.215184);
+    path.cubicTo(-0.411969, 0.179078, -0.443625, 0.134671, -0.466175, 0.081963);
+    path.cubicTo(-0.488725, 0.029255, -0.500000, -0.033043, -0.500000, -0.104932);
+    path.cubicTo(-0.500000, -0.218407, -0.467042, -0.312621, -0.401127, -0.387573);
+    path.cubicTo(-0.335212, -0.462524, -0.255421, -0.500000, -0.161752, -0.500000);
+    path.cubicTo(-0.072998, -0.500000, 0.003903, -0.462444, 0.068951, -0.387331);
+    path.cubicTo(0.133998, -0.312218, 0.166522, -0.217440, 0.166522, -0.102998);
+    path.cubicTo(0.166522, -0.010155, 0.143394, 0.071325, 0.097138, 0.141441);
+    path.cubicTo(0.050882, 0.211557, -0.009396, 0.259026, -0.083695, 0.283849);
+    path.moveTo(-0.167823, -0.456963);
+    path.cubicTo(-0.228823, -0.456963, -0.277826, -0.432624, -0.314831, -0.383946);
+    path.cubicTo(-0.361665, -0.323340, -0.385082, -0.230335, -0.385082, -0.104932);
+    path.cubicTo(-0.385082, 0.017569, -0.361376, 0.112025, -0.313964, 0.178433);
+    path.cubicTo(-0.277248, 0.229368, -0.228534, 0.254836, -0.167823, 0.254836);
+    path.cubicTo(-0.105088, 0.254836, -0.054496, 0.229368, -0.016045, 0.178433);
+    path.cubicTo(0.029055, 0.117827, 0.051605, 0.028691, 0.051605, -0.088975);
+    path.cubicTo(0.051605, -0.179562, 0.039318, -0.255803, 0.014744, -0.317698);
+    path.cubicTo(-0.004337, -0.365409, -0.029705, -0.400548, -0.061362, -0.423114);
+    path.cubicTo(-0.093018, -0.445680, -0.128505, -0.456963, -0.167823, -0.456963);
+    path.moveTo(0.379011, -0.404739);
+    path.lineTo(0.379011, -0.236460);
+    path.lineTo(0.486123, -0.236460);
+    path.lineTo(0.486123, -0.197292);
+    path.lineTo(0.379011, -0.197292);
+    path.lineTo(0.379011, 0.134913);
+    path.cubicTo(0.379011, 0.168117, 0.383276, 0.190442, 0.391804, 0.201886);
+    path.cubicTo(0.400332, 0.213330, 0.411246, 0.219052, 0.424545, 0.219052);
+    path.cubicTo(0.435531, 0.219052, 0.446227, 0.215264, 0.456635, 0.207689);
+    path.cubicTo(0.467042, 0.200113, 0.474993, 0.188910, 0.480486, 0.174081);
+    path.lineTo(0.500000, 0.174081);
+    path.cubicTo(0.488436, 0.210509, 0.471957, 0.237911, 0.450564, 0.256286);
+    path.cubicTo(0.429170, 0.274662, 0.407054, 0.283849, 0.384215, 0.283849);
+    path.cubicTo(0.368893, 0.283849, 0.353859, 0.279094, 0.339115, 0.269584);
+    path.cubicTo(0.324371, 0.260074, 0.313530, 0.246534, 0.306592, 0.228965);
+    path.cubicTo(0.299653, 0.211396, 0.296184, 0.184075, 0.296184, 0.147002);
+    path.lineTo(0.296184, -0.197292);
+    path.lineTo(0.223330, -0.197292);
+    path.lineTo(0.223330, -0.215667);
+    path.cubicTo(0.241833, -0.224049, 0.260697, -0.237992, 0.279922, -0.257495);
+    path.cubicTo(0.299147, -0.276999, 0.316276, -0.300129, 0.331310, -0.326886);
+    path.cubicTo(0.338826, -0.341070, 0.349523, -0.367021, 0.363400, -0.404739);
+    path.lineTo(0.379011, -0.404739);
+    path.moveTo(-0.535993, 0.275629);
+
+    painter->translate(w / 2, h / 2);
+    double scale = qMin(w, h) * 8 / 10.0;
+    painter->scale(scale, scale);
+
+    painter->setRenderHint(QPainter::Antialiasing);
+
+    painter->save();
+    painter->translate(.1, .1);
+    painter->fillPath(path, QColor(0, 0, 0, 63));
+    painter->restore();
+
+    painter->setBrush(color);
+    painter->setPen(QPen(Qt::black, 0.02, Qt::SolidLine, Qt::FlatCap, Qt::RoundJoin));
+    painter->drawPath(path);
+}
+
+void usage()
+{
+    qWarning() << "Usage: mainwindow [-SizeHint<color> <width>x<height>] ...";
+    exit(1);
+}
+
+QMap<QString, QSize> parseCustomSizeHints(int argc, char **argv)
+{
+    QMap<QString, QSize> result;
+
+    for (int i = 1; i < argc; ++i) {
+        QString arg = QString::fromLocal8Bit(argv[i]);
+
+        if (arg.startsWith(QLatin1String("-SizeHint"))) {
+            QString name = arg.mid(9);
+            if (name.isEmpty())
+                usage();
+            if (++i == argc)
+                usage();
+            QString sizeStr = QString::fromLocal8Bit(argv[i]);
+            int idx = sizeStr.indexOf(QLatin1Char('x'));
+            if (idx == -1)
+                usage();
+            bool ok;
+            int w = sizeStr.left(idx).toInt(&ok);
+            if (!ok)
+                usage();
+            int h = sizeStr.mid(idx + 1).toInt(&ok);
+            if (!ok)
+                usage();
+            result[name] = QSize(w, h);
+        }
+    }
+
+    return result;
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    QMap<QString, QSize> customSizeHints = parseCustomSizeHints(argc, argv);
+    MainWindow mainWin(customSizeHints);
+    mainWin.resize(800, 600);
+    mainWin.show();
+    return app.exec();
+}
diff --git a/demos/mainwindow/mainwindow.cpp b/demos/mainwindow/mainwindow.cpp
new file mode 100644
index 0000000..7edaf52
--- /dev/null
+++ b/demos/mainwindow/mainwindow.cpp
@@ -0,0 +1,510 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+#include "colorswatch.h"
+#include "toolbar.h"
+
+#include <QAction>
+#include <QLayout>
+#include <QMenu>
+#include <QMenuBar>
+#include <QStatusBar>
+#include <QTextEdit>
+#include <QFile>
+#include <QDataStream>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QSignalMapper>
+#include <QApplication>
+#include <QPainter>
+#include <QMouseEvent>
+#include <QLineEdit>
+#include <QComboBox>
+#include <QLabel>
+#include <QPushButton>
+#include <qdebug.h>
+
+static const char * const message =
+    "<p><b>Qt Main Window Demo</b></p>"
+
+    "<p>This is a demonstration of the QMainWindow, QToolBar and "
+    "QDockWidget classes.</p>"
+
+    "<p>The tool bar and dock widgets can be dragged around and rearranged "
+    "using the mouse or via the menu.</p>"
+
+    "<p>Each dock widget contains a colored frame and a context "
+    "(right-click) menu.</p>"
+
+#ifdef Q_WS_MAC
+    "<p>On Mac OS X, the \"Black\" dock widget has been created as a "
+    "<em>Drawer</em>, which is a special kind of QDockWidget.</p>"
+#endif
+    ;
+
+MainWindow::MainWindow(const QMap<QString, QSize> &customSizeHints,
+                        QWidget *parent, Qt::WindowFlags flags)
+    : QMainWindow(parent, flags)
+{
+    setObjectName("MainWindow");
+    setWindowTitle("Qt Main Window Demo");
+
+    center = new QTextEdit(this);
+    center->setReadOnly(true);
+    center->setMinimumSize(400, 205);
+    setCentralWidget(center);
+
+    setupToolBar();
+    setupMenuBar();
+    setupDockWidgets(customSizeHints);
+
+    statusBar()->showMessage(tr("Status Bar"));
+}
+
+void MainWindow::actionTriggered(QAction *action)
+{
+    qDebug("action '%s' triggered", action->text().toLocal8Bit().data());
+}
+
+void MainWindow::setupToolBar()
+{
+    for (int i = 0; i < 3; ++i) {
+        ToolBar *tb = new ToolBar(QString::fromLatin1("Tool Bar %1").arg(i + 1), this);
+        toolBars.append(tb);
+        addToolBar(tb);
+    }
+}
+
+void MainWindow::setupMenuBar()
+{
+    QMenu *menu = menuBar()->addMenu(tr("&File"));
+
+    QAction *action = menu->addAction(tr("Save layout..."));
+    connect(action, SIGNAL(triggered()), this, SLOT(saveLayout()));
+
+    action = menu->addAction(tr("Load layout..."));
+    connect(action, SIGNAL(triggered()), this, SLOT(loadLayout()));
+
+    action = menu->addAction(tr("Switch layout direction"));
+    connect(action, SIGNAL(triggered()), this, SLOT(switchLayoutDirection()));
+
+    menu->addSeparator();
+
+    menu->addAction(tr("&Quit"), this, SLOT(close()));
+
+    mainWindowMenu = menuBar()->addMenu(tr("Main window"));
+
+    action = mainWindowMenu->addAction(tr("Animated docks"));
+    action->setCheckable(true);
+    action->setChecked(dockOptions() & AnimatedDocks);
+    connect(action, SIGNAL(toggled(bool)), this, SLOT(setDockOptions()));
+
+    action = mainWindowMenu->addAction(tr("Allow nested docks"));
+    action->setCheckable(true);
+    action->setChecked(dockOptions() & AllowNestedDocks);
+    connect(action, SIGNAL(toggled(bool)), this, SLOT(setDockOptions()));
+
+    action = mainWindowMenu->addAction(tr("Allow tabbed docks"));
+    action->setCheckable(true);
+    action->setChecked(dockOptions() & AllowTabbedDocks);
+    connect(action, SIGNAL(toggled(bool)), this, SLOT(setDockOptions()));
+
+    action = mainWindowMenu->addAction(tr("Force tabbed docks"));
+    action->setCheckable(true);
+    action->setChecked(dockOptions() & ForceTabbedDocks);
+    connect(action, SIGNAL(toggled(bool)), this, SLOT(setDockOptions()));
+
+    action = mainWindowMenu->addAction(tr("Vertical tabs"));
+    action->setCheckable(true);
+    action->setChecked(dockOptions() & VerticalTabs);
+    connect(action, SIGNAL(toggled(bool)), this, SLOT(setDockOptions()));
+
+    QMenu *toolBarMenu = menuBar()->addMenu(tr("Tool bars"));
+    for (int i = 0; i < toolBars.count(); ++i)
+        toolBarMenu->addMenu(toolBars.at(i)->menu);
+
+    dockWidgetMenu = menuBar()->addMenu(tr("&Dock Widgets"));
+}
+
+void MainWindow::setDockOptions()
+{
+    DockOptions opts;
+    QList<QAction*> actions = mainWindowMenu->actions();
+
+    if (actions.at(0)->isChecked())
+        opts |= AnimatedDocks;
+    if (actions.at(1)->isChecked())
+        opts |= AllowNestedDocks;
+    if (actions.at(2)->isChecked())
+        opts |= AllowTabbedDocks;
+    if (actions.at(3)->isChecked())
+        opts |= ForceTabbedDocks;
+    if (actions.at(4)->isChecked())
+        opts |= VerticalTabs;
+
+    QMainWindow::setDockOptions(opts);
+}
+
+void MainWindow::saveLayout()
+{
+    QString fileName
+        = QFileDialog::getSaveFileName(this, tr("Save layout"));
+    if (fileName.isEmpty())
+        return;
+    QFile file(fileName);
+    if (!file.open(QFile::WriteOnly)) {
+        QString msg = tr("Failed to open %1\n%2")
+                        .arg(fileName)
+                        .arg(file.errorString());
+        QMessageBox::warning(this, tr("Error"), msg);
+        return;
+    }
+
+    QByteArray geo_data = saveGeometry();
+    QByteArray layout_data = saveState();
+
+    bool ok = file.putChar((uchar)geo_data.size());
+    if (ok)
+        ok = file.write(geo_data) == geo_data.size();
+    if (ok)
+        ok = file.write(layout_data) == layout_data.size();
+
+    if (!ok) {
+        QString msg = tr("Error writing to %1\n%2")
+                        .arg(fileName)
+                        .arg(file.errorString());
+        QMessageBox::warning(this, tr("Error"), msg);
+        return;
+    }
+}
+
+void MainWindow::loadLayout()
+{
+    QString fileName
+        = QFileDialog::getOpenFileName(this, tr("Load layout"));
+    if (fileName.isEmpty())
+        return;
+    QFile file(fileName);
+    if (!file.open(QFile::ReadOnly)) {
+        QString msg = tr("Failed to open %1\n%2")
+                        .arg(fileName)
+                        .arg(file.errorString());
+        QMessageBox::warning(this, tr("Error"), msg);
+        return;
+    }
+
+    uchar geo_size;
+    QByteArray geo_data;
+    QByteArray layout_data;
+
+    bool ok = file.getChar((char*)&geo_size);
+    if (ok) {
+        geo_data = file.read(geo_size);
+        ok = geo_data.size() == geo_size;
+    }
+    if (ok) {
+        layout_data = file.readAll();
+        ok = layout_data.size() > 0;
+    }
+
+    if (ok)
+        ok = restoreGeometry(geo_data);
+    if (ok)
+        ok = restoreState(layout_data);
+
+    if (!ok) {
+        QString msg = tr("Error reading %1")
+                        .arg(fileName);
+        QMessageBox::warning(this, tr("Error"), msg);
+        return;
+    }
+}
+
+QAction *addAction(QMenu *menu, const QString &text, QActionGroup *group, QSignalMapper *mapper,
+                    int id)
+{
+    bool first = group->actions().isEmpty();
+    QAction *result = menu->addAction(text);
+    result->setCheckable(true);
+    result->setChecked(first);
+    group->addAction(result);
+    QObject::connect(result, SIGNAL(triggered()), mapper, SLOT(map()));
+    mapper->setMapping(result, id);
+    return result;
+}
+
+void MainWindow::setupDockWidgets(const QMap<QString, QSize> &customSizeHints)
+{
+    mapper = new QSignalMapper(this);
+    connect(mapper, SIGNAL(mapped(int)), this, SLOT(setCorner(int)));
+
+    QMenu *corner_menu = dockWidgetMenu->addMenu(tr("Top left corner"));
+    QActionGroup *group = new QActionGroup(this);
+    group->setExclusive(true);
+    ::addAction(corner_menu, tr("Top dock area"), group, mapper, 0);
+    ::addAction(corner_menu, tr("Left dock area"), group, mapper, 1);
+
+    corner_menu = dockWidgetMenu->addMenu(tr("Top right corner"));
+    group = new QActionGroup(this);
+    group->setExclusive(true);
+    ::addAction(corner_menu, tr("Top dock area"), group, mapper, 2);
+    ::addAction(corner_menu, tr("Right dock area"), group, mapper, 3);
+
+    corner_menu = dockWidgetMenu->addMenu(tr("Bottom left corner"));
+    group = new QActionGroup(this);
+    group->setExclusive(true);
+    ::addAction(corner_menu, tr("Bottom dock area"), group, mapper, 4);
+    ::addAction(corner_menu, tr("Left dock area"), group, mapper, 5);
+
+    corner_menu = dockWidgetMenu->addMenu(tr("Bottom right corner"));
+    group = new QActionGroup(this);
+    group->setExclusive(true);
+    ::addAction(corner_menu, tr("Bottom dock area"), group, mapper, 6);
+    ::addAction(corner_menu, tr("Right dock area"), group, mapper, 7);
+
+    dockWidgetMenu->addSeparator();
+
+    static const struct Set {
+        const char * name;
+        uint flags;
+        Qt::DockWidgetArea area;
+    } sets [] = {
+#ifndef Q_WS_MAC
+        { "Black", 0, Qt::LeftDockWidgetArea },
+#else
+        { "Black", Qt::Drawer, Qt::LeftDockWidgetArea },
+#endif
+        { "White", 0, Qt::RightDockWidgetArea },
+        { "Red", 0, Qt::TopDockWidgetArea },
+        { "Green", 0, Qt::TopDockWidgetArea },
+        { "Blue", 0, Qt::BottomDockWidgetArea },
+        { "Yellow", 0, Qt::BottomDockWidgetArea }
+    };
+    const int setCount = sizeof(sets) / sizeof(Set);
+
+    for (int i = 0; i < setCount; ++i) {
+        ColorSwatch *swatch = new ColorSwatch(tr(sets[i].name), this, Qt::WindowFlags(sets[i].flags));
+        if (i%2)
+            swatch->setWindowIcon(QIcon(QPixmap(":/res/qt.png")));
+        if (qstrcmp(sets[i].name, "Blue") == 0) {
+            BlueTitleBar *titlebar = new BlueTitleBar(swatch);
+            swatch->setTitleBarWidget(titlebar);
+            connect(swatch, SIGNAL(topLevelChanged(bool)), titlebar, SLOT(updateMask()));
+            connect(swatch, SIGNAL(featuresChanged(QDockWidget::DockWidgetFeatures)), titlebar, SLOT(updateMask()));
+
+#ifdef Q_WS_QWS
+            QPalette pal = palette();
+            pal.setBrush(backgroundRole(), QColor(0,0,0,0));
+            swatch->setPalette(pal);
+#endif
+        }
+
+        QString name = QString::fromLatin1(sets[i].name);
+        if (customSizeHints.contains(name))
+            swatch->setCustomSizeHint(customSizeHints.value(name));
+
+        addDockWidget(sets[i].area, swatch);
+        dockWidgetMenu->addMenu(swatch->menu);
+    }
+
+    createDockWidgetAction = new QAction(tr("Add dock widget..."), this);
+    connect(createDockWidgetAction, SIGNAL(triggered()), this, SLOT(createDockWidget()));
+    destroyDockWidgetMenu = new QMenu(tr("Destroy dock widget"), this);
+    destroyDockWidgetMenu->setEnabled(false);
+    connect(destroyDockWidgetMenu, SIGNAL(triggered(QAction*)), this, SLOT(destroyDockWidget(QAction*)));
+
+    dockWidgetMenu->addSeparator();
+    dockWidgetMenu->addAction(createDockWidgetAction);
+    dockWidgetMenu->addMenu(destroyDockWidgetMenu);
+}
+
+void MainWindow::setCorner(int id)
+{
+    switch (id) {
+        case 0:
+            QMainWindow::setCorner(Qt::TopLeftCorner, Qt::TopDockWidgetArea);
+            break;
+        case 1:
+            QMainWindow::setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
+            break;
+        case 2:
+            QMainWindow::setCorner(Qt::TopRightCorner, Qt::TopDockWidgetArea);
+            break;
+        case 3:
+            QMainWindow::setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
+            break;
+        case 4:
+            QMainWindow::setCorner(Qt::BottomLeftCorner, Qt::BottomDockWidgetArea);
+            break;
+        case 5:
+            QMainWindow::setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
+            break;
+        case 6:
+            QMainWindow::setCorner(Qt::BottomRightCorner, Qt::BottomDockWidgetArea);
+            break;
+        case 7:
+            QMainWindow::setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
+            break;
+    }
+}
+
+void MainWindow::showEvent(QShowEvent *event)
+{
+    QMainWindow::showEvent(event);
+}
+
+void MainWindow::switchLayoutDirection()
+{
+    if (layoutDirection() == Qt::LeftToRight)
+        qApp->setLayoutDirection(Qt::RightToLeft);
+    else
+        qApp->setLayoutDirection(Qt::LeftToRight);
+}
+
+class CreateDockWidgetDialog : public QDialog
+{
+public:
+    CreateDockWidgetDialog(QWidget *parent = 0);
+
+    QString objectName() const;
+    Qt::DockWidgetArea location() const;
+
+private:
+    QLineEdit *m_objectName;
+    QComboBox *m_location;
+};
+
+CreateDockWidgetDialog::CreateDockWidgetDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    QGridLayout *layout = new QGridLayout(this);
+
+    layout->addWidget(new QLabel(tr("Object name:")), 0, 0);
+    m_objectName = new QLineEdit;
+    layout->addWidget(m_objectName, 0, 1);
+
+    layout->addWidget(new QLabel(tr("Location:")), 1, 0);
+    m_location = new QComboBox;
+    m_location->setEditable(false);
+    m_location->addItem(tr("Top"));
+    m_location->addItem(tr("Left"));
+    m_location->addItem(tr("Right"));
+    m_location->addItem(tr("Bottom"));
+    m_location->addItem(tr("Restore"));
+    layout->addWidget(m_location, 1, 1);
+
+    QHBoxLayout *buttonLayout = new QHBoxLayout;
+    layout->addLayout(buttonLayout, 2, 0, 1, 2);
+    buttonLayout->addStretch();
+
+    QPushButton *cancelButton = new QPushButton(tr("Cancel"));
+    connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+    buttonLayout->addWidget(cancelButton);
+    QPushButton *okButton = new QPushButton(tr("Ok"));
+    connect(okButton, SIGNAL(clicked()), this, SLOT(accept()));
+    buttonLayout->addWidget(okButton);
+
+    okButton->setDefault(true);
+}
+
+QString CreateDockWidgetDialog::objectName() const
+{
+    return m_objectName->text();
+}
+
+Qt::DockWidgetArea CreateDockWidgetDialog::location() const
+{
+    switch (m_location->currentIndex()) {
+        case 0: return Qt::TopDockWidgetArea;
+        case 1: return Qt::LeftDockWidgetArea;
+        case 2: return Qt::RightDockWidgetArea;
+        case 3: return Qt::BottomDockWidgetArea;
+        default:
+            break;
+    }
+    return Qt::NoDockWidgetArea;
+}
+
+void MainWindow::createDockWidget()
+{
+    CreateDockWidgetDialog dialog(this);
+    int ret = dialog.exec();
+    if (ret == QDialog::Rejected)
+        return;
+
+    QDockWidget *dw = new QDockWidget;
+    dw->setObjectName(dialog.objectName());
+    dw->setWindowTitle(dialog.objectName());
+    dw->setWidget(new QTextEdit);
+
+    Qt::DockWidgetArea area = dialog.location();
+    switch (area) {
+        case Qt::LeftDockWidgetArea:
+        case Qt::RightDockWidgetArea:
+        case Qt::TopDockWidgetArea:
+        case Qt::BottomDockWidgetArea:
+            addDockWidget(area, dw);
+            break;
+        default:
+            if (!restoreDockWidget(dw)) {
+                QMessageBox::warning(this, QString(), tr("Failed to restore dock widget"));
+                delete dw;
+                return;
+            }
+            break;
+    }
+
+    extraDockWidgets.append(dw);
+    destroyDockWidgetMenu->setEnabled(true);
+    destroyDockWidgetMenu->addAction(new QAction(dialog.objectName(), this));
+}
+
+void MainWindow::destroyDockWidget(QAction *action)
+{
+    int index = destroyDockWidgetMenu->actions().indexOf(action);
+    delete extraDockWidgets.takeAt(index);
+    destroyDockWidgetMenu->removeAction(action);
+    action->deleteLater();
+
+    if (destroyDockWidgetMenu->isEmpty())
+        destroyDockWidgetMenu->setEnabled(false);
+}
diff --git a/demos/mainwindow/mainwindow.h b/demos/mainwindow/mainwindow.h
new file mode 100644
index 0000000..9c7f620
--- /dev/null
+++ b/demos/mainwindow/mainwindow.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QTextEdit>
+
+class ToolBar;
+QT_FORWARD_DECLARE_CLASS(QMenu)
+QT_FORWARD_DECLARE_CLASS(QSignalMapper)
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+    QTextEdit *center;
+    QList<ToolBar*> toolBars;
+    QMenu *dockWidgetMenu;
+    QMenu *mainWindowMenu;
+    QSignalMapper *mapper;
+    QList<QDockWidget*> extraDockWidgets;
+    QAction *createDockWidgetAction;
+    QMenu *destroyDockWidgetMenu;
+
+public:
+    MainWindow(const QMap<QString, QSize> &customSizeHints,
+                QWidget *parent = 0, Qt::WindowFlags flags = 0);
+
+protected:
+    void showEvent(QShowEvent *event);
+
+public slots:
+    void actionTriggered(QAction *action);
+    void saveLayout();
+    void loadLayout();
+    void setCorner(int id);
+    void switchLayoutDirection();
+    void setDockOptions();
+
+    void createDockWidget();
+    void destroyDockWidget(QAction *action);
+
+private:
+    void setupToolBar();
+    void setupMenuBar();
+    void setupDockWidgets(const QMap<QString, QSize> &customSizeHints);
+};
+
+
+#endif
diff --git a/demos/mainwindow/mainwindow.pro b/demos/mainwindow/mainwindow.pro
new file mode 100644
index 0000000..9853a55
--- /dev/null
+++ b/demos/mainwindow/mainwindow.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+HEADERS += colorswatch.h mainwindow.h toolbar.h
+SOURCES += colorswatch.cpp mainwindow.cpp toolbar.cpp main.cpp
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+RESOURCES += mainwindow.qrc
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/mainwindow
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro
+sources.path = $$[QT_INSTALL_DEMOS]/mainwindow
+INSTALLS += target sources
+
diff --git a/demos/mainwindow/mainwindow.qrc b/demos/mainwindow/mainwindow.qrc
new file mode 100644
index 0000000..47ff22a
--- /dev/null
+++ b/demos/mainwindow/mainwindow.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res">
+   <file>qt.png</file>
+   <file>titlebarLeft.png</file>
+   <file>titlebarCenter.png</file>
+   <file>titlebarRight.png</file>
+</qresource>
+</RCC>
diff --git a/demos/mainwindow/qt.png b/demos/mainwindow/qt.png
new file mode 100644
index 0000000..48fa9fc
--- /dev/null
+++ b/demos/mainwindow/qt.png
diff --git a/demos/mainwindow/titlebarCenter.png b/demos/mainwindow/titlebarCenter.png
new file mode 100644
index 0000000..5cc1413
--- /dev/null
+++ b/demos/mainwindow/titlebarCenter.png
diff --git a/demos/mainwindow/titlebarLeft.png b/demos/mainwindow/titlebarLeft.png
new file mode 100644
index 0000000..3151662
--- /dev/null
+++ b/demos/mainwindow/titlebarLeft.png
diff --git a/demos/mainwindow/titlebarRight.png b/demos/mainwindow/titlebarRight.png
new file mode 100644
index 0000000..a450526
--- /dev/null
+++ b/demos/mainwindow/titlebarRight.png
diff --git a/demos/mainwindow/toolbar.cpp b/demos/mainwindow/toolbar.cpp
new file mode 100644
index 0000000..9de1348
--- /dev/null
+++ b/demos/mainwindow/toolbar.cpp
@@ -0,0 +1,383 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "toolbar.h"
+
+#include <QMainWindow>
+#include <QMenu>
+#include <QPainter>
+#include <QPainterPath>
+#include <QSpinBox>
+#include <QLabel>
+#include <QToolTip>
+
+#include <stdlib.h>
+
+static QPixmap genIcon(const QSize &iconSize, const QString &, const QColor &color)
+{
+    int w = iconSize.width();
+    int h = iconSize.height();
+
+    QImage image(w, h, QImage::Format_ARGB32_Premultiplied);
+    image.fill(0);
+
+    QPainter p(&image);
+
+    extern void render_qt_text(QPainter *, int, int, const QColor &);
+    render_qt_text(&p, w, h, color);
+
+    return QPixmap::fromImage(image, Qt::DiffuseDither | Qt::DiffuseAlphaDither);
+}
+
+static QPixmap genIcon(const QSize &iconSize, int number, const QColor &color)
+{ return genIcon(iconSize, QString::number(number), color); }
+
+ToolBar::ToolBar(const QString &title, QWidget *parent)
+    : QToolBar(parent), spinbox(0), spinboxAction(0)
+{
+    tip = 0;
+    setWindowTitle(title);
+    setObjectName(title);
+
+    setIconSize(QSize(32, 32));
+
+    QColor bg(palette().background().color());
+    menu = new QMenu("One", this);
+    menu->setIcon(genIcon(iconSize(), 1, Qt::black));
+    menu->addAction(genIcon(iconSize(), "A", Qt::blue), "A");
+    menu->addAction(genIcon(iconSize(), "B", Qt::blue), "B");
+    menu->addAction(genIcon(iconSize(), "C", Qt::blue), "C");
+    addAction(menu->menuAction());
+
+    QAction *two = addAction(genIcon(iconSize(), 2, Qt::white), "Two");
+    QFont boldFont;
+    boldFont.setBold(true);
+    two->setFont(boldFont);
+
+    addAction(genIcon(iconSize(), 3, Qt::red), "Three");
+    addAction(genIcon(iconSize(), 4, Qt::green), "Four");
+    addAction(genIcon(iconSize(), 5, Qt::blue), "Five");
+    addAction(genIcon(iconSize(), 6, Qt::yellow), "Six");
+    orderAction = new QAction(this);
+    orderAction->setText(tr("Order Items in Tool Bar"));
+    connect(orderAction, SIGNAL(triggered()), SLOT(order()));
+
+    randomizeAction = new QAction(this);
+    randomizeAction->setText(tr("Randomize Items in Tool Bar"));
+    connect(randomizeAction, SIGNAL(triggered()), SLOT(randomize()));
+
+    addSpinBoxAction = new QAction(this);
+    addSpinBoxAction->setText(tr("Add Spin Box"));
+    connect(addSpinBoxAction, SIGNAL(triggered()), SLOT(addSpinBox()));
+
+    removeSpinBoxAction = new QAction(this);
+    removeSpinBoxAction->setText(tr("Remove Spin Box"));
+    removeSpinBoxAction->setEnabled(false);
+    connect(removeSpinBoxAction, SIGNAL(triggered()), SLOT(removeSpinBox()));
+
+    movableAction = new QAction(tr("Movable"), this);
+    movableAction->setCheckable(true);
+    connect(movableAction, SIGNAL(triggered(bool)), SLOT(changeMovable(bool)));
+
+    allowedAreasActions = new QActionGroup(this);
+    allowedAreasActions->setExclusive(false);
+
+    allowLeftAction = new QAction(tr("Allow on Left"), this);
+    allowLeftAction->setCheckable(true);
+    connect(allowLeftAction, SIGNAL(triggered(bool)), SLOT(allowLeft(bool)));
+
+    allowRightAction = new QAction(tr("Allow on Right"), this);
+    allowRightAction->setCheckable(true);
+    connect(allowRightAction, SIGNAL(triggered(bool)), SLOT(allowRight(bool)));
+
+    allowTopAction = new QAction(tr("Allow on Top"), this);
+    allowTopAction->setCheckable(true);
+    connect(allowTopAction, SIGNAL(triggered(bool)), SLOT(allowTop(bool)));
+
+    allowBottomAction = new QAction(tr("Allow on Bottom"), this);
+    allowBottomAction->setCheckable(true);
+    connect(allowBottomAction, SIGNAL(triggered(bool)), SLOT(allowBottom(bool)));
+
+    allowedAreasActions->addAction(allowLeftAction);
+    allowedAreasActions->addAction(allowRightAction);
+    allowedAreasActions->addAction(allowTopAction);
+    allowedAreasActions->addAction(allowBottomAction);
+
+    areaActions = new QActionGroup(this);
+    areaActions->setExclusive(true);
+
+    leftAction = new QAction(tr("Place on Left") , this);
+    leftAction->setCheckable(true);
+    connect(leftAction, SIGNAL(triggered(bool)), SLOT(placeLeft(bool)));
+
+    rightAction = new QAction(tr("Place on Right") , this);
+    rightAction->setCheckable(true);
+    connect(rightAction, SIGNAL(triggered(bool)), SLOT(placeRight(bool)));
+
+    topAction = new QAction(tr("Place on Top") , this);
+    topAction->setCheckable(true);
+    connect(topAction, SIGNAL(triggered(bool)), SLOT(placeTop(bool)));
+
+    bottomAction = new QAction(tr("Place on Bottom") , this);
+    bottomAction->setCheckable(true);
+    connect(bottomAction, SIGNAL(triggered(bool)), SLOT(placeBottom(bool)));
+
+    areaActions->addAction(leftAction);
+    areaActions->addAction(rightAction);
+    areaActions->addAction(topAction);
+    areaActions->addAction(bottomAction);
+
+    toolBarBreakAction = new QAction(tr("Insert break"), this);
+    connect(toolBarBreakAction, SIGNAL(triggered(bool)), this, SLOT(insertToolBarBreak()));
+
+    connect(movableAction, SIGNAL(triggered(bool)), areaActions, SLOT(setEnabled(bool)));
+
+    connect(movableAction, SIGNAL(triggered(bool)), allowedAreasActions, SLOT(setEnabled(bool)));
+
+    menu = new QMenu(title, this);
+    menu->addAction(toggleViewAction());
+    menu->addSeparator();
+    menu->addAction(orderAction);
+    menu->addAction(randomizeAction);
+    menu->addSeparator();
+    menu->addAction(addSpinBoxAction);
+    menu->addAction(removeSpinBoxAction);
+    menu->addSeparator();
+    menu->addAction(movableAction);
+    menu->addSeparator();
+    menu->addActions(allowedAreasActions->actions());
+    menu->addSeparator();
+    menu->addActions(areaActions->actions());
+    menu->addSeparator();
+    menu->addAction(toolBarBreakAction);
+
+    connect(menu, SIGNAL(aboutToShow()), this, SLOT(updateMenu()));
+
+    randomize();
+}
+
+void ToolBar::updateMenu()
+{
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    Q_ASSERT(mainWindow != 0);
+
+    const Qt::ToolBarArea area = mainWindow->toolBarArea(this);
+    const Qt::ToolBarAreas areas = allowedAreas();
+
+    movableAction->setChecked(isMovable());
+
+    allowLeftAction->setChecked(isAreaAllowed(Qt::LeftToolBarArea));
+    allowRightAction->setChecked(isAreaAllowed(Qt::RightToolBarArea));
+    allowTopAction->setChecked(isAreaAllowed(Qt::TopToolBarArea));
+    allowBottomAction->setChecked(isAreaAllowed(Qt::BottomToolBarArea));
+
+    if (allowedAreasActions->isEnabled()) {
+        allowLeftAction->setEnabled(area != Qt::LeftToolBarArea);
+        allowRightAction->setEnabled(area != Qt::RightToolBarArea);
+        allowTopAction->setEnabled(area != Qt::TopToolBarArea);
+        allowBottomAction->setEnabled(area != Qt::BottomToolBarArea);
+    }
+
+    leftAction->setChecked(area == Qt::LeftToolBarArea);
+    rightAction->setChecked(area == Qt::RightToolBarArea);
+    topAction->setChecked(area == Qt::TopToolBarArea);
+    bottomAction->setChecked(area == Qt::BottomToolBarArea);
+
+    if (areaActions->isEnabled()) {
+        leftAction->setEnabled(areas & Qt::LeftToolBarArea);
+        rightAction->setEnabled(areas & Qt::RightToolBarArea);
+        topAction->setEnabled(areas & Qt::TopToolBarArea);
+        bottomAction->setEnabled(areas & Qt::BottomToolBarArea);
+    }
+}
+
+void ToolBar::order()
+{
+    QList<QAction *> ordered, actions1 = actions(),
+                              actions2 = qFindChildren<QAction *>(this);
+    while (!actions2.isEmpty()) {
+        QAction *action = actions2.takeFirst();
+        if (!actions1.contains(action))
+            continue;
+        actions1.removeAll(action);
+        ordered.append(action);
+    }
+
+    clear();
+    addActions(ordered);
+
+    orderAction->setEnabled(false);
+}
+
+void ToolBar::randomize()
+{
+    QList<QAction *> randomized, actions = this->actions();
+    while (!actions.isEmpty()) {
+        QAction *action = actions.takeAt(rand() % actions.size());
+        randomized.append(action);
+    }
+    clear();
+    addActions(randomized);
+
+    orderAction->setEnabled(true);
+}
+
+void ToolBar::addSpinBox()
+{
+    if (!spinbox) {
+        spinbox = new QSpinBox(this);
+    }
+    if (!spinboxAction)
+        spinboxAction = addWidget(spinbox);
+    else
+        addAction(spinboxAction);
+
+    addSpinBoxAction->setEnabled(false);
+    removeSpinBoxAction->setEnabled(true);
+}
+
+void ToolBar::removeSpinBox()
+{
+    if (spinboxAction)
+        removeAction(spinboxAction);
+
+    addSpinBoxAction->setEnabled(true);
+    removeSpinBoxAction->setEnabled(false);
+}
+
+void ToolBar::allow(Qt::ToolBarArea area, bool a)
+{
+    Qt::ToolBarAreas areas = allowedAreas();
+    areas = a ? areas | area : areas & ~area;
+    setAllowedAreas(areas);
+
+    if (areaActions->isEnabled()) {
+        leftAction->setEnabled(areas & Qt::LeftToolBarArea);
+        rightAction->setEnabled(areas & Qt::RightToolBarArea);
+        topAction->setEnabled(areas & Qt::TopToolBarArea);
+        bottomAction->setEnabled(areas & Qt::BottomToolBarArea);
+    }
+}
+
+void ToolBar::place(Qt::ToolBarArea area, bool p)
+{
+    if (!p)
+        return;
+
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    Q_ASSERT(mainWindow != 0);
+
+    mainWindow->addToolBar(area, this);
+
+    if (allowedAreasActions->isEnabled()) {
+        allowLeftAction->setEnabled(area != Qt::LeftToolBarArea);
+        allowRightAction->setEnabled(area != Qt::RightToolBarArea);
+        allowTopAction->setEnabled(area != Qt::TopToolBarArea);
+        allowBottomAction->setEnabled(area != Qt::BottomToolBarArea);
+    }
+}
+
+void ToolBar::changeMovable(bool movable)
+{ setMovable(movable); }
+
+void ToolBar::allowLeft(bool a)
+{ allow(Qt::LeftToolBarArea, a); }
+
+void ToolBar::allowRight(bool a)
+{ allow(Qt::RightToolBarArea, a); }
+
+void ToolBar::allowTop(bool a)
+{ allow(Qt::TopToolBarArea, a); }
+
+void ToolBar::allowBottom(bool a)
+{ allow(Qt::BottomToolBarArea, a); }
+
+void ToolBar::placeLeft(bool p)
+{ place(Qt::LeftToolBarArea, p); }
+
+void ToolBar::placeRight(bool p)
+{ place(Qt::RightToolBarArea, p); }
+
+void ToolBar::placeTop(bool p)
+{ place(Qt::TopToolBarArea, p); }
+
+void ToolBar::placeBottom(bool p)
+{ place(Qt::BottomToolBarArea, p); }
+
+void ToolBar::insertToolBarBreak()
+{
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    Q_ASSERT(mainWindow != 0);
+
+    mainWindow->insertToolBarBreak(this);
+}
+
+void ToolBar::enterEvent(QEvent*)
+{
+/*
+    These labels on top of toolbars look darn ugly
+
+    if (tip == 0) {
+        tip = new QLabel(windowTitle(), this);
+        QPalette pal = tip->palette();
+        QColor c = Qt::black;
+        c.setAlpha(100);
+        pal.setColor(QPalette::Window, c);
+        pal.setColor(QPalette::Foreground, Qt::white);
+        tip->setPalette(pal);
+        tip->setAutoFillBackground(true);
+        tip->setMargin(3);
+        tip->setText(windowTitle());
+    }
+    QPoint c = rect().center();
+    QSize hint = tip->sizeHint();
+    tip->setGeometry(c.x() - hint.width()/2, c.y() - hint.height()/2,
+                        hint.width(), hint.height());
+
+    tip->show();
+*/
+}
+
+void ToolBar::leaveEvent(QEvent*)
+{
+    if (tip != 0)
+        tip->hide();
+}
diff --git a/demos/mainwindow/toolbar.h b/demos/mainwindow/toolbar.h
new file mode 100644
index 0000000..a9b9af2
--- /dev/null
+++ b/demos/mainwindow/toolbar.h
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TOOLBAR_H
+#define TOOLBAR_H
+
+#include <QToolBar>
+
+QT_FORWARD_DECLARE_CLASS(QAction)
+QT_FORWARD_DECLARE_CLASS(QActionGroup)
+QT_FORWARD_DECLARE_CLASS(QMenu)
+QT_FORWARD_DECLARE_CLASS(QSpinBox)
+QT_FORWARD_DECLARE_CLASS(QLabel)
+
+class ToolBar : public QToolBar
+{
+    Q_OBJECT
+
+    QSpinBox *spinbox;
+    QAction *spinboxAction;
+
+    QAction *orderAction;
+    QAction *randomizeAction;
+    QAction *addSpinBoxAction;
+    QAction *removeSpinBoxAction;
+
+    QAction *movableAction;
+
+    QActionGroup *allowedAreasActions;
+    QAction *allowLeftAction;
+    QAction *allowRightAction;
+    QAction *allowTopAction;
+    QAction *allowBottomAction;
+
+    QActionGroup *areaActions;
+    QAction *leftAction;
+    QAction *rightAction;
+    QAction *topAction;
+    QAction *bottomAction;
+
+    QAction *toolBarBreakAction;
+
+public:
+    ToolBar(const QString &title, QWidget *parent);
+
+    QMenu *menu;
+
+protected:
+    void enterEvent(QEvent*);
+    void leaveEvent(QEvent*);
+
+private:
+    void allow(Qt::ToolBarArea area, bool allow);
+    void place(Qt::ToolBarArea area, bool place);
+    QLabel *tip;
+
+private slots:
+    void order();
+    void randomize();
+    void addSpinBox();
+    void removeSpinBox();
+
+    void changeMovable(bool movable);
+
+    void allowLeft(bool a);
+    void allowRight(bool a);
+    void allowTop(bool a);
+    void allowBottom(bool a);
+
+    void placeLeft(bool p);
+    void placeRight(bool p);
+    void placeTop(bool p);
+    void placeBottom(bool p);
+
+    void updateMenu();
+    void insertToolBarBreak();
+
+};
+
+#endif
diff --git a/demos/mediaplayer/images/screen.png b/demos/mediaplayer/images/screen.png
new file mode 100644
index 0000000..a15df92
--- /dev/null
+++ b/demos/mediaplayer/images/screen.png
diff --git a/demos/mediaplayer/main.cpp b/demos/mediaplayer/main.cpp
new file mode 100644
index 0000000..279a6c7
--- /dev/null
+++ b/demos/mediaplayer/main.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+***************************************************************************/
+
+#include <QtGui>
+#include "mediaplayer.h"
+
+int main (int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(mediaplayer);
+    QApplication app(argc, argv);
+    app.setApplicationName("Media Player");
+    app.setOrganizationName("Trolltech");
+    app.setQuitOnLastWindowClosed(true);
+    
+    QString fileString = app.arguments().value(1);
+    MediaPlayer player(fileString);
+    player.show();
+
+    return app.exec();
+}
+
diff --git a/demos/mediaplayer/mediaplayer.cpp b/demos/mediaplayer/mediaplayer.cpp
new file mode 100644
index 0000000..5f5a5dc
--- /dev/null
+++ b/demos/mediaplayer/mediaplayer.cpp
@@ -0,0 +1,840 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+***************************************************************************/
+
+#include <QtGui>
+
+#define SLIDER_RANGE 8
+
+#include "mediaplayer.h"
+#include "ui_settings.h"
+
+
+class MediaVideoWidget : public Phonon::VideoWidget
+{
+public:
+    MediaVideoWidget(MediaPlayer *player, QWidget *parent = 0) : 
+        Phonon::VideoWidget(parent), m_player(player), m_action(this)
+    {
+        m_action.setCheckable(true);
+        m_action.setChecked(false);
+        m_action.setShortcut(QKeySequence( Qt::AltModifier + Qt::Key_Return));
+        m_action.setShortcutContext(Qt::WindowShortcut);
+        connect(&m_action, SIGNAL(toggled(bool)), SLOT(setFullScreen(bool)));
+        addAction(&m_action);
+        setAcceptDrops(true);
+    }
+
+protected:
+    void mouseDoubleClickEvent(QMouseEvent *e)
+    {
+        Phonon::VideoWidget::mouseDoubleClickEvent(e);
+        setFullScreen(!isFullScreen());
+    }
+
+    void keyPressEvent(QKeyEvent *e)
+    {
+        if (e->key() == Qt::Key_Space && !e->modifiers()) {
+            m_player->playPause();
+            e->accept();
+            return;
+        } else if (e->key() == Qt::Key_Escape && !e->modifiers()) {
+            setFullScreen(false);
+            e->accept();
+            return;
+        }
+        Phonon::VideoWidget::keyPressEvent(e);        
+    }
+
+    bool event(QEvent *e)
+    {
+        switch(e->type())
+        {
+        case QEvent::Close:
+            //we just ignore the cose events on the video widget
+            //this prevents ALT+F4 from having an effect in fullscreen mode
+            e->ignore(); 
+            return true;
+        case QEvent::MouseMove:
+#ifndef QT_NO_CURSOR
+            unsetCursor();
+#endif
+            //fall through
+        case QEvent::WindowStateChange:
+            {
+                //we just update the state of the checkbox, in case it wasn't already
+                m_action.setChecked(windowState() & Qt::WindowFullScreen);
+                const Qt::WindowFlags flags = m_player->windowFlags();
+                if (windowState() & Qt::WindowFullScreen) {
+                    m_timer.start(1000, this);
+                } else {
+                    m_timer.stop();
+#ifndef QT_NO_CURSOR
+                    unsetCursor();
+#endif
+                }
+            }
+            break;
+        default:
+            break;
+        }
+
+        return Phonon::VideoWidget::event(e);
+    }
+
+    void timerEvent(QTimerEvent *e)
+    {
+        if (e->timerId() == m_timer.timerId()) {
+            //let's store the cursor shape
+#ifndef QT_NO_CURSOR
+            setCursor(Qt::BlankCursor);
+#endif
+        }
+        Phonon::VideoWidget::timerEvent(e);
+    }
+
+    void dropEvent(QDropEvent *e)
+    {
+        m_player->handleDrop(e);
+    }
+
+    void dragEnterEvent(QDragEnterEvent *e) {
+        if (e->mimeData()->hasUrls())
+            e->acceptProposedAction();
+    }
+
+private:
+    MediaPlayer *m_player;
+    QBasicTimer m_timer;
+    QAction m_action;
+};
+
+
+MediaPlayer::MediaPlayer(const QString &filePath) :
+        playButton(0), nextEffect(0), settingsDialog(0), ui(0), 
+            m_AudioOutput(Phonon::VideoCategory),
+            m_videoWidget(new MediaVideoWidget(this))
+{
+    setWindowTitle(tr("Media Player"));
+    setContextMenuPolicy(Qt::CustomContextMenu);
+    m_videoWidget->setContextMenuPolicy(Qt::CustomContextMenu);
+ 
+    QSize buttonSize(34, 28);
+
+    QPushButton *openButton = new QPushButton(this);
+
+    openButton->setIcon(style()->standardIcon(QStyle::SP_DialogOpenButton));
+    QPalette bpal;
+    QColor arrowcolor = bpal.buttonText().color();
+    if (arrowcolor == Qt::black)
+        arrowcolor = QColor(80, 80, 80);
+    bpal.setBrush(QPalette::ButtonText, arrowcolor);
+    openButton->setPalette(bpal);
+
+    rewindButton = new QPushButton(this);
+    rewindButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipBackward));
+
+    forwardButton = new QPushButton(this);
+    forwardButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipForward));
+    forwardButton->setEnabled(false);
+
+    playButton = new QPushButton(this);
+    playIcon = style()->standardIcon(QStyle::SP_MediaPlay);
+    pauseIcon = style()->standardIcon(QStyle::SP_MediaPause);
+    playButton->setIcon(playIcon);
+
+    slider = new Phonon::SeekSlider(this);
+    slider->setMediaObject(&m_MediaObject);
+    volume = new Phonon::VolumeSlider(&m_AudioOutput);
+ 
+    QVBoxLayout *vLayout = new QVBoxLayout(this);
+    vLayout->setContentsMargins(8, 8, 8, 8);    
+
+    QHBoxLayout *layout = new QHBoxLayout();
+
+    info = new QLabel(this);
+    info->setMinimumHeight(70);
+    info->setAcceptDrops(false);
+    info->setMargin(2);
+    info->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
+    info->setLineWidth(2);
+    info->setAutoFillBackground(true);
+
+    QPalette palette;
+    palette.setBrush(QPalette::WindowText, Qt::white);
+#ifndef Q_WS_MAC
+    openButton->setMinimumSize(54, buttonSize.height());
+    rewindButton->setMinimumSize(buttonSize);
+    forwardButton->setMinimumSize(buttonSize);
+    playButton->setMinimumSize(buttonSize);
+#endif
+    info->setStyleSheet("border-image:url(:/images/screen.png) ; border-width:3px");
+    info->setPalette(palette);
+    info->setText(tr("<center>No media</center>"));
+
+    volume->setFixedWidth(120);
+
+    layout->addWidget(openButton);
+    layout->addWidget(rewindButton);
+    layout->addWidget(playButton);
+    layout->addWidget(forwardButton);
+
+    layout->addStretch();
+    layout->addWidget(volume);
+
+    vLayout->addWidget(info);
+    initVideoWindow();
+    vLayout->addWidget(&m_videoWindow);
+    QVBoxLayout *buttonPanelLayout = new QVBoxLayout();
+    m_videoWindow.hide();
+    buttonPanelLayout->addLayout(layout);
+    
+    timeLabel = new QLabel(this);
+    progressLabel = new QLabel(this);
+    QWidget *sliderPanel = new QWidget(this);
+    QHBoxLayout *sliderLayout = new QHBoxLayout();
+    sliderLayout->addWidget(slider);
+    sliderLayout->addWidget(timeLabel);    
+    sliderLayout->addWidget(progressLabel);    
+    sliderLayout->setContentsMargins(0, 0, 0, 0);
+    sliderPanel->setLayout(sliderLayout);
+
+    buttonPanelLayout->addWidget(sliderPanel);
+    buttonPanelLayout->setContentsMargins(0, 0, 0, 0);
+#ifdef Q_OS_MAC
+    layout->setSpacing(4);
+    buttonPanelLayout->setSpacing(0);
+    info->setMinimumHeight(100);
+    info->setFont(QFont("verdana", 15));
+    // QStyle *flatButtonStyle = new QWindowsStyle;
+    openButton->setFocusPolicy(Qt::NoFocus);
+    // openButton->setStyle(flatButtonStyle);
+    // playButton->setStyle(flatButtonStyle);
+    // rewindButton->setStyle(flatButtonStyle);
+    // forwardButton->setStyle(flatButtonStyle);
+ #endif
+    QWidget *buttonPanelWidget = new QWidget(this);
+    buttonPanelWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); 
+    buttonPanelWidget->setLayout(buttonPanelLayout);    
+    vLayout->addWidget(buttonPanelWidget);
+ 
+    QHBoxLayout *labelLayout = new QHBoxLayout();
+
+    vLayout->addLayout(labelLayout);
+    setLayout(vLayout);
+
+    // Create menu bar:
+    fileMenu = new QMenu(this);
+    QAction *openFileAction = fileMenu->addAction(tr("Open &File..."));
+    QAction *openUrlAction = fileMenu->addAction(tr("Open &Location..."));
+
+    fileMenu->addSeparator();  
+    QMenu *aspectMenu = fileMenu->addMenu(tr("&Aspect ratio"));
+    QActionGroup *aspectGroup = new QActionGroup(aspectMenu);
+    connect(aspectGroup, SIGNAL(triggered(QAction *)), this, SLOT(aspectChanged(QAction *)));
+    aspectGroup->setExclusive(true);
+    QAction *aspectActionAuto = aspectMenu->addAction(tr("Auto"));
+    aspectActionAuto->setCheckable(true);
+    aspectActionAuto->setChecked(true);
+    aspectGroup->addAction(aspectActionAuto);
+    QAction *aspectActionScale = aspectMenu->addAction(tr("Scale"));
+    aspectActionScale->setCheckable(true);
+    aspectGroup->addAction(aspectActionScale);
+    QAction *aspectAction16_9 = aspectMenu->addAction(tr("16/9"));
+    aspectAction16_9->setCheckable(true);
+    aspectGroup->addAction(aspectAction16_9);
+    QAction *aspectAction4_3 = aspectMenu->addAction(tr("4/3"));
+    aspectAction4_3->setCheckable(true);
+    aspectGroup->addAction(aspectAction4_3);
+
+    QMenu *scaleMenu = fileMenu->addMenu(tr("&Scale mode"));
+    QActionGroup *scaleGroup = new QActionGroup(scaleMenu);
+    connect(scaleGroup, SIGNAL(triggered(QAction *)), this, SLOT(scaleChanged(QAction *)));
+    scaleGroup->setExclusive(true);
+    QAction *scaleActionFit = scaleMenu->addAction(tr("Fit in view"));
+    scaleActionFit->setCheckable(true);
+    scaleActionFit->setChecked(true);
+    scaleGroup->addAction(scaleActionFit);
+    QAction *scaleActionCrop = scaleMenu->addAction(tr("Scale and crop"));
+    scaleActionCrop->setCheckable(true);
+    scaleGroup->addAction(scaleActionCrop);
+    
+    fileMenu->addSeparator();    
+    QAction *settingsAction = fileMenu->addAction(tr("&Settings..."));
+    
+    // Setup signal connections:
+    connect(rewindButton, SIGNAL(clicked()), this, SLOT(rewind()));
+    //connect(openButton, SIGNAL(clicked()), this, SLOT(openFile()));
+    openButton->setMenu(fileMenu);
+    
+    connect(playButton, SIGNAL(clicked()), this, SLOT(playPause()));
+    connect(forwardButton, SIGNAL(clicked()), this, SLOT(forward()));
+    //connect(openButton, SIGNAL(clicked()), this, SLOT(openFile()));
+    connect(settingsAction, SIGNAL(triggered(bool)), this, SLOT(showSettingsDialog()));
+    connect(openUrlAction, SIGNAL(triggered(bool)), this, SLOT(openUrl()));
+    connect(openFileAction, SIGNAL(triggered(bool)), this, SLOT(openFile()));
+    
+    connect(m_videoWidget, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(showContextMenu(const QPoint &)));
+    connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(showContextMenu(const QPoint &)));
+    connect(&m_MediaObject, SIGNAL(metaDataChanged()), this, SLOT(updateInfo()));
+    connect(&m_MediaObject, SIGNAL(totalTimeChanged(qint64)), this, SLOT(updateTime()));
+    connect(&m_MediaObject, SIGNAL(tick(qint64)), this, SLOT(updateTime()));
+    connect(&m_MediaObject, SIGNAL(finished()), this, SLOT(finished()));
+    connect(&m_MediaObject, SIGNAL(stateChanged(Phonon::State, Phonon::State)), this, SLOT(stateChanged(Phonon::State, Phonon::State)));
+    connect(&m_MediaObject, SIGNAL(bufferStatus(int)), this, SLOT(bufferStatus(int)));
+
+    rewindButton->setEnabled(false);
+    playButton->setEnabled(false);
+    setAcceptDrops(true);
+
+    m_audioOutputPath = Phonon::createPath(&m_MediaObject, &m_AudioOutput);
+    Phonon::createPath(&m_MediaObject, m_videoWidget);
+
+    if (!filePath.isEmpty())
+        setFile(filePath);
+    resize(minimumSizeHint());
+}
+
+void MediaPlayer::stateChanged(Phonon::State newstate, Phonon::State oldstate)
+{
+    Q_UNUSED(oldstate);
+
+    if (oldstate == Phonon::LoadingState) {
+        m_videoWindow.setVisible(m_MediaObject.hasVideo());
+        info->setVisible(!m_MediaObject.hasVideo());        
+        QRect videoHintRect = QRect(QPoint(0, 0), m_videoWindow.sizeHint());
+        QRect newVideoRect = QApplication::desktop()->screenGeometry().intersected(videoHintRect);
+        if (m_MediaObject.hasVideo()){        
+            // Flush event que so that sizeHint takes the
+            // recently shown/hidden m_videoWindow into account:
+            qApp->processEvents();
+            resize(sizeHint());
+        } else
+            resize(minimumSize());
+    }
+
+    switch (newstate) {
+        case Phonon::ErrorState:
+            QMessageBox::warning(this, "Phonon Mediaplayer", m_MediaObject.errorString(), QMessageBox::Close);
+            if (m_MediaObject.errorType() == Phonon::FatalError) {
+                playButton->setEnabled(false);
+                rewindButton->setEnabled(false);
+            } else {
+                m_MediaObject.pause();
+            }
+            break;
+        case Phonon::PausedState:
+        case Phonon::StoppedState:
+            playButton->setIcon(playIcon);
+            if (m_MediaObject.currentSource().type() != Phonon::MediaSource::Invalid){
+                playButton->setEnabled(true);
+                rewindButton->setEnabled(true);
+            } else {
+                playButton->setEnabled(false);
+                rewindButton->setEnabled(false);
+            }
+            break;
+        case Phonon::PlayingState:
+            playButton->setEnabled(true);
+            playButton->setIcon(pauseIcon);
+            if (m_MediaObject.hasVideo())
+                m_videoWindow.show();
+            // Fall through
+        case Phonon::BufferingState:
+            rewindButton->setEnabled(true);
+            break;
+        case Phonon::LoadingState:
+            rewindButton->setEnabled(false);
+            break;
+    }
+
+}
+
+void MediaPlayer::initSettingsDialog()
+{
+    settingsDialog = new QDialog(this);
+    ui = new Ui_settings();
+    ui->setupUi(settingsDialog);
+
+    connect(ui->brightnessSlider, SIGNAL(valueChanged(int)), this, SLOT(setBrightness(int)));
+    connect(ui->hueSlider, SIGNAL(valueChanged(int)), this, SLOT(setHue(int)));
+    connect(ui->saturationSlider, SIGNAL(valueChanged(int)), this, SLOT(setSaturation(int)));
+    connect(ui->contrastSlider , SIGNAL(valueChanged(int)), this, SLOT(setContrast(int)));
+    connect(ui->aspectCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setAspect(int)));
+    connect(ui->scalemodeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setScale(int)));
+
+    ui->brightnessSlider->setValue(int(m_videoWidget->brightness() * SLIDER_RANGE));
+    ui->hueSlider->setValue(int(m_videoWidget->hue() * SLIDER_RANGE));
+    ui->saturationSlider->setValue(int(m_videoWidget->saturation() * SLIDER_RANGE));
+    ui->contrastSlider->setValue(int(m_videoWidget->contrast() * SLIDER_RANGE));
+    ui->aspectCombo->setCurrentIndex(m_videoWidget->aspectRatio());
+    ui->scalemodeCombo->setCurrentIndex(m_videoWidget->scaleMode());
+    connect(ui->effectButton, SIGNAL(clicked()), this, SLOT(configureEffect()));
+
+#ifdef Q_WS_X11
+    //Cross fading is not currently implemented in the GStreamer backend
+    ui->crossFadeSlider->setVisible(false);
+    ui->crossFadeLabel->setVisible(false);
+    ui->crossFadeLabel1->setVisible(false);
+    ui->crossFadeLabel2->setVisible(false);
+    ui->crossFadeLabel3->setVisible(false);
+#endif
+    ui->crossFadeSlider->setValue((int)(2 * m_MediaObject.transitionTime() / 1000.0f));
+    
+    // Insert audio devices:
+    QList<Phonon::AudioOutputDevice> devices = Phonon::BackendCapabilities::availableAudioOutputDevices();
+    for (int i=0; i<devices.size(); i++){
+        QString itemText = devices[i].name();
+        if (!devices[i].description().isEmpty()) {
+            itemText += QString::fromLatin1(" (%1)").arg(devices[i].description());
+        }
+        ui->deviceCombo->addItem(itemText);
+        if (devices[i] == m_AudioOutput.outputDevice())
+            ui->deviceCombo->setCurrentIndex(i);
+    }
+
+    // Insert audio effects:
+    ui->audioEffectsCombo->addItem(tr("<no effect>"));
+    QList<Phonon::Effect *> currEffects = m_audioOutputPath.effects();
+    Phonon::Effect *currEffect = currEffects.size() ? currEffects[0] : 0;
+    QList<Phonon::EffectDescription> availableEffects = Phonon::BackendCapabilities::availableAudioEffects();
+    for (int i=0; i<availableEffects.size(); i++){
+        ui->audioEffectsCombo->addItem(availableEffects[i].name());
+        if (currEffect && availableEffects[i] == currEffect->description())
+            ui->audioEffectsCombo->setCurrentIndex(i+1);
+    }
+    connect(ui->audioEffectsCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(effectChanged()));
+
+}
+
+void MediaPlayer::effectChanged()
+{
+    int currentIndex = ui->audioEffectsCombo->currentIndex();
+    if (currentIndex) {
+        QList<Phonon::EffectDescription> availableEffects = Phonon::BackendCapabilities::availableAudioEffects();
+        Phonon::EffectDescription chosenEffect = availableEffects[currentIndex - 1];
+
+        QList<Phonon::Effect *> currEffects = m_audioOutputPath.effects();
+        Phonon::Effect *currentEffect = currEffects.size() ? currEffects[0] : 0;
+
+        // Deleting the running effect will stop playback, it is deleted when removed from path
+        if (nextEffect && !(currentEffect && (currentEffect->description().name() == nextEffect->description().name())))
+            delete nextEffect;
+
+        nextEffect = new Phonon::Effect(chosenEffect);
+    }
+    ui->effectButton->setEnabled(currentIndex);
+}
+
+void MediaPlayer::showSettingsDialog()
+{
+    if (!settingsDialog)
+        initSettingsDialog();
+
+    float oldBrightness = m_videoWidget->brightness();
+    float oldHue = m_videoWidget->hue();
+    float oldSaturation = m_videoWidget->saturation();
+    float oldContrast = m_videoWidget->contrast();
+    Phonon::VideoWidget::AspectRatio oldAspect = m_videoWidget->aspectRatio();
+    Phonon::VideoWidget::ScaleMode oldScale = m_videoWidget->scaleMode();
+    int currentEffect = ui->audioEffectsCombo->currentIndex();
+    settingsDialog->exec();
+    
+    if (settingsDialog->result() == QDialog::Accepted){
+        m_MediaObject.setTransitionTime((int)(1000 * float(ui->crossFadeSlider->value()) / 2.0f));
+        QList<Phonon::AudioOutputDevice> devices = Phonon::BackendCapabilities::availableAudioOutputDevices();
+        m_AudioOutput.setOutputDevice(devices[ui->deviceCombo->currentIndex()]);
+        QList<Phonon::Effect *> currEffects = m_audioOutputPath.effects();
+        QList<Phonon::EffectDescription> availableEffects = Phonon::BackendCapabilities::availableAudioEffects();
+
+        if (ui->audioEffectsCombo->currentIndex() > 0){
+            Phonon::Effect *currentEffect = currEffects.size() ? currEffects[0] : 0;    
+            if (!currentEffect || currentEffect->description() != nextEffect->description()){
+                foreach(Phonon::Effect *effect, currEffects) {
+                    m_audioOutputPath.removeEffect(effect);
+                    delete effect;
+                }
+                m_audioOutputPath.insertEffect(nextEffect);
+            }
+        } else {
+            foreach(Phonon::Effect *effect, currEffects) {
+                m_audioOutputPath.removeEffect(effect);
+                delete effect;
+                nextEffect = 0;
+            }
+        }
+    } else {
+        // Restore previous settings
+        m_videoWidget->setBrightness(oldBrightness);
+        m_videoWidget->setSaturation(oldSaturation);
+        m_videoWidget->setHue(oldHue);
+        m_videoWidget->setContrast(oldContrast);
+        m_videoWidget->setAspectRatio(oldAspect);
+        m_videoWidget->setScaleMode(oldScale);
+        ui->audioEffectsCombo->setCurrentIndex(currentEffect);
+    }
+}
+
+void MediaPlayer::initVideoWindow()
+{
+    QVBoxLayout *videoLayout = new QVBoxLayout();
+    videoLayout->addWidget(m_videoWidget);
+    videoLayout->setContentsMargins(0, 0, 0, 0);
+    m_videoWindow.setLayout(videoLayout);
+    m_videoWindow.setMinimumSize(100, 100);
+}
+
+
+void MediaPlayer::configureEffect()
+{
+    if (!nextEffect)
+        return;
+
+
+    QList<Phonon::Effect *> currEffects = m_audioOutputPath.effects();
+    const QList<Phonon::EffectDescription> availableEffects = Phonon::BackendCapabilities::availableAudioEffects();
+    if (ui->audioEffectsCombo->currentIndex() > 0) {
+        Phonon::EffectDescription chosenEffect = availableEffects[ui->audioEffectsCombo->currentIndex() - 1];
+
+        QDialog effectDialog;
+        effectDialog.setWindowTitle(tr("Configure effect"));
+        QVBoxLayout *topLayout = new QVBoxLayout(&effectDialog);
+
+        QLabel *description = new QLabel("<b>Description:</b><br>" + chosenEffect.description(), &effectDialog);
+        description->setWordWrap(true); 
+        topLayout->addWidget(description);
+
+        QScrollArea *scrollArea = new QScrollArea(&effectDialog);
+        topLayout->addWidget(scrollArea);
+
+        QVariantList savedParamValues;
+        foreach(Phonon::EffectParameter param, nextEffect->parameters()) {
+            savedParamValues << nextEffect->parameterValue(param);
+        }
+
+        QWidget *scrollWidget = new Phonon::EffectWidget(nextEffect);
+        scrollWidget->setMinimumWidth(320);
+        scrollWidget->setContentsMargins(10, 10, 10,10);
+        scrollArea->setWidget(scrollWidget);
+
+        QDialogButtonBox *bbox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, &effectDialog);
+        connect(bbox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), &effectDialog, SLOT(accept()));
+        connect(bbox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), &effectDialog, SLOT(reject()));
+        topLayout->addWidget(bbox);
+
+        effectDialog.exec();
+
+        if (effectDialog.result() != QDialog::Accepted) {
+            //we need to restore the paramaters values
+            int currentIndex = 0;
+            foreach(Phonon::EffectParameter param, nextEffect->parameters()) {
+                nextEffect->setParameterValue(param, savedParamValues.at(currentIndex++));
+            }
+
+        }
+    }
+}
+
+void MediaPlayer::handleDrop(QDropEvent *e)
+{
+    QList<QUrl> urls = e->mimeData()->urls();
+    if (e->proposedAction() == Qt::MoveAction){
+        // Just add to the queue:
+        for (int i=0; i<urls.size(); i++)
+            m_MediaObject.enqueue(Phonon::MediaSource(urls[i].toLocalFile()));
+    } else {
+        // Create new queue:
+        m_MediaObject.clearQueue();
+        if (urls.size() > 0) {
+            QString fileName = urls[0].toLocalFile();
+            QDir dir(fileName);
+            if (dir.exists()) {
+                dir.setFilter(QDir::Files);            
+                QStringList entries = dir.entryList();
+                if (entries.size() > 0) {
+                    setFile(fileName + QDir::separator() +  entries[0]);
+                    for (int i=1; i< entries.size(); ++i)
+                        m_MediaObject.enqueue(fileName + QDir::separator() + entries[i]);
+                }
+            } else {
+                setFile(fileName);
+                for (int i=1; i<urls.size(); i++)
+                    m_MediaObject.enqueue(Phonon::MediaSource(urls[i].toLocalFile()));
+            }        
+        }
+    }
+    forwardButton->setEnabled(m_MediaObject.queue().size() > 0);
+    m_MediaObject.play();
+}
+
+void MediaPlayer::dropEvent(QDropEvent *e)
+{
+    if (e->mimeData()->hasUrls() && e->proposedAction() != Qt::LinkAction) {
+        e->acceptProposedAction();
+        handleDrop(e);
+    } else {
+        e->ignore(); 
+    }
+}
+
+void MediaPlayer::dragEnterEvent(QDragEnterEvent *e)
+{
+    dragMoveEvent(e);
+}
+
+void MediaPlayer::dragMoveEvent(QDragMoveEvent *e)
+{
+    if (e->mimeData()->hasUrls()) {
+        if (e->proposedAction() == Qt::CopyAction || e->proposedAction() == Qt::MoveAction){
+            e->acceptProposedAction();
+        }
+    }
+}
+
+void MediaPlayer::playPause()
+{
+    if (m_MediaObject.state() == Phonon::PlayingState)
+        m_MediaObject.pause();
+    else {
+        if (m_MediaObject.currentTime() == m_MediaObject.totalTime())
+            m_MediaObject.seek(0);
+        m_MediaObject.play();
+    }
+}
+
+void MediaPlayer::setFile(const QString &fileName)
+{
+    setWindowTitle(fileName.right(fileName.length() - fileName.lastIndexOf('/') - 1));
+    m_MediaObject.setCurrentSource(Phonon::MediaSource(fileName));
+    m_MediaObject.play();
+}
+
+void MediaPlayer::openFile()
+{
+    QStringList fileNames = QFileDialog::getOpenFileNames(this);
+    m_MediaObject.clearQueue();
+    if (fileNames.size() > 0) {
+        QString fileName = fileNames[0];
+        setFile(fileName);
+        for (int i=1; i<fileNames.size(); i++)
+            m_MediaObject.enqueue(Phonon::MediaSource(fileNames[i]));
+    }
+    forwardButton->setEnabled(m_MediaObject.queue().size() > 0);
+}
+
+void MediaPlayer::bufferStatus(int percent)
+{
+    if (percent == 0 || percent == 100)
+        progressLabel->setText(QString());
+    else {
+        QString str = QString::fromLatin1("(%1%)").arg(percent);
+        progressLabel->setText(str);
+    }
+}
+
+void MediaPlayer::setSaturation(int val)
+{
+    m_videoWidget->setSaturation(val / qreal(SLIDER_RANGE));
+}
+
+void MediaPlayer::setHue(int val)
+{
+    m_videoWidget->setHue(val / qreal(SLIDER_RANGE));
+}
+
+void MediaPlayer::setAspect(int val)
+{
+    m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatio(val));
+}
+
+void MediaPlayer::setScale(int val)
+{
+    m_videoWidget->setScaleMode(Phonon::VideoWidget::ScaleMode(val));
+}
+
+void MediaPlayer::setBrightness(int val)
+{
+    m_videoWidget->setBrightness(val / qreal(SLIDER_RANGE));
+}
+
+void MediaPlayer::setContrast(int val)
+{
+    m_videoWidget->setContrast(val / qreal(SLIDER_RANGE));
+}
+
+void MediaPlayer::updateInfo()
+{
+    int maxLength = 30;
+    QString font = "<font color=#ffeeaa>";
+    QString fontmono = "<font family=\"monospace,courier new\" color=#ffeeaa>";
+
+    QMap <QString, QString> metaData = m_MediaObject.metaData();
+    QString trackArtist = metaData.value("ARTIST");
+    if (trackArtist.length() > maxLength)
+        trackArtist = trackArtist.left(maxLength) + "...";
+    
+    QString trackTitle = metaData.value("TITLE");
+    int trackBitrate = metaData.value("BITRATE").toInt();
+
+    QString fileName;
+    if (m_MediaObject.currentSource().type() == Phonon::MediaSource::Url) {
+        fileName = m_MediaObject.currentSource().url().toString();
+    } else {
+        fileName = m_MediaObject.currentSource().fileName();
+        fileName = fileName.right(fileName.length() - fileName.lastIndexOf('/') - 1);
+        if (fileName.length() > maxLength)
+            fileName = fileName.left(maxLength) + "...";
+    }
+    
+    QString title;    
+    if (!trackTitle.isEmpty()) {
+        if (trackTitle.length() > maxLength)
+            trackTitle = trackTitle.left(maxLength) + "...";
+        title = "Title: " + font + trackTitle + "<br></font>";
+    } else if (!fileName.isEmpty()) {
+        if (fileName.length() > maxLength)
+            fileName = fileName.left(maxLength) + "...";
+        title = font + fileName + "</font>";
+        if (m_MediaObject.currentSource().type() == Phonon::MediaSource::Url) {
+            title.prepend("Url: ");
+        } else {
+            title.prepend("File: ");
+        }
+    }
+        
+    QString artist;
+    if (!trackArtist.isEmpty())
+        artist = "Artist:  " + font + trackArtist + "</font>";
+
+    QString bitrate;
+    if (trackBitrate != 0)
+        bitrate = "<br>Bitrate:  " + font + QString::number(trackBitrate/1000) + "kbit</font>";
+
+    info->setText(title + artist + bitrate);
+}
+
+void MediaPlayer::updateTime()
+{
+    long len = m_MediaObject.totalTime();
+    long pos = m_MediaObject.currentTime();
+    QString timeString;    
+    if (pos || len)
+    {
+        int sec = pos/1000;
+        int min = sec/60;
+        int hour = min/60;
+        int msec = pos;
+
+        QTime playTime(hour%60, min%60, sec%60, msec%1000);
+        sec = len / 1000;
+        min = sec / 60;
+        hour = min / 60;
+        msec = len;
+
+        QTime stopTime(hour%60, min%60, sec%60, msec%1000);
+        QString timeFormat = "m:ss";
+        if (hour > 0)
+            timeFormat = "h:mm:ss";        
+        timeString = playTime.toString(timeFormat);
+        if (len)
+            timeString += " / " + stopTime.toString(timeFormat);
+    }
+    timeLabel->setText(timeString);
+}
+
+void MediaPlayer::rewind()
+{
+    m_MediaObject.seek(0);
+}
+
+void MediaPlayer::forward()
+{
+    QList<Phonon::MediaSource> queue = m_MediaObject.queue();
+    if (queue.size() > 0) {
+        m_MediaObject.setCurrentSource(queue[0]);
+        forwardButton->setEnabled(queue.size() > 1);
+        m_MediaObject.play();
+    }
+}
+
+void MediaPlayer::openUrl()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("BrowserMainWindow"));
+    QString sourceURL = settings.value("location").toString();
+    bool ok = false;
+    sourceURL = QInputDialog::getText(this, tr("Open Location"), tr("Please enter a valid address here:"), QLineEdit::Normal, sourceURL, &ok);
+    if (ok && !sourceURL.isEmpty()) {
+        setWindowTitle(sourceURL.right(sourceURL.length() - sourceURL.lastIndexOf('/') - 1));
+        m_MediaObject.setCurrentSource(Phonon::MediaSource(QUrl::fromEncoded(sourceURL.toUtf8())));
+        m_MediaObject.play();
+        settings.setValue("location", sourceURL);
+    }
+}
+
+void MediaPlayer::finished()
+{
+}
+
+void MediaPlayer::showContextMenu(const QPoint &p)
+{
+    fileMenu->popup(m_videoWidget->isFullScreen() ? p : mapToGlobal(p));
+}
+
+void MediaPlayer::scaleChanged(QAction *act)
+{
+    if (act->text() == tr("Scale and crop"))
+        m_videoWidget->setScaleMode(Phonon::VideoWidget::ScaleAndCrop);
+    else 
+        m_videoWidget->setScaleMode(Phonon::VideoWidget::FitInView);    
+}
+
+void MediaPlayer::aspectChanged(QAction *act)
+{
+    if (act->text() == tr("16/9"))
+        m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatio16_9);
+    else if (act->text() == tr("Scale"))
+        m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatioWidget);
+    else if (act->text() == tr("4/3"))
+        m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatio4_3);
+    else
+        m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatioAuto);    
+}
+
diff --git a/demos/mediaplayer/mediaplayer.h b/demos/mediaplayer/mediaplayer.h
new file mode 100644
index 0000000..d162435
--- /dev/null
+++ b/demos/mediaplayer/mediaplayer.h
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+***************************************************************************/
+
+#ifndef MEDIALAYER_H
+#define MEDIAPLAYER_H
+
+#include <QtGui/QWidget>
+#include <QtGui/QApplication>
+#include <QtCore/QTimerEvent>
+#include <QtGui/QShowEvent>
+#include <QtGui/QIcon>
+
+#include <Phonon/AudioOutput>
+#include <Phonon/BackendCapabilities>
+#include <Phonon/Effect>
+#include <Phonon/EffectParameter>
+#include <Phonon/EffectWidget>
+#include <Phonon/MediaObject>
+#include <Phonon/SeekSlider>
+#include <Phonon/VideoWidget>
+#include <Phonon/VolumeSlider>
+
+QT_BEGIN_NAMESPACE
+class QPushButton;
+class QLabel;
+class QSlider;
+class QTextEdit;
+class QMenu;
+class Ui_settings;
+QT_END_NAMESPACE
+
+class MediaPlayer :
+            public QWidget
+{
+    Q_OBJECT
+public:
+    MediaPlayer(const QString &);
+    
+    void dragEnterEvent(QDragEnterEvent *e);
+    void dragMoveEvent(QDragMoveEvent *e);
+    void dropEvent(QDropEvent *e);
+    void handleDrop(QDropEvent *e);
+    void setFile(const QString &text);
+    void initVideoWindow();
+    void initSettingsDialog();
+    
+public slots:
+    void openFile();
+    void rewind();
+    void forward();
+    void updateInfo();
+    void updateTime();
+    void finished();
+    void playPause();
+    void scaleChanged(QAction *);
+    void aspectChanged(QAction *);
+
+private slots:
+    void setAspect(int);
+    void setScale(int);
+    void setSaturation(int);
+    void setContrast(int);
+    void setHue(int);
+    void setBrightness(int);
+    void stateChanged(Phonon::State newstate, Phonon::State oldstate);
+    void effectChanged();
+    void showSettingsDialog();
+    void showContextMenu(const QPoint &);
+    void bufferStatus(int percent);
+    void openUrl();
+    void configureEffect();
+
+private:
+    QIcon playIcon;
+    QIcon pauseIcon;
+    QMenu *fileMenu;
+    QPushButton *playButton;
+    QPushButton *rewindButton;
+    QPushButton *forwardButton;
+    Phonon::SeekSlider *slider;
+    QLabel *timeLabel;
+    QLabel *progressLabel;
+    Phonon::VolumeSlider *volume;
+    QSlider *m_hueSlider;
+    QSlider *m_satSlider;
+    QSlider *m_contSlider;
+    QLabel *info;
+    Phonon::Effect *nextEffect;
+    QDialog *settingsDialog;
+    Ui_settings *ui;
+        
+    QWidget m_videoWindow;
+    Phonon::MediaObject m_MediaObject;
+    Phonon::AudioOutput m_AudioOutput;
+    Phonon::VideoWidget *m_videoWidget;
+    Phonon::Path m_audioOutputPath;
+};
+
+#endif //MEDIAPLAYER_H
diff --git a/demos/mediaplayer/mediaplayer.pro b/demos/mediaplayer/mediaplayer.pro
new file mode 100644
index 0000000..c64abd9
--- /dev/null
+++ b/demos/mediaplayer/mediaplayer.pro
@@ -0,0 +1,28 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Thu Aug 23 18:02:14 2007
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += . build src ui
+
+QT += phonon
+
+FORMS += settings.ui
+RESOURCES += mediaplayer.qrc
+
+!win32:CONFIG += CONSOLE
+
+SOURCES += main.cpp mediaplayer.cpp
+HEADERS += mediaplayer.h
+
+target.path = $$[QT_INSTALL_DEMOS]/mediaplayer
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.html *.doc images
+sources.path = $$[QT_INSTALL_DEMOS]/mediaplayer
+INSTALLS += target sources
+
+wince*{
+DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout
+}
+
+
diff --git a/demos/mediaplayer/mediaplayer.qrc b/demos/mediaplayer/mediaplayer.qrc
new file mode 100644
index 0000000..bcdf404
--- /dev/null
+++ b/demos/mediaplayer/mediaplayer.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/screen.png</file>
+</qresource>
+</RCC>
diff --git a/demos/mediaplayer/settings.ui b/demos/mediaplayer/settings.ui
new file mode 100644
index 0000000..d2cedd4
--- /dev/null
+++ b/demos/mediaplayer/settings.ui
@@ -0,0 +1,464 @@
+<ui version="4.0" >
+ <class>settings</class>
+ <widget class="QDialog" name="settings" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>360</width>
+    <height>362</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Settings</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2" >
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Video options:</string>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_9" >
+        <property name="text" >
+         <string>Contrast:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="2" >
+       <widget class="QSlider" name="contrastSlider" >
+        <property name="minimum" >
+         <number>-8</number>
+        </property>
+        <property name="maximum" >
+         <number>8</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="tickPosition" >
+         <enum>QSlider::TicksBelow</enum>
+        </property>
+        <property name="tickInterval" >
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_8" >
+        <property name="text" >
+         <string>Brightness:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QSlider" name="brightnessSlider" >
+        <property name="minimum" >
+         <number>-8</number>
+        </property>
+        <property name="maximum" >
+         <number>8</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="tickPosition" >
+         <enum>QSlider::TicksBelow</enum>
+        </property>
+        <property name="tickInterval" >
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_7" >
+        <property name="text" >
+         <string>Saturation:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QSlider" name="saturationSlider" >
+        <property name="minimum" >
+         <number>-8</number>
+        </property>
+        <property name="maximum" >
+         <number>8</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="tickPosition" >
+         <enum>QSlider::TicksBelow</enum>
+        </property>
+        <property name="tickInterval" >
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Hue:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="QSlider" name="hueSlider" >
+        <property name="minimum" >
+         <number>-8</number>
+        </property>
+        <property name="maximum" >
+         <number>8</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="tickPosition" >
+         <enum>QSlider::TicksBelow</enum>
+        </property>
+        <property name="tickInterval" >
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" colspan="2" >
+       <widget class="QLabel" name="label_10" >
+        <property name="text" >
+         <string>Aspect ratio:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="2" >
+       <widget class="QComboBox" name="aspectCombo" >
+        <property name="minimumSize" >
+         <size>
+          <width>180</width>
+          <height>0</height>
+         </size>
+        </property>
+        <item>
+         <property name="text" >
+          <string>Auto</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>Stretch</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>4/3</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>16/9</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="5" column="0" colspan="2" >
+       <widget class="QLabel" name="label_11" >
+        <property name="text" >
+         <string>Scale Mode:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="2" >
+       <widget class="QComboBox" name="scalemodeCombo" >
+        <property name="minimumSize" >
+         <size>
+          <width>180</width>
+          <height>0</height>
+         </size>
+        </property>
+        <item>
+         <property name="text" >
+          <string>Fit in view</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>Scale and crop</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Audio options:</string>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout" >
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize" >
+           <size>
+            <width>90</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text" >
+           <string>Audio device:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="deviceCombo" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout" >
+        <item>
+         <widget class="QLabel" name="label_6" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize" >
+           <size>
+            <width>90</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text" >
+           <string>Audio effect:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="audioEffectsCombo" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Maximum" hsizetype="Minimum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="effectButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>Setup</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QLabel" name="crossFadeLabel" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize" >
+           <size>
+            <width>90</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text" >
+           <string>Cross fade:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" >
+          <item>
+           <widget class="QSlider" name="crossFadeSlider" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimum" >
+             <number>-20</number>
+            </property>
+            <property name="maximum" >
+             <number>20</number>
+            </property>
+            <property name="singleStep" >
+             <number>1</number>
+            </property>
+            <property name="pageStep" >
+             <number>2</number>
+            </property>
+            <property name="value" >
+             <number>0</number>
+            </property>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="tickPosition" >
+             <enum>QSlider::TicksBelow</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" >
+            <item>
+             <widget class="QLabel" name="crossFadeLabel1" >
+              <property name="font" >
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text" >
+               <string>-10 Sec</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation" >
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0" >
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="crossFadeLabel2" >
+              <property name="font" >
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text" >
+               <string>0</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation" >
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0" >
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="crossFadeLabel3" >
+              <property name="font" >
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text" >
+               <string>10 Sec</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>settings</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>settings</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/pathstroke/main.cpp b/demos/pathstroke/main.cpp
new file mode 100644
index 0000000..613d835
--- /dev/null
+++ b/demos/pathstroke/main.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "pathstroke.h"
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(pathstroke);
+
+    QApplication app(argc, argv);
+
+    bool smallScreen = false;
+    for (int i=0; i<argc; i++)
+        if (QString(argv[i]) == "-small-screen")
+            smallScreen = true;
+
+    PathStrokeWidget pathStrokeWidget(smallScreen);
+    QStyle *arthurStyle = new ArthurStyle();
+    pathStrokeWidget.setStyle(arthurStyle);
+    QList<QWidget *> widgets = qFindChildren<QWidget *>(&pathStrokeWidget);
+    foreach (QWidget *w, widgets)
+        w->setStyle(arthurStyle);
+
+    if (smallScreen)
+        pathStrokeWidget.showFullScreen();
+    else
+        pathStrokeWidget.show();
+
+    return app.exec();
+}
diff --git a/demos/pathstroke/pathstroke.cpp b/demos/pathstroke/pathstroke.cpp
new file mode 100644
index 0000000..d079490
--- /dev/null
+++ b/demos/pathstroke/pathstroke.cpp
@@ -0,0 +1,599 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "pathstroke.h"
+#include "arthurstyle.h"
+#include "arthurwidgets.h"
+
+#include <stdio.h>
+
+extern void draw_round_rect(QPainter *p, const QRect &bounds, int radius);
+
+
+PathStrokeControls::PathStrokeControls(QWidget* parent, PathStrokeRenderer* renderer, bool smallScreen)
+      : QWidget(parent)
+{
+    m_renderer = renderer;
+
+    if (smallScreen)
+        layoutForSmallScreens();
+    else
+        layoutForDesktop();
+}
+
+void PathStrokeControls::createCommonControls(QWidget* parent)
+{
+    m_capGroup = new QGroupBox(parent);
+    m_capGroup->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    QRadioButton *flatCap = new QRadioButton(m_capGroup);
+    QRadioButton *squareCap = new QRadioButton(m_capGroup);
+    QRadioButton *roundCap = new QRadioButton(m_capGroup);
+    m_capGroup->setTitle(tr("Cap Style"));
+    flatCap->setText(tr("Flat"));
+    squareCap->setText(tr("Square"));
+    roundCap->setText(tr("Round"));
+    flatCap->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    squareCap->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    roundCap->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
+    m_joinGroup = new QGroupBox(parent);
+    m_joinGroup->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    QRadioButton *bevelJoin = new QRadioButton(m_joinGroup);
+    QRadioButton *miterJoin = new QRadioButton(m_joinGroup);
+    QRadioButton *roundJoin = new QRadioButton(m_joinGroup);
+    m_joinGroup->setTitle(tr("Join Style"));
+    bevelJoin->setText(tr("Bevel"));
+    miterJoin->setText(tr("Miter"));
+    roundJoin->setText(tr("Round"));
+
+    m_styleGroup = new QGroupBox(parent);
+    m_styleGroup->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    QRadioButton *solidLine = new QRadioButton(m_styleGroup);
+    QRadioButton *dashLine = new QRadioButton(m_styleGroup);
+    QRadioButton *dotLine = new QRadioButton(m_styleGroup);
+    QRadioButton *dashDotLine = new QRadioButton(m_styleGroup);
+    QRadioButton *dashDotDotLine = new QRadioButton(m_styleGroup);
+    QRadioButton *customDashLine = new QRadioButton(m_styleGroup);
+    m_styleGroup->setTitle(tr("Pen Style"));
+
+    QPixmap line_solid(":res/images/line_solid.png");
+    solidLine->setIcon(line_solid);
+    solidLine->setIconSize(line_solid.size());
+    QPixmap line_dashed(":res/images/line_dashed.png");
+    dashLine->setIcon(line_dashed);
+    dashLine->setIconSize(line_dashed.size());
+    QPixmap line_dotted(":res/images/line_dotted.png");
+    dotLine->setIcon(line_dotted);
+    dotLine->setIconSize(line_dotted.size());
+    QPixmap line_dash_dot(":res/images/line_dash_dot.png");
+    dashDotLine->setIcon(line_dash_dot);
+    dashDotLine->setIconSize(line_dash_dot.size());
+    QPixmap line_dash_dot_dot(":res/images/line_dash_dot_dot.png");
+    dashDotDotLine->setIcon(line_dash_dot_dot);
+    dashDotDotLine->setIconSize(line_dash_dot_dot.size());
+    customDashLine->setText(tr("Custom"));
+
+    int fixedHeight = bevelJoin->sizeHint().height();
+    solidLine->setFixedHeight(fixedHeight);
+    dashLine->setFixedHeight(fixedHeight);
+    dotLine->setFixedHeight(fixedHeight);
+    dashDotLine->setFixedHeight(fixedHeight);
+    dashDotDotLine->setFixedHeight(fixedHeight);
+
+    m_pathModeGroup = new QGroupBox(parent);
+    m_pathModeGroup->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    QRadioButton *curveMode = new QRadioButton(m_pathModeGroup);
+    QRadioButton *lineMode = new QRadioButton(m_pathModeGroup);
+    m_pathModeGroup->setTitle(tr("Line Style"));
+    curveMode->setText(tr("Curves"));
+    lineMode->setText(tr("Lines"));
+
+
+    // Layouts
+    QVBoxLayout *capGroupLayout = new QVBoxLayout(m_capGroup);
+    capGroupLayout->addWidget(flatCap);
+    capGroupLayout->addWidget(squareCap);
+    capGroupLayout->addWidget(roundCap);
+
+    QVBoxLayout *joinGroupLayout = new QVBoxLayout(m_joinGroup);
+    joinGroupLayout->addWidget(bevelJoin);
+    joinGroupLayout->addWidget(miterJoin);
+    joinGroupLayout->addWidget(roundJoin);
+
+    QVBoxLayout *styleGroupLayout = new QVBoxLayout(m_styleGroup);
+    styleGroupLayout->addWidget(solidLine);
+    styleGroupLayout->addWidget(dashLine);
+    styleGroupLayout->addWidget(dotLine);
+    styleGroupLayout->addWidget(dashDotLine);
+    styleGroupLayout->addWidget(dashDotDotLine);
+    styleGroupLayout->addWidget(customDashLine);
+
+    QVBoxLayout *pathModeGroupLayout = new QVBoxLayout(m_pathModeGroup);
+    pathModeGroupLayout->addWidget(curveMode);
+    pathModeGroupLayout->addWidget(lineMode);
+
+
+    // Connections
+    connect(flatCap, SIGNAL(clicked()), m_renderer, SLOT(setFlatCap()));
+    connect(squareCap, SIGNAL(clicked()), m_renderer, SLOT(setSquareCap()));
+    connect(roundCap, SIGNAL(clicked()), m_renderer, SLOT(setRoundCap()));
+
+    connect(bevelJoin, SIGNAL(clicked()), m_renderer, SLOT(setBevelJoin()));
+    connect(miterJoin, SIGNAL(clicked()), m_renderer, SLOT(setMiterJoin()));
+    connect(roundJoin, SIGNAL(clicked()), m_renderer, SLOT(setRoundJoin()));
+
+    connect(curveMode, SIGNAL(clicked()), m_renderer, SLOT(setCurveMode()));
+    connect(lineMode, SIGNAL(clicked()), m_renderer, SLOT(setLineMode()));
+
+    connect(solidLine, SIGNAL(clicked()), m_renderer, SLOT(setSolidLine()));
+    connect(dashLine, SIGNAL(clicked()), m_renderer, SLOT(setDashLine()));
+    connect(dotLine, SIGNAL(clicked()), m_renderer, SLOT(setDotLine()));
+    connect(dashDotLine, SIGNAL(clicked()), m_renderer, SLOT(setDashDotLine()));
+    connect(dashDotDotLine, SIGNAL(clicked()), m_renderer, SLOT(setDashDotDotLine()));
+    connect(customDashLine, SIGNAL(clicked()), m_renderer, SLOT(setCustomDashLine()));
+
+    // Set the defaults:
+    flatCap->setChecked(true);
+    bevelJoin->setChecked(true);
+    curveMode->setChecked(true);
+    solidLine->setChecked(true);
+}
+
+
+void PathStrokeControls::layoutForDesktop()
+{
+    QGroupBox *mainGroup = new QGroupBox(this);
+    mainGroup->setFixedWidth(180);
+    mainGroup->setTitle(tr("Path Stroking"));
+
+    createCommonControls(mainGroup);
+
+    QGroupBox* penWidthGroup = new QGroupBox(mainGroup);
+    QSlider *penWidth = new QSlider(Qt::Horizontal, penWidthGroup);
+    penWidth->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    penWidthGroup->setTitle(tr("Pen Width"));
+    penWidth->setRange(0, 500);
+
+    QPushButton *animated = new QPushButton(mainGroup);
+    animated->setText(tr("Animate"));
+    animated->setCheckable(true);
+
+    QPushButton *showSourceButton = new QPushButton(mainGroup);
+    showSourceButton->setText(tr("Show Source"));
+#ifdef QT_OPENGL_SUPPORT
+    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(true);
+    enableOpenGLButton->setChecked(m_renderer->usesOpenGL());
+    if (!QGLFormat::hasOpenGL())
+        enableOpenGLButton->hide();
+#endif
+    QPushButton *whatsThisButton = new QPushButton(mainGroup);
+    whatsThisButton->setText(tr("What's This?"));
+    whatsThisButton->setCheckable(true);
+
+
+    // Layouts:
+    QVBoxLayout *penWidthLayout = new QVBoxLayout(penWidthGroup);
+    penWidthLayout->addWidget(penWidth);
+
+    QVBoxLayout * mainLayout = new QVBoxLayout(this);
+    mainLayout->setMargin(0);
+    mainLayout->addWidget(mainGroup);
+
+    QVBoxLayout *mainGroupLayout = new QVBoxLayout(mainGroup);
+    mainGroupLayout->setMargin(3);
+    mainGroupLayout->addWidget(m_capGroup);
+    mainGroupLayout->addWidget(m_joinGroup);
+    mainGroupLayout->addWidget(m_styleGroup);
+    mainGroupLayout->addWidget(penWidthGroup);
+    mainGroupLayout->addWidget(m_pathModeGroup);
+    mainGroupLayout->addWidget(animated);
+    mainGroupLayout->addStretch(1);
+    mainGroupLayout->addWidget(showSourceButton);
+#ifdef QT_OPENGL_SUPPORT
+    mainGroupLayout->addWidget(enableOpenGLButton);
+#endif
+    mainGroupLayout->addWidget(whatsThisButton);
+
+
+    // Set up connections
+    connect(animated, SIGNAL(toggled(bool)),
+            m_renderer, SLOT(setAnimation(bool)));
+
+    connect(penWidth, SIGNAL(valueChanged(int)),
+            m_renderer, SLOT(setPenWidth(int)));
+
+    connect(showSourceButton, SIGNAL(clicked()), m_renderer, SLOT(showSource()));
+#ifdef QT_OPENGL_SUPPORT
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer, SLOT(enableOpenGL(bool)));
+#endif
+    connect(whatsThisButton, SIGNAL(clicked(bool)), m_renderer, SLOT(setDescriptionEnabled(bool)));
+    connect(m_renderer, SIGNAL(descriptionEnabledChanged(bool)),
+            whatsThisButton, SLOT(setChecked(bool)));
+
+
+    // Set the defaults
+    animated->setChecked(true);
+    penWidth->setValue(50);
+
+}
+
+void PathStrokeControls::layoutForSmallScreens()
+{
+    createCommonControls(this);
+
+    m_capGroup->layout()->setMargin(0);
+    m_joinGroup->layout()->setMargin(0);
+    m_styleGroup->layout()->setMargin(0);
+    m_pathModeGroup->layout()->setMargin(0);
+
+    QPushButton* okBtn = new QPushButton(tr("OK"), this);
+    okBtn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    okBtn->setMinimumSize(100,okBtn->minimumSize().height());
+
+    QPushButton* quitBtn = new QPushButton(tr("Quit"), this);
+    quitBtn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    quitBtn->setMinimumSize(100, okBtn->minimumSize().height());
+
+    QLabel *penWidthLabel = new QLabel(tr(" Width:"));
+    QSlider *penWidth = new QSlider(Qt::Horizontal, this);
+    penWidth->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    penWidth->setRange(0, 500);
+
+#ifdef QT_OPENGL_SUPPORT
+    QPushButton *enableOpenGLButton = new QPushButton(this);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(true);
+    enableOpenGLButton->setChecked(m_renderer->usesOpenGL());
+    if (!QGLFormat::hasOpenGL())
+        enableOpenGLButton->hide();
+#endif
+
+    // Layouts:
+    QHBoxLayout *penWidthLayout = new QHBoxLayout(0);
+    penWidthLayout->addWidget(penWidthLabel, 0, Qt::AlignRight);
+    penWidthLayout->addWidget(penWidth);
+
+    QVBoxLayout *leftLayout = new QVBoxLayout(0);
+    leftLayout->addWidget(m_capGroup);
+    leftLayout->addWidget(m_joinGroup);
+#ifdef QT_OPENGL_SUPPORT
+    leftLayout->addWidget(enableOpenGLButton);
+#endif
+    leftLayout->addLayout(penWidthLayout);
+
+    QVBoxLayout *rightLayout = new QVBoxLayout(0);
+    rightLayout->addWidget(m_styleGroup);
+    rightLayout->addWidget(m_pathModeGroup);
+
+    QGridLayout *mainLayout = new QGridLayout(this);
+    mainLayout->setMargin(0);
+
+    // Add spacers around the form items so we don't look stupid at higher resolutions
+    mainLayout->addItem(new QSpacerItem(0,0), 0, 0, 1, 4);
+    mainLayout->addItem(new QSpacerItem(0,0), 1, 0, 2, 1);
+    mainLayout->addItem(new QSpacerItem(0,0), 1, 3, 2, 1);
+    mainLayout->addItem(new QSpacerItem(0,0), 3, 0, 1, 4);
+
+    mainLayout->addLayout(leftLayout, 1, 1);
+    mainLayout->addLayout(rightLayout, 1, 2);
+    mainLayout->addWidget(quitBtn, 2, 1, Qt::AlignHCenter | Qt::AlignTop);
+    mainLayout->addWidget(okBtn, 2, 2, Qt::AlignHCenter | Qt::AlignTop);
+
+#ifdef QT_OPENGL_SUPPORT
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer, SLOT(enableOpenGL(bool)));
+#endif
+
+    connect(penWidth, SIGNAL(valueChanged(int)), m_renderer, SLOT(setPenWidth(int)));
+    connect(quitBtn, SIGNAL(clicked()), this, SLOT(emitQuitSignal()));
+    connect(okBtn, SIGNAL(clicked()), this, SLOT(emitOkSignal()));
+
+    m_renderer->setAnimation(true);
+    penWidth->setValue(50);
+}
+
+void PathStrokeControls::emitQuitSignal()
+{   emit quitPressed();  }
+
+void PathStrokeControls::emitOkSignal()
+{   emit okPressed();   }
+
+
+PathStrokeWidget::PathStrokeWidget(bool smallScreen)
+{
+    setWindowTitle(tr("Path Stroking"));
+
+    // Widget construction and property setting
+    m_renderer = new PathStrokeRenderer(this, smallScreen);
+
+    m_controls = new PathStrokeControls(0, m_renderer, smallScreen);
+
+    // Layouting
+    QHBoxLayout *viewLayout = new QHBoxLayout(this);
+    viewLayout->addWidget(m_renderer);
+
+    if (!smallScreen)
+        viewLayout->addWidget(m_controls);
+
+    m_renderer->loadSourceFile(":res/pathstroke/pathstroke.cpp");
+    m_renderer->loadDescription(":res/pathstroke/pathstroke.html");
+
+    connect(m_renderer, SIGNAL(clicked()), this, SLOT(showControls()));
+    connect(m_controls, SIGNAL(okPressed()), this, SLOT(hideControls()));
+    connect(m_controls, SIGNAL(quitPressed()), QApplication::instance(), SLOT(quit()));
+}
+
+
+void PathStrokeWidget::showControls()
+{
+    m_controls->showFullScreen();
+}
+
+
+void PathStrokeWidget::hideControls()
+{
+    m_controls->hide();
+}
+
+
+void PathStrokeWidget::setStyle( QStyle * style )
+{
+    QWidget::setStyle(style);
+    if (m_controls != 0)
+    {
+        m_controls->setStyle(style);
+        
+        QList<QWidget *> widgets = qFindChildren<QWidget *>(m_controls);
+        foreach (QWidget *w, widgets)
+            w->setStyle(style);
+    }
+}
+
+
+PathStrokeRenderer::PathStrokeRenderer(QWidget *parent, bool smallScreen)
+    : ArthurFrame(parent)
+{
+    m_smallScreen = smallScreen;
+    m_pointSize = 10;
+    m_activePoint = -1;
+    m_capStyle = Qt::FlatCap;
+    m_joinStyle = Qt::BevelJoin;
+    m_pathMode = CurveMode;
+    m_penWidth = 1;
+    m_penStyle = Qt::SolidLine;
+    m_wasAnimated = true;
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+}
+
+void PathStrokeRenderer::paint(QPainter *painter)
+{
+    if (m_points.isEmpty())
+        initializePoints();
+
+    painter->setRenderHint(QPainter::Antialiasing);
+
+    QPalette pal = palette();
+    painter->setPen(Qt::NoPen);
+
+    // Construct the path
+    QPainterPath path;
+    path.moveTo(m_points.at(0));
+
+    if (m_pathMode == LineMode) {
+        for (int i=1; i<m_points.size(); ++i) {
+            path.lineTo(m_points.at(i));
+        }
+    } else {
+        int i=1;
+        while (i + 2 < m_points.size()) {
+            path.cubicTo(m_points.at(i), m_points.at(i+1), m_points.at(i+2));
+            i += 3;
+        }
+        while (i < m_points.size()) {
+            path.lineTo(m_points.at(i));
+            ++i;
+        }
+    }
+
+    // Draw the path
+    {
+        QColor lg = Qt::red;
+
+        // The "custom" pen
+        if (m_penStyle == Qt::NoPen) {
+            QPainterPathStroker stroker;
+            stroker.setWidth(m_penWidth);
+            stroker.setJoinStyle(m_joinStyle);
+            stroker.setCapStyle(m_capStyle);
+
+            QVector<qreal> dashes;
+            qreal space = 4;
+            dashes << 1 << space
+                   << 3 << space
+                   << 9 << space
+                   << 27 << space
+                   << 9 << space
+                   << 3 << space;
+            stroker.setDashPattern(dashes);
+            QPainterPath stroke = stroker.createStroke(path);
+            painter->fillPath(stroke, lg);
+
+        } else {
+            QPen pen(lg, m_penWidth, m_penStyle, m_capStyle, m_joinStyle);
+            painter->strokePath(path, pen);
+        }
+    }
+
+    if (1) {
+        // Draw the control points
+        painter->setPen(QColor(50, 100, 120, 200));
+        painter->setBrush(QColor(200, 200, 210, 120));
+        for (int i=0; i<m_points.size(); ++i) {
+            QPointF pos = m_points.at(i);
+            painter->drawEllipse(QRectF(pos.x() - m_pointSize,
+                                       pos.y() - m_pointSize,
+                                       m_pointSize*2, m_pointSize*2));
+        }
+        painter->setPen(QPen(Qt::lightGray, 0, Qt::SolidLine));
+        painter->setBrush(Qt::NoBrush);
+        painter->drawPolyline(m_points);
+    }
+
+}
+
+void PathStrokeRenderer::initializePoints()
+{
+    const int count = 7;
+    m_points.clear();
+    m_vectors.clear();
+
+    QMatrix m;
+    qreal rot = 360 / count;
+    QPointF center(width() / 2, height() / 2);
+    QMatrix vm;
+    vm.shear(2, -1);
+    vm.scale(3, 3);
+
+    for (int i=0; i<count; ++i) {
+        m_vectors << QPointF(.1f, .25f) * (m * vm);
+        m_points << QPointF(0, 100) * m + center;
+        m.rotate(rot);
+    }
+}
+
+void PathStrokeRenderer::updatePoints()
+{
+    qreal pad = 10;
+    qreal left = pad;
+    qreal right = width() - pad;
+    qreal top = pad;
+    qreal bottom = height() - pad;
+
+    Q_ASSERT(m_points.size() == m_vectors.size());
+    for (int i=0; i<m_points.size(); ++i) {
+
+        if (i == m_activePoint)
+            continue;
+
+        QPointF pos = m_points.at(i);
+        QPointF vec = m_vectors.at(i);
+        pos += vec;
+        if (pos.x() < left || pos.x() > right) {
+            vec.setX(-vec.x());
+            pos.setX(pos.x() < left ? left : right);
+        } if (pos.y() < top || pos.y() > bottom) {
+            vec.setY(-vec.y());
+            pos.setY(pos.y() < top ? top : bottom);
+        }
+        m_points[i] = pos;
+        m_vectors[i] = vec;
+    }
+    update();
+}
+
+void PathStrokeRenderer::mousePressEvent(QMouseEvent *e)
+{
+    setDescriptionEnabled(false);
+    m_activePoint = -1;
+    qreal distance = -1;
+    for (int i=0; i<m_points.size(); ++i) {
+        qreal d = QLineF(e->pos(), m_points.at(i)).length();
+        if ((distance < 0 && d < 8 * m_pointSize) || d < distance) {
+            distance = d;
+            m_activePoint = i;
+        }
+    }
+
+    if (m_activePoint != -1) {
+        m_wasAnimated = m_timer.isActive();
+        setAnimation(false);
+        mouseMoveEvent(e);
+    }
+    
+    // If we're not running in small screen mode, always assume we're dragging
+    m_mouseDrag = !m_smallScreen;
+    m_mousePress = e->pos();
+}
+
+void PathStrokeRenderer::mouseMoveEvent(QMouseEvent *e)
+{
+    // If we've moved more then 25 pixels, assume user is dragging
+    if (!m_mouseDrag && QPoint(m_mousePress - e->pos()).manhattanLength() > 25)
+        m_mouseDrag = true;
+
+    if (m_mouseDrag && m_activePoint >= 0 && m_activePoint < m_points.size()) {
+        m_points[m_activePoint] = e->pos();
+        update();
+    }
+}
+
+void PathStrokeRenderer::mouseReleaseEvent(QMouseEvent *)
+{
+    m_activePoint = -1;
+    setAnimation(m_wasAnimated);
+
+    if (!m_mouseDrag && m_smallScreen)
+        emit clicked();
+}
+
+void PathStrokeRenderer::timerEvent(QTimerEvent *e)
+{
+    if (e->timerId() == m_timer.timerId()) {
+        updatePoints();
+        QApplication::syncX();
+    } // else if (e->timerId() == m_fpsTimer.timerId()) {
+//         emit frameRate(m_frameCount);
+//         m_frameCount = 0;
+//     }
+}
+
+void PathStrokeRenderer::setAnimation(bool animation)
+{
+    m_timer.stop();
+//     m_fpsTimer.stop();
+
+    if (animation) {
+        m_timer.start(25, this);
+//         m_fpsTimer.start(1000, this);
+//         m_frameCount = 0;
+    }
+}
diff --git a/demos/pathstroke/pathstroke.h b/demos/pathstroke/pathstroke.h
new file mode 100644
index 0000000..99f17a7
--- /dev/null
+++ b/demos/pathstroke/pathstroke.h
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PATHSTROKE_H
+#define PATHSTROKE_H
+
+#include "arthurwidgets.h"
+#include <QtGui>
+
+class PathStrokeRenderer : public ArthurFrame
+{
+    Q_OBJECT
+    Q_PROPERTY(bool animation READ animation WRITE setAnimation)
+    Q_PROPERTY(qreal penWidth READ realPenWidth WRITE setRealPenWidth)
+public:
+    enum PathMode { CurveMode, LineMode };
+
+    PathStrokeRenderer(QWidget *parent, bool smallScreen = false);
+
+    void paint(QPainter *);
+    void mousePressEvent(QMouseEvent *e);
+    void mouseMoveEvent(QMouseEvent *e);
+    void mouseReleaseEvent(QMouseEvent *e);
+    void timerEvent(QTimerEvent *e);
+
+    QSize sizeHint() const { return QSize(500, 500); }
+
+    bool animation() const { return m_timer.isActive(); }
+
+    qreal realPenWidth() const { return m_penWidth; }
+    void setRealPenWidth(qreal penWidth) { m_penWidth = penWidth; update(); }
+
+signals:
+    void clicked();
+
+public slots:
+    void setPenWidth(int penWidth) { m_penWidth = penWidth / 10.0; update(); }
+    void setAnimation(bool animation);
+
+    void setFlatCap() { m_capStyle = Qt::FlatCap; update(); }
+    void setSquareCap() { m_capStyle = Qt::SquareCap; update(); }
+    void setRoundCap() { m_capStyle = Qt::RoundCap; update(); }
+
+    void setBevelJoin() { m_joinStyle = Qt::BevelJoin; update(); }
+    void setMiterJoin() { m_joinStyle = Qt::MiterJoin; update(); }
+    void setRoundJoin() { m_joinStyle = Qt::RoundJoin; update(); }
+
+    void setCurveMode() { m_pathMode = CurveMode; update(); }
+    void setLineMode() { m_pathMode = LineMode; update(); }
+
+    void setSolidLine() { m_penStyle = Qt::SolidLine; update(); }
+    void setDashLine() { m_penStyle = Qt::DashLine; update(); }
+    void setDotLine() { m_penStyle = Qt::DotLine; update(); }
+    void setDashDotLine() { m_penStyle = Qt::DashDotLine; update(); }
+    void setDashDotDotLine() { m_penStyle = Qt::DashDotDotLine; update(); }
+    void setCustomDashLine() { m_penStyle = Qt::NoPen; update(); }
+
+private:
+    void initializePoints();
+    void updatePoints();
+
+    QBasicTimer m_timer;
+
+    PathMode m_pathMode;
+
+    bool m_wasAnimated;
+
+    qreal m_penWidth;
+    int m_pointCount;
+    int m_pointSize;
+    int m_activePoint;
+    QVector<QPointF> m_points;
+    QVector<QPointF> m_vectors;
+
+    Qt::PenJoinStyle m_joinStyle;
+    Qt::PenCapStyle m_capStyle;
+
+    Qt::PenStyle m_penStyle;
+
+    bool m_smallScreen;
+    QPoint m_mousePress;
+    bool m_mouseDrag;
+};
+
+class PathStrokeControls : public QWidget
+{
+    Q_OBJECT
+public:
+    PathStrokeControls(QWidget* parent, PathStrokeRenderer* renderer, bool smallScreen);
+
+signals:
+    void okPressed();
+    void quitPressed();
+
+private:
+    PathStrokeRenderer* m_renderer;
+
+    QGroupBox *m_capGroup;
+    QGroupBox *m_joinGroup;
+    QGroupBox *m_styleGroup;
+    QGroupBox *m_pathModeGroup;
+
+    void createCommonControls(QWidget* parent);
+    void layoutForDesktop();
+    void layoutForSmallScreens();
+
+private slots:
+    void emitQuitSignal();
+    void emitOkSignal();
+
+};
+
+class PathStrokeWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    PathStrokeWidget(bool smallScreen);
+    void setStyle ( QStyle * style );
+
+private:
+    PathStrokeRenderer *m_renderer;
+    PathStrokeControls *m_controls;
+
+private slots:
+    void showControls();
+    void hideControls();
+
+};
+
+#endif // PATHSTROKE_H
diff --git a/demos/pathstroke/pathstroke.html b/demos/pathstroke/pathstroke.html
new file mode 100644
index 0000000..9e7e50d
--- /dev/null
+++ b/demos/pathstroke/pathstroke.html
@@ -0,0 +1,20 @@
+<html>
+<center>
+<h2>Primitive Stroking</h2>
+</center>
+
+<p>In this demo we show some of the various types of pens that can be
+used in Qt.</p>
+
+<p>Qt defines cap styles for how the end points are treated and join
+styles for how path segments are joined together. A standard set of
+predefined dash patterns are also included that can be used with
+<code>QPen</code>.</p>
+
+<p>In addition to the predefined patterns available in
+<code>QPen</code> we also demonstrate direct use of the
+<code>QPainterPathStroker</code> class which can be used to define
+custom dash patterns. You can see this by enabling the
+<i>Custom Pattern</i> option.</p>
+
+</html>
diff --git a/demos/pathstroke/pathstroke.pro b/demos/pathstroke/pathstroke.pro
new file mode 100644
index 0000000..50b4de2
--- /dev/null
+++ b/demos/pathstroke/pathstroke.pro
@@ -0,0 +1,20 @@
+SOURCES += main.cpp pathstroke.cpp
+HEADERS += pathstroke.h
+
+SHARED_FOLDER = ../shared
+
+include($$SHARED_FOLDER/shared.pri)
+
+RESOURCES += pathstroke.qrc
+
+contains(QT_CONFIG, opengl) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/pathstroke
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
+sources.path = $$[QT_INSTALL_DEMOS]/pathstroke
+INSTALLS += target sources
+
diff --git a/demos/pathstroke/pathstroke.qrc b/demos/pathstroke/pathstroke.qrc
new file mode 100644
index 0000000..a9a7234
--- /dev/null
+++ b/demos/pathstroke/pathstroke.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res/pathstroke">
+   <file>pathstroke.cpp</file>
+   <file>pathstroke.html</file>
+</qresource>
+</RCC>
diff --git a/demos/qtdemo/Info_mac.plist b/demos/qtdemo/Info_mac.plist
new file mode 100644
index 0000000..71b0059
--- /dev/null
+++ b/demos/qtdemo/Info_mac.plist
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleIconFile</key>
+	<string>@ICON@</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+        <key>CFBundleGetInfoString</key>
+	<string>Created by Qt/QMake</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.trolltech.qt.demo</string>
+	<key>CFBundleExecutable</key>
+	<string>@EXECUTABLE@</string>
+</dict>
+</plist>
diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp
new file mode 100644
index 0000000..18343cb
--- /dev/null
+++ b/demos/qtdemo/colors.cpp
@@ -0,0 +1,390 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "colors.h"
+
+#ifndef QT_NO_OPENGL
+    #include <QGLWidget>
+#endif
+//#define QT_NO_OPENGL
+
+// Colors:
+QColor Colors::sceneBg1(QColor(91, 91, 91));
+QColor Colors::sceneBg1Line(QColor(114, 108, 104));
+QColor Colors::sceneBg2(QColor(0, 0, 0));
+QColor Colors::sceneLine(255, 255, 255);
+QColor Colors::paperBg(QColor(100, 100, 100));
+QColor Colors::menuTextFg(QColor(255, 0, 0));
+QColor Colors::buttonBgLow(QColor(255, 255, 255, 90));
+QColor Colors::buttonBgHigh(QColor(255, 255, 255, 20));
+QColor Colors::buttonText(QColor(255, 255, 255));
+QColor Colors::tt_green(QColor(166, 206, 57));
+QColor Colors::fadeOut(QColor(206, 246, 117, 0));
+QColor Colors::heading(QColor(190,230,80));
+QString Colors::contentColor("<font color='#eeeeee'>");
+QString Colors::glVersion("Not detected!");
+
+// Guides:
+int Colors::stageStartY = 8;
+int Colors::stageHeight = 536;
+int Colors::stageStartX = 8;
+int Colors::stageWidth = 785;
+int Colors::contentStartY = 22;
+int Colors::contentHeight = 510;
+
+// Properties:
+bool Colors::openGlRendering = false;
+bool Colors::direct3dRendering = false;
+bool Colors::softwareRendering = false;
+bool Colors::openGlAwailable = true;
+bool Colors::direct3dAwailable = true;
+bool Colors::xRenderPresent = true;
+
+bool Colors::noTicker = false;
+bool Colors::noRescale = false;
+bool Colors::noAnimations = false;
+bool Colors::noBlending = false;
+bool Colors::noScreenSync = false;
+bool Colors::fullscreen = false;
+bool Colors::usePixmaps = false;
+bool Colors::useLoop = false;
+bool Colors::showBoundingRect = false;
+bool Colors::showFps = false;
+bool Colors::noAdapt = false;
+bool Colors::noWindowMask = true;
+bool Colors::useButtonBalls = false;
+bool Colors::useEightBitPalette = false;
+bool Colors::noTimerUpdate = false;
+bool Colors::noTickerMorph = false;
+bool Colors::adapted = false;
+bool Colors::verbose = false;
+bool Colors::pause = true;
+int Colors::fps = 100;
+int Colors::menuCount = 18;
+float Colors::animSpeed = 1.0;
+float Colors::animSpeedButtons = 1.0;
+float Colors::benchmarkFps = -1;
+int Colors::tickerLetterCount = 80;
+float Colors::tickerMoveSpeed = 0.4f;
+float Colors::tickerMorphSpeed = 2.5f;
+QString Colors::tickerText = ".EROM ETAERC .SSEL EDOC";
+QString Colors::rootMenuName = "Qt Examples and Demos";
+
+QFont Colors::contentFont()
+{
+    QFont font;
+    font.setStyleStrategy(QFont::PreferAntialias);
+#if defined(Q_OS_MAC)
+    font.setPixelSize(14);
+    font.setFamily("Arial");
+#else
+    font.setPixelSize(13);
+    font.setFamily("Verdana");
+#endif
+    return font;
+}
+
+QFont Colors::headingFont()
+{
+    QFont font;
+    font.setStyleStrategy(QFont::PreferAntialias);
+    font.setPixelSize(23);
+    font.setBold(true);
+    font.setFamily("Verdana");
+    return font;
+}
+
+QFont Colors::buttonFont()
+{
+    QFont font;
+    font.setStyleStrategy(QFont::PreferAntialias);
+#if 0//defined(Q_OS_MAC)
+    font.setPixelSize(11);
+    font.setFamily("Silom");
+#else
+    font.setPixelSize(11);
+    font.setFamily("Verdana");
+#endif
+    return font;
+}
+
+QFont Colors::tickerFont()
+{
+    QFont font;
+    font.setStyleStrategy(QFont::PreferAntialias);
+#if defined(Q_OS_MAC)
+    font.setPixelSize(11);
+    font.setBold(true);
+    font.setFamily("Arial");
+#else
+    font.setPixelSize(10);
+    font.setBold(true);
+    font.setFamily("sans serif");
+#endif
+    return font;
+}
+
+float parseFloat(const QString &argument, const QString &name)
+{
+    if (name.length() == argument.length()){
+        QMessageBox::warning(0, "Arguments",
+                                 QString("No argument number found for ")
+                                 + name
+                                 + ". Remember to put name and value adjacent! (e.g. -fps100)");
+        exit(0);
+    }
+    float value = argument.mid(name.length()).toFloat();
+    return value;
+}
+
+QString parseText(const QString &argument, const QString &name)
+{
+    if (name.length() == argument.length()){
+        QMessageBox::warning(0, "Arguments",
+                                 QString("No argument number found for ")
+                                 + name
+                                 + ". Remember to put name and value adjacent! (e.g. -fps100)");
+        exit(0);
+    }
+    QString value = argument.mid(name.length());
+    return value;
+}
+
+void Colors::parseArgs(int argc, char *argv[])
+{
+    // some arguments should be processed before
+    // others. Handle them now:
+    for (int i=1; i<argc; i++){
+        QString s(argv[i]);
+        if (s == "-verbose")
+            Colors::verbose = true;
+    }
+
+    Colors::detectSystemResources();
+
+    // Handle the rest of the arguments. They may
+    // override attributes already set:
+    for (int i=1; i<argc; i++){
+        QString s(argv[i]);
+        if (s == "-opengl")
+            Colors::openGlRendering = true;
+        else if (s == "-direct3d")
+            Colors::direct3dRendering = true;
+        else if (s == "-software")
+            Colors::softwareRendering = true;
+        else if (s == "-no-opengl") // support old style
+            Colors::softwareRendering = true;
+        else if (s == "-no-ticker") // support old style
+            Colors::noTicker = true;
+        else if (s.startsWith("-ticker"))
+            Colors::noTicker = !bool(parseFloat(s, "-ticker"));
+        else if (s == "-no-animations")
+            Colors::noAnimations = true; // support old style
+        else if (s.startsWith("-animations"))
+            Colors::noAnimations = !bool(parseFloat(s, "-animations"));
+        else if (s == "-no-adapt")
+            Colors::noAdapt = true;
+        else if (s == "-low")
+            Colors::setLowSettings();
+        else if (s == "-no-rescale")
+            Colors::noRescale = true;
+        else if (s == "-use-pixmaps")
+            Colors::usePixmaps = true;
+        else if (s == "-fullscreen")
+            Colors::fullscreen = true;
+        else if (s == "-show-br")
+            Colors::showBoundingRect = true;
+        else if (s == "-show-fps")
+            Colors::showFps = true;
+        else if (s == "-no-blending")
+            Colors::noBlending = true;
+        else if (s == "-no-sync")
+            Colors::noScreenSync = true;
+        else if (s.startsWith("-menu"))
+            Colors::menuCount = int(parseFloat(s, "-menu"));
+        else if (s.startsWith("-use-timer-update"))
+            Colors::noTimerUpdate = !bool(parseFloat(s, "-use-timer-update"));
+        else if (s.startsWith("-pause"))
+            Colors::pause = bool(parseFloat(s, "-pause"));
+        else if (s == "-no-ticker-morph")
+            Colors::noTickerMorph = true;
+        else if (s == "-use-window-mask")
+            Colors::noWindowMask = false;
+        else if (s == "-use-loop")
+            Colors::useLoop = true;
+        else if (s == "-use-8bit")
+            Colors::useEightBitPalette = true;
+        else if (s.startsWith("-8bit"))
+            Colors::useEightBitPalette = bool(parseFloat(s, "-8bit"));
+        else if (s == "-use-balls")
+            Colors::useButtonBalls = true;
+        else if (s.startsWith("-ticker-letters"))
+            Colors::tickerLetterCount = int(parseFloat(s, "-ticker-letters"));
+        else if (s.startsWith("-ticker-text"))
+            Colors::tickerText = parseText(s, "-ticker-text");
+        else if (s.startsWith("-ticker-speed"))
+            Colors::tickerMoveSpeed = parseFloat(s, "-ticker-speed");
+        else if (s.startsWith("-ticker-morph-speed"))
+            Colors::tickerMorphSpeed = parseFloat(s, "-ticker-morph-speed");
+        else if (s.startsWith("-animation-speed"))
+            Colors::animSpeed = parseFloat(s, "-animation-speed");
+        else if (s.startsWith("-fps"))
+            Colors::fps = int(parseFloat(s, "-fps"));
+        else if (s.startsWith("-h") || s.startsWith("-help")){
+            QMessageBox::warning(0, "Arguments",
+                                 QString("Usage: qtdemo [-verbose] [-no-adapt] [-opengl] [-direct3d] [-software] [-fullscreen] [-ticker[0|1]] ")
+                                 + "[-animations[0|1]] [-no-blending] [-no-sync] [-use-timer-update[0|1]] [-pause[0|1]]  "
+                                 + "[-use-window-mask] [-no-rescale] "
+                                 + "[-use-pixmaps] [-show-fps] [-show-br] [-8bit[0|1]] [-menu<int>] [-use-loop] [-use-balls] "
+                                 + "[-animation-speed<float>] [-fps<int>] "
+                                 + "[-low] [-ticker-letters<int>] [-ticker-speed<float>] [-no-ticker-morph] "
+                                 + "[-ticker-morph-speed<float>] [-ticker-text<string>]");
+            exit(0);
+        }
+    }
+
+    Colors::postConfigure();
+}
+
+void Colors::setLowSettings()
+{
+    Colors::openGlRendering = false;
+    Colors::direct3dRendering = false;
+    Colors::softwareRendering = true;
+    Colors::noTicker = true;
+    Colors::noTimerUpdate = true;
+    Colors::fps = 30;
+    Colors::usePixmaps = true;
+    Colors::noAnimations = true;
+    Colors::noBlending = true;
+}
+
+void Colors::detectSystemResources()
+{
+#ifndef QT_NO_OPENGL
+    if (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0)
+        Colors::glVersion = "2.0 or higher";
+    else if (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_5)
+        Colors::glVersion = "1.5";
+    else if (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_4)
+        Colors::glVersion = "1.4";
+    else if (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_3)
+        Colors::glVersion = "1.3 or lower";
+    if (Colors::verbose)
+        qDebug() << "- OpenGL version:" << Colors::glVersion;
+
+    QGLWidget glw;
+    if (!QGLFormat::hasOpenGL()
+        || !glw.format().directRendering()
+        || !(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_5)
+        || glw.depth() < 24
+    )
+#else
+    if (Colors::verbose)
+        qDebug() << "- OpenGL not supported by current build of Qt";
+#endif
+    {
+        Colors::openGlAwailable = false;
+        if (Colors::verbose)
+            qDebug("- OpenGL not recommended on this system");
+    }
+
+#if defined(Q_WS_WIN)
+    Colors::direct3dAwailable = false; // for now.
+#endif
+
+#if defined(Q_WS_X11)
+    // check if X render is present:
+    QPixmap tmp(1, 1);
+    if (!tmp.x11PictureHandle()){
+        Colors::xRenderPresent = false;
+        if (Colors::verbose)
+            qDebug("- X render not present");
+    }
+
+#endif
+
+    QWidget w;
+    if (Colors::verbose)
+        qDebug() << "- Color depth: " << QString::number(w.depth());
+}
+
+void Colors::postConfigure()
+{
+    if (!Colors::noAdapt){
+        QWidget w;
+        if (w.depth() < 16){
+            Colors::useEightBitPalette = true;
+            Colors::adapted = true;
+            if (Colors::verbose)
+                qDebug() << "- Adapt: Color depth less than 16 bit. Using 8 bit palette";
+        }
+
+        if (!Colors::xRenderPresent){
+            Colors::setLowSettings();
+            Colors::adapted = true;
+            if (Colors::verbose)
+                qDebug() << "- Adapt: X renderer not present. Using low settings";
+        }
+    }
+
+#if !defined(Q_WS_WIN)
+    if (Colors::direct3dRendering){
+        Colors::direct3dRendering = false;
+            qDebug() << "- WARNING: Direct3D specified, but not supported on this platform";
+    }
+#endif
+
+    if (!Colors::openGlRendering && !Colors::direct3dRendering && !Colors::softwareRendering){
+        // The user has not decided rendering system. So we do it instead:
+#if defined(Q_WS_WIN)
+        if (Colors::direct3dAwailable)
+            Colors::direct3dRendering = true;
+        else
+#endif
+        if (Colors::openGlAwailable)
+            Colors::openGlRendering = true;
+        else
+            Colors::softwareRendering = true;
+    }
+}
+
+
diff --git a/demos/qtdemo/colors.h b/demos/qtdemo/colors.h
new file mode 100644
index 0000000..58865c6
--- /dev/null
+++ b/demos/qtdemo/colors.h
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COLORS_H
+#define COLORS_H
+
+#include <QtGui>
+#include <QBrush>
+
+class Colors
+{
+private:
+    Colors(){};
+
+public:
+    static void parseArgs(int argc, char *argv[]);
+    static void detectSystemResources();
+    static void postConfigure();
+    static void setLowSettings();
+
+    // Colors:
+    static QColor sceneBg1;
+    static QColor sceneBg2;
+    static QColor sceneBg1Line;
+    static QColor paperBg;
+    static QColor menuTextFg;
+    static QColor buttonText;
+    static QColor buttonBgLow;
+    static QColor buttonBgHigh;
+    static QColor tt_green;
+    static QColor fadeOut;
+    static QColor sceneLine;
+    static QColor heading;
+    static QString contentColor;
+    static QString glVersion;
+
+    // Guides:
+    static int stageStartY;
+    static int stageHeight;
+    static int stageStartX;
+    static int stageWidth;
+    static int contentStartY;
+    static int contentHeight;
+
+    // properties:
+    static bool openGlRendering;
+    static bool direct3dRendering;
+    static bool softwareRendering;
+    static bool openGlAwailable;
+    static bool direct3dAwailable;
+    static bool xRenderPresent;
+    static bool noAdapt;
+    static bool noTicker;
+    static bool noRescale;
+    static bool noAnimations;
+    static bool noBlending;
+    static bool noScreenSync;
+    static bool useLoop;
+    static bool noWindowMask;
+    static bool usePixmaps;
+    static bool useEightBitPalette;
+    static bool fullscreen;
+    static bool showBoundingRect;
+    static bool showFps;
+    static bool noTimerUpdate;
+    static bool noTickerMorph;
+    static bool useButtonBalls;
+    static bool adapted;
+    static bool verbose;
+    static bool pause;
+
+    static float animSpeed;
+    static float animSpeedButtons;
+    static float benchmarkFps;
+    static int tickerLetterCount;
+    static int fps;
+    static int menuCount;
+    static float tickerMoveSpeed;
+    static float tickerMorphSpeed;
+    static QString tickerText;
+    static QString rootMenuName;
+
+    // fonts
+    static QFont contentFont();
+    static QFont headingFont();
+    static QFont buttonFont();
+    static QFont tickerFont();
+
+};
+
+#endif // COLORS_H
+
diff --git a/demos/qtdemo/demoitem.cpp b/demos/qtdemo/demoitem.cpp
new file mode 100644
index 0000000..0335bd3
--- /dev/null
+++ b/demos/qtdemo/demoitem.cpp
@@ -0,0 +1,280 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "demoitem.h"
+#include "menumanager.h"
+#include "guide.h"
+#include "colors.h"
+
+QHash<QString, SharedImage *> DemoItem::sharedImageHash;
+QMatrix DemoItem::matrix;
+
+DemoItem::DemoItem(QGraphicsScene *scene, QGraphicsItem *parent) : QGraphicsItem(parent, scene)
+{
+    this->opacity = 1.0;
+    this->locked = false;
+    this->prepared = false;
+    this->neverVisible = false;
+    this->noSubPixeling = false;
+    this->currentAnimation = 0;
+    this->currGuide = 0;
+    this->guideFrame = 0;
+    this->sharedImage = new SharedImage();
+    ++this->sharedImage->refCount;
+}
+
+DemoItem::~DemoItem()
+{
+    if(--this->sharedImage->refCount == 0){
+        if (!this->hashKey.isEmpty())
+            DemoItem::sharedImageHash.remove(this->hashKey);
+        delete this->sharedImage;
+    }
+}
+
+void DemoItem::setNeverVisible(bool never)
+{
+    Q_UNUSED(never);
+/*
+    this->neverVisible = never;
+    if (never){
+        this->setVisible(false);
+        QList<QGraphicsItem *> c = children();
+        for (int i=0; i<c.size(); i++){
+            DemoItem *d = dynamic_cast<DemoItem *>(c[i]); // Don't use dynamic cast because it needs RTTI support.
+            if (d)
+                d->setNeverVisible(true);
+            else{
+                c[i]->setVisible(false);
+            }
+        }
+    }
+*/
+}
+
+void DemoItem::setRecursiveVisible(bool visible){
+    if (visible && this->neverVisible){
+        this->setVisible(false);
+        return;
+    }
+
+    this->setVisible(visible);
+    QList<QGraphicsItem *> c = children();
+    for (int i=0; i<c.size(); i++){
+        // DemoItem *d = dynamic_cast<DemoItem *>(c[i]);
+        // if (d)
+        //     d->setRecursiveVisible(visible);
+        // else{
+            c[i]->setVisible(visible);
+        // }
+    }
+}
+
+void DemoItem::useGuide(Guide *guide, float startFrame)
+{
+    this->startFrame = startFrame;
+    this->guideFrame = startFrame;
+    while (this->guideFrame > guide->startLength + guide->length()){
+        if (guide->nextGuide == guide->firstGuide)
+            break;
+
+        guide = guide->nextGuide;
+    }
+    this->currGuide = guide;
+}
+
+void DemoItem::guideAdvance(float distance)
+{
+    this->guideFrame += distance;
+    while (this->guideFrame > this->currGuide->startLength + this->currGuide->length()){
+        this->currGuide = this->currGuide->nextGuide;
+        if (this->currGuide == this->currGuide->firstGuide)
+            this->guideFrame -= this->currGuide->lengthAll();
+    }
+}
+
+void DemoItem::guideMove(float moveSpeed)
+{
+    this->currGuide->guide(this, moveSpeed);
+}
+
+void DemoItem::setPosUsingSheepDog(const QPointF &dest, const QRectF &sceneFence)
+{
+    this->setPos(dest);
+    if (sceneFence.isNull())
+        return;
+
+    // I agree. This is not the optimal way of doing it.
+    // But don't want for use time on it now....
+    float itemWidth = this->boundingRect().width();
+    float itemHeight = this->boundingRect().height();
+    float fenceRight = sceneFence.x() + sceneFence.width();
+    float fenceBottom = sceneFence.y() + sceneFence.height();
+
+    if (this->scenePos().x() < sceneFence.x()) this->moveBy(this->mapFromScene(QPointF(sceneFence.x(), 0)).x(), 0);
+    if (this->scenePos().x() > fenceRight - itemWidth) this->moveBy(this->mapFromScene(QPointF(fenceRight - itemWidth, 0)).x(), 0);
+    if (this->scenePos().y() < sceneFence.y()) this->moveBy(0, this->mapFromScene(QPointF(0, sceneFence.y())).y());
+    if (this->scenePos().y() > fenceBottom - itemHeight) this->moveBy(0, this->mapFromScene(QPointF(0, fenceBottom - itemHeight)).y());
+}
+
+void DemoItem::setGuidedPos(const QPointF &pos)
+{
+    this->guidedPos = pos;
+}
+
+QPointF DemoItem::getGuidedPos()
+{
+    return this->guidedPos;
+}
+
+void DemoItem::switchGuide(Guide *guide)
+{
+    this->currGuide = guide;
+    this->guideFrame = 0;
+}
+
+bool DemoItem::inTransition()
+{
+    if (this->currentAnimation)
+        return this->currentAnimation->running();
+    else
+        return false;
+}
+
+void DemoItem::setMatrix(const QMatrix &matrix)
+{
+    DemoItem::matrix = matrix;
+}
+
+void DemoItem::useSharedImage(const QString &hashKey)
+{
+    this->hashKey = hashKey;
+    if (!sharedImageHash.contains(hashKey))
+        sharedImageHash.insert(hashKey, this->sharedImage);
+    else {
+        if(--this->sharedImage->refCount == 0)
+            delete this->sharedImage;
+        this->sharedImage = sharedImageHash.value(hashKey);
+        ++this->sharedImage->refCount;
+    }
+}
+
+bool DemoItem::validateImage()
+{
+    if ((this->sharedImage->matrix != DemoItem::matrix && !Colors::noRescale) || !(this->sharedImage->image || this->sharedImage->pixmap)){
+        // (Re)create image according to new matrix
+        delete this->sharedImage->image;
+        this->sharedImage->image = 0;
+        delete this->sharedImage->pixmap;
+        this->sharedImage->pixmap = 0;
+        this->sharedImage->matrix = DemoItem::matrix;
+
+        // Let subclass create and draw a new image according to the new matrix
+        QImage *image = this->createImage(Colors::noRescale ? QMatrix() : DemoItem::matrix);
+        if (image){
+            if (Colors::showBoundingRect){
+                // draw red transparent rect
+                QPainter painter(image);
+                painter.fillRect(image->rect(), QColor(255, 0, 0, 50));
+                painter.end();
+            }
+
+            this->sharedImage->unscaledBoundingRect = this->sharedImage->matrix.inverted().mapRect(image->rect());
+            if (Colors::usePixmaps){
+                if (image->isNull())
+                    this->sharedImage->pixmap = new QPixmap(1, 1);
+                else
+                    this->sharedImage->pixmap = new QPixmap(image->size());
+                this->sharedImage->pixmap->fill(QColor(0, 0, 0, 0));
+                QPainter painter(this->sharedImage->pixmap);
+                painter.drawImage(0, 0, *image);
+                delete image;
+            } else {
+                this->sharedImage->image = image;
+            }
+            return true;
+        } else
+            return false;
+    }
+    return true;
+}
+
+QRectF DemoItem::boundingRect() const
+{
+    const_cast<DemoItem *>(this)->validateImage();
+    return this->sharedImage->unscaledBoundingRect;
+}
+
+void DemoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    if (this->validateImage()){
+
+        bool wasSmoothPixmapTransform = painter->testRenderHint(QPainter::SmoothPixmapTransform);
+        painter->setRenderHint(QPainter::SmoothPixmapTransform);
+
+        if (Colors::noRescale){
+            // Let the painter scale the image for us.
+            // This may degrade both quality and performance
+            if (this->sharedImage->image)
+                painter->drawImage(this->pos(), *this->sharedImage->image);
+            else
+                painter->drawPixmap(this->pos(), *this->sharedImage->pixmap);
+        }
+        else {
+            QMatrix m = painter->worldMatrix();
+            painter->setWorldMatrix(QMatrix());
+            float x = this->noSubPixeling ? qRound(m.dx()) : m.dx();
+            float y = this->noSubPixeling ? qRound(m.dy()) : m.dy();
+            if (this->sharedImage->image)
+                painter->drawImage(QPointF(x, y), *this->sharedImage->image);
+            else
+                painter->drawPixmap(QPointF(x, y), *this->sharedImage->pixmap);
+        }
+
+        if (!wasSmoothPixmapTransform) {
+            painter->setRenderHint(QPainter::SmoothPixmapTransform, false);
+        }
+
+    }
+}
diff --git a/demos/qtdemo/demoitem.h b/demos/qtdemo/demoitem.h
new file mode 100644
index 0000000..e03327b
--- /dev/null
+++ b/demos/qtdemo/demoitem.h
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DEMO_ITEM_H
+#define DEMO_ITEM_H
+
+#include <QtGui>
+
+class DemoItemAnimation;
+class Guide;
+
+class SharedImage
+{
+public:
+    SharedImage() : refCount(0), image(0), pixmap(0){};
+    ~SharedImage()
+    {
+        delete image;
+        delete pixmap;
+    }
+
+    int refCount;
+    QImage *image;
+    QPixmap *pixmap;
+    QMatrix matrix;
+    QRectF unscaledBoundingRect;
+};
+
+class DemoItem : public QGraphicsItem
+{
+
+public:
+    DemoItem(QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+    virtual ~DemoItem();
+
+    bool inTransition();
+    virtual void animationStarted(int id = 0){ Q_UNUSED(id); };
+    virtual void animationStopped(int id = 0){ Q_UNUSED(id); };
+    virtual void prepare(){};
+    void setRecursiveVisible(bool visible);
+    void useSharedImage(const QString &hashKey);
+    void setNeverVisible(bool never = true);
+    static void setMatrix(const QMatrix &matrix);
+    virtual QRectF boundingRect() const; // overridden
+    void setPosUsingSheepDog(const QPointF &dest, const QRectF &sceneFence);
+
+    qreal opacity;
+    bool locked;
+    DemoItemAnimation *currentAnimation;
+    bool noSubPixeling;
+
+    // Used if controlled by a guide:
+    void useGuide(Guide *guide, float startFrame = 0);
+    void guideAdvance(float distance);
+    void guideMove(float moveSpeed);
+    void setGuidedPos(const QPointF &position);
+    QPointF getGuidedPos();
+    float startFrame;
+    float guideFrame;
+    Guide *currGuide;
+
+protected:
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option = 0, QWidget *widget = 0); // overridden
+    virtual QImage *createImage(const QMatrix &) const { return 0; };
+    virtual bool collidesWithItem(const QGraphicsItem *, Qt::ItemSelectionMode) const { return false; };
+    bool prepared;
+
+private:
+    SharedImage *sharedImage;
+    QString hashKey;
+    bool neverVisible;
+    bool validateImage();
+
+    // Used if controlled by a guide:
+    void switchGuide(Guide *guide);
+    friend class Guide;
+    QPointF guidedPos;
+
+    // The next static hash is shared amongst all demo items, and
+    // has the purpose of reusing images to save memory and time
+    static QHash<QString, SharedImage *> sharedImageHash;
+    static QMatrix matrix;
+};
+
+#endif // DEMO_ITEM_H
+
diff --git a/demos/qtdemo/demoitemanimation.cpp b/demos/qtdemo/demoitemanimation.cpp
new file mode 100644
index 0000000..92b2d24
--- /dev/null
+++ b/demos/qtdemo/demoitemanimation.cpp
@@ -0,0 +1,219 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "demoitemanimation.h"
+#include "demoitem.h"
+#include "colors.h"
+
+DemoItemAnimation::DemoItemAnimation(DemoItem *item, INOROUT inOrOut)
+{
+    this->opacityAt0 = 1.0;
+    this->opacityAt1 = 1.0;
+    this->startDelay = 0;
+    this->inOrOut = inOrOut;
+    this->hideOnFinished = false;
+    this->forcePlay = false;
+    this->timeline = new QTimeLine(5000);
+    this->timeline->setFrameRange(0, 2000);
+    this->timeline->setUpdateInterval(int(1000.0/Colors::fps));
+    this->moveOnPlay = false;
+    setTimeLine(this->timeline);
+    setItem(item);
+}
+
+DemoItemAnimation::~DemoItemAnimation()
+{
+    // Do not delete demoitem. It is not
+    // owned by an animation
+    delete this->timeline;
+}
+
+void DemoItemAnimation::prepare()
+{
+    this->demoItem()->prepare();
+}
+
+void DemoItemAnimation::setStartPos(const QPointF &pos){
+    this->startPos = pos;
+}
+
+void DemoItemAnimation::setDuration(int duration)
+{
+    duration = int(duration * Colors::animSpeed);
+    this->timeline->setDuration(duration);
+    this->moveOnPlay = true;
+}
+
+void DemoItemAnimation::setCurrentTime(int ms)
+{
+    this->timeline->setCurrentTime(ms);
+}
+
+bool DemoItemAnimation::notOwnerOfItem()
+{
+    return this != demoItem()->currentAnimation;
+}
+
+void DemoItemAnimation::play(bool fromStart, bool force)
+{
+    this->fromStart = fromStart;
+    this->forcePlay = force;
+
+    QPointF currPos = this->demoItem()->pos();
+
+    // If the item that this animation controls in currently under the
+    // control of another animation, stop that animation first
+    if (this->demoItem()->currentAnimation)
+        this->demoItem()->currentAnimation->timeline->stop();
+    this->demoItem()->currentAnimation = this;
+    this->timeline->stop();
+
+    if (Colors::noAnimations && !this->forcePlay){
+        this->timeline->setCurrentTime(1);
+        this->demoItem()->setPos(this->posAt(1));
+    }
+    else{
+        if (this->demoItem()->isVisible())
+            // If the item is already visible, start the animation from
+            // the items current position rather than from start.
+            this->setPosAt(0.0, currPos);
+        else
+            this->setPosAt(0.0, this->startPos);
+
+        if (this->fromStart){
+            this->timeline->setCurrentTime(0);
+            this->demoItem()->setPos(this->posAt(0));
+        }
+    }
+
+    if (this->inOrOut == ANIM_IN)
+        this->demoItem()->setRecursiveVisible(true);
+
+    if (this->startDelay){
+        QTimer::singleShot(this->startDelay, this, SLOT(playWithoutDelay()));
+        return;
+    }
+    else
+        this->playWithoutDelay();
+}
+
+void DemoItemAnimation::playWithoutDelay()
+{
+    if (this->moveOnPlay && !(Colors::noAnimations && !this->forcePlay))
+        this->timeline->start();
+    this->demoItem()->animationStarted(this->inOrOut);
+}
+
+void DemoItemAnimation::stop(bool reset)
+{
+    this->timeline->stop();
+    if (reset)
+        this->demoItem()->setPos(this->posAt(0));
+    if (this->hideOnFinished && !this->moveOnPlay)
+        this->demoItem()->setRecursiveVisible(false);
+    this->demoItem()->animationStopped(this->inOrOut);
+}
+
+void DemoItemAnimation::setRepeat(int nr)
+{
+    this->timeline->setLoopCount(nr);
+}
+
+void DemoItemAnimation::playReverse()
+{
+}
+
+bool DemoItemAnimation::running()
+{
+    return (this->timeLine()->state() == QTimeLine::Running);
+}
+
+bool DemoItemAnimation::runningOrItemLocked()
+{
+    return (this->running() || this->demoItem()->locked);
+}
+
+void DemoItemAnimation::lockItem(bool state)
+{
+    this->demoItem()->locked = state;
+}
+
+DemoItem *DemoItemAnimation::demoItem()
+{
+    return (DemoItem *) this->item();
+}
+
+void DemoItemAnimation::setOpacityAt0(qreal opacity)
+{
+    this->opacityAt0 = opacity;
+}
+
+void DemoItemAnimation::setOpacityAt1(qreal opacity)
+{
+    this->opacityAt1 = opacity;
+}
+
+void DemoItemAnimation::setOpacity(qreal step)
+{
+    DemoItem *demoItem = (DemoItem *) item();
+    demoItem->opacity = this->opacityAt0 + step * step * step * (this->opacityAt1 - this->opacityAt0);
+}
+
+void DemoItemAnimation::afterAnimationStep(qreal step)
+{
+    if (step == 1.0f){
+        if (this->timeline->loopCount() > 0){
+            // animation finished.
+            if (this->hideOnFinished)
+                this->demoItem()->setRecursiveVisible(false);
+            this->demoItem()->animationStopped(this->inOrOut);
+        }
+    } else if (Colors::noAnimations && !this->forcePlay){
+        // The animation is not at end, but
+        // the animations should not play, so go to end.
+        this->setStep(1.0f); // will make this method being called recursive.
+    }
+}
+
+
+
+
+
diff --git a/demos/qtdemo/demoitemanimation.h b/demos/qtdemo/demoitemanimation.h
new file mode 100644
index 0000000..ad89ada
--- /dev/null
+++ b/demos/qtdemo/demoitemanimation.h
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DEMO_ITEM_ANIMATION_H
+#define DEMO_ITEM_ANIMATION_H
+
+#include <QtCore>
+#include <QtGui>
+
+class DemoItem;
+
+class DemoItemAnimation : public QGraphicsItemAnimation
+{
+    Q_OBJECT
+
+public:
+    enum INOROUT {ANIM_IN, ANIM_OUT, ANIM_UNSPECIFIED};
+
+    DemoItemAnimation(DemoItem *item, INOROUT inOrOut = ANIM_UNSPECIFIED);
+    virtual ~DemoItemAnimation();
+
+    virtual void play(bool fromStart = true, bool force = false);
+    virtual void playReverse();
+    virtual void stop(bool reset = true);
+    virtual void setRepeat(int nr = 0);
+
+    void setDuration(int duration);
+    void setDuration(float duration){ setDuration(int(duration)); };
+    void setOpacityAt0(qreal opacity);
+    void setOpacityAt1(qreal opacity);
+    void setOpacity(qreal step);
+    void setCurrentTime(int ms);
+    void setStartPos(const QPointF &pos);
+    bool notOwnerOfItem();
+
+    bool running();
+    bool runningOrItemLocked();
+    void lockItem(bool state);
+    void prepare();
+
+    DemoItem *demoItem();
+
+    virtual void afterAnimationStep(qreal step); // overridden
+
+    QTimeLine *timeline;
+    qreal opacityAt0;
+    qreal opacityAt1;
+    int startDelay;
+    QPointF startPos;
+    bool hideOnFinished;
+    bool moveOnPlay;
+    bool forcePlay;
+    bool fromStart;
+    INOROUT inOrOut;
+
+private slots:
+    virtual void playWithoutDelay();
+};
+
+#endif // DEMO_ITEM_ANIMATION_H
+
+
+
diff --git a/demos/qtdemo/demoscene.cpp b/demos/qtdemo/demoscene.cpp
new file mode 100644
index 0000000..29b73d3
--- /dev/null
+++ b/demos/qtdemo/demoscene.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "demoscene.h"
+
+void DemoScene::drawItems(QPainter *painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[], QWidget *widget)
+{
+    for (int i=0; i<numItems; ++i) {
+        painter->save();
+        painter->setMatrix(items[i]->sceneMatrix(), true);
+        items[i]->paint(painter, &options[i], widget);
+        painter->restore();
+    }
+}
+
+
diff --git a/demos/qtdemo/demoscene.h b/demos/qtdemo/demoscene.h
new file mode 100644
index 0000000..e4838c7
--- /dev/null
+++ b/demos/qtdemo/demoscene.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAIN_VIEW_H
+#define MAIN_VIEW_H
+
+#include <QtGui>
+
+class DemoScene : public QGraphicsScene
+{
+public:
+    DemoScene(QObject *parent) : QGraphicsScene(parent){};
+
+protected:
+    void drawItems(QPainter *painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[], QWidget *widget);
+};
+
+#endif // MAIN_VIEW_H
+
diff --git a/demos/qtdemo/demotextitem.cpp b/demos/qtdemo/demotextitem.cpp
new file mode 100644
index 0000000..cd549fc
--- /dev/null
+++ b/demos/qtdemo/demotextitem.cpp
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "demotextitem.h"
+#include "colors.h"
+
+DemoTextItem::DemoTextItem(const QString &text, const QFont &font, const QColor &textColor,
+                           float textWidth, QGraphicsScene *scene, QGraphicsItem *parent, TYPE type, const QColor &bgColor)
+                           : DemoItem(scene, parent)
+{
+    this->type = type;
+    this->text = text;
+    this->font = font;
+    this->textColor = textColor;
+    this->bgColor = bgColor;
+    this->textWidth = textWidth;
+    this->noSubPixeling = true;
+}
+
+void DemoTextItem::setText(const QString &text)
+{
+    this->text = text;
+    this->update();
+}
+
+QImage *DemoTextItem::createImage(const QMatrix &matrix) const
+{
+    if (this->type == DYNAMIC_TEXT)
+        return 0;
+
+    float sx = qMin(matrix.m11(), matrix.m22());
+    float sy = matrix.m22() < sx ? sx : matrix.m22();
+
+    QGraphicsTextItem textItem(0, 0);
+    textItem.setHtml(this->text);
+    textItem.setTextWidth(this->textWidth);
+    textItem.setFont(this->font);
+    textItem.setDefaultTextColor(this->textColor);
+    textItem.document()->setDocumentMargin(2);
+
+    float w = textItem.boundingRect().width();
+    float h = textItem.boundingRect().height();
+    QImage *image = new QImage(int(w * sx), int(h * sy), QImage::Format_ARGB32_Premultiplied);
+    image->fill(QColor(0, 0, 0, 0).rgba());
+    QPainter painter(image);
+    painter.scale(sx, sy);
+    QStyleOptionGraphicsItem style;
+    textItem.paint(&painter, &style, 0);
+    return image;
+}
+
+
+void DemoTextItem::animationStarted(int)
+{
+    this->noSubPixeling = false;
+}
+
+
+void DemoTextItem::animationStopped(int)
+{
+    this->noSubPixeling = true;
+}
+
+QRectF DemoTextItem::boundingRect() const
+
+{
+    if (this->type == STATIC_TEXT)
+        return DemoItem::boundingRect();
+    return QRectF(0, 0, 50, 20); // Sorry for using magic number
+}
+
+
+void DemoTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    if (this->type == STATIC_TEXT) {
+        DemoItem::paint(painter, option, widget);
+        return;
+    }
+
+    painter->setPen(this->textColor);
+    painter->drawText(0, 0, this->text);
+}
diff --git a/demos/qtdemo/demotextitem.h b/demos/qtdemo/demotextitem.h
new file mode 100644
index 0000000..679e3fb
--- /dev/null
+++ b/demos/qtdemo/demotextitem.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DEMO_TEXT_ITEM_H
+#define DEMO_TEXT_ITEM_H
+
+#include <QtGui>
+#include "demoitem.h"
+
+class DemoTextItem : public DemoItem
+{
+public:
+    enum TYPE {STATIC_TEXT, DYNAMIC_TEXT};
+
+    DemoTextItem(const QString &text, const QFont &font, const QColor &textColor,
+        float textWidth, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0, TYPE type = STATIC_TEXT, const QColor &bgColor = QColor());
+    void setText(const QString &text);
+    QRectF boundingRect() const; // overridden
+    void animationStarted(int id = 0);
+    void animationStopped(int id = 0);
+
+protected:
+    virtual QImage *createImage(const QMatrix &matrix) const; // overridden
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option = 0, QWidget *widget = 0); // overridden
+
+private:
+    float textWidth;
+    QString text;
+    QFont font;
+    QColor textColor;
+    QColor bgColor;
+    TYPE type;
+};
+
+#endif // DEMO_TEXT_ITEM_H
+
diff --git a/demos/qtdemo/dockitem.cpp b/demos/qtdemo/dockitem.cpp
new file mode 100644
index 0000000..7f26f04
--- /dev/null
+++ b/demos/qtdemo/dockitem.cpp
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "dockitem.h"
+#include "colors.h"
+
+DockItem::DockItem(ORIENTATION orien, qreal x, qreal y, qreal width, qreal length, QGraphicsScene *scene, QGraphicsItem *parent)
+    : DemoItem(scene, parent)
+{
+    this->orientation = orien;
+    this->width = width;
+    this->length = length;
+    this->setPos(x, y);
+    this->setZValue(40);
+    this->setupPixmap();
+}
+
+void DockItem::setupPixmap()
+{
+    this->pixmap = new QPixmap(int(this->boundingRect().width()), int(this->boundingRect().height()));
+    this->pixmap->fill(QColor(0, 0, 0, 0));
+    QPainter painter(this->pixmap);
+    // create brush:
+    QColor background = Colors::sceneBg1;
+    QLinearGradient brush(0, 0, 0, this->boundingRect().height());
+    brush.setSpread(QGradient::PadSpread);
+
+    if (this->orientation == DOWN){
+        brush.setColorAt(0.0, background);
+        brush.setColorAt(0.2, background);
+        background.setAlpha(0);
+        brush.setColorAt(1.0, background);
+    }
+    else
+        if (this->orientation == UP){
+        brush.setColorAt(1.0, background);
+        brush.setColorAt(0.8, background);
+        background.setAlpha(0);
+        brush.setColorAt(0.0, background);
+    }
+    else
+        qWarning("DockItem doesn't support the orientation given!");
+
+    painter.fillRect(0, 0, int(this->boundingRect().width()), int(this->boundingRect().height()), brush);
+
+}
+
+DockItem::~DockItem()
+{
+    delete this->pixmap;
+}
+
+QRectF DockItem::boundingRect() const
+{
+    if (this->orientation == UP || this->orientation == DOWN)
+        return QRectF(0, 0, this->length, this->width);
+    else
+        return QRectF(0, 0, this->width, this->length);
+}
+
+void DockItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    painter->drawPixmap(0, 0, *this->pixmap);
+}
+
+
+
diff --git a/demos/qtdemo/dockitem.h b/demos/qtdemo/dockitem.h
new file mode 100644
index 0000000..13473a3
--- /dev/null
+++ b/demos/qtdemo/dockitem.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DOCK_ITEM_H
+#define DOCK_ITEM_H
+
+#include <QtGui>
+#include "demoitem.h"
+
+class DockItem : public DemoItem
+{
+public:
+    enum ORIENTATION {UP, DOWN, LEFT, RIGHT};
+
+    DockItem(ORIENTATION orien, qreal x, qreal y, qreal width, qreal length, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+    virtual ~DockItem();
+
+    virtual QRectF boundingRect() const; // overridden
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); // overridden
+
+    qreal length;
+    qreal width;
+    ORIENTATION orientation;
+
+private:
+    void setupPixmap();
+    QPixmap *pixmap;
+};
+
+#endif // DOCK_ITEM_H
+
diff --git a/demos/qtdemo/examplecontent.cpp b/demos/qtdemo/examplecontent.cpp
new file mode 100644
index 0000000..a568b8c
--- /dev/null
+++ b/demos/qtdemo/examplecontent.cpp
@@ -0,0 +1,158 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "examplecontent.h"
+#include "colors.h"
+#include "menumanager.h"
+#include "imageitem.h"
+#include "headingitem.h"
+
+ExampleContent::ExampleContent(const QString &name, QGraphicsScene *scene, QGraphicsItem *parent)
+    : DemoItem(scene, parent)
+{
+    this->name = name;
+    this->heading = 0;
+    this->description = 0;
+    this->screenshot = 0;
+}
+
+void ExampleContent::prepare()
+{
+    if (!this->prepared){
+        this->prepared = true;
+        this->createContent();
+    }
+}
+
+void ExampleContent::animationStopped(int id)
+{
+    if (id == DemoItemAnimation::ANIM_OUT){
+        // Free up some memory:
+        delete this->heading;
+        delete this->description;
+        delete this->screenshot;
+        this->heading = 0;
+        this->description = 0;
+        this->screenshot = 0;
+        this->prepared = false;
+    }
+}
+
+QString ExampleContent::loadDescription()
+{
+    QByteArray ba = MenuManager::instance()->getHtml(this->name);
+
+    QDomDocument exampleDoc;
+    exampleDoc.setContent(ba, false);
+
+    QDomNodeList paragraphs = exampleDoc.elementsByTagName("p");
+    if (paragraphs.length() < 1 && Colors::verbose)
+        qDebug() << "- ExampleContent::loadDescription(): Could not load description:" << MenuManager::instance()->info[this->name]["docfile"];
+    QString description = Colors::contentColor + QLatin1String("Could not load description. Ensure that the documentation for Qt is built.");
+    for (int p = 0; p < int(paragraphs.length()); ++p) {
+        description = this->extractTextFromParagraph(paragraphs.item(p));
+        if (this->isSummary(description)) {
+            break;
+        }
+    }
+    return Colors::contentColor + description;
+}
+
+bool ExampleContent::isSummary(const QString &text)
+{
+    return (!text.contains("[") &&
+        text.indexOf(QRegExp(QString("(In )?((The|This) )?(%1 )?.*(tutorial|example|demo|application)").arg(this->name), Qt::CaseInsensitive)) != -1);
+}
+
+QString ExampleContent::extractTextFromParagraph(const QDomNode &parentNode)
+{
+    QString description;
+    QDomNode node = parentNode.firstChild();
+
+    while (!node.isNull()) {
+        QString beginTag;
+        QString endTag;
+        if (node.isText())
+            description += Colors::contentColor + node.nodeValue();
+        else if (node.hasChildNodes()) {
+            if (node.nodeName() == "b") {
+                beginTag = "<b>";
+                endTag = "</b>";
+            } else if (node.nodeName() == "a") {
+                beginTag = Colors::contentColor;
+                endTag = "</font>";
+            } else if (node.nodeName() == "i") {
+                beginTag = "<i>";
+                endTag = "</i>";
+            } else if (node.nodeName() == "tt") {
+                beginTag = "<tt>";
+                endTag = "</tt>";
+            }
+            description += beginTag + this->extractTextFromParagraph(node) + endTag;
+        }
+        node = node.nextSibling();
+    }
+
+    return description;
+}
+
+void ExampleContent::createContent()
+{
+    // Create the items:
+    this->heading = new HeadingItem(this->name, this->scene(), this);
+    this->description = new DemoTextItem(this->loadDescription(), Colors::contentFont(),
+        Colors::heading, 500, this->scene(), this);
+    int imgHeight = 340 - int(this->description->boundingRect().height()) + 50;
+    this->screenshot = new ImageItem(QImage::fromData(MenuManager::instance()->getImage(this->name)),
+          550, imgHeight, this->scene(), this);
+
+    // Place the items on screen:
+    this->heading->setPos(0, 3);
+    this->description->setPos(0, this->heading->pos().y() + this->heading->boundingRect().height() + 10);
+    this->screenshot->setPos(0, this->description->pos().y() + this->description->boundingRect().height() + 10);
+}
+
+QRectF ExampleContent::boundingRect() const
+{
+    return QRectF(0, 0, 500, 100);
+}
+
+
diff --git a/demos/qtdemo/examplecontent.h b/demos/qtdemo/examplecontent.h
new file mode 100644
index 0000000..850d64b
--- /dev/null
+++ b/demos/qtdemo/examplecontent.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CONTENT_ITEM_H
+#define CONTENT_ITEM_H
+
+#include <QtGui>
+#include <QtXml>
+#include "demoitem.h"
+
+class HeadingItem;
+class DemoTextItem;
+class ImageItem;
+
+class ExampleContent : public DemoItem
+{
+
+public:
+    ExampleContent(const QString &name, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+
+    virtual QRectF boundingRect() const;
+    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0){};
+    void animationStopped(int id);
+    void prepare();
+
+private:
+    QString name;
+    HeadingItem *heading;
+    DemoTextItem *description;
+    ImageItem *screenshot;
+
+    QString loadDescription();
+    QString extractTextFromParagraph(const QDomNode &parentNode);
+    bool isSummary(const QString &text);
+    void createContent();
+};
+
+#endif // CONTENT_ITEM_H
+
diff --git a/demos/qtdemo/guide.cpp b/demos/qtdemo/guide.cpp
new file mode 100644
index 0000000..1f3c355
--- /dev/null
+++ b/demos/qtdemo/guide.cpp
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <cmath>
+#include "guide.h"
+#include "colors.h"
+
+Guide::Guide(Guide *follows)
+{
+    this->scaleX = 1.0;
+    this->scaleY = 1.0;
+
+    if (follows){
+        while (follows->nextGuide != follows->firstGuide) // append to end
+            follows = follows->nextGuide;
+
+        follows->nextGuide = this;
+        this->prevGuide = follows;
+        this->firstGuide = follows->firstGuide;
+        this->nextGuide = follows->firstGuide;
+        this->startLength = int(follows->startLength + follows->length()) + 1;
+    }
+    else{
+        this->prevGuide = this;
+        this->firstGuide = this;
+        this->nextGuide = this;
+        this->startLength = 0;
+    }
+}
+
+void Guide::setScale(float scaleX, float scaleY, bool all)
+{
+    this->scaleX = scaleX;
+    this->scaleY = scaleY;
+
+    if (all){
+        Guide *next = this->nextGuide;
+        while(next != this){
+            next->scaleX = scaleX;
+            next->scaleY = scaleY;
+            next = next->nextGuide;
+        }
+    }
+}
+
+void Guide::setFence(const QRectF &fence, bool all)
+{
+    this->fence = fence;
+
+    if (all){
+        Guide *next = this->nextGuide;
+        while(next != this){
+            next->fence = fence;
+            next = next->nextGuide;
+        }
+    }
+}
+
+Guide::~Guide()
+{
+    if (this != this->nextGuide && this->nextGuide != this->firstGuide)
+        delete this->nextGuide;
+}
+
+float Guide::lengthAll()
+{
+    float len = length();
+    Guide *next = this->nextGuide;
+    while(next != this){
+        len += next->length();
+        next = next->nextGuide;
+    }
+    return len;
+}
+
+void Guide::move(DemoItem *item, QPointF &dest, float moveSpeed)
+{
+    QLineF walkLine(item->getGuidedPos(), dest);
+    if (moveSpeed >= 0 && walkLine.length() > moveSpeed){
+        // The item is too far away from it's destination point.
+        // So we choose to move it towards it instead.
+        float dx = walkLine.dx();
+        float dy = walkLine.dy();
+
+        if (qAbs(dx) > qAbs(dy)){
+            // walk along x-axis
+            if (dx != 0){
+                float d = moveSpeed * dy / qAbs(dx);
+                float s = dx > 0 ? moveSpeed : -moveSpeed;
+                dest.setX(item->getGuidedPos().x() + s);
+                dest.setY(item->getGuidedPos().y() + d);
+            }
+        }
+        else{
+            // walk along y-axis
+            if (dy != 0){
+                float d = moveSpeed * dx / qAbs(dy);
+                float s = dy > 0 ? moveSpeed : -moveSpeed;
+                dest.setX(item->getGuidedPos().x() + d);
+                dest.setY(item->getGuidedPos().y() + s);
+            }
+        }
+    }
+
+    item->setGuidedPos(dest);
+}
diff --git a/demos/qtdemo/guide.h b/demos/qtdemo/guide.h
new file mode 100644
index 0000000..51ce6c3
--- /dev/null
+++ b/demos/qtdemo/guide.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GUIDE_H
+#define GUIDE_H
+
+#include "demoitem.h"
+
+class Guide
+{
+public:
+    Guide(Guide *follows = 0);
+    virtual ~Guide();
+
+    virtual void guide(DemoItem *item, float moveSpeed) = 0;
+    void move(DemoItem *item, QPointF &dest, float moveSpeed);
+    virtual QPointF startPos(){ return QPointF(0, 0); };
+    virtual QPointF endPos(){ return QPointF(0, 0); };
+    virtual float length(){ return 1; };
+    float lengthAll();
+
+    void setScale(float scaleX, float scaleY, bool all = true);
+    void setFence(const QRectF &fence, bool all = true);
+
+    int startLength;
+    Guide *nextGuide;
+    Guide *firstGuide;
+    Guide *prevGuide;
+    float scaleX;
+    float scaleY;
+    QRectF fence;
+};
+
+#endif // GUIDE_H
+
diff --git a/demos/qtdemo/guidecircle.cpp b/demos/qtdemo/guidecircle.cpp
new file mode 100644
index 0000000..98328dc
--- /dev/null
+++ b/demos/qtdemo/guidecircle.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "guidecircle.h"
+
+static float PI2 = 2*3.1415f;
+
+GuideCircle::GuideCircle(const QRectF &rect, float startAngle, float span, DIRECTION dir, Guide *follows) : Guide(follows)
+{
+    this->radiusX = rect.width() / 2.0;
+    this->radiusY = rect.height() / 2.0;
+    this->posX = rect.topLeft().x();
+    this->posY = rect.topLeft().y();
+    this->spanRad = span * PI2 / -360.0;
+    if (dir == CCW){
+        this->startAngleRad = startAngle * PI2 / -360.0;
+        this->endAngleRad = startAngleRad + spanRad;
+        this->stepAngleRad = this->spanRad / this->length();
+    }
+    else{
+        this->startAngleRad = spanRad + (startAngle * PI2 / -360.0);
+        this->endAngleRad = startAngle * PI2 / -360.0;
+        this->stepAngleRad = -this->spanRad / this->length();
+    }
+}
+
+float GuideCircle::length()
+{
+    return qAbs(this->radiusX * spanRad);
+}
+
+QPointF GuideCircle::startPos()
+{
+    return QPointF((posX + radiusX + radiusX * cos(startAngleRad)) * scaleX,
+                   (posY + radiusY + radiusY * sin(startAngleRad)) * scaleY);
+}
+
+QPointF GuideCircle::endPos()
+{
+    return QPointF((posX + radiusX + radiusX * cos(endAngleRad)) * scaleX,
+                   (posY + radiusY + radiusY * sin(endAngleRad)) * scaleY);
+}
+
+void GuideCircle::guide(DemoItem *item, float moveSpeed)
+{
+    float frame = item->guideFrame - this->startLength;
+    QPointF end((posX + radiusX + radiusX * cos(startAngleRad + (frame * stepAngleRad))) * scaleX,
+                (posY + radiusY + radiusY * sin(startAngleRad + (frame * stepAngleRad))) * scaleY);
+    this->move(item, end, moveSpeed);
+}
diff --git a/demos/qtdemo/guidecircle.h b/demos/qtdemo/guidecircle.h
new file mode 100644
index 0000000..2179527
--- /dev/null
+++ b/demos/qtdemo/guidecircle.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GUIDECIRCLE_H
+#define GUIDECIRCLE_H
+
+#include "guide.h"
+#include "demoitem.h"
+
+class GuideCircle : public Guide
+{
+public:
+    enum DIRECTION {CW = 1, CCW = -1};
+
+    GuideCircle(const QRectF &rect, float startAngle = 0, float span = 360, DIRECTION dir = CCW, Guide *follows = 0);
+
+    void guide(DemoItem *item, float moveSpeed); // overridden
+    QPointF startPos();
+    QPointF endPos();
+    float length();
+
+private:
+    float posX;
+    float posY;
+    float radiusX;
+    float radiusY;
+    float startAngleRad;
+    float endAngleRad;
+    float spanRad;
+    float stepAngleRad;
+};
+
+#endif // GUIDECIRCLE_H
+
diff --git a/demos/qtdemo/guideline.cpp b/demos/qtdemo/guideline.cpp
new file mode 100644
index 0000000..ac01339
--- /dev/null
+++ b/demos/qtdemo/guideline.cpp
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "guideline.h"
+#include <cmath>
+
+GuideLine::GuideLine(const QLineF &line, Guide *follows) : Guide(follows)
+{
+    this->line = line;
+}
+
+GuideLine::GuideLine(const QPointF &end, Guide *follows) : Guide(follows)
+{
+    if (follows)
+        this->line = QLineF(prevGuide->endPos(), end);
+    else
+        this->line = QLineF(QPointF(0, 0), end);
+}
+
+float GuideLine::length()
+{
+    return line.length();
+}
+
+QPointF GuideLine::startPos()
+{
+    return QPointF(this->line.p1().x() * scaleX, this->line.p1().y() * scaleY);
+}
+
+QPointF GuideLine::endPos()
+{
+    return QPointF(this->line.p2().x() * scaleX, this->line.p2().y() * scaleY);
+}
+
+void GuideLine::guide(DemoItem *item, float moveSpeed)
+{
+    float frame = item->guideFrame - this->startLength;
+    float endX = (this->line.p1().x() + (frame * this->line.dx() / this->length())) * scaleX;
+    float endY = (this->line.p1().y() + (frame * this->line.dy() / this->length())) * scaleY;
+    QPointF pos(endX, endY);
+    this->move(item, pos, moveSpeed);
+}
+
diff --git a/demos/qtdemo/guideline.h b/demos/qtdemo/guideline.h
new file mode 100644
index 0000000..93daaa8
--- /dev/null
+++ b/demos/qtdemo/guideline.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GUIDELINE_H
+#define GUIDELINE_H
+
+#include "guide.h"
+#include "demoitem.h"
+
+class GuideLine : public Guide
+{
+public:
+    GuideLine(const QLineF &line, Guide *follows = 0);
+    GuideLine(const QPointF &end, Guide *follows = 0);
+
+    void guide(DemoItem *item, float moveSpeed); // overridden
+    QPointF startPos();
+    QPointF endPos();
+    float length();
+
+private:
+    QLineF line;
+
+};
+
+#endif // GUIDELINE_H
+
diff --git a/demos/qtdemo/headingitem.cpp b/demos/qtdemo/headingitem.cpp
new file mode 100644
index 0000000..80a255a
--- /dev/null
+++ b/demos/qtdemo/headingitem.cpp
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "headingitem.h"
+#include "colors.h"
+
+HeadingItem::HeadingItem(const QString &text, QGraphicsScene *scene, QGraphicsItem *parent)
+    : DemoItem(scene, parent)
+{
+    this->text = text;
+    this->noSubPixeling = true;
+}
+
+QImage *HeadingItem::createImage(const QMatrix &matrix) const
+{
+    float sx = qMin(matrix.m11(), matrix.m22());
+    float sy = matrix.m22() < sx ? sx : matrix.m22();
+    QFontMetrics fm(Colors::headingFont());
+
+    float w = fm.width(this->text) + 1;
+    float h = fm.height();
+    float xShadow = 3.0f;
+    float yShadow = 3.0f;
+
+    QImage *image = new QImage(int((w + xShadow) * sx), int((h + yShadow) * sy), QImage::Format_ARGB32_Premultiplied);
+    image->fill(QColor(0, 0, 0, 0).rgba());
+    QPainter painter(image);
+    painter.setFont(Colors::headingFont());
+    painter.scale(sx, sy);
+
+    //draw shadow
+    QLinearGradient brush_shadow(xShadow, yShadow, w, yShadow);
+    brush_shadow.setSpread(QLinearGradient::PadSpread);
+    if (Colors::useEightBitPalette)
+        brush_shadow.setColorAt(0.0f, QColor(0, 0, 0));
+    else
+        brush_shadow.setColorAt(0.0f, QColor(0, 0, 0, 100));
+    QPen pen_shadow;
+    pen_shadow.setBrush(brush_shadow);
+    painter.setPen(pen_shadow);
+    painter.drawText(int(xShadow), int(yShadow), int(w), int(h), Qt::AlignLeft, this->text);
+
+    // draw text
+    QLinearGradient brush_text(0, 0, w, w);
+    brush_text.setSpread(QLinearGradient::PadSpread);
+    brush_text.setColorAt(0.0f, QColor(255, 255, 255));
+    brush_text.setColorAt(0.2f, QColor(255, 255, 255));
+    brush_text.setColorAt(0.5f, QColor(190, 190, 190));
+    QPen pen_text;
+    pen_text.setBrush(brush_text);
+    painter.setPen(pen_text);
+    painter.drawText(0, 0, int(w), int(h), Qt::AlignLeft, this->text);
+    return image;
+}
+
+
+void HeadingItem::animationStarted(int)
+{
+    this->noSubPixeling = false;
+}
+
+
+void HeadingItem::animationStopped(int)
+{
+    this->noSubPixeling = true;
+}
diff --git a/demos/qtdemo/headingitem.h b/demos/qtdemo/headingitem.h
new file mode 100644
index 0000000..a5cb997
--- /dev/null
+++ b/demos/qtdemo/headingitem.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HEADING_ITEM_H
+#define HEADING_ITEM_H
+
+#include <QtGui>
+#include "demoitem.h"
+
+class HeadingItem : public DemoItem
+{
+public:
+    HeadingItem(const QString &text, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+    void animationStarted(int id = 0);
+    void animationStopped(int id = 0);
+
+protected:
+    virtual QImage *createImage(const QMatrix &matrix) const; // overridden
+
+private:
+    QString text;
+};
+
+#endif // HEADING_ITEM_H
+
diff --git a/demos/qtdemo/imageitem.cpp b/demos/qtdemo/imageitem.cpp
new file mode 100644
index 0000000..e556011
--- /dev/null
+++ b/demos/qtdemo/imageitem.cpp
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "imageitem.h"
+#include "colors.h"
+
+ImageItem::ImageItem(const QImage &image, int maxWidth, int maxHeight, QGraphicsScene *scene,
+        QGraphicsItem *parent, bool adjustSize, float scale) : DemoItem(scene, parent)
+{
+    this->image = image;
+    this->maxWidth = maxWidth;
+    this->maxHeight = maxHeight;
+    this->adjustSize = adjustSize;
+    this->scale = scale;
+}
+
+QImage *ImageItem::createImage(const QMatrix &matrix) const
+{
+    QImage *original = new QImage(image);
+    if (original->isNull()){
+        return original; // nothing we can do about it...
+    }
+
+    QPoint size = matrix.map(QPoint(this->maxWidth, this->maxHeight));
+    float w = size.x(); // x, y is the used as width, height
+    float h = size.y();
+
+    // Optimization: if image is smaller than maximum allowed size, just return the loaded image
+    if (original->size().height() <= h && original->size().width() <= w && !this->adjustSize && this->scale == 1)
+        return original;
+
+    // Calculate what the size of the final image will be:
+    w = qMin(w, float(original->size().width()) * this->scale);
+    h = qMin(h, float(original->size().height()) * this->scale);
+
+    float adjustx = 1.0f;
+    float adjusty = 1.0f;
+    if (this->adjustSize){
+        adjustx = qMin(matrix.m11(), matrix.m22());
+        adjusty = matrix.m22() < adjustx ? adjustx : matrix.m22();
+        w *= adjustx;
+        h *= adjusty;
+    }
+
+    // Create a new image with correct size, and draw original on it
+    QImage *image = new QImage(int(w+2), int(h+2), QImage::Format_ARGB32_Premultiplied);
+    image->fill(QColor(0, 0, 0, 0).rgba());
+    QPainter painter(image);
+    painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+    if (this->adjustSize)
+        painter.scale(adjustx, adjusty);
+    if (this->scale != 1)
+       painter.scale(this->scale, this->scale);
+    painter.drawImage(0, 0, *original);
+
+    if (!this->adjustSize){
+       // Blur out edges
+       int blur = 30;
+       if (h < original->height()){
+           QLinearGradient brush1(0, h - blur, 0, h);
+           brush1.setSpread(QGradient::PadSpread);
+           brush1.setColorAt(0.0, QColor(0, 0, 0, 0));
+           brush1.setColorAt(1.0, Colors::sceneBg1);
+           painter.fillRect(0, int(h) - blur, original->width(), int(h), brush1);
+       }
+       if (w < original->width()){
+           QLinearGradient brush2(w - blur, 0, w, 0);
+           brush2.setSpread(QGradient::PadSpread);
+           brush2.setColorAt(0.0, QColor(0, 0, 0, 0));
+           brush2.setColorAt(1.0, Colors::sceneBg1);
+           painter.fillRect(int(w) - blur, 0, int(w), original->height(), brush2);
+       }
+    }
+    delete original;
+    return image;
+}
diff --git a/demos/qtdemo/imageitem.h b/demos/qtdemo/imageitem.h
new file mode 100644
index 0000000..e73079a
--- /dev/null
+++ b/demos/qtdemo/imageitem.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef IMAGE_ITEM_H
+#define IMAGE_ITEM_H
+
+#include <QtGui>
+#include "demoitem.h"
+
+class ImageItem : public DemoItem
+{
+public:
+    ImageItem(const QImage &image, int maxWidth, int maxHeight, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0,
+         bool adjustSize = false, float scale = 1.0f);
+
+    bool adjustSize;
+    float scale;
+protected:
+    QImage *createImage(const QMatrix &matrix) const;
+
+private:
+    QImage image;
+    int maxWidth;
+    int maxHeight;
+};
+
+#endif // DOCK_ITEM_H
+
diff --git a/demos/qtdemo/images/demobg.png b/demos/qtdemo/images/demobg.png
new file mode 100755
index 0000000..3280afa
--- /dev/null
+++ b/demos/qtdemo/images/demobg.png
diff --git a/demos/qtdemo/images/qtlogo_small.png b/demos/qtdemo/images/qtlogo_small.png
new file mode 100644
index 0000000..21b17df
--- /dev/null
+++ b/demos/qtdemo/images/qtlogo_small.png
diff --git a/demos/qtdemo/images/trolltech-logo.png b/demos/qtdemo/images/trolltech-logo.png
new file mode 100644
index 0000000..186c69c
--- /dev/null
+++ b/demos/qtdemo/images/trolltech-logo.png
diff --git a/demos/qtdemo/itemcircleanimation.cpp b/demos/qtdemo/itemcircleanimation.cpp
new file mode 100644
index 0000000..fff52bb
--- /dev/null
+++ b/demos/qtdemo/itemcircleanimation.cpp
@@ -0,0 +1,507 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "itemcircleanimation.h"
+#include "demoitemanimation.h"
+#include "colors.h"
+#include "menumanager.h"
+#include "mainwindow.h"
+#include "menumanager.h"
+
+static QGraphicsScene *sscene;
+
+//////////////////// POST EFFECT STUFF ////////////////////////////////////////
+
+class TickerPostEffect
+{
+public:
+    virtual ~TickerPostEffect(){};
+    virtual void tick(float){};
+    virtual void transform(DemoItem *, QPointF &){};
+};
+
+class PostRotateXY : public TickerPostEffect
+{
+public:
+    float currRotX, currRotY;
+    float speedx, speedy, curvx, curvy;
+
+    PostRotateXY(float speedx, float speedy, float curvx, float curvy)
+        : currRotX(0), currRotY(0),
+        speedx(speedx), speedy(speedy),
+        curvx(curvx), curvy(curvy){};
+
+    void tick(float adjust)
+    {
+        currRotX += speedx * adjust;
+        currRotY += speedy * adjust;
+    }
+
+    void transform(DemoItem *item, QPointF &pos)
+    {
+        DemoItem *parent = (DemoItem *) item->parentItem();
+        QPointF center = parent->boundingRect().center();
+        pos.setX(center.x() + (pos.x() - center.x()) * cos(currRotX + pos.x() * curvx));
+        pos.setY(center.y() + (pos.y() - center.y()) * cos(currRotY + pos.y() * curvy));
+    }
+};
+
+class PostRotateXYTwist : public TickerPostEffect
+{
+public:
+    float currRotX, currRotY;
+    float speedx, speedy, curvx, curvy;
+
+    PostRotateXYTwist(float speedx, float speedy, float curvx, float curvy)
+        : currRotX(0), currRotY(0),
+        speedx(speedx), speedy(speedy),
+        curvx(curvx), curvy(curvy){};
+
+    void tick(float adjust)
+    {
+        currRotX += speedx * adjust;
+        currRotY += speedy * adjust;
+    }
+
+    void transform(DemoItem *item, QPointF &pos)
+    {
+        DemoItem *parent = (DemoItem *) item->parentItem();
+        QPointF center = parent->boundingRect().center();
+        pos.setX(center.x() + (pos.x() - center.x()) * cos(currRotX + pos.y() * curvx));
+        pos.setY(center.y() + (pos.y() - center.y()) * cos(currRotY + pos.x() * curvy));
+    }
+};
+
+//////////////////// TICKER EFFECT STUFF //////////////////////////////////////
+
+class TickerEffect
+{
+    TickerPostEffect *postEffect;
+public:
+    enum EffectStatus{Normal, Intro, Outro} status;
+    LetterList *letters;
+    float morphSpeed, moveSpeed;
+    float normalMorphSpeed, normalMoveSpeed;
+    bool useSheepDog, morphBetweenModels;
+
+    TickerEffect(LetterList *letters)
+        : postEffect(new TickerPostEffect()), status(Intro), letters(letters),
+        morphSpeed(Colors::tickerMorphSpeed), moveSpeed(Colors::tickerMoveSpeed),
+        normalMorphSpeed(Colors::tickerMorphSpeed), normalMoveSpeed(Colors::tickerMoveSpeed),
+        useSheepDog(true), morphBetweenModels(!Colors::noTickerMorph){}
+
+    void setPostEffect(TickerPostEffect *effect)
+    {
+        delete postEffect;
+        postEffect = effect;
+    }
+
+    virtual ~TickerEffect()
+    {
+        delete postEffect;
+    }
+
+    void slowDownAfterIntro(float adjust)
+    {
+        if (morphBetweenModels){
+            if (status == Intro){
+                float dec = 0.1 * adjust;
+                moveSpeed -= dec;
+                if (moveSpeed < Colors::tickerMoveSpeed){
+                    moveSpeed = normalMoveSpeed;
+                    morphSpeed = normalMorphSpeed;
+                    status = Normal;
+                }
+            }
+        }
+    }
+
+    void moveLetters(float adjust)
+    {
+        float adaptedMoveSpeed = this->moveSpeed * adjust;
+        float adaptedMorphSpeed = this->morphSpeed * adjust;
+        postEffect->tick(adjust);
+
+        for (int i=0; i<letters->size(); i++){
+            LetterItem *letter = letters->at(i);
+            letter->guideAdvance(this->morphBetweenModels ? adaptedMoveSpeed : Colors::tickerMoveSpeed);
+            letter->guideMove(this->morphBetweenModels ? adaptedMorphSpeed : -1);
+
+            QPointF pos = letter->getGuidedPos();
+            postEffect->transform(letter, pos);
+
+            if (useSheepDog)
+                letter->setPosUsingSheepDog(pos, QRectF(0, 0, 800, 600));
+            else
+                letter->setPos(pos);
+        }
+    }
+
+    virtual void tick(float adjust)
+    {
+        slowDownAfterIntro(adjust);
+        moveLetters(adjust);
+    }
+
+};
+
+class EffectWhirlWind : public TickerEffect
+{
+public:
+    EffectWhirlWind(LetterList *letters) : TickerEffect(letters)
+    {
+        moveSpeed = 50;
+        for (int i=0; i<this->letters->size(); i++){
+            LetterItem *letter = this->letters->at(i);
+            letter->setGuidedPos(QPointF(0, 100));
+        }
+    }
+};
+
+class EffectSnake : public TickerEffect
+{
+public:
+    EffectSnake(LetterList *letters) : TickerEffect(letters)
+    {
+        moveSpeed = 40;
+        for (int i=0; i<this->letters->size(); i++){
+            LetterItem *letter = this->letters->at(i);
+            letter->setGuidedPos(QPointF(0, -250 - (i * 5)));
+        }
+    }
+};
+
+class EffectScan : public TickerEffect
+{
+public:
+    EffectScan(LetterList *letters) : TickerEffect(letters)
+    {
+        for (int i=0; i<this->letters->size(); i++){
+            LetterItem *letter = this->letters->at(i);
+            letter->setGuidedPos(QPointF(100, -300));
+        }
+    }
+};
+
+class EffectRaindrops : public TickerEffect
+{
+public:
+    EffectRaindrops(LetterList *letters) : TickerEffect(letters)
+    {
+        for (int i=0; i<this->letters->size(); i++){
+            LetterItem *letter = this->letters->at(i);
+            letter->setGuidedPos(QPointF(-100 + rand() % 200, - 200.0f - rand() % 1300));
+        }
+    }
+};
+
+class EffectLine : public TickerEffect
+{
+public:
+    EffectLine(LetterList *letters) : TickerEffect(letters)
+    {
+        for (int i=0; i<this->letters->size(); i++){
+            LetterItem *letter = this->letters->at(i);
+            letter->setGuidedPos(QPointF(100, 500.0f + i * 20));
+        }
+    }
+};
+
+//////////////////// TICKER STUFF /////////////////////////////////////////////
+
+ItemCircleAnimation::ItemCircleAnimation(QGraphicsScene *scene, QGraphicsItem *parent)
+    : DemoItem(scene, parent)
+{
+    sscene = scene;
+    this->letterCount = Colors::tickerLetterCount;
+    this->scale = 1;
+    this->showCount = -1;
+    this->tickOnPaint = false;
+    this->paused = false;
+    this->doIntroTransitions = true;
+    this->setAcceptsHoverEvents(true);
+    this->setCursor(Qt::OpenHandCursor);
+    this->setupGuides();
+    this->setupLetters();
+    this->useGuideQt();
+    this->effect = 0;//new TickerEffect(this->letterList);
+}
+
+ItemCircleAnimation::~ItemCircleAnimation()
+{
+    delete this->letterList;
+    delete this->qtGuide1;
+    delete this->qtGuide2;
+    delete this->qtGuide3;
+    delete this->effect;
+}
+
+void ItemCircleAnimation::createLetter(char c)
+{
+    LetterItem *letter = new LetterItem(c, sscene, this);
+    this->letterList->append(letter);
+}
+
+void ItemCircleAnimation::setupLetters()
+{
+    this->letterList = new LetterList();
+
+    QString s = Colors::tickerText;
+    int len = s.length();
+    int i = 0;
+    for (; i < this->letterCount - len; i += len)
+        for (int l=0; l<len; l++)
+            createLetter(s[l].toLatin1());
+
+    // Fill inn with blanks:
+    for (; i < this->letterCount; ++i)
+        createLetter(' ');
+}
+
+void ItemCircleAnimation::setupGuides()
+{
+    int x = 0;
+    int y = 20;
+
+    this->qtGuide1 = new GuideCircle(QRectF(x, y, 260, 260), -36, 342);
+    new GuideLine(QPointF(x + 240, y + 268), this->qtGuide1);
+    new GuideLine(QPointF(x + 265, y + 246), this->qtGuide1);
+    new GuideLine(QPointF(x + 158, y + 134), this->qtGuide1);
+    new GuideLine(QPointF(x + 184, y + 109), this->qtGuide1);
+    new GuideLine(QPointF(x + 160, y +  82), this->qtGuide1);
+    new GuideLine(QPointF(x +  77, y + 163), this->qtGuide1); // T-top
+    new GuideLine(QPointF(x + 100, y + 190), this->qtGuide1);
+    new GuideLine(QPointF(x + 132, y + 159), this->qtGuide1);
+    new GuideLine(QPointF(x + 188, y + 211), this->qtGuide1);
+    new GuideCircle(QRectF(x + 30, y + 30, 200, 200), -30, 336, GuideCircle::CW, this->qtGuide1);
+    new GuideLine(QPointF(x + 238, y + 201), this->qtGuide1);
+
+    y = 30;
+    this->qtGuide2 = new GuideCircle(QRectF(x + 30, y + 30, 200, 200), 135, 270, GuideCircle::CCW);
+    new GuideLine(QPointF(x + 222, y + 38), this->qtGuide2);
+    new GuideCircle(QRectF(x, y, 260, 260), 135, 270, GuideCircle::CW, this->qtGuide2);
+    new GuideLine(QPointF(x + 59, y + 59), this->qtGuide2);
+
+    x = 115;
+    y = 10;
+    this->qtGuide3 = new GuideLine(QLineF(x, y, x + 30, y));
+    new GuideLine(QPointF(x + 30, y + 170), this->qtGuide3);
+    new GuideLine(QPointF(x, y + 170), this->qtGuide3);
+    new GuideLine(QPointF(x, y), this->qtGuide3);
+
+    this->qtGuide1->setFence(QRectF(0, 0, 800, 600));
+    this->qtGuide2->setFence(QRectF(0, 0, 800, 600));
+    this->qtGuide3->setFence(QRectF(0, 0, 800, 600));
+}
+
+void ItemCircleAnimation::useGuide(Guide *guide, int firstLetter, int lastLetter)
+{
+    float padding = guide->lengthAll() / float(lastLetter - firstLetter);
+    for (int i=firstLetter; i<lastLetter; i++){
+        LetterItem *letter = this->letterList->at(i);
+        letter->useGuide(guide, (i - firstLetter) * padding);
+    }
+}
+
+void ItemCircleAnimation::useGuideQt()
+{
+    if (this->currGuide != this->qtGuide1){
+        this->useGuide(qtGuide1, 0, this->letterCount);
+        this->currGuide = qtGuide1;
+    }
+}
+
+void ItemCircleAnimation::useGuideTt()
+{
+    if (this->currGuide != this->qtGuide2){
+        int split = int(this->letterCount * 5.0 / 7.0);
+        this->useGuide(qtGuide2, 0, split);
+        this->useGuide(qtGuide3, split, this->letterCount);
+        this->currGuide = qtGuide2;
+    }
+}
+
+QRectF ItemCircleAnimation::boundingRect() const
+{
+    return QRectF(0, 0, 300, 320);
+}
+
+void ItemCircleAnimation::prepare()
+{
+}
+
+void ItemCircleAnimation::switchToNextEffect()
+{
+    ++this->showCount;
+    delete this->effect;
+
+    switch (this->showCount){
+    case 1:
+        this->effect = new EffectSnake(this->letterList);
+        break;
+    case 2:
+        this->effect = new EffectLine(this->letterList);
+        this->effect->setPostEffect(new PostRotateXYTwist(0.01f, 0.0f, 0.003f, 0.0f));
+        break;
+    case 3:
+        this->effect = new EffectRaindrops(this->letterList);
+        this->effect->setPostEffect(new PostRotateXYTwist(0.01f, 0.005f, 0.003f, 0.003f));
+        break;
+    case 4:
+        this->effect = new EffectScan(this->letterList);
+        this->effect->normalMoveSpeed = 0;
+        this->effect->setPostEffect(new PostRotateXY(0.008f, 0.0f, 0.005f, 0.0f));
+        break;
+    default:
+        this->showCount = 0;
+        this->effect = new EffectWhirlWind(this->letterList);
+    }
+}
+
+void ItemCircleAnimation::animationStarted(int id)
+{
+    if (id == DemoItemAnimation::ANIM_IN){
+        if (this->doIntroTransitions){
+            // Make all letters dissapear
+            for (int i=0; i<this->letterList->size(); i++){
+                LetterItem *letter = this->letterList->at(i);
+                letter->setPos(1000, 0);
+            }
+            this->switchToNextEffect();
+            this->useGuideQt();
+            this->scale = 1;
+            // The first time we run, we have a rather large
+            // delay to perform benchmark before the ticker shows.
+            // But now, since we are showing, use a more appropriate value:
+            this->currentAnimation->startDelay = 1500;
+        }
+    }
+    else if (this->effect)
+        this->effect->useSheepDog = false;
+
+    this->tickTimer = QTime::currentTime();
+}
+
+void ItemCircleAnimation::animationStopped(int)
+{
+    // Nothing to do.
+}
+
+void ItemCircleAnimation::swapModel(){
+    if (this->currGuide == this->qtGuide2)
+        this->useGuideQt();
+    else
+        this->useGuideTt();
+}
+
+void ItemCircleAnimation::hoverEnterEvent(QGraphicsSceneHoverEvent *)
+{
+//  Skip swap here to enhance ticker dragging
+//    this->swapModel();
+}
+
+void ItemCircleAnimation::hoverLeaveEvent(QGraphicsSceneHoverEvent *)
+{
+    this->swapModel();
+}
+
+void ItemCircleAnimation::setTickerScale(float s)
+{
+    this->scale = s;
+    qtGuide1->setScale(this->scale, this->scale);
+    qtGuide2->setScale(this->scale, this->scale);
+    qtGuide3->setScale(this->scale, this->scale);
+}
+
+void ItemCircleAnimation::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    this->mouseMoveLastPosition = event->scenePos();
+    if (event->button() == Qt::LeftButton)
+        this->setCursor(Qt::ClosedHandCursor);
+    else
+        this->switchToNextEffect();
+}
+
+void ItemCircleAnimation::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+        this->setCursor(Qt::OpenHandCursor);
+}
+
+void ItemCircleAnimation::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    QPointF newPosition = event->scenePos();
+    this->setPosUsingSheepDog(this->pos() + newPosition - this->mouseMoveLastPosition, QRectF(-260, -280, 1350, 1160));
+    this->mouseMoveLastPosition = newPosition;
+}
+
+void ItemCircleAnimation::wheelEvent(QGraphicsSceneWheelEvent *event)
+{
+    this->effect->moveSpeed = this->effect->moveSpeed + (event->delta() > 0 ? -0.20 : 0.20);
+    if (this->effect->moveSpeed < 0)
+        this->effect->moveSpeed = 0;
+}
+
+void ItemCircleAnimation::pause(bool on)
+{
+    this->paused = on;
+    this->tickTimer = QTime::currentTime();
+}
+
+void ItemCircleAnimation::tick()
+{
+    if (this->paused || !this->effect)
+        return;
+
+    float t = this->tickTimer.msecsTo(QTime::currentTime());
+    this->tickTimer = QTime::currentTime();
+    this->effect->tick(t/10.0f);
+}
+
+void ItemCircleAnimation::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    if (this->tickOnPaint)
+        tick();
+}
+
+
+
+
diff --git a/demos/qtdemo/itemcircleanimation.h b/demos/qtdemo/itemcircleanimation.h
new file mode 100644
index 0000000..27e399c
--- /dev/null
+++ b/demos/qtdemo/itemcircleanimation.h
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ITEM_CIRCLE_ANIMATION_H
+#define ITEM_CIRCLE_ANIMATION_H
+
+#include <QtCore>
+#include <QObject>
+#include <QtGui>
+#include <QTimeLine>
+#include <QList>
+#include "demoitem.h"
+#include "letteritem.h"
+#include "guideline.h"
+#include "guidecircle.h"
+
+typedef QList<LetterItem *> LetterList;
+class TickerEffect;
+
+class ItemCircleAnimation : public QObject, public DemoItem
+{
+public:
+    ItemCircleAnimation(QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+    virtual ~ItemCircleAnimation();
+
+    // overidden methods:
+    QRectF boundingRect() const;
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0);
+    void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void wheelEvent(QGraphicsSceneWheelEvent *event);
+    void animationStarted(int id = 0);
+    void animationStopped(int id = 0);
+    void prepare();
+    void tick();
+    void switchToNextEffect();
+    void useGuideQt();
+    void useGuideTt();
+    void pause(bool on);
+
+    bool tickOnPaint;
+    bool paused;
+    bool doIntroTransitions;
+
+private:
+    void setupLetters();
+    void createLetter(char c);
+    void setupGuides();
+    void useGuide(Guide *guide, int firstLetter, int lastLetter);
+    void swapModel();
+    void setTickerScale(float s);
+
+    int showCount;
+    float scale;
+    QPointF mouseMoveLastPosition;
+    int letterCount;
+    LetterList *letterList;
+    Guide *qtGuide1;
+    Guide *qtGuide2;
+    Guide *qtGuide3;
+    Guide *currGuide;
+    TickerEffect *effect;
+    QTime tickTimer;
+};
+
+#endif // ITEM_CIRCLE_ANIMATION_H
+
+
+
diff --git a/demos/qtdemo/letteritem.cpp b/demos/qtdemo/letteritem.cpp
new file mode 100644
index 0000000..7b814b1
--- /dev/null
+++ b/demos/qtdemo/letteritem.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <cmath>
+#include "letteritem.h"
+#include "colors.h"
+
+LetterItem::LetterItem(char letter, QGraphicsScene *scene, QGraphicsItem *parent) : DemoItem(scene, parent), letter(letter)
+{
+    useSharedImage(QString(__FILE__) + letter);
+}
+
+LetterItem::~LetterItem()
+{
+}
+
+QImage *LetterItem::createImage(const QMatrix &matrix) const
+{
+    QRect scaledRect = matrix.mapRect(QRect(0, 0, 25, 25));
+    QImage *image = new QImage(scaledRect.width(), scaledRect.height(), QImage::Format_ARGB32_Premultiplied);
+    image->fill(0);
+    QPainter painter(image);
+    painter.scale(matrix.m11(), matrix.m22());
+    painter.setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+    painter.setPen(Qt::NoPen);
+    if (Colors::useEightBitPalette){
+        painter.setBrush(QColor(102, 175, 54));
+        painter.drawEllipse(0, 0, 25, 25);
+        painter.setFont(Colors::tickerFont());
+        painter.setPen(QColor(255, 255, 255));
+        painter.drawText(10, 15, QString(this->letter));
+    }
+    else {
+        QLinearGradient brush(0, 0, 0, 25);
+        brush.setSpread(QLinearGradient::PadSpread);
+        brush.setColorAt(0.0, QColor(102, 175, 54, 200));
+        brush.setColorAt(1.0, QColor(102, 175, 54, 60));
+        painter.setBrush(brush);
+        painter.drawEllipse(0, 0, 25, 25);
+        painter.setFont(Colors::tickerFont());
+        painter.setPen(QColor(255, 255, 255, 255));
+        painter.drawText(10, 15, QString(this->letter));
+    }
+    return image;
+}
+
+
diff --git a/demos/qtdemo/letteritem.h b/demos/qtdemo/letteritem.h
new file mode 100644
index 0000000..8c3f16e
--- /dev/null
+++ b/demos/qtdemo/letteritem.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef LETTER_ITEM_H
+#define LETTER_ITEM_H
+
+#include <QtGui>
+#include "demoitem.h"
+
+class LetterItem : public DemoItem
+{
+public:
+    LetterItem(char letter, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+    virtual ~LetterItem();
+
+protected:
+    QImage *createImage(const QMatrix &matrix) const;
+
+private:
+    char letter;
+};
+
+#endif // LETTER_ITEM_H
+
diff --git a/demos/qtdemo/main.cpp b/demos/qtdemo/main.cpp
new file mode 100644
index 0000000..bf2028d
--- /dev/null
+++ b/demos/qtdemo/main.cpp
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "mainwindow.h"
+#include "menumanager.h"
+#include "colors.h"
+
+static void artisticSleep(int sleepTime)
+{
+    QTime time;
+    time.restart();
+    while (time.elapsed() < sleepTime)
+        QCoreApplication::processEvents(QEventLoop::AllEvents, 50);
+}
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(qtdemo);
+    QApplication app(argc, argv);
+    Colors::parseArgs(argc, argv);
+    MainWindow mainWindow;
+    MenuManager::instance()->init(&mainWindow);
+    mainWindow.setFocus();
+
+    if (Colors::fullscreen)
+        mainWindow.showFullScreen();
+    else {
+        mainWindow.enableMask(true);
+        mainWindow.show();
+    }
+
+    artisticSleep(500);
+    mainWindow.start();
+    return app.exec();
+}
diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp
new file mode 100644
index 0000000..8723823
--- /dev/null
+++ b/demos/qtdemo/mainwindow.cpp
@@ -0,0 +1,483 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+#include "menumanager.h"
+#include "colors.h"
+#include "dockitem.h"
+#include "demotextitem.h"
+#include "imageitem.h"
+#include "demoitem.h"
+#include "demoscene.h"
+
+#ifndef QT_NO_OPENGL
+    #include <QGLWidget>
+#endif
+//#define QT_NO_OPENGL
+
+MainWindow::MainWindow(QWidget *parent) : QGraphicsView(parent), updateTimer(this)
+{
+    this->currentFps = Colors::fps;
+    this->loop = false;
+    this->fpsMedian = -1;
+    this->fpsLabel = 0;
+    this->pausedLabel = 0;
+    this->doneAdapt = false;
+    this->useTimer = false;
+    this->updateTimer.setSingleShot(true);
+    this->trolltechLogo = 0;
+    this->qtLogo = 0;
+    this->setupWidget();
+    this->setupScene();
+    this->setupSceneItems();
+    this->drawBackgroundToPixmap();
+}
+
+MainWindow::~MainWindow()
+{
+    delete this->trolltechLogo;
+    delete this->qtLogo;
+}
+
+void MainWindow::setupWidget()
+{
+    QRect screenRect = QApplication::desktop()->screenGeometry(QApplication::desktop()->primaryScreen());
+    QRect windowRect(0, 0, 800, 600);
+    if (screenRect.width() < 800)
+        windowRect.setWidth(screenRect.width());
+    if (screenRect.height() < 600)
+        windowRect.setHeight(screenRect.height());
+    windowRect.moveCenter(screenRect.center());
+    this->setGeometry(windowRect);
+    this->setMinimumSize(80, 60);
+    setWindowTitle(tr("Qt Examples and Demos"));
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setFrameStyle(QFrame::NoFrame);
+    this->setRenderingSystem();
+    connect(&this->updateTimer, SIGNAL(timeout()), this, SLOT(tick()));
+}
+
+void MainWindow::setRenderingSystem()
+{
+    QWidget *viewport = 0;
+
+    if (Colors::direct3dRendering){
+        viewport->setAttribute(Qt::WA_MSWindowsUseDirect3D);
+        setCacheMode(QGraphicsView::CacheNone);
+        if (Colors::verbose)
+            qDebug() << "- using Direct3D";
+    }
+#ifndef QT_NO_OPENGL
+    else if (Colors::openGlRendering){
+        QGLWidget *glw = new QGLWidget(QGLFormat(QGL::SampleBuffers));
+        if (Colors::noScreenSync)
+            glw->format().setSwapInterval(0);
+        glw->setAutoFillBackground(false);
+        viewport = glw;
+        setCacheMode(QGraphicsView::CacheNone);
+        if (Colors::verbose)
+            qDebug() << "- using OpenGL";
+    }
+#endif
+    else{ // software rendering
+        viewport = new QWidget;
+        setCacheMode(QGraphicsView::CacheBackground);
+        if (Colors::verbose)
+            qDebug() << "- using software rendering";
+    }
+
+    setViewport(viewport);
+}
+
+void MainWindow::start()
+{
+    this->switchTimerOnOff(true);
+    this->demoStartTime.restart();
+    MenuManager::instance()->itemSelected(MenuManager::ROOT, Colors::rootMenuName);
+    if (Colors::verbose)
+        qDebug("- starting demo");
+}
+
+void MainWindow::enableMask(bool enable)
+{
+    if (!enable || Colors::noWindowMask)
+        this->clearMask();
+    else {
+        QPolygon region;
+        region.setPoints(9,
+                                // north side:
+                                0, 0,
+                                800, 0,
+                                // east side:
+                                // 800, 70,
+                                // 790, 90,
+                                // 790, 480,
+                                // 800, 500,
+                                800, 600,
+                                // south side:
+                                700, 600,
+                                670, 590,
+                                130, 590,
+                                100, 600,
+                                0, 600,
+                                // west side:
+                                // 0, 550,
+                                // 10, 530,
+                                // 10, 520,
+                                // 0, 520,
+                                0, 0);
+        this->setMask(QRegion(region));
+    }
+}
+
+void MainWindow::setupScene()
+{
+    this->scene = new DemoScene(this);
+    this->scene->setSceneRect(0, 0, 800, 600);
+    setScene(this->scene);
+    this->scene->setItemIndexMethod(QGraphicsScene::NoIndex);
+}
+
+void MainWindow::drawItems(QPainter *painter, int numItems, QGraphicsItem **items, const QStyleOptionGraphicsItem* options)
+{
+    QGraphicsView::drawItems(painter, numItems, items, options);
+}
+
+void MainWindow::switchTimerOnOff(bool on)
+{
+    bool ticker = MenuManager::instance()->ticker && MenuManager::instance()->ticker->scene();
+    if (ticker)
+        MenuManager::instance()->ticker->tickOnPaint = !on || Colors::noTimerUpdate;
+
+    if (on && !Colors::noTimerUpdate){
+        this->useTimer = true;
+        this->setViewportUpdateMode(QGraphicsView::NoViewportUpdate);
+        this->fpsTime = QTime::currentTime();
+        this->updateTimer.start(int(1000 / Colors::fps));
+    }
+    else{
+        this->useTimer = false;
+        this->updateTimer.stop();
+        if (Colors::softwareRendering)
+            if (Colors::noTicker)
+                this->setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate);
+            else
+                this->setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
+        else
+            this->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    }
+}
+
+bool MainWindow::measureFps()
+{
+    // Calculate time diff:
+    float t = this->fpsTime.msecsTo(QTime::currentTime());
+    if (t == 0)
+        t = 0.01f;
+    this->currentFps = (1000.0f / t);
+    this->fpsHistory += this->currentFps;
+    this->fpsTime = QTime::currentTime();
+
+    // Calculate median:
+    int size = this->fpsHistory.size();
+    if (size == 10){
+        qSort(this->fpsHistory.begin(), this->fpsHistory.end());
+        this->fpsMedian = this->fpsHistory.at(int(size/2));
+        if (this->fpsMedian == 0)
+            this->fpsMedian = 0.01f;
+        this->fpsHistory.clear();
+        return true;
+    }
+    return false;
+}
+
+/**
+    Used for adaption in case things are so slow
+    that no median  yet has been calculated
+*/
+void MainWindow::forceFpsMedianCalculation()
+{
+    if (this->fpsMedian != -1)
+        return;
+
+    int size = this->fpsHistory.size();
+    if (size == 0){
+        this->fpsMedian = 0.01f;
+        return;
+    }
+
+    qSort(this->fpsHistory.begin(), this->fpsHistory.end());
+    this->fpsMedian = this->fpsHistory.at(int(size/2));
+    if (this->fpsMedian == 0)
+        this->fpsMedian = 0.01f;
+}
+
+void MainWindow::tick()
+{
+    bool medianChanged = this->measureFps();
+    this->checkAdapt();
+
+    if (medianChanged && this->fpsLabel && Colors::showFps)
+        this->fpsLabel->setText(QString("FPS: ") + QString::number(int(this->currentFps)));
+
+    if (MenuManager::instance()->ticker)
+        MenuManager::instance()->ticker->tick();
+
+    this->viewport()->update();
+    if (Colors::softwareRendering)
+        QApplication::syncX();
+
+    if (this->useTimer)
+        this->updateTimer.start(int(1000 / Colors::fps));
+}
+
+void MainWindow::setupSceneItems()
+{
+    if (Colors::showFps){
+        this->fpsLabel = new DemoTextItem(QString("FPS: --"), Colors::buttonFont(), Qt::white, -1, this->scene, 0, DemoTextItem::DYNAMIC_TEXT);
+        this->fpsLabel->setZValue(100);
+        this->fpsLabel->setPos(Colors::stageStartX, 600 - QFontMetricsF(Colors::buttonFont()).height() - 5);
+    }
+
+    this->trolltechLogo = new ImageItem(QImage(":/images/trolltech-logo.png"), 1000, 1000, this->scene, 0, true, 0.5f);
+    this->qtLogo = new ImageItem(QImage(":/images/qtlogo_small.png"), 1000, 1000, this->scene, 0, true, 0.5f);
+    this->trolltechLogo->setZValue(100);
+    this->qtLogo->setZValue(100);
+    this->pausedLabel = new DemoTextItem(QString("PAUSED"), Colors::buttonFont(), Qt::white, -1, this->scene, 0);
+    this->pausedLabel->setZValue(100);
+    QFontMetricsF fm(Colors::buttonFont());
+    this->pausedLabel->setPos(Colors::stageWidth - fm.width("PAUSED"), 590 - fm.height());
+    this->pausedLabel->setRecursiveVisible(false);
+}
+
+void MainWindow::checkAdapt()
+{
+    if (this->doneAdapt
+        || Colors::noTimerUpdate
+        || this->demoStartTime.elapsed() < 2000)
+       return;
+
+    this->doneAdapt = true;
+    this->forceFpsMedianCalculation();
+    Colors::benchmarkFps = this->fpsMedian;
+    if (Colors::verbose)
+        qDebug() << "- benchmark:" << QString::number(Colors::benchmarkFps) << "FPS";
+
+    if (Colors::noAdapt)
+        return;
+
+    if (this->fpsMedian < 30){
+        if (MenuManager::instance()->ticker && MenuManager::instance()->ticker->scene()){
+            this->scene->removeItem(MenuManager::instance()->ticker);
+            Colors::noTimerUpdate = true;
+            this->switchTimerOnOff(false);
+            if (this->fpsLabel)
+               this->fpsLabel->setText(QString("FPS: (") + QString::number(this->fpsMedian) + QString(")"));
+            if (Colors::verbose)
+               qDebug() << "- benchmark adaption: removed ticker (fps < 30)";
+        }
+
+        if (this->fpsMedian < 20){
+            Colors::noAnimations = true;
+            if (Colors::verbose)
+               qDebug() << "- benchmark adaption: animations switched off (fps < 20)";
+        }
+
+        Colors::adapted = true;
+    }
+}
+
+int MainWindow::performBenchmark()
+{
+/*
+    QTime time;
+    time.restart();
+    while (time.elapsed() < 2000)
+        QCoreApplication::processEvents(QEventLoop::AllEvents, 50);
+*/
+    return 0;
+}
+
+void MainWindow::drawBackgroundToPixmap()
+{
+    const QRectF r = this->scene->sceneRect();
+    this->background = QPixmap(qRound(r.width()), qRound(r.height()));
+    this->background.fill(Qt::black);
+    QPainter painter(&this->background);
+
+    if (false && Colors::useEightBitPalette){
+        painter.fillRect(r, Colors::sceneBg1);
+    } else {
+        QImage bg(":/images/demobg.png");
+        painter.drawImage(0, 0, bg);
+    }
+}
+
+void MainWindow::drawBackground(QPainter *painter, const QRectF &rect)
+{
+    Q_UNUSED(rect);
+    painter->drawPixmap(QPoint(0, 0), this->background);
+}
+
+void MainWindow::showEvent(QShowEvent * event)
+{
+    Q_UNUSED(event);
+    QGraphicsView::showEvent(event);
+}
+
+void MainWindow::toggleFullscreen()
+{
+    if (this->isFullScreen()){
+        this->enableMask(true);
+        this->showNormal();
+        if (MenuManager::instance()->ticker)
+            MenuManager::instance()->ticker->pause(false);
+    }
+    else {
+        this->enableMask(false);
+        this->showFullScreen();
+    }
+}
+
+void MainWindow::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Escape){
+        this->loop = false;
+        QApplication::quit();
+    }
+    else if (event->key() == Qt::Key_1){
+            QString s("");
+            s += "Rendering system: ";
+            if (Colors::openGlRendering)
+                s += "OpenGL";
+            else if (Colors::direct3dRendering)
+                s += "Direct3D";
+            else
+                s += "software";
+
+            s += "\nAdapt: ";
+            s += Colors::noAdapt ? "off" : "on";
+            s += "\nAdaption occured: ";
+            s += Colors::adapted ? "yes" : "no";
+            s += "\nOpenGL version: ";
+            s += Colors::glVersion;
+            QWidget w;
+            s += "\nColor bit depth: ";
+            s += QString::number(w.depth());
+            s += "\nWanted FPS: ";
+            s += QString::number(Colors::fps);
+            s += "\nBenchmarked FPS: ";
+            s += Colors::benchmarkFps != -1 ? QString::number(Colors::benchmarkFps) : "not calculated";
+            s += "\nAnimations: ";
+            s += Colors::noAnimations ? "off" : "on";
+            s += "\nBlending: ";
+            s += Colors::useEightBitPalette ? "off" : "on";
+            s += "\nTicker: ";
+            s += Colors::noTicker ? "off" : "on";
+            s += "\nPixmaps: ";
+            s += Colors::usePixmaps ? "on" : "off";
+            s += "\nRescale images on resize: ";
+            s += Colors::noRescale ? "off" : "on";
+            s += "\nTimer based updates: ";
+            s += Colors::noTimerUpdate ? "off" : "on";
+            s += "\nSeparate loop: ";
+            s += Colors::useLoop ? "yes" : "no";
+            s += "\nScreen sync: ";
+            s += Colors::noScreenSync ? "no" : "yes";
+            QMessageBox::information(0, QString("Current configuration"), s);
+    }
+}
+
+void MainWindow::focusInEvent(QFocusEvent *)
+{
+    if (!Colors::pause)
+        return;
+
+    if (MenuManager::instance()->ticker)
+        MenuManager::instance()->ticker->pause(false);
+
+    int code = MenuManager::instance()->currentMenuCode;
+    if (code == MenuManager::ROOT || code == MenuManager::MENU1)
+        this->switchTimerOnOff(true);
+
+    this->pausedLabel->setRecursiveVisible(false);
+}
+
+void MainWindow::focusOutEvent(QFocusEvent *)
+{
+    if (!Colors::pause)
+        return;
+
+    if (MenuManager::instance()->ticker)
+        MenuManager::instance()->ticker->pause(true);
+
+    int code = MenuManager::instance()->currentMenuCode;
+    if (code == MenuManager::ROOT || code == MenuManager::MENU1)
+        this->switchTimerOnOff(false);
+
+    this->pausedLabel->setRecursiveVisible(true);
+}
+
+void MainWindow::resizeEvent(QResizeEvent *event)
+{
+    Q_UNUSED(event);
+
+    this->resetMatrix();
+    this->scale(event->size().width() / 800.0, event->size().height() / 600.0);
+    QGraphicsView::resizeEvent(event);
+    DemoItem::setMatrix(this->matrix());
+
+    if (this->trolltechLogo){
+        const QRectF r = this->scene->sceneRect();
+        QRectF ttb = this->trolltechLogo->boundingRect();
+        this->trolltechLogo->setPos(int((r.width() - ttb.width()) / 2), 595 - ttb.height());
+        QRectF qtb = this->qtLogo->boundingRect();
+        this->qtLogo->setPos(802 - qtb.width(), 0);
+    }
+
+    // Changing size will almost always
+    // hurt FPS during the changing. So
+    // ignore it.
+    this->fpsHistory.clear();
+}
+
+
diff --git a/demos/qtdemo/mainwindow.h b/demos/qtdemo/mainwindow.h
new file mode 100644
index 0000000..388a392
--- /dev/null
+++ b/demos/qtdemo/mainwindow.h
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAIN_WINDOW_H
+#define MAIN_WINDOW_H
+
+#include <QtGui>
+#include <QPixmap>
+
+class DemoTextItem;
+class ImageItem;
+
+class MainWindow : public QGraphicsView
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+    void enableMask(bool enable);
+    void toggleFullscreen();
+    int performBenchmark();
+    void switchTimerOnOff(bool on);
+    void start();
+
+    QGraphicsScene *scene;
+    bool loop;
+
+    // FPS stuff:
+    QList<QTime> frameTimeList;
+    QList<float> fpsHistory;
+    float currentFps;
+    float fpsMedian;
+    DemoTextItem *fpsLabel;
+
+protected:
+    // Overidden methods:
+    void showEvent(QShowEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+    void resizeEvent(QResizeEvent *event);
+    void drawBackground(QPainter *painter, const QRectF &rect);
+    void drawItems(QPainter *painter, int numItems, QGraphicsItem ** items, const QStyleOptionGraphicsItem* options);
+    void focusInEvent(QFocusEvent *event);
+    void focusOutEvent(QFocusEvent *event);
+
+private slots:
+    void tick();
+
+private:
+    void setupWidget();
+    void setupSceneItems();
+    void drawBackgroundToPixmap();
+    void setupScene();
+    bool measureFps();
+    void forceFpsMedianCalculation();
+    void checkAdapt();
+    void setRenderingSystem();
+
+    QTimer updateTimer;
+    QTime demoStartTime;
+    QTime fpsTime;
+    QPixmap background;
+    ImageItem *trolltechLogo;
+    ImageItem *qtLogo;
+    bool doneAdapt;
+    bool useTimer;
+    DemoTextItem *pausedLabel;
+};
+
+#endif // MAIN_WINDOW_H
+
diff --git a/demos/qtdemo/menucontent.cpp b/demos/qtdemo/menucontent.cpp
new file mode 100644
index 0000000..a74cfe4
--- /dev/null
+++ b/demos/qtdemo/menucontent.cpp
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "menucontent.h"
+#include "colors.h"
+#include "menumanager.h"
+#include "demotextitem.h"
+#include "headingitem.h"
+
+MenuContentItem::MenuContentItem(const QDomElement &el, QGraphicsScene *scene, QGraphicsItem *parent)
+    : DemoItem(scene, parent)
+{
+    this->name = el.attribute("name");
+    this->heading = 0;
+    this->description1 = 0;
+    this->description2 = 0;
+
+    if (el.tagName() == "demos")
+        this->readmePath = QLibraryInfo::location(QLibraryInfo::DemosPath) + "/README";
+    else
+        this->readmePath = QLibraryInfo::location(QLibraryInfo::ExamplesPath) + "/" + el.attribute("dirname") + "/README";
+
+}
+
+void MenuContentItem::prepare()
+{
+    if (!this->prepared){
+        this->prepared= true;
+        this->createContent();
+    }
+}
+
+void MenuContentItem::animationStopped(int id)
+{
+    if (this->name == Colors::rootMenuName)
+        return; // Optimization hack.
+
+    if (id == DemoItemAnimation::ANIM_OUT){
+        // Free up some memory:
+        delete this->heading;
+        delete this->description1;
+        delete this->description2;
+        this->heading = 0;
+        this->description1 = 0;
+        this->description2 = 0;
+        this->prepared = false;
+    }
+}
+
+QString MenuContentItem::loadDescription(int startPara, int nrPara)
+{
+    QString result;
+    QFile readme(this->readmePath);
+    if (!readme.open(QFile::ReadOnly)){
+        if (Colors::verbose)
+            qDebug() << "- MenuContentItem::loadDescription: Could not load:" << this->readmePath;
+        return "";
+    }
+
+    QTextStream in(&readme);
+    // Skip a certain number of paragraphs:
+    while (startPara)
+        if (in.readLine().isEmpty()) --startPara;
+
+    // Read in the number of wanted paragraphs:
+    QString line = in.readLine();
+    do {
+        result += line + " ";
+        line = in.readLine();
+        if (line.isEmpty()){
+            --nrPara;
+            line = "<br><br>" + in.readLine();
+        }
+    } while (nrPara && !in.atEnd());
+
+    return Colors::contentColor + result;
+}
+
+void MenuContentItem::createContent()
+{
+    // Create the items:
+    this->heading = new HeadingItem(this->name, this->scene(), this);
+    QString para1 = this->loadDescription(0, 1);
+    if (para1.isEmpty())
+        para1 = Colors::contentColor + QLatin1String("Could not load description. Ensure that the documentation for Qt is built.");
+    QColor bgcolor = Colors::sceneBg1.darker(200);
+    bgcolor.setAlpha(100);
+    this->description1 = new DemoTextItem(para1, Colors::contentFont(), Colors::heading, 500, this->scene(), this, DemoTextItem::STATIC_TEXT);
+    this->description2 = new DemoTextItem(this->loadDescription(1, 2), Colors::contentFont(), Colors::heading, 250, this->scene(), this, DemoTextItem::STATIC_TEXT);
+
+    // Place the items on screen:
+    this->heading->setPos(0, 3);
+    this->description1->setPos(0, this->heading->pos().y() + this->heading->boundingRect().height() + 10);
+    this->description2->setPos(0, this->description1->pos().y() + this->description1->boundingRect().height() + 15);
+}
+
+QRectF MenuContentItem::boundingRect() const
+{
+    return QRectF(0, 0, 500, 350);
+}
+
+
diff --git a/demos/qtdemo/menucontent.h b/demos/qtdemo/menucontent.h
new file mode 100644
index 0000000..737492d
--- /dev/null
+++ b/demos/qtdemo/menucontent.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MENU_CONTENT_ITEM_H
+#define MENU_CONTENT_ITEM_H
+
+#include <QtGui>
+#include <QtXml>
+#include "demoitem.h"
+
+class HeadingItem;
+class DemoTextItem;
+
+class MenuContentItem : public DemoItem
+{
+
+public:
+    MenuContentItem(const QDomElement &el, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+
+    virtual QRectF boundingRect() const; // overridden
+    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0){}; // overridden
+    void animationStopped(int id);
+    void prepare();
+
+private:
+    QString name;
+    QString readmePath;
+    HeadingItem *heading;
+    DemoTextItem *description1;
+    DemoTextItem *description2;
+
+    QString loadDescription(int startPara, int nrPara);
+    QString extractTextFromParagraph(const QDomNode &parentNode);
+
+    void createContent();
+};
+
+#endif // MENU_CONTENT_ITEM_H
+
diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp
new file mode 100644
index 0000000..bfa2e3f
--- /dev/null
+++ b/demos/qtdemo/menumanager.cpp
@@ -0,0 +1,876 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "menumanager.h"
+#include "colors.h"
+#include "menucontent.h"
+#include "examplecontent.h"
+
+MenuManager *MenuManager::pInstance = 0;
+
+MenuManager * MenuManager::instance()
+{
+    if (!MenuManager::pInstance)
+        MenuManager::pInstance = new MenuManager();
+    return MenuManager::pInstance;
+}
+
+MenuManager::MenuManager()
+{
+    this->ticker = 0;
+    this->tickerInAnim = 0;
+    this->upButton = 0;
+    this->downButton = 0;
+    this->helpEngine = 0;
+    this->score = new Score();
+    this->currentMenu = QLatin1String("[no menu visible]");
+    this->currentCategory = QLatin1String("[no category visible]");
+    this->currentMenuButtons = QLatin1String("[no menu buttons visible]");
+    this->currentInfo = QLatin1String("[no info visible]");
+    this->currentMenuCode = -1;
+    this->readXmlDocument();
+    this->initHelpEngine();
+}
+
+MenuManager::~MenuManager()
+{
+    delete this->score;
+    delete this->contentsDoc;
+    delete this->helpEngine;
+}
+
+QByteArray MenuManager::getResource(const QString &name)
+{
+    QByteArray ba = this->helpEngine->fileData(name);
+    if (Colors::verbose && ba.isEmpty())
+        qDebug() << " - WARNING: Could not get " << name;
+    return ba;
+}
+
+void MenuManager::readXmlDocument()
+{
+    this->contentsDoc = new QDomDocument();
+    QString errorStr;
+    int errorLine;
+    int errorColumn;
+
+    QFile file(":/xml/examples.xml");
+    bool statusOK = this->contentsDoc->setContent(&file, true, &errorStr, &errorLine, &errorColumn);
+    if (!statusOK){
+        QMessageBox::critical(0,
+                              QObject::tr("DOM Parser"),
+                              QObject::tr("Could not read or find the contents document. Error at line %1, column %2:\n%3")
+                              .arg(errorLine).arg(errorColumn).arg(errorStr)
+                              );
+        exit(-1);
+    }
+}
+
+void MenuManager::initHelpEngine()
+{
+    this->helpRootUrl = QString("qthelp://com.trolltech.qt.%1%2%3/qdoc/")
+        .arg(QT_VERSION >> 16).arg((QT_VERSION >> 8) & 0xFF)
+        .arg(QT_VERSION & 0xFF);
+
+    // Store help collection file in cache dir of assistant
+    QString cacheDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation)
+                     + QLatin1String("/Trolltech/Assistant/");
+    QString helpDataFile = QString(QLatin1String("qtdemo_%1.qhc")).arg(QLatin1String(QT_VERSION_STR));
+
+    QDir dir;
+    if (!dir.exists(cacheDir))
+        dir.mkpath(cacheDir);
+
+    // Create help engine (and new
+    // helpDataFile if it does not exist):
+    this->helpEngine = new QHelpEngineCore(cacheDir + helpDataFile);
+    this->helpEngine->setupData();
+
+    QString qtDocRoot = QLibraryInfo::location(QLibraryInfo::DocumentationPath) + QLatin1String("/qch");
+    qtDocRoot = QDir(qtDocRoot).absolutePath();
+
+    QStringList qchFiles;
+    qchFiles << QLatin1String("/qt.qch")
+             << QLatin1String("/designer.qch")
+             << QLatin1String("/linguist.qch");
+
+    QString oldDir = helpEngine->customValue(QLatin1String("docDir"), QString()).toString();
+    if (oldDir != qtDocRoot) {
+        foreach (const QString &qchFile, qchFiles)
+            helpEngine->unregisterDocumentation(QHelpEngineCore::namespaceName(qtDocRoot + qchFile));
+    }
+
+    // If the data that the engine will work
+    // on is not yet registered, do it now:
+    foreach (const QString &qchFile, qchFiles)
+        helpEngine->registerDocumentation(qtDocRoot + qchFile);
+
+    helpEngine->setCustomValue(QLatin1String("docDir"), qtDocRoot);
+}
+
+void MenuManager::itemSelected(int userCode, const QString &menuName)
+{
+    switch (userCode){
+    case LAUNCH:
+        this->launchExample(this->currentInfo);
+        break;
+    case DOCUMENTATION:
+        this->showDocInAssistant(this->currentInfo);
+        break;
+    case QUIT:
+        this->window->loop = false;
+        QCoreApplication::quit();
+        break;
+    case FULLSCREEN:
+        this->window->toggleFullscreen();
+        break;
+    case ROOT:
+        // out:
+        this->score->queueMovie(this->currentMenu + " -out", Score::FROM_START, Score::LOCK_ITEMS);
+        this->score->queueMovie(this->currentMenuButtons + " -out", Score::FROM_START, Score::LOCK_ITEMS);
+        this->score->queueMovie(this->currentInfo + " -out");
+        this->score->queueMovie(this->currentInfo + " -buttons -out", Score::NEW_ANIMATION_ONLY);
+        this->score->queueMovie("back -out", Score::ONLY_IF_VISIBLE);
+        // book-keeping:
+        this->currentMenuCode = ROOT;
+        this->currentMenu = menuName + " -menu1";
+        this->currentMenuButtons = menuName + " -buttons";
+        this->currentInfo = menuName + " -info";
+        // in:
+        this->score->queueMovie("upndown -shake");
+        this->score->queueMovie(this->currentMenu, Score::FROM_START, Score::UNLOCK_ITEMS);
+        this->score->queueMovie(this->currentMenuButtons, Score::FROM_START, Score::UNLOCK_ITEMS);
+        this->score->queueMovie(this->currentInfo);
+        if (!Colors::noTicker){
+            this->ticker->doIntroTransitions = true;
+            this->tickerInAnim->startDelay = 2000;
+            this->ticker->useGuideQt();
+            this->score->queueMovie("ticker", Score::NEW_ANIMATION_ONLY);
+            this->window->switchTimerOnOff(true);
+        }
+        break;
+    case MENU1:
+        // out:
+        this->score->queueMovie(this->currentMenu + " -out", Score::FROM_START, Score::LOCK_ITEMS);
+        this->score->queueMovie(this->currentMenuButtons + " -out", Score::FROM_START, Score::LOCK_ITEMS);
+        this->score->queueMovie(this->currentInfo + " -out");
+        // book-keeping:
+        this->currentMenuCode = MENU1;
+        this->currentCategory = menuName;
+        this->currentMenu = menuName + " -menu1";
+        this->currentInfo = menuName + " -info";
+        // in:
+        this->score->queueMovie("upndown -shake");
+        this->score->queueMovie("back -in");
+        this->score->queueMovie(this->currentMenu, Score::FROM_START, Score::UNLOCK_ITEMS);
+        this->score->queueMovie(this->currentInfo);
+        if (!Colors::noTicker)
+            this->ticker->useGuideTt();
+        break;
+    case MENU2:
+        // out:
+        this->score->queueMovie(this->currentInfo + " -out", Score::NEW_ANIMATION_ONLY);
+        this->score->queueMovie(this->currentInfo + " -buttons -out", Score::NEW_ANIMATION_ONLY);
+        // book-keeping:
+        this->currentMenuCode = MENU2;
+        this->currentInfo = menuName;
+        // in / shake:
+        this->score->queueMovie("upndown -shake");
+        this->score->queueMovie("back -shake");
+        this->score->queueMovie(this->currentMenu + " -shake");
+        this->score->queueMovie(this->currentInfo, Score::NEW_ANIMATION_ONLY);
+        this->score->queueMovie(this->currentInfo + " -buttons", Score::NEW_ANIMATION_ONLY);
+        if (!Colors::noTicker){
+            this->score->queueMovie("ticker -out", Score::NEW_ANIMATION_ONLY);
+            this->window->switchTimerOnOff(false);
+        }
+        break;
+    case UP:{
+        QString backMenu = this->info[this->currentMenu]["back"];
+        if (!backMenu.isNull()){
+            this->score->queueMovie(this->currentMenu + " -top_out", Score::FROM_START, Score::LOCK_ITEMS);
+            this->score->queueMovie(backMenu + " -bottom_in", Score::FROM_START, Score::UNLOCK_ITEMS);
+            this->currentMenu = backMenu;
+        }
+        break; }
+    case DOWN:{
+        QString moreMenu = this->info[this->currentMenu]["more"];
+        if (!moreMenu.isNull()){
+            this->score->queueMovie(this->currentMenu + " -bottom_out", Score::FROM_START, Score::LOCK_ITEMS);
+            this->score->queueMovie(moreMenu + " -top_in", Score::FROM_START, Score::UNLOCK_ITEMS);
+            this->currentMenu = moreMenu;
+        }
+        break; }
+    case BACK:{
+        if (this->currentMenuCode == MENU2){
+            // out:
+            this->score->queueMovie(this->currentInfo + " -out", Score::NEW_ANIMATION_ONLY);
+            this->score->queueMovie(this->currentInfo + " -buttons -out", Score::NEW_ANIMATION_ONLY);
+            // book-keeping:
+            this->currentMenuCode = MENU1;
+            this->currentMenuButtons = this->currentCategory + " -buttons";
+            this->currentInfo = this->currentCategory + " -info";
+            // in / shake:
+            this->score->queueMovie("upndown -shake");
+            this->score->queueMovie(this->currentMenu + " -shake");
+            this->score->queueMovie(this->currentInfo, Score::NEW_ANIMATION_ONLY);
+            this->score->queueMovie(this->currentInfo + " -buttons", Score::NEW_ANIMATION_ONLY);
+            if (!Colors::noTicker){
+                this->ticker->doIntroTransitions = false;
+                this->tickerInAnim->startDelay = 500;
+                this->score->queueMovie("ticker", Score::NEW_ANIMATION_ONLY);
+                this->window->switchTimerOnOff(true);
+            }
+        } else if (this->currentMenuCode != ROOT)
+            itemSelected(ROOT, Colors::rootMenuName);
+        break; }
+    }
+
+    // update back- and more buttons
+    bool noBackMenu = this->info[this->currentMenu]["back"].isNull();
+    bool noMoreMenu = this->info[this->currentMenu]["more"].isNull();
+    this->upButton->setState(noBackMenu ? TextButton::DISABLED : TextButton::OFF);
+    this->downButton->setState(noMoreMenu ? TextButton::DISABLED : TextButton::OFF);
+
+    if (this->score->hasQueuedMovies()){
+        this->score->playQue();
+        // Playing new movies might include
+        // loading etc. So ignore the FPS
+        // at this point
+        this->window->fpsHistory.clear();
+    }
+}
+
+void MenuManager::showDocInAssistant(const QString &name)
+{
+    QString url = this->resolveDocUrl(name);
+    if (Colors::verbose)
+        qDebug() << "Sending URL to Assistant:" << url;
+
+    // Start assistant if it's not already running:
+    if (this->assistantProcess.state() != QProcess::Running){
+        QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
+#if !defined(Q_OS_MAC)
+        app += QLatin1String("assistant");
+#else
+        app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");
+#endif
+        QStringList args;
+        args << QLatin1String("-enableRemoteControl");
+        this->assistantProcess.start(app, args);
+        if (!this->assistantProcess.waitForStarted()) {
+            QMessageBox::critical(0, tr("Qt Demo"), tr("Could not start Qt Assistant.").arg(app));
+            return;
+        }
+    }
+
+    // Send command through remote control even if the process
+    // was started to activate assistant and bring it to front:
+    QTextStream str(&this->assistantProcess);
+    str << "SetSource " << url << QLatin1Char('\0') << endl;
+}
+
+void MenuManager::launchExample(const QString &name)
+{
+    QString executable = this->resolveExeFile(name);
+#ifdef Q_OS_MAC
+    if (Colors::verbose)
+        qDebug() << "Launching:" << executable;
+    bool success = QDesktopServices::openUrl(QUrl::fromLocalFile(executable));
+    if (!success){
+        QMessageBox::critical(0, tr("Failed to launch the example"),
+                          tr("Could not launch the example. Ensure that it has been built."),
+                          QMessageBox::Cancel);
+    }
+#else // Not mac. To not break anything regarding dll's etc, keep it the way it was before:
+    QProcess *process = new QProcess(this);
+    connect(process, SIGNAL(finished(int)), this, SLOT(exampleFinished()));
+    connect(process, SIGNAL(error(QProcess::ProcessError)), this, SLOT(exampleError(QProcess::ProcessError)));
+
+#ifdef Q_OS_WIN
+    //make sure it finds the dlls on windows
+    QString curpath = QString::fromLocal8Bit(qgetenv("PATH").constData());
+    QString newpath = QString("PATH=%1;%2").arg(QLibraryInfo::location(QLibraryInfo::BinariesPath), curpath);
+    process->setEnvironment(QStringList(newpath));
+#endif
+
+    if (info[name]["changedirectory"] != "false"){
+        QString workingDirectory = resolveDataDir(name);
+        process->setWorkingDirectory(workingDirectory);
+        if (Colors::verbose)
+            qDebug() << "Setting working directory:" << workingDirectory;
+    }
+
+    if (Colors::verbose)
+        qDebug() << "Launching:" << executable;
+    process->start(executable);
+#endif
+}
+
+void MenuManager::exampleFinished()
+{
+}
+
+void MenuManager::exampleError(QProcess::ProcessError error)
+{
+    if (error != QProcess::Crashed)
+        QMessageBox::critical(0, tr("Failed to launch the example"),
+                          tr("Could not launch the example. Ensure that it has been built."),
+                          QMessageBox::Cancel);
+}
+
+void MenuManager::init(MainWindow *window)
+{
+    this->window = window;
+
+    // Create div:
+    this->createTicker();
+    this->createUpnDownButtons();
+    this->createBackButton();
+
+    // Create first level menu:
+    QDomElement rootElement = this->contentsDoc->documentElement();
+    this->createRootMenu(rootElement);
+
+    // Create second level menus:
+    QDomNode level2MenuNode = rootElement.firstChild();
+    while (!level2MenuNode.isNull()){
+        QDomElement level2MenuElement = level2MenuNode.toElement();
+        this->createSubMenu(level2MenuElement);
+
+        // create leaf menu and example info:
+        QDomNode exampleNode = level2MenuElement.firstChild();
+        while (!exampleNode.isNull()){
+            QDomElement exampleElement = exampleNode.toElement();
+            this->readInfoAboutExample(exampleElement);
+            this->createLeafMenu(exampleElement);
+            exampleNode = exampleNode.nextSibling();
+        }
+
+        level2MenuNode = level2MenuNode.nextSibling();
+    }
+}
+
+void MenuManager::readInfoAboutExample(const QDomElement &example)
+{
+    QString name = example.attribute("name");
+    if (this->info.contains(name))
+        qWarning() << "__WARNING: MenuManager::readInfoAboutExample: Demo/example with name"
+                    << name << "appears twize in the xml-file!__";
+
+    this->info[name]["filename"] = example.attribute("filename");
+    this->info[name]["category"] = example.parentNode().toElement().tagName();
+    this->info[name]["dirname"] = example.parentNode().toElement().attribute("dirname");
+    this->info[name]["changedirectory"] = example.attribute("changedirectory");
+    this->info[name]["image"] = example.attribute("image");
+}
+
+QString MenuManager::resolveDataDir(const QString &name)
+{
+    QString dirName = this->info[name]["dirname"];
+    QString category = this->info[name]["category"];
+    QString fileName = this->info[name]["filename"];
+
+    QDir dir;
+    if (category == "demos")
+        dir = QDir(QLibraryInfo::location(QLibraryInfo::DemosPath));
+    else
+        dir = QDir(QLibraryInfo::location(QLibraryInfo::ExamplesPath));
+
+    dir.cd(dirName);
+    dir.cd(fileName);
+    return dir.absolutePath();
+}
+
+QString MenuManager::resolveExeFile(const QString &name)
+{
+    QString dirName = this->info[name]["dirname"];
+    QString category = this->info[name]["category"];
+    QString fileName = this->info[name]["filename"];
+
+    QDir dir;
+    if (category == "demos")
+        dir = QDir(QLibraryInfo::location(QLibraryInfo::DemosPath));
+    else
+        dir = QDir(QLibraryInfo::location(QLibraryInfo::ExamplesPath));
+
+    dir.cd(dirName);
+    dir.cd(fileName);
+
+    QFile unixFile(dir.path() + "/" + fileName);
+    if (unixFile.exists()) return unixFile.fileName();
+    QFile winR(dir.path() + "\\release\\" + fileName + ".exe");
+    if (winR.exists()) return winR.fileName();
+    QFile winD(dir.path() + "\\debug\\" + fileName + ".exe");
+    if (winD.exists()) return winD.fileName();
+    QFile mac(dir.path() + "/" + fileName + ".app");
+    if (mac.exists()) return mac.fileName();
+
+    if (Colors::verbose)
+        qDebug() << "- WARNING: Could not resolve executable:" << dir.path() << fileName;
+    return "__executable not found__";
+}
+
+QString MenuManager::resolveDocUrl(const QString &name)
+{
+    QString dirName = this->info[name]["dirname"];
+    QString category = this->info[name]["category"];
+    QString fileName = this->info[name]["filename"];
+
+    if (category == "demos")
+        return this->helpRootUrl + "demos-" + fileName + ".html";
+    else
+        return this->helpRootUrl + dirName.replace("/", "-") + "-" + fileName + ".html";
+}
+
+QString MenuManager::resolveImageUrl(const QString &name)
+{
+    return this->helpRootUrl + "images/" + name;
+}
+
+QByteArray MenuManager::getHtml(const QString &name)
+{
+    return getResource(this->resolveDocUrl(name));
+}
+
+QByteArray MenuManager::getImage(const QString &name)
+{
+    QString imageName = this->info[name]["image"];
+    QString category = this->info[name]["category"];
+    QString fileName = this->info[name]["filename"];
+
+    if (imageName.isEmpty()){
+        if (category == "demos")
+            imageName = fileName + "-demo.png";
+        else
+            imageName = fileName + "-example.png";
+        if ((getResource(resolveImageUrl(imageName))).isEmpty())
+            imageName = fileName + ".png";
+        if ((getResource(resolveImageUrl(imageName))).isEmpty())
+            imageName = fileName + "example.png";
+    }
+    return getResource(resolveImageUrl(imageName));
+}
+
+
+void MenuManager::createRootMenu(const QDomElement &el)
+{
+    QString name = el.attribute("name");
+    createMenu(el, MENU1);
+    createInfo(new MenuContentItem(el, this->window->scene, 0), name + " -info");
+
+    Movie *menuButtonsIn = this->score->insertMovie(name + " -buttons");
+    Movie *menuButtonsOut = this->score->insertMovie(name + " -buttons -out");
+    createLowLeftButton(QLatin1String("Quit"), QUIT, menuButtonsIn, menuButtonsOut, 0);
+    createLowRightButton("Toggle fullscreen", FULLSCREEN, menuButtonsIn, menuButtonsOut, 0);
+}
+
+void MenuManager::createSubMenu(const QDomElement &el)
+{
+    QString name = el.attribute("name");
+    createMenu(el, MENU2);
+    createInfo(new MenuContentItem(el, this->window->scene, 0), name + " -info");
+}
+
+void MenuManager::createLeafMenu(const QDomElement &el)
+{
+    QString name = el.attribute("name");
+    createInfo(new ExampleContent(name, this->window->scene, 0), name);
+
+    Movie *infoButtonsIn = this->score->insertMovie(name + " -buttons");
+    Movie *infoButtonsOut = this->score->insertMovie(name + " -buttons -out");
+    createLowRightLeafButton("Documentation", 600, DOCUMENTATION, infoButtonsIn, infoButtonsOut, 0);
+    if (el.attribute("executable") != "false")
+        createLowRightLeafButton("Launch", 405, LAUNCH, infoButtonsIn, infoButtonsOut, 0);
+}
+
+void MenuManager::createMenu(const QDomElement &category, BUTTON_TYPE type)
+{
+    qreal sw = this->window->scene->sceneRect().width();
+    int xOffset = 15;
+    int yOffset = 10;
+    int maxExamples = Colors::menuCount;
+    int menuIndex = 1;
+    QString name = category.attribute("name");
+    QDomNode currentNode = category.firstChild();
+    QString currentMenu = name + QLatin1String(" -menu") + QString::number(menuIndex);
+
+    while (!currentNode.isNull()){
+        Movie *movieIn = this->score->insertMovie(currentMenu);
+        Movie *movieOut = this->score->insertMovie(currentMenu + " -out");
+        Movie *movieNextTopOut = this->score->insertMovie(currentMenu + " -top_out");
+        Movie *movieNextBottomOut = this->score->insertMovie(currentMenu + " -bottom_out");
+        Movie *movieNextTopIn = this->score->insertMovie(currentMenu + " -top_in");
+        Movie *movieNextBottomIn = this->score->insertMovie(currentMenu + " -bottom_in");
+        Movie *movieShake = this->score->insertMovie(currentMenu + " -shake");
+
+        int i = 0;
+        while (!currentNode.isNull() && i < maxExamples){
+            TextButton *item;
+
+            // create normal menu button
+            QString label = currentNode.toElement().attribute("name");
+            item = new TextButton(label, TextButton::LEFT, type, this->window->scene, 0);
+            currentNode = currentNode.nextSibling();
+
+#ifndef QT_OPENGL_SUPPORT
+            if (currentNode.toElement().attribute("dirname") == "opengl")
+                currentNode = currentNode.nextSibling();
+#endif
+
+            item->setRecursiveVisible(false);
+            item->setZValue(10);
+            qreal ih = item->sceneBoundingRect().height();
+            qreal iw = item->sceneBoundingRect().width();
+            qreal ihp = ih + 3;
+
+            // create in-animation:
+            DemoItemAnimation *anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_IN);
+            anim->setDuration(float(1000 + (i * 20)) * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(xOffset, -ih));
+            anim->setPosAt(0.20, QPointF(xOffset, -ih));
+            anim->setPosAt(0.50, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY + (10 * float(i / 4.0f))));
+            anim->setPosAt(0.60, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.70, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY + (5 * float(i / 4.0f))));
+            anim->setPosAt(0.80, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.90, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY + (2 * float(i / 4.0f))));
+            anim->setPosAt(1.00, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            movieIn->append(anim);
+
+            // create out-animation:
+            anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_OUT);
+            anim->hideOnFinished = true;
+            anim->setDuration((700 + (30 * i)) * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.60, QPointF(xOffset, 600 - ih - ih));
+            anim->setPosAt(0.65, QPointF(xOffset + 20, 600 - ih));
+            anim->setPosAt(1.00, QPointF(sw + iw, 600 - ih));
+            movieOut->append(anim);
+
+            // create shake-animation:
+            anim = new DemoItemAnimation(item);
+            anim->setDuration(700 * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.55, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY - i*2.0));
+            anim->setPosAt(0.70, QPointF(xOffset - 10, (i * ihp) + yOffset + Colors::contentStartY - i*1.5));
+            anim->setPosAt(0.80, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY - i*1.0));
+            anim->setPosAt(0.90, QPointF(xOffset - 2, (i * ihp) + yOffset + Colors::contentStartY - i*0.5));
+            anim->setPosAt(1.00, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            movieShake->append(anim);
+
+            // create next-menu top-out-animation:
+            anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_OUT);
+            anim->hideOnFinished = true;
+            anim->setDuration((200 + (30 * i)) * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.70, QPointF(xOffset, yOffset + Colors::contentStartY));
+            anim->setPosAt(1.00, QPointF(-iw, yOffset + Colors::contentStartY));
+            movieNextTopOut->append(anim);
+
+            // create next-menu bottom-out-animation:
+            anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_OUT);
+            anim->hideOnFinished = true;
+            anim->setDuration((200 + (30 * i)) * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.70, QPointF(xOffset, (maxExamples * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(1.00, QPointF(-iw, (maxExamples * ihp) + yOffset + Colors::contentStartY));
+            movieNextBottomOut->append(anim);
+
+            // create next-menu top-in-animation:
+            anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_IN);
+            anim->setDuration((700 - (30 * i)) * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(-iw, yOffset + Colors::contentStartY));
+            anim->setPosAt(0.30, QPointF(xOffset, yOffset + Colors::contentStartY));
+            anim->setPosAt(1.00, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            movieNextTopIn->append(anim);
+
+            // create next-menu bottom-in-animation:
+            int reverse = maxExamples - i;
+            anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_IN);
+            anim->setDuration((1000 - (30 * reverse)) * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(-iw, (maxExamples * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.30, QPointF(xOffset, (maxExamples * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(1.00, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            movieNextBottomIn->append(anim);
+
+            i++;
+        }
+
+        if (!currentNode.isNull() && i == maxExamples){
+            // We need another menu, so register for 'more' and 'back' buttons
+            ++menuIndex;
+            this->info[currentMenu]["more"] = name + QLatin1String(" -menu") + QString::number(menuIndex);
+            currentMenu = name + QLatin1String(" -menu") + QString::number(menuIndex);
+            this->info[currentMenu]["back"] = name + QLatin1String(" -menu") + QString::number(menuIndex - 1);
+        }
+    }
+}
+
+
+void MenuManager::createLowLeftButton(const QString &label, BUTTON_TYPE type,
+    Movie *movieIn, Movie *movieOut, Movie *movieShake, const QString &menuString)
+{
+    TextButton *button = new TextButton(label, TextButton::RIGHT, type, this->window->scene, 0, TextButton::PANEL);
+    if (!menuString.isNull())
+        button->setMenuString(menuString);
+    button->setRecursiveVisible(false);
+    button->setZValue(10);
+
+    qreal iw = button->sceneBoundingRect().width();
+    int xOffset = 15;
+
+    // create in-animation:
+    DemoItemAnimation *buttonIn = new DemoItemAnimation(button, DemoItemAnimation::ANIM_IN);
+    buttonIn->setDuration(1800 * Colors::animSpeedButtons);
+    buttonIn->setStartPos(QPointF(-iw, Colors::contentStartY + Colors::contentHeight - 35));
+    buttonIn->setPosAt(0.5, QPointF(-iw, Colors::contentStartY + Colors::contentHeight - 35));
+    buttonIn->setPosAt(0.7, QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 35));
+    buttonIn->setPosAt(1.0, QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 26));
+    movieIn->append(buttonIn);
+
+    // create out-animation:
+    DemoItemAnimation *buttonOut = new DemoItemAnimation(button, DemoItemAnimation::ANIM_OUT);
+    buttonOut->hideOnFinished = true;
+    buttonOut->setDuration(400 * Colors::animSpeedButtons);
+    buttonOut->setStartPos(QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 26));
+    buttonOut->setPosAt(1.0, QPointF(-iw, Colors::contentStartY + Colors::contentHeight - 26));
+    movieOut->append(buttonOut);
+
+    if (movieShake){
+        DemoItemAnimation *shakeAnim = new DemoItemAnimation(button, DemoItemAnimation::ANIM_UNSPECIFIED);
+        shakeAnim->timeline->setCurveShape(QTimeLine::LinearCurve);
+        shakeAnim->setDuration(650);
+        shakeAnim->setStartPos(buttonIn->posAt(1.0f));
+        shakeAnim->setPosAt(0.60, buttonIn->posAt(1.0f));
+        shakeAnim->setPosAt(0.70, buttonIn->posAt(1.0f) + QPointF(-3, 0));
+        shakeAnim->setPosAt(0.80, buttonIn->posAt(1.0f) + QPointF(2, 0));
+        shakeAnim->setPosAt(0.90, buttonIn->posAt(1.0f) + QPointF(-1, 0));
+        shakeAnim->setPosAt(1.00, buttonIn->posAt(1.0f));
+        movieShake->append(shakeAnim);
+    }
+}
+
+void MenuManager::createLowRightButton(const QString &label, BUTTON_TYPE type, Movie *movieIn, Movie *movieOut, Movie * /*movieShake*/)
+{
+    TextButton *item = new TextButton(label, TextButton::RIGHT, type, this->window->scene, 0, TextButton::PANEL);
+    item->setRecursiveVisible(false);
+    item->setZValue(10);
+
+    qreal sw = this->window->scene->sceneRect().width();
+    int xOffset = 70;
+
+    // create in-animation:
+    DemoItemAnimation *anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_IN);
+    anim->setDuration(1800 * Colors::animSpeedButtons);
+    anim->setStartPos(QPointF(sw, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.5, QPointF(sw, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.7, QPointF(xOffset + 535, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(1.0, QPointF(xOffset + 535, Colors::contentStartY + Colors::contentHeight - 26));
+    movieIn->append(anim);
+
+    // create out-animation:
+    anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_OUT);
+    anim->hideOnFinished = true;
+    anim->setDuration(400 * Colors::animSpeedButtons);
+    anim->setStartPos(QPointF(xOffset + 535, Colors::contentStartY + Colors::contentHeight - 26));
+    anim->setPosAt(1.0, QPointF(sw, Colors::contentStartY + Colors::contentHeight - 26));
+    movieOut->append(anim);
+}
+
+void MenuManager::createLowRightLeafButton(const QString &label, int xOffset, BUTTON_TYPE type, Movie *movieIn, Movie *movieOut, Movie * /*movieShake*/)
+{
+    TextButton *item = new TextButton(label, TextButton::RIGHT, type, this->window->scene, 0, TextButton::PANEL);
+    item->setRecursiveVisible(false);
+    item->setZValue(10);
+
+    qreal sw = this->window->scene->sceneRect().width();
+    qreal sh = this->window->scene->sceneRect().height();
+
+    // create in-animation:
+    DemoItemAnimation *anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_IN);
+    anim->setDuration(1050 * Colors::animSpeedButtons);
+    anim->setStartPos(QPointF(sw, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.10, QPointF(sw, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.30, QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.35, QPointF(xOffset + 30, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.40, QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.45, QPointF(xOffset + 5, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.50, QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(1.00, QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 26));
+    movieIn->append(anim);
+
+    // create out-animation:
+    anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_OUT);
+    anim->hideOnFinished = true;
+    anim->setDuration(300 * Colors::animSpeedButtons);
+    anim->setStartPos(QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 26));
+    anim->setPosAt(1.0, QPointF(xOffset, sh));
+    movieOut->append(anim);
+}
+
+void MenuManager::createInfo(DemoItem *item, const QString &name)
+{
+    Movie *movie_in = this->score->insertMovie(name);
+    Movie *movie_out = this->score->insertMovie(name + " -out");
+    item->setZValue(8);
+    item->setRecursiveVisible(false);
+
+    float xOffset = 230.0f;
+    DemoItemAnimation *infoIn = new DemoItemAnimation(item, DemoItemAnimation::ANIM_IN);
+    infoIn->timeline->setCurveShape(QTimeLine::LinearCurve);
+    infoIn->setDuration(650);
+    infoIn->setStartPos(QPointF(this->window->scene->sceneRect().width(), Colors::contentStartY));
+    infoIn->setPosAt(0.60, QPointF(xOffset, Colors::contentStartY));
+    infoIn->setPosAt(0.70, QPointF(xOffset + 20, Colors::contentStartY));
+    infoIn->setPosAt(0.80, QPointF(xOffset, Colors::contentStartY));
+    infoIn->setPosAt(0.90, QPointF(xOffset + 7, Colors::contentStartY));
+    infoIn->setPosAt(1.00, QPointF(xOffset, Colors::contentStartY));
+    movie_in->append(infoIn);
+
+    DemoItemAnimation *infoOut = new DemoItemAnimation(item, DemoItemAnimation::ANIM_OUT);
+    infoOut->timeline->setCurveShape(QTimeLine::EaseInCurve);
+    infoOut->setDuration(300);
+    infoOut->hideOnFinished = true;
+    infoOut->setStartPos(QPointF(xOffset, Colors::contentStartY));
+    infoOut->setPosAt(1.0, QPointF(-600, Colors::contentStartY));
+    movie_out->append(infoOut);
+}
+
+void MenuManager::createTicker()
+{
+    if (!Colors::noTicker){
+        Movie *movie_in = this->score->insertMovie("ticker");
+        Movie *movie_out = this->score->insertMovie("ticker -out");
+        Movie *movie_activate = this->score->insertMovie("ticker -activate");
+        Movie *movie_deactivate = this->score->insertMovie("ticker -deactivate");
+
+        this->ticker = new ItemCircleAnimation(this->window->scene, 0);
+        this->ticker->setZValue(50);
+        this->ticker->hide();
+
+        // Move ticker in:
+        int qtendpos = 485;
+        int qtPosY = 120;
+        this->tickerInAnim = new DemoItemAnimation(this->ticker, DemoItemAnimation::ANIM_IN);
+        this->tickerInAnim->setDuration(500);
+        this->tickerInAnim->setStartPos(QPointF(this->window->scene->sceneRect().width(), Colors::contentStartY + qtPosY));
+        this->tickerInAnim->setPosAt(0.60, QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        this->tickerInAnim->setPosAt(0.70, QPointF(qtendpos + 30, Colors::contentStartY + qtPosY));
+        this->tickerInAnim->setPosAt(0.80, QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        this->tickerInAnim->setPosAt(0.90, QPointF(qtendpos + 5, Colors::contentStartY + qtPosY));
+        this->tickerInAnim->setPosAt(1.00, QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        movie_in->append(this->tickerInAnim);
+
+        // Move ticker out:
+        DemoItemAnimation *qtOut = new DemoItemAnimation(this->ticker, DemoItemAnimation::ANIM_OUT);
+        qtOut->hideOnFinished = true;
+        qtOut->setDuration(500);
+        qtOut->setStartPos(QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        qtOut->setPosAt(1.00, QPointF(this->window->scene->sceneRect().width() + 700, Colors::contentStartY + qtPosY));
+        movie_out->append(qtOut);
+
+        // Move ticker in on activate:
+        DemoItemAnimation *qtActivate = new DemoItemAnimation(this->ticker);
+        qtActivate->setDuration(400);
+        qtActivate->setStartPos(QPointF(this->window->scene->sceneRect().width(), Colors::contentStartY + qtPosY));
+        qtActivate->setPosAt(0.60, QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        qtActivate->setPosAt(0.70, QPointF(qtendpos + 30, Colors::contentStartY + qtPosY));
+        qtActivate->setPosAt(0.80, QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        qtActivate->setPosAt(0.90, QPointF(qtendpos + 5, Colors::contentStartY + qtPosY));
+        qtActivate->setPosAt(1.00, QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        movie_activate->append(qtActivate);
+
+        // Move ticker out on deactivate:
+        DemoItemAnimation *qtDeactivate = new DemoItemAnimation(this->ticker);
+        qtDeactivate->hideOnFinished = true;
+        qtDeactivate->setDuration(400);
+        qtDeactivate->setStartPos(QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        qtDeactivate->setPosAt(1.00, QPointF(qtendpos, 800));
+        movie_deactivate->append(qtDeactivate);
+    }
+}
+
+void MenuManager::createUpnDownButtons()
+{
+    float xOffset = 15.0f;
+    float yOffset = 450.0f;
+
+    this->upButton = new TextButton("", TextButton::LEFT, MenuManager::UP, this->window->scene, 0, TextButton::UP);
+    this->upButton->prepare();
+    this->upButton->setPos(xOffset, yOffset);
+    this->upButton->setState(TextButton::DISABLED);
+
+    this->downButton = new TextButton("", TextButton::LEFT, MenuManager::DOWN, this->window->scene, 0, TextButton::DOWN);
+    this->downButton->prepare();
+    this->downButton->setPos(xOffset + 10 + this->downButton->sceneBoundingRect().width(), yOffset);
+
+    Movie *movieShake = this->score->insertMovie("upndown -shake");
+
+    DemoItemAnimation *shakeAnim = new DemoItemAnimation(this->upButton, DemoItemAnimation::ANIM_UNSPECIFIED);
+    shakeAnim->timeline->setCurveShape(QTimeLine::LinearCurve);
+    shakeAnim->setDuration(650);
+    shakeAnim->setStartPos(this->upButton->pos());
+    shakeAnim->setPosAt(0.60, this->upButton->pos());
+    shakeAnim->setPosAt(0.70, this->upButton->pos() + QPointF(-2, 0));
+    shakeAnim->setPosAt(0.80, this->upButton->pos() + QPointF(1, 0));
+    shakeAnim->setPosAt(0.90, this->upButton->pos() + QPointF(-1, 0));
+    shakeAnim->setPosAt(1.00, this->upButton->pos());
+    movieShake->append(shakeAnim);
+
+    shakeAnim = new DemoItemAnimation(this->downButton, DemoItemAnimation::ANIM_UNSPECIFIED);
+    shakeAnim->timeline->setCurveShape(QTimeLine::LinearCurve);
+    shakeAnim->setDuration(650);
+    shakeAnim->setStartPos(this->downButton->pos());
+    shakeAnim->setPosAt(0.60, this->downButton->pos());
+    shakeAnim->setPosAt(0.70, this->downButton->pos() + QPointF(-5, 0));
+    shakeAnim->setPosAt(0.80, this->downButton->pos() + QPointF(-3, 0));
+    shakeAnim->setPosAt(0.90, this->downButton->pos() + QPointF(-1, 0));
+    shakeAnim->setPosAt(1.00, this->downButton->pos());
+    movieShake->append(shakeAnim);
+}
+
+void MenuManager::createBackButton()
+{
+    Movie *backIn = this->score->insertMovie("back -in");
+    Movie *backOut = this->score->insertMovie("back -out");
+    Movie *backShake = this->score->insertMovie("back -shake");
+    createLowLeftButton(QLatin1String("Back"), ROOT, backIn, backOut, backShake, Colors::rootMenuName);
+}
diff --git a/demos/qtdemo/menumanager.h b/demos/qtdemo/menumanager.h
new file mode 100644
index 0000000..3a12c54
--- /dev/null
+++ b/demos/qtdemo/menumanager.h
@@ -0,0 +1,134 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MENU_MANAGER_H
+#define MENU_MANAGER_H
+
+#include <QtGui>
+#include <QtXml>
+#include <QtHelp/QHelpEngineCore>
+
+#include "score.h"
+#include "textbutton.h"
+#include "mainwindow.h"
+#include "itemcircleanimation.h"
+
+typedef QHash<QString, QString> StringHash;
+typedef QHash<QString, StringHash> HashHash;
+
+class TextButton;
+
+class MenuManager : public QObject
+{
+    Q_OBJECT
+
+public:
+    enum BUTTON_TYPE {ROOT, MENU1, MENU2, LAUNCH, DOCUMENTATION, QUIT, FULLSCREEN, UP, DOWN, BACK};
+
+    // singleton pattern:
+    static MenuManager *instance();
+    virtual ~MenuManager();
+
+    void init(MainWindow *window);
+    void itemSelected(int userCode, const QString &menuName = "");
+
+    QByteArray getHtml(const QString &name);
+    QByteArray getImage(const QString &name);
+    QString resolveExeFile(const QString &name);
+    QString resolveDocUrl(const QString &name);
+    QString resolveImageUrl(const QString &name);
+    QString resolveDataDir(const QString &name);
+
+    HashHash info;
+    ItemCircleAnimation *ticker;
+    MainWindow *window;
+    Score *score;
+    int currentMenuCode;
+
+private slots:
+    void exampleFinished();
+    void exampleError(QProcess::ProcessError error);
+
+private:
+    // singleton pattern:
+    MenuManager();
+    static MenuManager *pInstance;
+
+    QByteArray getResource(const QString &name);
+
+    void readXmlDocument();
+    void initHelpEngine();
+    void getDocumentationDir();
+    void readInfoAboutExample(const QDomElement &example);
+    void showDocInAssistant(const QString &docFile);
+    void launchExample(const QString &uniqueName);
+
+    void createMenu(const QDomElement &category, BUTTON_TYPE type);
+    void createLowLeftButton(const QString &label, BUTTON_TYPE type,
+        Movie *movieIn, Movie *movieOut, Movie *movieShake, const QString &menuString = QString());
+    void createLowRightButton(const QString &label, BUTTON_TYPE type, Movie *movieIn, Movie *movieOut, Movie *movieShake);
+    void createLowRightLeafButton(const QString &label, int pos, BUTTON_TYPE type, Movie *movieIn, Movie *movieOut, Movie * /*movieShake*/);
+    void createRootMenu(const QDomElement &el);
+    void createSubMenu(const QDomElement &el);
+    void createLeafMenu(const QDomElement &el);
+    void createInfo(DemoItem *item, const QString &name);
+    void createTicker();
+    void createUpnDownButtons();
+    void createBackButton();
+
+    QDomDocument *contentsDoc;
+    QProcess assistantProcess;
+    QString currentMenu;
+    QString currentCategory;
+    QString currentMenuButtons;
+    QString currentInfo;
+    QString helpRootUrl;
+    DemoItemAnimation *tickerInAnim;
+    QDir docDir;
+    QDir imgDir;
+    QHelpEngineCore *helpEngine;
+
+    TextButton *upButton;
+    TextButton *downButton;
+};
+
+#endif // MENU_MANAGER_H
+
diff --git a/demos/qtdemo/qtdemo.icns b/demos/qtdemo/qtdemo.icns
new file mode 100644
index 0000000..def5f0e
--- /dev/null
+++ b/demos/qtdemo/qtdemo.icns
diff --git a/demos/qtdemo/qtdemo.ico b/demos/qtdemo/qtdemo.ico
new file mode 100644
index 0000000..016c77f
--- /dev/null
+++ b/demos/qtdemo/qtdemo.ico
diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro
new file mode 100644
index 0000000..2534b75
--- /dev/null
+++ b/demos/qtdemo/qtdemo.pro
@@ -0,0 +1,72 @@
+CONFIG += assistant help x11inc
+TARGET = qtdemo
+DESTDIR = $$QT_BUILD_TREE/bin
+OBJECTS_DIR = .obj
+MOC_DIR = .moc
+INSTALLS += target sources
+QT += xml network
+
+contains(QT_CONFIG, opengl) {
+    DEFINES += QT_OPENGL_SUPPORT
+    QT += opengl
+}
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+RESOURCES = qtdemo.qrc
+HEADERS = mainwindow.h \
+    demoscene.h \
+    demoitem.h \
+    score.h \
+    demoitemanimation.h \
+    itemcircleanimation.h \
+    demotextitem.h \
+    headingitem.h \
+    dockitem.h \
+    scanitem.h \
+    letteritem.h \
+    examplecontent.h \
+    menucontent.h \
+    guide.h \
+    guideline.h \
+    guidecircle.h \
+    menumanager.h \
+    colors.h \
+    textbutton.h \
+    imageitem.h
+SOURCES = main.cpp \
+    demoscene.cpp \
+    mainwindow.cpp \
+    demoitem.cpp \
+    score.cpp \
+    demoitemanimation.cpp \
+    itemcircleanimation.cpp \
+    demotextitem.cpp \
+    headingitem.cpp \
+    dockitem.cpp \
+    scanitem.cpp \
+    letteritem.cpp \
+    examplecontent.cpp \
+    menucontent.cpp \
+    guide.cpp \
+    guideline.cpp \
+    guidecircle.cpp \
+    menumanager.cpp \
+    colors.cpp \
+    textbutton.cpp \
+    imageitem.cpp
+
+win32:RC_FILE = qtdemo.rc
+mac {
+ICON = qtdemo.icns
+QMAKE_INFO_PLIST = Info_mac.plist
+}
+
+# install
+target.path = $$[QT_INSTALL_BINS]
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES qtdemo.pro images xml *.ico *.icns *.rc *.plist
+sources.path = $$[QT_INSTALL_DEMOS]/qtdemo
+
diff --git a/demos/qtdemo/qtdemo.qrc b/demos/qtdemo/qtdemo.qrc
new file mode 100644
index 0000000..b30dd58
--- /dev/null
+++ b/demos/qtdemo/qtdemo.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+   <file>xml/examples.xml</file>
+   <file>images/qtlogo_small.png</file>
+   <file>images/trolltech-logo.png</file>
+   <file>images/demobg.png</file>
+</qresource>
+</RCC>
diff --git a/demos/qtdemo/qtdemo.rc b/demos/qtdemo/qtdemo.rc
new file mode 100644
index 0000000..4cf2a63
--- /dev/null
+++ b/demos/qtdemo/qtdemo.rc
@@ -0,0 +1,2 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtdemo.ico"
+
diff --git a/demos/qtdemo/scanitem.cpp b/demos/qtdemo/scanitem.cpp
new file mode 100644
index 0000000..0eab840
--- /dev/null
+++ b/demos/qtdemo/scanitem.cpp
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "scanitem.h"
+#include "colors.h"
+
+#define ITEM_WIDTH 16
+#define ITEM_HEIGHT 16
+
+ScanItem::ScanItem(QGraphicsScene *scene, QGraphicsItem *parent)
+    : DemoItem(scene, parent)
+{
+    useSharedImage(QString(__FILE__));
+}
+
+ScanItem::~ScanItem()
+{
+}
+
+QImage *ScanItem::createImage(const QMatrix &matrix) const
+{
+    QRect scaledRect = matrix.mapRect(QRect(0, 0, ITEM_WIDTH, ITEM_HEIGHT));
+    QImage *image = new QImage(scaledRect.width(), scaledRect.height(), QImage::Format_ARGB32_Premultiplied);
+    image->fill(QColor(0, 0, 0, 0).rgba());
+    QPainter painter(image);
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    if (Colors::useEightBitPalette){
+        painter.setPen(QPen(QColor(100, 100, 100), 2));
+        painter.setBrush(QColor(206, 246, 117));
+        painter.drawEllipse(1, 1, scaledRect.width()-2, scaledRect.height()-2);
+    }
+    else {
+        painter.setPen(QPen(QColor(0, 0, 0, 15), 1));
+//        painter.setBrush(QColor(206, 246, 117, 150));
+        painter.setBrush(QColor(0, 0, 0, 15));
+        painter.drawEllipse(1, 1, scaledRect.width()-2, scaledRect.height()-2);
+    }
+    return image;
+}
+
+
diff --git a/demos/qtdemo/scanitem.h b/demos/qtdemo/scanitem.h
new file mode 100644
index 0000000..b0b5ffc
--- /dev/null
+++ b/demos/qtdemo/scanitem.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SCAN_ITEM_H
+#define SCAN_ITEM_H
+
+#include <QtGui>
+#include "demoitem.h"
+
+class ScanItem : public DemoItem
+{
+public:
+    ScanItem(QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+    virtual ~ScanItem();
+
+protected:
+    QImage *createImage(const QMatrix &matrix) const;
+
+};
+
+#endif // SCAN_ITEM_H
+
diff --git a/demos/qtdemo/score.cpp b/demos/qtdemo/score.cpp
new file mode 100644
index 0000000..f45ba0d
--- /dev/null
+++ b/demos/qtdemo/score.cpp
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "score.h"
+#include "colors.h"
+#include "demoitem.h"
+
+Score::Score()
+{
+}
+
+Score::~Score()
+{
+    // NB! Deleting all movies.
+    qDeleteAll(this->index);
+}
+
+void Score::prepare(Movie *movie, RUN_MODE runMode, LOCK_MODE lockMode)
+{
+    if (lockMode == LOCK_ITEMS){
+        for (int i=0; i<movie->size(); ++i){
+            if (runMode == ONLY_IF_VISIBLE && !movie->at(i)->demoItem()->isVisible())
+                continue;
+            movie->at(i)->lockItem(true);
+            movie->at(i)->prepare();
+        }
+    }
+    else if (lockMode == UNLOCK_ITEMS){
+        for (int i=0; i<movie->size(); ++i){
+            if (runMode == ONLY_IF_VISIBLE && !movie->at(i)->demoItem()->isVisible())
+                continue;
+            movie->at(i)->lockItem(false);
+            movie->at(i)->prepare();
+        }
+    }
+    else {
+        for (int i=0; i<movie->size(); ++i){
+            if (runMode == ONLY_IF_VISIBLE && !movie->at(i)->demoItem()->isVisible())
+                continue;
+            movie->at(i)->prepare();
+        }
+    }
+}
+
+void Score::play(Movie *movie, RUN_MODE runMode)
+{
+    if (runMode == NEW_ANIMATION_ONLY){
+        for (int i=0; i<movie->size(); ++i)
+            if (movie->at(i)->notOwnerOfItem())
+                movie->at(i)->play(true);
+    }
+    else if (runMode == ONLY_IF_VISIBLE){
+        for (int i=0; i<movie->size(); ++i)
+            if (movie->at(i)->demoItem()->isVisible())
+                movie->at(i)->play(runMode == FROM_START);
+    }
+    else {
+        for (int i=0; i<movie->size(); ++i)
+            movie->at(i)->play(runMode == FROM_START);
+    }
+}
+
+void Score::playMovie(const QString &indexName, RUN_MODE runMode, LOCK_MODE lockMode)
+{
+    MovieIndex::iterator movieIterator = this->index.find(indexName);
+    if (movieIterator == this->index.end())
+        return;
+
+    Movie *movie = *movieIterator;
+    this->prepare(movie, runMode, lockMode);
+    this->play(movie, runMode);
+}
+
+void Score::queueMovie(const QString &indexName, RUN_MODE runMode, LOCK_MODE lockMode)
+{
+    MovieIndex::iterator movieIterator = this->index.find(indexName);
+    if (movieIterator == this->index.end()){
+        if (Colors::verbose)
+            qDebug() << "Queuing movie:" << indexName << "(does not exist)";
+        return;
+    }
+
+    Movie *movie = *movieIterator;
+    this->prepare(movie, runMode, lockMode);
+    this->playList.append(PlayListMember(movie, int(runMode)));
+    if (Colors::verbose)
+        qDebug() << "Queuing movie:" << indexName;
+}
+
+void Score::playQue()
+{
+    int movieCount = this->playList.size();
+    for (int i=0; i<movieCount; i++)
+        this->play(this->playList.at(i).movie, RUN_MODE(this->playList.at(i).runMode));
+    this->playList.clear();
+    if (Colors::verbose)
+        qDebug() << "********* Playing que *********";
+}
+
+void Score::insertMovie(const QString &indexName, Movie *movie)
+{
+    this->index.insert(indexName, movie);
+}
+
+Movie *Score::insertMovie(const QString &indexName)
+{
+    Movie *movie = new Movie();
+    insertMovie(indexName, movie);
+    return movie;
+}
+
diff --git a/demos/qtdemo/score.h b/demos/qtdemo/score.h
new file mode 100644
index 0000000..bfed5d2
--- /dev/null
+++ b/demos/qtdemo/score.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SCORE_H
+#define SCORE_H
+
+#include <QList>
+#include <QHash>
+#include "demoitemanimation.h"
+
+typedef QList<DemoItemAnimation *> Movie;
+typedef QHash<QString, Movie*> MovieIndex;
+
+class PlayListMember
+{
+public:
+    PlayListMember(Movie *movie, int runMode) : movie(movie), runMode(runMode){};
+    Movie *movie;
+    int runMode;
+};
+typedef QList<PlayListMember> PlayList;
+
+class Score
+{
+public:
+    enum LOCK_MODE {LOCK_ITEMS, UNLOCK_ITEMS, SKIP_LOCK};
+    enum RUN_MODE {FROM_CURRENT, FROM_START, NEW_ANIMATION_ONLY, ONLY_IF_VISIBLE};
+
+    Score();
+    virtual ~Score();
+
+    void playMovie(const QString &indexName, RUN_MODE runMode = FROM_START, LOCK_MODE lockMode = SKIP_LOCK);
+    void insertMovie(const QString &indexName, Movie *movie);
+    Movie *insertMovie(const QString &indexName);
+    void queueMovie(const QString &indexName, RUN_MODE runMode = FROM_START, LOCK_MODE lockMode = SKIP_LOCK);
+    void playQue();
+    bool hasQueuedMovies(){ return this->playList.size() > 0; };
+
+    MovieIndex index;
+    PlayList playList;
+
+private:
+    void prepare(Movie *movie, RUN_MODE runMode, LOCK_MODE lockMode);
+    void play(Movie *movie, RUN_MODE runMode);
+};
+
+#endif // SCORE_H
+
diff --git a/demos/qtdemo/textbutton.cpp b/demos/qtdemo/textbutton.cpp
new file mode 100644
index 0000000..96e1a23
--- /dev/null
+++ b/demos/qtdemo/textbutton.cpp
@@ -0,0 +1,384 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "textbutton.h"
+#include "demoitemanimation.h"
+#include "demotextitem.h"
+#include "colors.h"
+#include "menumanager.h"
+
+#define BUTTON_WIDTH 180
+#define BUTTON_HEIGHT 19
+
+class ButtonBackground : public DemoItem
+{
+public:
+    TextButton::BUTTONTYPE type;
+    bool highlighted;
+    bool pressed;
+    QSize logicalSize;
+
+    ButtonBackground(TextButton::BUTTONTYPE type, bool highlighted, bool pressed, QSize logicalSize,
+        QGraphicsScene *scene, QGraphicsItem *parent) : DemoItem(scene, parent)
+    {
+        this->type = type;
+        this->highlighted = highlighted;
+        this->pressed = pressed;
+        this->logicalSize = logicalSize;
+        useSharedImage(QString(__FILE__) + static_cast<int>(type) + highlighted + pressed);
+    }
+
+protected:
+    QImage *createImage(const QMatrix &matrix) const
+    {
+        if (type == TextButton::SIDEBAR || type == TextButton::PANEL)
+            return createRoundButtonBackground(matrix);
+        else
+            return createArrowBackground(matrix);
+    }
+
+    QImage *createRoundButtonBackground(const QMatrix &matrix) const
+    {
+        QRect scaledRect;
+        scaledRect = matrix.mapRect(QRect(0, 0, this->logicalSize.width(), this->logicalSize.height()));
+
+        QImage *image = new QImage(scaledRect.width(), scaledRect.height(), QImage::Format_ARGB32_Premultiplied);
+        image->fill(QColor(0, 0, 0, 0).rgba());
+        QPainter painter(image);
+        painter.setRenderHint(QPainter::SmoothPixmapTransform);
+        painter.setRenderHint(QPainter::Antialiasing);
+        painter.setPen(Qt::NoPen);
+
+        if (Colors::useEightBitPalette){
+            painter.setPen(QColor(120, 120, 120));
+            if (this->pressed)
+                painter.setBrush(QColor(60, 60, 60));
+            else if (this->highlighted)
+                painter.setBrush(QColor(100, 100, 100));
+            else
+                painter.setBrush(QColor(80, 80, 80));
+        }
+        else {
+            QLinearGradient outlinebrush(0, 0, 0, scaledRect.height());
+            QLinearGradient brush(0, 0, 0, scaledRect.height());
+
+            brush.setSpread(QLinearGradient::PadSpread);
+            QColor highlight(255, 255, 255, 70);
+            QColor shadow(0, 0, 0, 70);
+            QColor sunken(220, 220, 220, 30);
+            QColor normal1(255, 255, 245, 60);
+            QColor normal2(255, 255, 235, 10);
+
+            if (this->type == TextButton::PANEL){
+                normal1 = QColor(200, 170, 160, 50);
+                normal2 = QColor(50, 10, 0, 50);
+            }
+
+           if (pressed) {
+               outlinebrush.setColorAt(0.0f, shadow);
+               outlinebrush.setColorAt(1.0f, highlight);
+               brush.setColorAt(0.0f, sunken);
+               painter.setPen(Qt::NoPen);
+           } else {
+               outlinebrush.setColorAt(1.0f, shadow);
+               outlinebrush.setColorAt(0.0f, highlight);
+               brush.setColorAt(0.0f, normal1);
+               if (!this->highlighted)
+                   brush.setColorAt(1.0f, normal2);
+               painter.setPen(QPen(outlinebrush, 1));
+           }
+           painter.setBrush(brush);
+        }
+
+        if (this->type == TextButton::PANEL)
+            painter.drawRect(0, 0, scaledRect.width(), scaledRect.height());
+        else
+            painter.drawRoundedRect(0, 0, scaledRect.width(), scaledRect.height(), 10, 90, Qt::RelativeSize);
+        return image;
+    }
+
+    QImage *createArrowBackground(const QMatrix &matrix) const
+    {
+        QRect scaledRect;
+        scaledRect = matrix.mapRect(QRect(0, 0, this->logicalSize.width(), this->logicalSize.height()));
+
+        QImage *image = new QImage(scaledRect.width(), scaledRect.height(), QImage::Format_ARGB32_Premultiplied);
+        image->fill(QColor(0, 0, 0, 0).rgba());
+        QPainter painter(image);
+        painter.setRenderHint(QPainter::SmoothPixmapTransform);
+        painter.setRenderHint(QPainter::Antialiasing);
+        painter.setPen(Qt::NoPen);
+
+        if (Colors::useEightBitPalette){
+            painter.setPen(QColor(120, 120, 120));
+            if (this->pressed)
+                painter.setBrush(QColor(60, 60, 60));
+            else if (this->highlighted)
+                painter.setBrush(QColor(100, 100, 100));
+            else
+                painter.setBrush(QColor(80, 80, 80));
+        }
+        else {
+            QLinearGradient outlinebrush(0, 0, 0, scaledRect.height());
+            QLinearGradient brush(0, 0, 0, scaledRect.height());
+
+            brush.setSpread(QLinearGradient::PadSpread);
+            QColor highlight(255, 255, 255, 70);
+            QColor shadow(0, 0, 0, 70);
+            QColor sunken(220, 220, 220, 30);
+            QColor normal1 = QColor(200, 170, 160, 50);
+            QColor normal2 = QColor(50, 10, 0, 50);
+
+           if (pressed) {
+               outlinebrush.setColorAt(0.0f, shadow);
+               outlinebrush.setColorAt(1.0f, highlight);
+               brush.setColorAt(0.0f, sunken);
+               painter.setPen(Qt::NoPen);
+           } else {
+               outlinebrush.setColorAt(1.0f, shadow);
+               outlinebrush.setColorAt(0.0f, highlight);
+               brush.setColorAt(0.0f, normal1);
+               if (!this->highlighted)
+                   brush.setColorAt(1.0f, normal2);
+               painter.setPen(QPen(outlinebrush, 1));
+           }
+           painter.setBrush(brush);
+        }
+
+        painter.drawRect(0, 0, scaledRect.width(), scaledRect.height());
+
+        float xOff = scaledRect.width() / 2;
+        float yOff = scaledRect.height() / 2;
+        float sizex = 3.0f * matrix.m11();
+        float sizey = 1.5f * matrix.m22();
+        if (this->type == TextButton::UP)
+            sizey *= -1;
+        QPainterPath path;
+        path.moveTo(xOff, yOff + (5 * sizey));
+        path.lineTo(xOff - (4 * sizex), yOff - (3 * sizey));
+        path.lineTo(xOff + (4 * sizex), yOff - (3 * sizey));
+        path.lineTo(xOff, yOff + (5 * sizey));
+        painter.drawPath(path);
+
+        return image;
+    }
+
+};
+
+TextButton::TextButton(const QString &text, ALIGNMENT align, int userCode,
+    QGraphicsScene *scene, QGraphicsItem *parent, BUTTONTYPE type)
+    : DemoItem(scene, parent)
+{
+    this->menuString = text;
+    this->buttonLabel = text;
+    this->alignment = align;
+    this->buttonType = type;
+    this->userCode = userCode;
+    this->bgOn = 0;
+    this->bgOff = 0;
+    this->bgHighlight = 0;
+    this->bgDisabled = 0;
+    this->state = OFF;
+
+    this->setAcceptsHoverEvents(true);
+    this->setCursor(Qt::PointingHandCursor);
+
+    // Calculate button size:
+    const int w = 180;
+    const int h = 19;
+    if (type == SIDEBAR || type == PANEL)
+        this->logicalSize = QSize(w, h);
+    else
+        this->logicalSize = QSize(int((w / 2.0f) - 5), int(h * 1.5f));
+}
+
+void TextButton::setMenuString(const QString &menu)
+{
+    this->menuString = menu;
+}
+
+void TextButton::prepare()
+{
+    if (!this->prepared){
+        this->prepared = true;
+        this->setupHoverText();
+        this->setupScanItem();
+        this->setupButtonBg();
+    }
+}
+
+TextButton::~TextButton()
+{
+    if (this->prepared){
+        if (Colors::useButtonBalls)
+            delete this->scanAnim;
+    }
+}
+
+QRectF TextButton::boundingRect() const
+{
+    return QRectF(0, 0, this->logicalSize.width(), this->logicalSize.height());
+};
+
+void TextButton::setupHoverText()
+{
+    if (this->buttonLabel.isEmpty())
+        return;
+
+    DemoTextItem *textItem = new DemoTextItem(this->buttonLabel, Colors::buttonFont(), Colors::buttonText, -1, this->scene(), this);
+    textItem->setZValue(zValue() + 2);
+    textItem->setPos(16, 0);
+}
+
+void TextButton::setupScanItem()
+{
+    if (Colors::useButtonBalls){
+        ScanItem *scanItem = new ScanItem(0, this);
+        scanItem->setZValue(zValue() + 1);
+
+        this->scanAnim = new DemoItemAnimation(scanItem);
+        this->scanAnim->timeline->setLoopCount(1);
+
+        float x = 1;
+        float y = 1.5f;
+        float stop = BUTTON_WIDTH - scanItem->boundingRect().width() - x;
+        if (this->alignment == LEFT){
+            this->scanAnim->setDuration(2500);
+            this->scanAnim->setPosAt(0.0, QPointF(x, y));
+            this->scanAnim->setPosAt(0.5, QPointF(x, y));
+            this->scanAnim->setPosAt(0.7, QPointF(stop, y));
+            this->scanAnim->setPosAt(1.0, QPointF(x, y));
+            scanItem->setPos(QPointF(x, y));
+        }
+        else {
+            this->scanAnim->setPosAt(0.0, QPointF(stop, y));
+            this->scanAnim->setPosAt(0.5, QPointF(x, y));
+            this->scanAnim->setPosAt(1.0, QPointF(stop, y));
+            scanItem->setPos(QPointF(stop, y));
+        }
+    }
+}
+
+void TextButton::setState(STATE state)
+{
+    this->state = state;
+    this->bgOn->setRecursiveVisible(state == ON);
+    this->bgOff->setRecursiveVisible(state == OFF);
+    this->bgHighlight->setRecursiveVisible(state == HIGHLIGHT);
+    this->bgDisabled->setRecursiveVisible(state == DISABLED);
+    this->setCursor(state == DISABLED ? Qt::ArrowCursor : Qt::PointingHandCursor);
+
+}
+
+void TextButton::setupButtonBg()
+{
+    this->bgOn = new ButtonBackground(this->buttonType, true, true, this->logicalSize, this->scene(), this);
+    this->bgOff = new ButtonBackground(this->buttonType, false, false, this->logicalSize, this->scene(), this);
+    this->bgHighlight = new ButtonBackground(this->buttonType, true, false, this->logicalSize, this->scene(), this);
+    this->bgDisabled = new ButtonBackground(this->buttonType, true, true, this->logicalSize, this->scene(), this);
+    this->setState(OFF);
+}
+
+void TextButton::hoverEnterEvent(QGraphicsSceneHoverEvent *)
+{
+    if (this->locked || this->state == DISABLED)
+        return;
+
+    if (this->state == OFF){
+        this->setState(HIGHLIGHT);
+
+        if (Colors::noAnimations && Colors::useButtonBalls){
+            // wait a bit in the beginning
+            // to enhance the effect. Have to this here
+            // so that the adaption can be dynamic
+            this->scanAnim->setDuration(1000);
+            this->scanAnim->setPosAt(0.2, this->scanAnim->posAt(0));
+        }
+
+        if (MenuManager::instance()->window->fpsMedian > 10
+            || Colors::noAdapt
+            || Colors::noTimerUpdate){
+            if (Colors::useButtonBalls)
+                this->scanAnim->play(true, true);
+        }
+    }
+}
+
+void TextButton::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+    Q_UNUSED(event);
+    if (this->state == DISABLED)
+        return;
+
+    this->setState(OFF);
+
+    if (Colors::noAnimations && Colors::useButtonBalls)
+        this->scanAnim->stop();
+}
+
+void TextButton::mousePressEvent(QGraphicsSceneMouseEvent *)
+{
+    if (this->state == DISABLED)
+        return;
+
+    if (this->state == HIGHLIGHT || this->state == OFF)
+        this->setState(ON);
+}
+
+void TextButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (this->state == ON){
+        this->setState(OFF);
+        if (!this->locked && this->boundingRect().contains(event->pos())){
+            MenuManager::instance()->itemSelected(this->userCode, this->menuString);
+        }
+    }
+}
+
+void TextButton::animationStarted(int)
+{
+    if (this->state == DISABLED)
+        return;
+    this->setState(OFF);
+}
+
+
+
diff --git a/demos/qtdemo/textbutton.h b/demos/qtdemo/textbutton.h
new file mode 100644
index 0000000..b7c91fb
--- /dev/null
+++ b/demos/qtdemo/textbutton.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TEXT_BUTTON_H
+#define TEXT_BUTTON_H
+
+#include <QtGui>
+#include "demoitem.h"
+#include "demotextitem.h"
+#include "scanitem.h"
+
+class DemoItemAnimation;
+class ButtonBackground;
+
+class TextButton : public DemoItem
+{
+public:
+    enum ALIGNMENT {LEFT, RIGHT};
+    enum BUTTONTYPE {SIDEBAR, PANEL, UP, DOWN};
+    enum STATE {ON, OFF, HIGHLIGHT, DISABLED};
+
+    TextButton(const QString &text, ALIGNMENT align = LEFT, int userCode = 0,
+        QGraphicsScene *scene = 0, QGraphicsItem *parent = 0, BUTTONTYPE color = SIDEBAR);
+    virtual ~TextButton();
+
+    // overidden methods:
+    virtual QRectF boundingRect() const;
+    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0){};
+    virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+    virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+
+    void animationStarted(int id = 0);
+    void prepare();
+    void setState(STATE state);
+    void setMenuString(const QString &menu);
+    void setDisabled(bool disabled);
+
+private:
+    void setupButtonBg();
+    void setupScanItem();
+    void setupHoverText();
+
+    DemoItemAnimation *scanAnim;
+    ButtonBackground *bgOn;
+    ButtonBackground *bgOff;
+    ButtonBackground *bgHighlight;
+    ButtonBackground *bgDisabled;
+
+    BUTTONTYPE buttonType;
+    ALIGNMENT alignment;
+    QString buttonLabel;
+    QString menuString;
+    int userCode;
+    QSize logicalSize;
+
+    STATE state;
+};
+
+#endif // TEXT_BUTTON_H
+
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
new file mode 100644
index 0000000..df2d93b
--- /dev/null
+++ b/demos/qtdemo/xml/examples.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<categories name="Qt Examples and Demos">
+  <demos dirname="." docname="demos" name="Demonstrations">
+    <example filename="affine" name="Affine Transformations" />
+    <example filename="arthurplugin" name="Arthur Plugin" executable="false" />
+    <example filename="composition" name="Composition Modes" />
+    <example filename="gradients" name="Gradients" />
+    <example filename="pathstroke" name="Path Stroking" />
+    <example filename="deform" name="Vector Deformation" />
+    <example filename="books" name="Books" />
+    <example filename="mainwindow" name="Main Window" />
+    <example filename="spreadsheet" name="Spreadsheet" />
+    <example filename="sqlbrowser" name="SQL Browser" />
+    <example filename="textedit" name="Text Edit" />
+    <example filename="chip" name="40000 Chips" />
+    <example filename="embeddeddialogs" name="Embedded Dialogs" />
+    <example filename="interview" name="Interview" />
+    <example filename="browser" name="Browser" />
+    <example filename="mediaplayer" name="Media Player" />
+    <example filename="boxes" name="Boxes" />
+  </demos>
+  <category dirname="qtconcurrent" name="Concurrent Programming">
+    <example filename="map" name="Map" executable="false" />
+    <example filename="progressdialog" name="Progress Dialog" />
+    <example filename="runfunction" name="Run Function" executable="false"/>
+    <example filename="wordcount" name="Word Count" executable="false" />
+  </category>
+  <category dirname="designer" name="Qt Designer">
+    <example filename="calculatorbuilder" name="Calculator Builder" />
+    <example filename="calculatorform" name="Calculator Form" />
+    <example filename="containerextension" name="Container Extension" executable="false"/>
+    <example filename="customwidgetplugin" name="Custom Widget Plugin" executable="false" />
+    <example filename="taskmenuextension" name="Task Menu Extension" executable="false" />
+    <example filename="worldtimeclockbuilder" name="World Time Clock Builder" />
+    <example filename="worldtimeclockplugin" name="World Time Clock Plugin" executable="false"/>
+  </category>
+  <category dirname="desktop" name="Desktop">
+    <example filename="systray" name="System Tray" image="systemtray-example.png"/>
+    <example filename="screenshot" name="Screenshot" />
+  </category>
+  <category dirname="dialogs" name="Dialogs">
+    <example filename="configdialog" name="Configuration Dialog" />
+    <example filename="extension" name="Extension Dialog" />
+    <example filename="findfiles" name="Find Files Dialog" />
+    <example filename="standarddialogs" name="Standard Dialogs" />
+    <example filename="tabdialog" name="Tab Dialog" />
+    <example filename="trivialwizard" name="Trivial Wizard" image="trivialwizard-example-introduction.png"/>
+    <example filename="licensewizard" name="License Wizard" />
+    <example filename="classwizard" name="Class Wizard" />
+  </category>
+  <category dirname="draganddrop" name="Drag and Drop">
+    <example filename="draggableicons" name="Draggable Icons" />
+    <example filename="draggabletext" name="Draggable Text" />
+    <example filename="dropsite" name="Drop Site" />
+    <example filename="fridgemagnets" name="Fridge Magnets" />
+    <example filename="puzzle" name="Puzzle" image="draganddroppuzzle-example.png"/>
+  </category>
+  <category dirname="graphicsview" name="Graphics View">
+    <example filename="elasticnodes" name="Elastic Nodes" />
+    <example filename="collidingmice" name="Colliding Mice" />
+    <example filename="diagramscene" name="Diagram Scene" />
+    <example filename="dragdroprobot" name="Drag and Drop Robot" />
+    <example filename="portedcanvas" name="Ported Canvas" />
+    <example filename="portedasteroids" name="Ported Asteroids" />
+    <example filename="padnavigator" name="Pad Navigator Example" />
+  </category>
+  <category dirname="ipc" name="IPC">
+    <example filename="sharedmemory" name="Shared Memory" image="sharedmemory-example_1.png"/>
+    <example filename="localfortuneclient" name="Local Fortune Client" image="localfortuneclient-example.png"/>
+    <example filename="localfortuneserver" name="Local Fortune Server" image="localfortuneserver-example.png"/>
+  </category>
+  <category dirname="itemviews" name="Item Views">
+    <example filename="addressbook" name="Address Book" />
+    <example filename="basicsortfiltermodel" name="Basic Sort/Filter Model" />
+    <example filename="chart" name="Chart" />
+    <example filename="customsortfiltermodel" name="Custom Sort/Filter Model" />
+    <example filename="coloreditorfactory" name="Color Editor Factory" image="coloreditorfactoryimage.png"/>
+    <example filename="combowidgetmapper" name="Combo Widget Mapper" />
+    <example filename="dirview" name="Directory View" />
+    <example filename="fetchmore" name="Fetch More" />
+    <example filename="pixelator" name="Pixelator" />
+    <example filename="puzzle" name="Puzzle " image="itemviewspuzzle-example.png"/>
+    <example filename="simpledommodel" name="Simple DOM Model" />
+    <example filename="simpletreemodel" name="Simple Tree Model" />
+    <example filename="simplewidgetmapper" name="Simple Widget Mapper" />
+    <example filename="spinboxdelegate" name="Spin Box Delegate" />
+    <example filename="stardelegate" name="Star Delegate" />
+  </category>
+  <category dirname="layouts" name="Layouts">
+    <example filename="basiclayouts" name="Basic Layouts" />
+    <example filename="borderlayout" name="Border Layout" />
+    <example filename="dynamiclayouts" name="Dynamic Layouts" />
+    <example filename="flowlayout" name="Flow Layout" />
+  </category>
+  <category dirname="linguist" name="Qt Linguist">
+    <example filename="arrowpad" name="Arrow Pad" image="linguist-arrowpad_en.png"/>
+    <example filename="hellotr" name="Hello World" image="linguist-hellotr_en.png"/>
+    <example filename="trollprint" name="Troll Print" image="linguist-trollprint_10_en.png"/>
+  </category>
+  <category dirname="mainwindows" name="Main Windows">
+    <example filename="application" name="Application" />
+    <example filename="dockwidgets" name="Dock Widgets" />
+    <example filename="mdi" name="MDI" />
+    <example filename="sdi" name="SDI" />
+    <example filename="menus" name="Menus" />
+    <example filename="recentfiles" name="Recent Files" />
+  </category>
+  <category dirname="network" name="Networking">
+    <example filename="blockingfortuneclient" name="Blocking Fortune Client" />
+    <example filename="broadcastreceiver" name="Broadcast Receiver" />
+    <example filename="broadcastsender" name="Broadcast Sender" />
+    <example filename="network-chat" name="Network Chat Client" />
+    <example filename="fortuneclient" name="Fortune Client" />
+    <example filename="fortuneserver" name="Fortune Server" />
+    <example filename="ftp" changedirectory="false" name="FTP Client" />
+    <example filename="http" changedirectory="false" name="HTTP Client" />
+    <example filename="loopback" name="Loopback" />
+    <example filename="threadedfortuneserver" name="Threaded Fort. Server" />
+    <example filename="torrent" name="Torrent Client" />
+    <example filename="securesocketclient" name="Secure Socket Client" />
+  </category>
+  <category dirname="opengl" name="OpenGL">
+    <example filename="2dpainting" name="2D Painting" />
+    <example filename="framebufferobject" name="Framebuffer Object" />
+    <example filename="framebufferobject2" name="Framebuffer Object 2" />
+    <example filename="grabber" name="Grabber" />
+    <example filename="hellogl" name="Hello GL" />
+    <example filename="overpainting" name="Overpainting" />
+    <example filename="pbuffers" name="Pixel Buffers" />
+    <example filename="pbuffers2" name="Pixel Buffers 2" />
+    <example filename="samplebuffers" name="Sample Buffers" />
+    <example filename="textures" name="Textures" />
+  </category>
+  <category dirname="painting" name="Painting">
+    <example filename="basicdrawing" name="Basic Drawing" />
+    <example filename="concentriccircles" name="Concentric Circles" />
+    <example filename="fontsampler" name="Font Sampler" />
+    <example filename="imagecomposition" name="Image Composition" />
+    <example filename="painterpaths" name="Painter Paths" />
+    <example filename="svgviewer" name="SVG Viewer" />
+    <example filename="transformations" name="Transformations" />
+  </category>
+  <category dirname="phonon" name="Phonon">
+    <example filename="musicplayer" name="Music Player" />
+  </category>
+  <category dirname="richtext" name="Rich Text">
+    <example filename="calendar" name="Calendar" />
+    <example filename="orderform" name="Order Form" />
+    <example filename="syntaxhighlighter" name="Syntax Highlighter" />
+    <example filename="textobject" name="Text Object" />
+  </category>
+  <category dirname="script" name="QtScript">
+    <example filename="calculator" name="Calculator" />
+    <example filename="context2d" name="Context2D" />
+    <example filename="defaultprototypes" name="Default Prototypes" />
+    <example filename="helloscript" name="Hello Script" image="t1.png"/>
+    <example filename="qstetrix" name="QSTetrix" image="tetrix-example.png" />
+  </category>
+  <category dirname="sql" name="SQL">
+    <example filename="cachedtable" name="Cached Table" />
+    <example filename="drilldown" name="Drill Down" />
+    <example filename="querymodel" name="Query Model" />
+    <example filename="relationaltablemodel" name="Relational Table Model" />
+    <example filename="tablemodel" name="Table Model" />
+    <example filename="masterdetail" name="Music Archive" />
+    <example filename="sqlwidgetmapper" name="SQL Widget Mapper" />
+  </category>
+  <category dirname="threads" name="Threading">
+    <example filename="mandelbrot" name="Mandelbrot" />
+  </category>
+  <category dirname="tools" name="Tools">
+    <example filename="codecs" name="Codecs" />
+    <example filename="completer" name="Completer" />
+    <example filename="customcompleter" name="Custom Completer" />
+    <example filename="i18n" name="Internationalization" />
+    <example filename="plugandpaint" name="Plug and Paint" />
+    <example filename="regexp" name="Regular Expressions" />
+    <example filename="settingseditor" name="Settings Editor" />
+    <example filename="treemodelcompleter" name="Tree Model Completer" />
+    <example filename="undoframework" name="Undo Framework"/>
+  </category>
+  <category dirname="tutorials/addressbook" name="Address Book Tutorial">
+    <example filename="part1" name="Part 1" image="addressbook-tutorial-part1-screenshot.png" />
+    <example filename="part2" name="Part 2" image="addressbook-tutorial-part2-add-contact.png" />
+    <example filename="part3" name="Part 3" image="addressbook-tutorial-part3-screenshot.png" />
+    <example filename="part4" name="Part 4" image="addressbook-tutorial-screenshot.png" />
+    <example filename="part5" name="Part 5" image="addressbook-tutorial-part5-screenshot.png" />
+    <example filename="part6" name="Part 6" image="addressbook-tutorial-part6-screenshot.png" />
+    <example filename="part7" name="Part 7" image="addressbook-tutorial-part7-screenshot.png" />
+  </category>
+  <category dirname="widgets" name="Widgets">
+    <example filename="analogclock" name="Analog Clock" />
+    <example filename="calculator" name="Calculator " />
+    <example filename="calendarwidget" name="Calendar Widget" />
+    <example filename="charactermap" name="Character Map" />
+    <example filename="codeeditor" name="Code Editor" />
+    <example filename="digitalclock" name="Digital Clock" />
+    <example filename="groupbox" name="Group Box" />
+    <example filename="icons" name="Icons" />
+    <example filename="imageviewer" name="Image Viewer" />
+    <example filename="lineedits" name="Line Edits" />
+    <example filename="movie" name="Movie Player" />
+    <example filename="scribble" name="Scribble" />
+    <example filename="shapedclock" name="Shaped Clock" />
+    <example filename="sliders" name="Sliders" />
+    <example filename="spinboxes" name="Spin Boxes" />
+    <example filename="styles" name="Styles" image="styles-enabledwood.png"/>
+    <example filename="stylesheet" name="Style Sheet" image="stylesheet-coffee-plastique.png"/>
+    <example filename="tablet" name="Tablet" />
+    <example filename="tetrix" name="Tetrix " />
+    <example filename="tooltips" name="Tool Tips" />
+    <example filename="wiggly" name="Wiggly" />
+    <example filename="windowflags" name="Window Flags" />
+  </category>
+  <category dirname="xml" name="XML">
+    <example filename="saxbookmarks" name="SAX Bookmarks" />
+    <example filename="dombookmarks" name="DOM Bookmarks" />
+    <example filename="rsslisting" name="RSS-Listing" />
+    <example filename="streambookmarks" name="QXmlStream Bookmarks" image="xmlstreamexample-screenshot.png"/>
+  </category>
+  <category dirname="xmlpatterns" name="XML Patterns">
+    <example filename="recipes" name="Recipes" />
+    <example filename="qobjectxmlmodel" name="QObjectXmlModel" />
+    <example filename="filetree" name="File Tree" />
+    <example filename="trafficinfo" name="Traffic Info" />
+  </category>  
+</categories>
diff --git a/demos/shared/arthurstyle.cpp b/demos/shared/arthurstyle.cpp
new file mode 100644
index 0000000..846d2f3
--- /dev/null
+++ b/demos/shared/arthurstyle.cpp
@@ -0,0 +1,452 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "arthurstyle.h"
+#include "arthurwidgets.h"
+#include <QLayout>
+#include <QPainter>
+#include <QPainterPath>
+#include <QPixmapCache>
+#include <QRadioButton>
+#include <QString>
+#include <QStyleOption>
+#include <QtDebug>
+
+QPixmap cached(const QString &img)
+{
+    if (QPixmap *p = QPixmapCache::find(img))
+        return *p;
+
+    QPixmap pm;
+    pm = QPixmap::fromImage(QImage(img), Qt::OrderedDither | Qt::OrderedAlphaDither);
+    if (pm.isNull())
+        return QPixmap();
+
+    QPixmapCache::insert(img, pm);
+    return pm;
+}
+
+
+ArthurStyle::ArthurStyle()
+    : QWindowsStyle()
+{
+    Q_INIT_RESOURCE(shared);
+}
+
+
+void ArthurStyle::drawHoverRect(QPainter *painter, const QRect &r) const
+{
+    qreal h = r.height();
+    qreal h2 = r.height() / qreal(2);
+    QPainterPath path;
+    path.addRect(r.x() + h2, r.y() + 0, r.width() - h2 * 2, r.height());
+    path.addEllipse(r.x(), r.y(), h, h);
+    path.addEllipse(r.x() + r.width() - h, r.y(), h, h);
+    path.setFillRule(Qt::WindingFill);
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(QColor(191, 215, 191));
+    painter->setRenderHint(QPainter::Antialiasing);
+    painter->drawPath(path);
+}
+
+
+void ArthurStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option,
+                                QPainter *painter, const QWidget *widget) const
+{
+
+    Q_ASSERT(option);
+    switch (element) {
+    case PE_FrameFocusRect:
+        break;
+
+    case PE_IndicatorRadioButton:
+        if (const QStyleOptionButton *button = qstyleoption_cast<const QStyleOptionButton *>(option)) {
+            bool hover = (button->state & State_Enabled) && (button->state & State_MouseOver);
+            painter->save();
+            QPixmap radio;
+            if (hover)
+                drawHoverRect(painter, widget->rect());
+
+            if (button->state & State_Sunken)
+                radio = cached(":res/images/radiobutton-on.png");
+            else if (button->state & State_On)
+                radio = cached(":res/images/radiobutton_on.png");
+            else
+                radio = cached(":res/images/radiobutton_off.png");
+            painter->drawPixmap(button->rect.topLeft(), radio);
+
+            painter->restore();
+        }
+        break;
+
+    case PE_PanelButtonCommand:
+        if (const QStyleOptionButton *button = qstyleoption_cast<const QStyleOptionButton *>(option)) {
+            bool hover = (button->state & State_Enabled) && (button->state & State_MouseOver);
+
+            painter->save();
+            const QPushButton *pushButton = qobject_cast<const QPushButton *>(widget);
+            Q_ASSERT(pushButton);
+            QWidget *parent = pushButton->parentWidget();
+            if (parent && qobject_cast<QGroupBox *>(parent)) {
+                QLinearGradient lg(0, 0, 0, parent->height());
+                lg.setColorAt(0, QColor(224,224,224));
+                lg.setColorAt(1, QColor(255,255,255));
+                painter->setPen(Qt::NoPen);
+                painter->setBrush(lg);
+                painter->setBrushOrigin(-widget->mapToParent(QPoint(0,0)));
+                painter->drawRect(button->rect);
+                painter->setBrushOrigin(0,0);
+            }
+
+            bool down = (button->state & State_Sunken) || (button->state & State_On);
+
+            QPixmap left, right, mid;
+            if (down) {
+                left = cached(":res/images/button_pressed_cap_left.png");
+                right = cached(":res/images/button_pressed_cap_right.png");
+                mid = cached(":res/images/button_pressed_stretch.png");
+            } else {
+                left = cached(":res/images/button_normal_cap_left.png");
+                right = cached(":res/images/button_normal_cap_right.png");
+                mid = cached(":res/images/button_normal_stretch.png");
+            }
+            painter->drawPixmap(button->rect.topLeft(), left);
+            painter->drawTiledPixmap(QRect(button->rect.x() + left.width(),
+                                           button->rect.y(),
+                                           button->rect.width() - left.width() - right.width(),
+                                           left.height()),
+                                     mid);
+            painter->drawPixmap(button->rect.x() + button->rect.width() - right.width(),
+                                button->rect.y(),
+                                right);
+            if (hover)
+                painter->fillRect(widget->rect().adjusted(3,5,-3,-5), QColor(31,127,31,63));
+            painter->restore();
+        }
+        break;
+
+    case PE_FrameGroupBox:
+        if (const QStyleOptionFrameV2 *group
+                = qstyleoption_cast<const QStyleOptionFrameV2 *>(option)) {
+            const QRect &r = group->rect;
+
+            painter->save();
+            int radius = 14;
+            int radius2 = radius*2;
+            QPainterPath clipPath;
+            clipPath.moveTo(radius, 0);
+            clipPath.arcTo(r.right() - radius2, 0, radius2, radius2, 90, -90);
+            clipPath.arcTo(r.right() - radius2, r.bottom() - radius2, radius2, radius2, 0, -90);
+            clipPath.arcTo(r.left(), r.bottom() - radius2, radius2, radius2, 270, -90);
+            clipPath.arcTo(r.left(), r.top(), radius2, radius2, 180, -90);
+            painter->setClipPath(clipPath);
+            QPixmap titleStretch = cached(":res/images/title_stretch.png");
+            QPixmap topLeft = cached(":res/images/groupframe_topleft.png");
+            QPixmap topRight = cached(":res/images/groupframe_topright.png");
+            QPixmap bottomLeft = cached(":res/images/groupframe_bottom_left.png");
+            QPixmap bottomRight = cached(":res/images/groupframe_bottom_right.png");
+            QPixmap leftStretch = cached(":res/images/groupframe_left_stretch.png");
+            QPixmap topStretch = cached(":res/images/groupframe_top_stretch.png");
+            QPixmap rightStretch = cached(":res/images/groupframe_right_stretch.png");
+            QPixmap bottomStretch = cached(":res/images/groupframe_bottom_stretch.png");
+            QLinearGradient lg(0, 0, 0, r.height());
+            lg.setColorAt(0, QColor(224,224,224));
+            lg.setColorAt(1, QColor(255,255,255));
+            painter->setPen(Qt::NoPen);
+            painter->setBrush(lg);
+            painter->drawRect(r.adjusted(0, titleStretch.height()/2, 0, 0));
+            painter->setClipping(false);
+
+            int topFrameOffset = titleStretch.height()/2 - 2;
+            painter->drawPixmap(r.topLeft() + QPoint(0, topFrameOffset), topLeft);
+            painter->drawPixmap(r.topRight() - QPoint(topRight.width()-1, 0)
+                                + QPoint(0, topFrameOffset), topRight);
+            painter->drawPixmap(r.bottomLeft() - QPoint(0, bottomLeft.height()-1), bottomLeft);
+            painter->drawPixmap(r.bottomRight() - QPoint(bottomRight.width()-1,
+                                bottomRight.height()-1), bottomRight);
+
+            QRect left = r;
+            left.setY(r.y() + topLeft.height() + topFrameOffset);
+            left.setWidth(leftStretch.width());
+            left.setHeight(r.height() - topLeft.height() - bottomLeft.height() - topFrameOffset);
+            painter->drawTiledPixmap(left, leftStretch);
+
+            QRect top = r;
+            top.setX(r.x() + topLeft.width());
+            top.setY(r.y() + topFrameOffset);
+            top.setWidth(r.width() - topLeft.width() - topRight.width());
+            top.setHeight(topLeft.height());
+            painter->drawTiledPixmap(top, topStretch);
+
+            QRect right = r;
+            right.setX(r.right() - rightStretch.width()+1);
+            right.setY(r.y() + topRight.height() + topFrameOffset);
+            right.setWidth(rightStretch.width());
+            right.setHeight(r.height() - topRight.height()
+                            - bottomRight.height() - topFrameOffset);
+            painter->drawTiledPixmap(right, rightStretch);
+
+            QRect bottom = r;
+            bottom.setX(r.x() + bottomLeft.width());
+            bottom.setY(r.bottom() - bottomStretch.height()+1);
+            bottom.setWidth(r.width() - bottomLeft.width() - bottomRight.width());
+            bottom.setHeight(bottomLeft.height());
+            painter->drawTiledPixmap(bottom, bottomStretch);
+            painter->restore();
+        }
+        break;
+
+    default:
+        QWindowsStyle::drawPrimitive(element, option, painter, widget);
+        break;
+    }
+    return;
+}
+
+
+void ArthurStyle::drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
+                                     QPainter *painter, const QWidget *widget) const
+{
+    switch (control) {
+    case CC_Slider:
+        if (const QStyleOptionSlider *slider = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
+            QRect groove = subControlRect(CC_Slider, option, SC_SliderGroove, widget);
+            QRect handle = subControlRect(CC_Slider, option, SC_SliderHandle, widget);
+
+            painter->save();
+
+            bool hover = (slider->state & State_Enabled) && (slider->state & State_MouseOver);
+            if (hover) {
+                QRect moderated = widget->rect().adjusted(0, 4, 0, -4);
+                drawHoverRect(painter, moderated);
+            }
+
+            if ((option->subControls & SC_SliderGroove) && groove.isValid()) {
+                QPixmap grv = cached(":res/images/slider_bar.png");
+                painter->drawPixmap(QRect(groove.x() + 5, groove.y(),
+                                          groove.width() - 10, grv.height()),
+                                    grv);
+            }
+            if ((option->subControls & SC_SliderHandle) && handle.isValid()) {
+                QPixmap hndl = cached(":res/images/slider_thumb_on.png");
+                painter->drawPixmap(handle.topLeft(), hndl);
+            }
+
+            painter->restore();
+        }
+        break;
+    case CC_GroupBox:
+        if (const QStyleOptionGroupBox *groupBox
+                = qstyleoption_cast<const QStyleOptionGroupBox *>(option)) {
+            QStyleOptionGroupBox groupBoxCopy(*groupBox);
+            groupBoxCopy.subControls &= ~SC_GroupBoxLabel;
+            QWindowsStyle::drawComplexControl(control, &groupBoxCopy, painter, widget);
+
+            if (groupBox->subControls & SC_GroupBoxLabel) {
+                const QRect &r = groupBox->rect;
+                QPixmap titleLeft = cached(":res/images/title_cap_left.png");
+                QPixmap titleRight = cached(":res/images/title_cap_right.png");
+                QPixmap titleStretch = cached(":res/images/title_stretch.png");
+                int txt_width = groupBox->fontMetrics.width(groupBox->text) + 20;
+                painter->drawPixmap(r.center().x() - txt_width/2, 0, titleLeft);
+                QRect tileRect = subControlRect(control, groupBox, SC_GroupBoxLabel, widget);
+                painter->drawTiledPixmap(tileRect, titleStretch);
+                painter->drawPixmap(tileRect.x() + tileRect.width(), 0, titleRight);
+                int opacity = 31;
+                painter->setPen(QColor(0, 0, 0, opacity));
+                painter->drawText(tileRect.translated(0, 1),
+                                  Qt::AlignVCenter | Qt::AlignHCenter, groupBox->text);
+                painter->drawText(tileRect.translated(2, 1),
+                                  Qt::AlignVCenter | Qt::AlignHCenter, groupBox->text);
+                painter->setPen(QColor(0, 0, 0, opacity * 2));
+                painter->drawText(tileRect.translated(1, 1),
+                                  Qt::AlignVCenter | Qt::AlignHCenter, groupBox->text);
+                painter->setPen(Qt::white);
+                painter->drawText(tileRect, Qt::AlignVCenter | Qt::AlignHCenter, groupBox->text);
+            }
+        }
+        break;
+    default:
+        QWindowsStyle::drawComplexControl(control, option, painter, widget);
+        break;
+    }
+    return;
+}
+
+QRect ArthurStyle::subControlRect(ComplexControl control, const QStyleOptionComplex *option,
+                                  SubControl subControl, const QWidget *widget) const
+{
+    QRect rect;
+
+    switch (control) {
+    default:
+        rect = QWindowsStyle::subControlRect(control, option, subControl, widget);
+        break;
+    case CC_GroupBox:
+        if (const QStyleOptionGroupBox *group
+                = qstyleoption_cast<const QStyleOptionGroupBox *>(option)) {
+            switch (subControl) {
+            default:
+                rect = QWindowsStyle::subControlRect(control, option, subControl, widget);
+                break;
+            case SC_GroupBoxContents:
+                rect = QWindowsStyle::subControlRect(control, option, subControl, widget);
+                rect.adjust(0, -8, 0, 0);
+                break;
+            case SC_GroupBoxFrame:
+                rect = group->rect;
+                break;
+            case SC_GroupBoxLabel:
+                QPixmap titleLeft = cached(":res/images/title_cap_left.png");
+                QPixmap titleRight = cached(":res/images/title_cap_right.png");
+                QPixmap titleStretch = cached(":res/images/title_stretch.png");
+                int txt_width = group->fontMetrics.width(group->text) + 20;
+                rect = QRect(group->rect.center().x() - txt_width/2 + titleLeft.width(), 0,
+                             txt_width - titleLeft.width() - titleRight.width(),
+                             titleStretch.height());
+                break;
+            }
+        }
+        break;
+    }
+
+    if (control == CC_Slider && subControl == SC_SliderHandle) {
+        rect.setWidth(13);
+        rect.setHeight(27);
+    } else if (control == CC_Slider && subControl == SC_SliderGroove) {
+        rect.setHeight(9);
+        rect.moveTop(27/2 - 9/2);
+    }
+    return rect;
+}
+
+QSize ArthurStyle::sizeFromContents(ContentsType type, const QStyleOption *option,
+                                    const QSize &size, const QWidget *widget) const
+{
+    QSize newSize = QWindowsStyle::sizeFromContents(type, option, size, widget);
+
+
+    switch (type) {
+    case CT_RadioButton:
+        newSize += QSize(20, 0);
+        break;
+
+    case CT_PushButton:
+        newSize.setHeight(26);
+        break;
+
+    case CT_Slider:
+        newSize.setHeight(27);
+        break;
+
+    default:
+        break;
+    }
+
+    return newSize;
+}
+
+int ArthurStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, const QWidget *widget) const
+{
+    if (pm == PM_SliderLength)
+        return 13;
+    return QWindowsStyle::pixelMetric(pm, opt, widget);
+}
+
+void ArthurStyle::polish(QWidget *widget)
+{
+    if (widget->layout() && qobject_cast<QGroupBox *>(widget)) {
+        if (qFindChildren<QGroupBox *>(widget).size() == 0) {
+            widget->layout()->setSpacing(0);
+            widget->layout()->setMargin(12);
+        } else {
+            widget->layout()->setMargin(13);
+        }
+    }
+
+    if (qobject_cast<QPushButton *>(widget)
+        || qobject_cast<QRadioButton *>(widget)
+        || qobject_cast<QSlider *>(widget)) {
+        widget->setAttribute(Qt::WA_Hover);
+    }
+
+    QPalette pal = widget->palette();
+    if (widget->isWindow()) {
+        pal.setColor(QPalette::Background, QColor(241, 241, 241));
+        widget->setPalette(pal);
+    }
+
+}
+
+void ArthurStyle::unpolish(QWidget *widget)
+{
+    if (qobject_cast<QPushButton *>(widget)
+        || qobject_cast<QRadioButton *>(widget)
+        || qobject_cast<QSlider *>(widget)) {
+        widget->setAttribute(Qt::WA_Hover, false);
+    }
+}
+
+void ArthurStyle::polish(QPalette &palette)
+{
+    palette.setColor(QPalette::Background, QColor(241, 241, 241));
+}
+
+QRect ArthurStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const
+{
+    QRect r;
+    switch(element) {
+    case SE_RadioButtonClickRect:
+        r = widget->rect();
+        break;
+    case SE_RadioButtonContents:
+        r = widget->rect().adjusted(20, 0, 0, 0);
+        break;
+    default:
+        r = QWindowsStyle::subElementRect(element, option, widget);
+        break;
+    }
+
+    if (qobject_cast<const QRadioButton*>(widget))
+        r = r.adjusted(5, 0, -5, 0);
+
+    return r;
+}
diff --git a/demos/shared/arthurstyle.h b/demos/shared/arthurstyle.h
new file mode 100644
index 0000000..ec79361
--- /dev/null
+++ b/demos/shared/arthurstyle.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ARTHURSTYLE_H
+#define ARTHURSTYLE_H
+
+#include <QWindowsStyle>
+
+QT_USE_NAMESPACE
+
+class ArthurStyle : public QWindowsStyle
+{
+public:
+    ArthurStyle();
+
+    void drawHoverRect(QPainter *painter, const QRect &rect) const;
+
+    void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
+                       QPainter *painter, const QWidget *widget = 0) const;
+//     void drawControl(ControlElement element, const QStyleOption *option,
+//                      QPainter *painter, const QWidget *widget) const;
+    void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
+                            QPainter *painter, const QWidget *widget) const;
+    QSize sizeFromContents(ContentsType type, const QStyleOption *option,
+                           const QSize &size, const QWidget *widget) const;
+
+    QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const;
+    QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
+                         SubControl sc, const QWidget *widget) const;
+
+//     SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option,
+// 				     const QPoint &pos, const QWidget *widget = 0) const;
+
+    int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const;
+
+    void polish(QPalette &palette);
+    void polish(QWidget *widget);
+    void unpolish(QWidget *widget);
+};
+
+#endif
diff --git a/demos/shared/arthurwidgets.cpp b/demos/shared/arthurwidgets.cpp
new file mode 100644
index 0000000..f9eed99
--- /dev/null
+++ b/demos/shared/arthurwidgets.cpp
@@ -0,0 +1,371 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "arthurwidgets.h"
+#include <QApplication>
+#include <QPainter>
+#include <QPainterPath>
+#include <QPixmapCache>
+#include <QtEvents>
+#include <QTextDocument>
+#include <QAbstractTextDocumentLayout>
+#include <QFile>
+#include <QTextBrowser>
+#include <QBoxLayout>
+
+#include <private/qpixmapdata_p.h>
+
+extern QPixmap cached(const QString &img);
+
+ArthurFrame::ArthurFrame(QWidget *parent)
+    : QWidget(parent)
+    , m_prefer_image(false)
+{
+#ifdef QT_OPENGL_SUPPORT
+    glw = 0;
+    m_use_opengl = false;
+    QGLFormat f = QGLFormat::defaultFormat();
+    f.setSampleBuffers(true);
+    f.setStencil(true);
+    f.setAlpha(true);
+    f.setAlphaBufferSize(8);
+    QGLFormat::setDefaultFormat(f);
+#endif
+    m_document = 0;
+    m_show_doc = false;
+
+    m_tile = QPixmap(128, 128);
+    m_tile.fill(Qt::white);
+    QPainter pt(&m_tile);
+    QColor color(230, 230, 230);
+    pt.fillRect(0, 0, 64, 64, color);
+    pt.fillRect(64, 64, 64, 64, color);
+    pt.end();
+
+//     QPalette pal = palette();
+//     pal.setBrush(backgroundRole(), m_tile);
+//     setPalette(pal);
+
+#ifdef Q_WS_X11
+    QPixmap xRenderPixmap(1, 1);
+    m_prefer_image = xRenderPixmap.pixmapData()->classId() == QPixmapData::X11Class && !xRenderPixmap.x11PictureHandle();
+#endif
+}
+
+
+#ifdef QT_OPENGL_SUPPORT
+void ArthurFrame::enableOpenGL(bool use_opengl)
+{
+    m_use_opengl = use_opengl;
+
+    if (!glw) {
+        glw = new GLWidget(this);
+        glw->setAutoFillBackground(false);
+        glw->disableAutoBufferSwap();
+        QApplication::postEvent(this, new QResizeEvent(size(), size()));
+    }
+
+    if (use_opengl) {
+        glw->show();
+    } else {
+        glw->hide();
+    }
+
+    update();
+}
+#endif
+
+void ArthurFrame::paintEvent(QPaintEvent *e)
+{
+#ifdef Q_WS_QWS
+    static QPixmap *static_image = 0;
+#else
+    static QImage *static_image = 0;
+#endif
+    QPainter painter;
+    if (preferImage()
+#ifdef QT_OPENGL_SUPPORT
+        && !m_use_opengl
+#endif
+        ) {
+        if (!static_image || static_image->size() != size()) {
+            delete static_image;
+#ifdef Q_WS_QWS
+            static_image = new QPixmap(size());
+#else
+            static_image = new QImage(size(), QImage::Format_RGB32);
+#endif
+        }
+        painter.begin(static_image);
+
+        int o = 10;
+
+        QBrush bg = palette().brush(QPalette::Background);
+        painter.fillRect(0, 0, o, o, bg);
+        painter.fillRect(width() - o, 0, o, o, bg);
+        painter.fillRect(0, height() - o, o, o, bg);
+        painter.fillRect(width() - o, height() - o, o, o, bg);
+    } else {
+#ifdef QT_OPENGL_SUPPORT
+        if (m_use_opengl) {
+            painter.begin(glw);
+            painter.fillRect(QRectF(0, 0, glw->width(), glw->height()), palette().color(backgroundRole()));
+        } else {
+            painter.begin(this);
+        }
+#else
+        painter.begin(this);
+#endif
+    }
+
+    painter.setClipRect(e->rect());
+
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    QPainterPath clipPath;
+
+    QRect r = rect();
+    qreal left = r.x() + 1;
+    qreal top = r.y() + 1;
+    qreal right = r.right();
+    qreal bottom = r.bottom();
+    qreal radius2 = 8 * 2;
+
+    clipPath.moveTo(right - radius2, top);
+    clipPath.arcTo(right - radius2, top, radius2, radius2, 90, -90);
+    clipPath.arcTo(right - radius2, bottom - radius2, radius2, radius2, 0, -90);
+    clipPath.arcTo(left, bottom - radius2, radius2, radius2, 270, -90);
+    clipPath.arcTo(left, top, radius2, radius2, 180, -90);
+    clipPath.closeSubpath();
+
+    painter.save();
+    painter.setClipPath(clipPath, Qt::IntersectClip);
+
+    painter.drawTiledPixmap(rect(), m_tile);
+
+    // client painting
+
+    paint(&painter);
+
+    painter.restore();
+
+    painter.save();
+    if (m_show_doc)
+        paintDescription(&painter);
+    painter.restore();
+
+    int level = 180;
+    painter.setPen(QPen(QColor(level, level, level), 2));
+    painter.setBrush(Qt::NoBrush);
+    painter.drawPath(clipPath);
+
+    if (preferImage()
+#ifdef QT_OPENGL_SUPPORT
+        && !m_use_opengl
+#endif
+        ) {
+        painter.end();
+        painter.begin(this);
+#ifdef Q_WS_QWS
+        painter.drawPixmap(e->rect(), *static_image, e->rect());
+#else
+        painter.drawImage(e->rect(), *static_image, e->rect());
+#endif
+    }
+
+#ifdef QT_OPENGL_SUPPORT
+    if (m_use_opengl && (inherits("PathDeformRenderer") || inherits("PathStrokeRenderer") || inherits("CompositionRenderer") || m_show_doc))
+        glw->swapBuffers();
+#endif
+}
+
+void ArthurFrame::resizeEvent(QResizeEvent *e)
+{
+#ifdef QT_OPENGL_SUPPORT
+    if (glw)
+        glw->setGeometry(0, 0, e->size().width()-1, e->size().height()-1);
+#endif
+    QWidget::resizeEvent(e);
+}
+
+void ArthurFrame::setDescriptionEnabled(bool enabled)
+{
+    if (m_show_doc != enabled) {
+        m_show_doc = enabled;
+        emit descriptionEnabledChanged(m_show_doc);
+        update();
+    }
+}
+
+void ArthurFrame::loadDescription(const QString &fileName)
+{
+    QFile textFile(fileName);
+    QString text;
+    if (!textFile.open(QFile::ReadOnly))
+        text = QString("Unable to load resource file: '%1'").arg(fileName);
+    else
+        text = textFile.readAll();
+    setDescription(text);
+}
+
+
+void ArthurFrame::setDescription(const QString &text)
+{
+    m_document = new QTextDocument(this);
+    m_document->setHtml(text);
+}
+
+void ArthurFrame::paintDescription(QPainter *painter)
+{
+    if (!m_document)
+        return;
+
+    int pageWidth = qMax(width() - 100, 100);
+    int pageHeight = qMax(height() - 100, 100);
+    if (pageWidth != m_document->pageSize().width()) {
+        m_document->setPageSize(QSize(pageWidth, pageHeight));
+    }
+
+    QRect textRect(width() / 2 - pageWidth / 2,
+                   height() / 2 - pageHeight / 2,
+                   pageWidth,
+                   pageHeight);
+    int pad = 10;
+    QRect clearRect = textRect.adjusted(-pad, -pad, pad, pad);
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(QColor(0, 0, 0, 63));
+    int shade = 10;
+    painter->drawRect(clearRect.x() + clearRect.width() + 1,
+                      clearRect.y() + shade,
+                      shade,
+                      clearRect.height() + 1);
+    painter->drawRect(clearRect.x() + shade,
+                      clearRect.y() + clearRect.height() + 1,
+                      clearRect.width() - shade + 1,
+                      shade);
+
+    painter->setRenderHint(QPainter::Antialiasing, false);
+    painter->setBrush(QColor(255, 255, 255, 220));
+    painter->setPen(Qt::black);
+    painter->drawRect(clearRect);
+
+    painter->setClipRegion(textRect, Qt::IntersectClip);
+    painter->translate(textRect.topLeft());
+
+    QAbstractTextDocumentLayout::PaintContext ctx;
+
+    QLinearGradient g(0, 0, 0, textRect.height());
+    g.setColorAt(0, Qt::black);
+    g.setColorAt(0.9, Qt::black);
+    g.setColorAt(1, Qt::transparent);
+
+    QPalette pal = palette();
+    pal.setBrush(QPalette::Text, g);
+
+    ctx.palette = pal;
+    ctx.clip = QRect(0, 0, textRect.width(), textRect.height());
+    m_document->documentLayout()->draw(painter, ctx);
+}
+
+void ArthurFrame::loadSourceFile(const QString &sourceFile)
+{
+    m_sourceFileName = sourceFile;
+}
+
+void ArthurFrame::showSource()
+{
+    // Check for existing source
+    if (qFindChild<QTextBrowser *>(this))
+        return;
+
+    QString contents;
+    if (m_sourceFileName.isEmpty()) {
+        contents = QString("No source for widget: '%1'").arg(objectName());
+    } else {
+        QFile f(m_sourceFileName);
+        if (!f.open(QFile::ReadOnly))
+            contents = QString("Could not open file: '%1'").arg(m_sourceFileName);
+        else
+            contents = f.readAll();
+    }
+
+    contents.replace('&', "&amp;");
+    contents.replace('<', "&lt;");
+    contents.replace('>', "&gt;");
+
+    QStringList keywords;
+    keywords << "for " << "if " << "switch " << " int " << "#include " << "const"
+             << "void " << "uint " << "case " << "double " << "#define " << "static"
+             << "new" << "this";
+
+    foreach (QString keyword, keywords)
+        contents.replace(keyword, QLatin1String("<font color=olive>") + keyword + QLatin1String("</font>"));
+    contents.replace("(int ", "(<font color=olive><b>int </b></font>");
+
+    QStringList ppKeywords;
+    ppKeywords << "#ifdef" << "#ifndef" << "#if" << "#endif" << "#else";
+
+    foreach (QString keyword, ppKeywords)
+        contents.replace(keyword, QLatin1String("<font color=navy>") + keyword + QLatin1String("</font>"));
+
+    contents.replace(QRegExp("(\\d\\d?)"), QLatin1String("<font color=navy>\\1</font>"));
+
+    QRegExp commentRe("(//.+)\\n");
+    commentRe.setMinimal(true);
+    contents.replace(commentRe, QLatin1String("<font color=red>\\1</font>\n"));
+
+    QRegExp stringLiteralRe("(\".+\")");
+    stringLiteralRe.setMinimal(true);
+    contents.replace(stringLiteralRe, QLatin1String("<font color=green>\\1</font>"));
+
+    QString html = contents;
+    html.prepend("<html><pre>");
+    html.append("</pre></html>");
+
+    QTextBrowser *sourceViewer = new QTextBrowser(0);
+    sourceViewer->setWindowTitle("Source: " + m_sourceFileName.mid(5));
+    sourceViewer->setParent(this, Qt::Dialog);
+    sourceViewer->setAttribute(Qt::WA_DeleteOnClose);
+    sourceViewer->setLineWrapMode(QTextEdit::NoWrap);
+    sourceViewer->setHtml(html);
+    sourceViewer->resize(600, 600);
+    sourceViewer->show();
+}
diff --git a/demos/shared/arthurwidgets.h b/demos/shared/arthurwidgets.h
new file mode 100644
index 0000000..4d55b61
--- /dev/null
+++ b/demos/shared/arthurwidgets.h
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ARTHURWIDGETS_H
+#define ARTHURWIDGETS_H
+
+#include "arthurstyle.h"
+#include <QBitmap>
+#include <QPushButton>
+#include <QGroupBox>
+
+#if defined(QT_OPENGL_SUPPORT)
+#include <QGLWidget>
+class GLWidget : public QGLWidget
+{
+public:
+    GLWidget(QWidget *parent)
+        : QGLWidget(QGLFormat(QGL::SampleBuffers), parent) {}
+    void disableAutoBufferSwap() { setAutoBufferSwap(false); }
+    void paintEvent(QPaintEvent *) { parentWidget()->update(); }
+};
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QTextDocument)
+QT_FORWARD_DECLARE_CLASS(QTextEdit)
+QT_FORWARD_DECLARE_CLASS(QVBoxLayout)
+
+class ArthurFrame : public QWidget
+{
+    Q_OBJECT
+public:
+    ArthurFrame(QWidget *parent);
+    virtual void paint(QPainter *) {}
+
+
+    void paintDescription(QPainter *p);
+
+    void loadDescription(const QString &filename);
+    void setDescription(const QString &htmlDesc);
+
+    void loadSourceFile(const QString &fileName);
+
+    bool preferImage() const { return m_prefer_image; }
+
+#if defined(QT_OPENGL_SUPPORT)
+    QGLWidget *glWidget() const { return glw; }
+#endif
+
+public slots:
+    void setPreferImage(bool pi) { m_prefer_image = pi; }
+    void setDescriptionEnabled(bool enabled);
+    void showSource();
+
+#if defined(QT_OPENGL_SUPPORT)
+    void enableOpenGL(bool use_opengl);
+    bool usesOpenGL() { return m_use_opengl; }
+#endif
+
+signals:
+    void descriptionEnabledChanged(bool);
+
+protected:
+    void paintEvent(QPaintEvent *);
+    void resizeEvent(QResizeEvent *);
+
+#if defined(QT_OPENGL_SUPPORT)
+    GLWidget *glw;
+    bool m_use_opengl;
+#endif
+    QPixmap m_tile;
+
+    bool m_show_doc;
+    bool m_prefer_image;
+    QTextDocument *m_document;
+
+    QString m_sourceFileName;
+
+};
+
+#endif
diff --git a/demos/shared/hoverpoints.cpp b/demos/shared/hoverpoints.cpp
new file mode 100644
index 0000000..70062f6
--- /dev/null
+++ b/demos/shared/hoverpoints.cpp
@@ -0,0 +1,333 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifdef QT_OPENGL_SUPPORT
+#include <QGLWidget>
+#endif
+
+#include "arthurwidgets.h"
+#include "hoverpoints.h"
+
+#define printf
+
+HoverPoints::HoverPoints(QWidget *widget, PointShape shape)
+    : QObject(widget)
+{
+    m_widget = widget;
+    widget->installEventFilter(this);
+
+    m_connectionType = CurveConnection;
+    m_sortType = NoSort;
+    m_shape = shape;
+    m_pointPen = QPen(QColor(255, 255, 255, 191), 1);
+    m_connectionPen = QPen(QColor(255, 255, 255, 127), 2);
+    m_pointBrush = QBrush(QColor(191, 191, 191, 127));
+    m_pointSize = QSize(11, 11);
+    m_currentIndex = -1;
+    m_editable = true;
+    m_enabled = true;
+
+    connect(this, SIGNAL(pointsChanged(const QPolygonF &)),
+            m_widget, SLOT(update()));
+}
+
+
+void HoverPoints::setEnabled(bool enabled)
+{
+    if (m_enabled != enabled) {
+        m_enabled = enabled;
+        m_widget->update();
+    }
+}
+
+
+bool HoverPoints::eventFilter(QObject *object, QEvent *event)
+{
+    if (object == m_widget && m_enabled) {
+        switch (event->type()) {
+
+        case QEvent::MouseButtonPress:
+        {
+            QMouseEvent *me = (QMouseEvent *) event;
+
+            QPointF clickPos = me->pos();
+            int index = -1;
+            for (int i=0; i<m_points.size(); ++i) {
+                QPainterPath path;
+                if (m_shape == CircleShape)
+                    path.addEllipse(pointBoundingRect(i));
+                else
+                    path.addRect(pointBoundingRect(i));
+
+                if (path.contains(clickPos)) {
+                    index = i;
+                    break;
+                }
+            }
+
+            if (me->button() == Qt::LeftButton) {
+                if (index == -1) {
+                    if (!m_editable)
+                        return false;
+                    int pos = 0;
+                    // Insert sort for x or y
+                    if (m_sortType == XSort) {
+                        for (int i=0; i<m_points.size(); ++i)
+                            if (m_points.at(i).x() > clickPos.x()) {
+                                pos = i;
+                                break;
+                            }
+                    } else if (m_sortType == YSort) {
+                        for (int i=0; i<m_points.size(); ++i)
+                            if (m_points.at(i).y() > clickPos.y()) {
+                                pos = i;
+                                break;
+                            }
+                    }
+
+                    m_points.insert(pos, clickPos);
+                    m_locks.insert(pos, 0);
+                    m_currentIndex = pos;
+                    firePointChange();
+                } else {
+                    m_currentIndex = index;
+                }
+                return true;
+
+            } else if (me->button() == Qt::RightButton) {
+                if (index >= 0 && m_editable) {
+                    if (m_locks[index] == 0) {
+                        m_locks.remove(index);
+                        m_points.remove(index);
+                    }
+                    firePointChange();
+                    return true;
+                }
+            }
+
+        }
+        break;
+
+        case QEvent::MouseButtonRelease:
+            m_currentIndex = -1;
+            break;
+
+        case QEvent::MouseMove:
+            if (m_currentIndex >= 0)
+                movePoint(m_currentIndex, ((QMouseEvent *)event)->pos());
+            break;
+
+        case QEvent::Resize:
+        {
+            QResizeEvent *e = (QResizeEvent *) event;
+            if (e->oldSize().width() == 0 || e->oldSize().height() == 0)
+                break;
+            qreal stretch_x = e->size().width() / qreal(e->oldSize().width());
+            qreal stretch_y = e->size().height() / qreal(e->oldSize().height());
+            for (int i=0; i<m_points.size(); ++i) {
+                QPointF p = m_points[i];
+                movePoint(i, QPointF(p.x() * stretch_x, p.y() * stretch_y), false);
+            }
+
+            firePointChange();
+            break;
+        }
+
+        case QEvent::Paint:
+        {
+            QWidget *that_widget = m_widget;
+            m_widget = 0;
+            QApplication::sendEvent(object, event);
+            m_widget = that_widget;
+            paintPoints();
+#ifdef QT_OPENGL_SUPPORT
+            ArthurFrame *af = qobject_cast<ArthurFrame *>(that_widget);
+            if (af && af->usesOpenGL())
+                af->glWidget()->swapBuffers();
+#endif
+            return true;
+        }
+        default:
+            break;
+        }
+    }
+
+    return false;
+}
+
+
+void HoverPoints::paintPoints()
+{
+    QPainter p;
+#ifdef QT_OPENGL_SUPPORT
+    ArthurFrame *af = qobject_cast<ArthurFrame *>(m_widget);
+    if (af && af->usesOpenGL())
+        p.begin(af->glWidget());
+    else
+        p.begin(m_widget);
+#else
+    p.begin(m_widget);
+#endif
+
+    p.setRenderHint(QPainter::Antialiasing);
+
+    if (m_connectionPen.style() != Qt::NoPen && m_connectionType != NoConnection) {
+        p.setPen(m_connectionPen);
+
+        if (m_connectionType == CurveConnection) {
+            QPainterPath path;
+            path.moveTo(m_points.at(0));
+            for (int i=1; i<m_points.size(); ++i) {
+                QPointF p1 = m_points.at(i-1);
+                QPointF p2 = m_points.at(i);
+                qreal distance = p2.x() - p1.x();
+
+                path.cubicTo(p1.x() + distance / 2, p1.y(),
+                             p1.x() + distance / 2, p2.y(),
+                             p2.x(), p2.y());
+            }
+            p.drawPath(path);
+        } else {
+            p.drawPolyline(m_points);
+        }
+    }
+
+    p.setPen(m_pointPen);
+    p.setBrush(m_pointBrush);
+
+    for (int i=0; i<m_points.size(); ++i) {
+        QRectF bounds = pointBoundingRect(i);
+        if (m_shape == CircleShape)
+            p.drawEllipse(bounds);
+        else
+            p.drawRect(bounds);
+    }
+}
+
+static QPointF bound_point(const QPointF &point, const QRectF &bounds, int lock)
+{
+    QPointF p = point;
+
+    qreal left = bounds.left();
+    qreal right = bounds.right();
+    qreal top = bounds.top();
+    qreal bottom = bounds.bottom();
+
+    if (p.x() < left || (lock & HoverPoints::LockToLeft)) p.setX(left);
+    else if (p.x() > right || (lock & HoverPoints::LockToRight)) p.setX(right);
+
+    if (p.y() < top || (lock & HoverPoints::LockToTop)) p.setY(top);
+    else if (p.y() > bottom || (lock & HoverPoints::LockToBottom)) p.setY(bottom);
+
+    return p;
+}
+
+void HoverPoints::setPoints(const QPolygonF &points)
+{
+    m_points.clear();
+    for (int i=0; i<points.size(); ++i)
+        m_points << bound_point(points.at(i), boundingRect(), 0);
+
+    m_locks.clear();
+    if (m_points.size() > 0) {
+        m_locks.resize(m_points.size());
+
+        m_locks.fill(0);
+    }
+}
+
+
+void HoverPoints::movePoint(int index, const QPointF &point, bool emitUpdate)
+{
+    m_points[index] = bound_point(point, boundingRect(), m_locks.at(index));
+    if (emitUpdate)
+        firePointChange();
+}
+
+
+inline static bool x_less_than(const QPointF &p1, const QPointF &p2)
+{
+    return p1.x() < p2.x();
+}
+
+
+inline static bool y_less_than(const QPointF &p1, const QPointF &p2)
+{
+    return p1.y() < p2.y();
+}
+
+void HoverPoints::firePointChange()
+{
+//    printf("HoverPoints::firePointChange(), current=%d\n", m_currentIndex);
+
+    if (m_sortType != NoSort) {
+
+        QPointF oldCurrent;
+        if (m_currentIndex != -1) {
+            oldCurrent = m_points[m_currentIndex];
+        }
+
+        if (m_sortType == XSort)
+            qSort(m_points.begin(), m_points.end(), x_less_than);
+        else if (m_sortType == YSort)
+            qSort(m_points.begin(), m_points.end(), y_less_than);
+
+        // Compensate for changed order...
+        if (m_currentIndex != -1) {
+            for (int i=0; i<m_points.size(); ++i) {
+                if (m_points[i] == oldCurrent) {
+                    m_currentIndex = i;
+                    break;
+                }
+            }
+        }
+
+//         printf(" - firePointChange(), current=%d\n", m_currentIndex);
+
+    }
+
+//     for (int i=0; i<m_points.size(); ++i) {
+//         printf(" - point(%2d)=[%.2f, %.2f], lock=%d\n",
+//                i, m_points.at(i).x(), m_points.at(i).y(), m_locks.at(i));
+//     }
+
+    emit pointsChanged(m_points);
+}
diff --git a/demos/shared/hoverpoints.h b/demos/shared/hoverpoints.h
new file mode 100644
index 0000000..cf8742d
--- /dev/null
+++ b/demos/shared/hoverpoints.h
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HOVERPOINTS_H
+#define HOVERPOINTS_H
+
+#include <QtGui>
+
+QT_FORWARD_DECLARE_CLASS(QBypassWidget)
+
+class HoverPoints : public QObject
+{
+    Q_OBJECT
+public:
+    enum PointShape {
+        CircleShape,
+        RectangleShape
+    };
+
+    enum LockType {
+        LockToLeft   = 0x01,
+        LockToRight  = 0x02,
+        LockToTop    = 0x04,
+        LockToBottom = 0x08
+    };
+
+    enum SortType {
+        NoSort,
+        XSort,
+        YSort
+    };
+
+    enum ConnectionType {
+        NoConnection,
+        LineConnection,
+        CurveConnection
+    };
+
+    HoverPoints(QWidget *widget, PointShape shape);
+
+    bool eventFilter(QObject *object, QEvent *event);
+
+    void paintPoints();
+
+    inline QRectF boundingRect() const;
+    void setBoundingRect(const QRectF &boundingRect) { m_bounds = boundingRect; }
+
+    QPolygonF points() const { return m_points; }
+    void setPoints(const QPolygonF &points);
+
+    QSizeF pointSize() const { return m_pointSize; }
+    void setPointSize(const QSizeF &size) { m_pointSize = size; }
+
+    SortType sortType() const { return m_sortType; }
+    void setSortType(SortType sortType) { m_sortType = sortType; }
+
+    ConnectionType connectionType() const { return m_connectionType; }
+    void setConnectionType(ConnectionType connectionType) { m_connectionType = connectionType; }
+
+    void setConnectionPen(const QPen &pen) { m_connectionPen = pen; }
+    void setShapePen(const QPen &pen) { m_pointPen = pen; }
+    void setShapeBrush(const QBrush &brush) { m_pointBrush = brush; }
+
+    void setPointLock(int pos, LockType lock) { m_locks[pos] = lock; }
+
+    void setEditable(bool editable) { m_editable = editable; }
+    bool editable() const { return m_editable; }
+
+public slots:
+    void setEnabled(bool enabled);
+    void setDisabled(bool disabled) { setEnabled(!disabled); }
+
+signals:
+    void pointsChanged(const QPolygonF &points);
+
+public:
+    void firePointChange();
+
+private:
+    inline QRectF pointBoundingRect(int i) const;
+    void movePoint(int i, const QPointF &newPos, bool emitChange = true);
+
+    QWidget *m_widget;
+
+    QPolygonF m_points;
+    QRectF m_bounds;
+    PointShape m_shape;
+    SortType m_sortType;
+    ConnectionType m_connectionType;
+
+    QVector<uint> m_locks;
+
+    QSizeF m_pointSize;
+    int m_currentIndex;
+    bool m_editable;
+    bool m_enabled;
+
+    QPen m_pointPen;
+    QBrush m_pointBrush;
+    QPen m_connectionPen;
+};
+
+
+inline QRectF HoverPoints::pointBoundingRect(int i) const
+{
+    QPointF p = m_points.at(i);
+    qreal w = m_pointSize.width();
+    qreal h = m_pointSize.height();
+    qreal x = p.x() - w / 2;
+    qreal y = p.y() - h / 2;
+    return QRectF(x, y, w, h);
+}
+
+inline QRectF HoverPoints::boundingRect() const
+{
+    if (m_bounds.isEmpty())
+        return m_widget->rect();
+    else
+        return m_bounds;
+}
+
+#endif // HOVERPOINTS_H
diff --git a/demos/shared/images/bg_pattern.png b/demos/shared/images/bg_pattern.png
new file mode 100644
index 0000000..ee67026
--- /dev/null
+++ b/demos/shared/images/bg_pattern.png
diff --git a/demos/shared/images/button_normal_cap_left.png b/demos/shared/images/button_normal_cap_left.png
new file mode 100644
index 0000000..db31dd9
--- /dev/null
+++ b/demos/shared/images/button_normal_cap_left.png
diff --git a/demos/shared/images/button_normal_cap_right.png b/demos/shared/images/button_normal_cap_right.png
new file mode 100644
index 0000000..38ead1c
--- /dev/null
+++ b/demos/shared/images/button_normal_cap_right.png
diff --git a/demos/shared/images/button_normal_stretch.png b/demos/shared/images/button_normal_stretch.png
new file mode 100644
index 0000000..87abe67
--- /dev/null
+++ b/demos/shared/images/button_normal_stretch.png
diff --git a/demos/shared/images/button_pressed_cap_left.png b/demos/shared/images/button_pressed_cap_left.png
new file mode 100644
index 0000000..66bfc13
--- /dev/null
+++ b/demos/shared/images/button_pressed_cap_left.png
diff --git a/demos/shared/images/button_pressed_cap_right.png b/demos/shared/images/button_pressed_cap_right.png
new file mode 100644
index 0000000..3d4cfe2
--- /dev/null
+++ b/demos/shared/images/button_pressed_cap_right.png
diff --git a/demos/shared/images/button_pressed_stretch.png b/demos/shared/images/button_pressed_stretch.png
new file mode 100644
index 0000000..4dd4ad1
--- /dev/null
+++ b/demos/shared/images/button_pressed_stretch.png
diff --git a/demos/shared/images/curve_thing_edit-6.png b/demos/shared/images/curve_thing_edit-6.png
new file mode 100644
index 0000000..034b474
--- /dev/null
+++ b/demos/shared/images/curve_thing_edit-6.png
diff --git a/demos/shared/images/frame_bottom.png b/demos/shared/images/frame_bottom.png
new file mode 100644
index 0000000..889b40d
--- /dev/null
+++ b/demos/shared/images/frame_bottom.png
diff --git a/demos/shared/images/frame_bottomleft.png b/demos/shared/images/frame_bottomleft.png
new file mode 100644
index 0000000..0b3023f
--- /dev/null
+++ b/demos/shared/images/frame_bottomleft.png
diff --git a/demos/shared/images/frame_bottomright.png b/demos/shared/images/frame_bottomright.png
new file mode 100644
index 0000000..0021e35
--- /dev/null
+++ b/demos/shared/images/frame_bottomright.png
diff --git a/demos/shared/images/frame_left.png b/demos/shared/images/frame_left.png
new file mode 100644
index 0000000..40f331c
--- /dev/null
+++ b/demos/shared/images/frame_left.png
diff --git a/demos/shared/images/frame_right.png b/demos/shared/images/frame_right.png
new file mode 100644
index 0000000..023af8c
--- /dev/null
+++ b/demos/shared/images/frame_right.png
diff --git a/demos/shared/images/frame_top.png b/demos/shared/images/frame_top.png
new file mode 100644
index 0000000..001f3a7
--- /dev/null
+++ b/demos/shared/images/frame_top.png
diff --git a/demos/shared/images/frame_topleft.png b/demos/shared/images/frame_topleft.png
new file mode 100644
index 0000000..58c68d4
--- /dev/null
+++ b/demos/shared/images/frame_topleft.png
diff --git a/demos/shared/images/frame_topright.png b/demos/shared/images/frame_topright.png
new file mode 100644
index 0000000..6a7e8d3
--- /dev/null
+++ b/demos/shared/images/frame_topright.png
diff --git a/demos/shared/images/groupframe_bottom_left.png b/demos/shared/images/groupframe_bottom_left.png
new file mode 100644
index 0000000..af2fe06
--- /dev/null
+++ b/demos/shared/images/groupframe_bottom_left.png
diff --git a/demos/shared/images/groupframe_bottom_right.png b/demos/shared/images/groupframe_bottom_right.png
new file mode 100644
index 0000000..fdf2e97
--- /dev/null
+++ b/demos/shared/images/groupframe_bottom_right.png
diff --git a/demos/shared/images/groupframe_bottom_stretch.png b/demos/shared/images/groupframe_bottom_stretch.png
new file mode 100644
index 0000000..f47b67d
--- /dev/null
+++ b/demos/shared/images/groupframe_bottom_stretch.png
diff --git a/demos/shared/images/groupframe_left_stretch.png b/demos/shared/images/groupframe_left_stretch.png
new file mode 100644
index 0000000..c122f46
--- /dev/null
+++ b/demos/shared/images/groupframe_left_stretch.png
diff --git a/demos/shared/images/groupframe_right_stretch.png b/demos/shared/images/groupframe_right_stretch.png
new file mode 100644
index 0000000..1056b78
--- /dev/null
+++ b/demos/shared/images/groupframe_right_stretch.png
diff --git a/demos/shared/images/groupframe_top_stretch.png b/demos/shared/images/groupframe_top_stretch.png
new file mode 100644
index 0000000..5746ef9
--- /dev/null
+++ b/demos/shared/images/groupframe_top_stretch.png
diff --git a/demos/shared/images/groupframe_topleft.png b/demos/shared/images/groupframe_topleft.png
new file mode 100644
index 0000000..98d9cd9
--- /dev/null
+++ b/demos/shared/images/groupframe_topleft.png
diff --git a/demos/shared/images/groupframe_topright.png b/demos/shared/images/groupframe_topright.png
new file mode 100644
index 0000000..1a0a328
--- /dev/null
+++ b/demos/shared/images/groupframe_topright.png
diff --git a/demos/shared/images/line_dash_dot.png b/demos/shared/images/line_dash_dot.png
new file mode 100644
index 0000000..1c61442
--- /dev/null
+++ b/demos/shared/images/line_dash_dot.png
diff --git a/demos/shared/images/line_dash_dot_dot.png b/demos/shared/images/line_dash_dot_dot.png
new file mode 100644
index 0000000..0d9bb97
--- /dev/null
+++ b/demos/shared/images/line_dash_dot_dot.png
diff --git a/demos/shared/images/line_dashed.png b/demos/shared/images/line_dashed.png
new file mode 100644
index 0000000..d5bc7ea
--- /dev/null
+++ b/demos/shared/images/line_dashed.png
diff --git a/demos/shared/images/line_dotted.png b/demos/shared/images/line_dotted.png
new file mode 100644
index 0000000..a2f9a35
--- /dev/null
+++ b/demos/shared/images/line_dotted.png
diff --git a/demos/shared/images/line_solid.png b/demos/shared/images/line_solid.png
new file mode 100644
index 0000000..60ef3f9
--- /dev/null
+++ b/demos/shared/images/line_solid.png
diff --git a/demos/shared/images/radiobutton-off.png b/demos/shared/images/radiobutton-off.png
new file mode 100644
index 0000000..af1753a
--- /dev/null
+++ b/demos/shared/images/radiobutton-off.png
diff --git a/demos/shared/images/radiobutton-on.png b/demos/shared/images/radiobutton-on.png
new file mode 100644
index 0000000..f875838
--- /dev/null
+++ b/demos/shared/images/radiobutton-on.png
diff --git a/demos/shared/images/radiobutton_off.png b/demos/shared/images/radiobutton_off.png
new file mode 100644
index 0000000..400906e
--- /dev/null
+++ b/demos/shared/images/radiobutton_off.png
diff --git a/demos/shared/images/radiobutton_on.png b/demos/shared/images/radiobutton_on.png
new file mode 100644
index 0000000..50a049e
--- /dev/null
+++ b/demos/shared/images/radiobutton_on.png
diff --git a/demos/shared/images/slider_bar.png b/demos/shared/images/slider_bar.png
new file mode 100644
index 0000000..1b3d62c
--- /dev/null
+++ b/demos/shared/images/slider_bar.png
diff --git a/demos/shared/images/slider_thumb_off.png b/demos/shared/images/slider_thumb_off.png
new file mode 100644
index 0000000..d7f141d
--- /dev/null
+++ b/demos/shared/images/slider_thumb_off.png
diff --git a/demos/shared/images/slider_thumb_on.png b/demos/shared/images/slider_thumb_on.png
new file mode 100644
index 0000000..8e1f510
--- /dev/null
+++ b/demos/shared/images/slider_thumb_on.png
diff --git a/demos/shared/images/title_cap_left.png b/demos/shared/images/title_cap_left.png
new file mode 100644
index 0000000..2d47507
--- /dev/null
+++ b/demos/shared/images/title_cap_left.png
diff --git a/demos/shared/images/title_cap_right.png b/demos/shared/images/title_cap_right.png
new file mode 100644
index 0000000..dc3ff85
--- /dev/null
+++ b/demos/shared/images/title_cap_right.png
diff --git a/demos/shared/images/title_stretch.png b/demos/shared/images/title_stretch.png
new file mode 100644
index 0000000..1104334
--- /dev/null
+++ b/demos/shared/images/title_stretch.png
diff --git a/demos/shared/shared.pri b/demos/shared/shared.pri
new file mode 100644
index 0000000..b551595
--- /dev/null
+++ b/demos/shared/shared.pri
@@ -0,0 +1,20 @@
+INCLUDEPATH += $$SHARED_FOLDER
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+contains(CONFIG, debug_and_release_target) {    
+    CONFIG(debug, debug|release) { 
+	LIBS+=-L$$SHARED_FOLDER/debug
+    } else {
+	LIBS+=-L$$SHARED_FOLDER/release
+    }
+} else {
+    LIBS += -L$$SHARED_FOLDER
+}
+
+hpux-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
+hpuxi-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
+!hpuxi-acc*:!hpux-acc*:LIBS += -ldemo_shared
+
diff --git a/demos/shared/shared.pro b/demos/shared/shared.pro
new file mode 100644
index 0000000..cabce25
--- /dev/null
+++ b/demos/shared/shared.pro
@@ -0,0 +1,33 @@
+TEMPLATE = lib
+CONFIG += static
+
+contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+TARGET = demo_shared
+
+SOURCES += \
+	arthurstyle.cpp\
+	arthurwidgets.cpp \
+	hoverpoints.cpp
+
+HEADERS += \
+	arthurstyle.h \
+	arthurwidgets.h \
+	hoverpoints.h
+
+RESOURCES += shared.qrc
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/shared
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.pri images
+sources.path = $$[QT_INSTALL_DEMOS]/shared
+INSTALLS += sources
+!cross_compile:INSTALLS += target
+
diff --git a/demos/shared/shared.qrc b/demos/shared/shared.qrc
new file mode 100644
index 0000000..17336ec
--- /dev/null
+++ b/demos/shared/shared.qrc
@@ -0,0 +1,39 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res">
+   <file>images/button_normal_cap_left.png</file>
+   <file>images/button_normal_cap_right.png</file>
+   <file>images/button_normal_stretch.png</file>
+   <file>images/button_pressed_cap_left.png</file>
+   <file>images/button_pressed_cap_right.png</file>
+   <file>images/button_pressed_stretch.png</file>
+   <file>images/radiobutton-on.png</file>
+   <file>images/radiobutton_on.png</file>
+   <file>images/radiobutton_off.png</file>
+   <file>images/slider_bar.png</file>
+   <file>images/slider_thumb_on.png</file>
+   <file>images/groupframe_topleft.png</file>
+   <file>images/groupframe_topright.png</file>
+   <file>images/groupframe_bottom_left.png</file>
+   <file>images/groupframe_bottom_right.png</file>
+   <file>images/groupframe_top_stretch.png</file>
+   <file>images/groupframe_bottom_stretch.png</file>
+   <file>images/groupframe_left_stretch.png</file>
+   <file>images/groupframe_right_stretch.png</file>
+   <file>images/frame_topleft.png</file>
+   <file>images/frame_topright.png</file>
+   <file>images/frame_bottomleft.png</file>
+   <file>images/frame_bottomright.png</file>
+   <file>images/frame_left.png</file>
+   <file>images/frame_top.png</file>
+   <file>images/frame_right.png</file>
+   <file>images/frame_bottom.png</file>
+   <file>images/title_cap_left.png</file>
+   <file>images/title_cap_right.png</file>
+   <file>images/title_stretch.png</file>
+   <file>images/line_dash_dot.png</file>
+   <file>images/line_dotted.png</file>
+   <file>images/line_dashed.png</file>
+   <file>images/line_solid.png</file>
+   <file>images/line_dash_dot_dot.png</file>
+</qresource>
+</RCC>
diff --git a/demos/spreadsheet/images/interview.png b/demos/spreadsheet/images/interview.png
new file mode 100644
index 0000000..0c3d690
--- /dev/null
+++ b/demos/spreadsheet/images/interview.png
diff --git a/demos/spreadsheet/main.cpp b/demos/spreadsheet/main.cpp
new file mode 100644
index 0000000..7a71641
--- /dev/null
+++ b/demos/spreadsheet/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include "spreadsheet.h"
+
+int main(int argc, char** argv) {
+    Q_INIT_RESOURCE(spreadsheet);
+    QApplication app(argc, argv);
+    SpreadSheet sheet(10, 6);
+    sheet.setWindowIcon(QPixmap(":/images/interview.png"));
+    sheet.resize(640, 420);
+    sheet.show();
+    return app.exec();
+}
+
+
diff --git a/demos/spreadsheet/printview.cpp b/demos/spreadsheet/printview.cpp
new file mode 100644
index 0000000..76c4ae8
--- /dev/null
+++ b/demos/spreadsheet/printview.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "printview.h"
+#include <QPrinter>
+#include <QStyleOptionViewItem>
+
+PrintView::PrintView()
+{
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+}
+
+void PrintView::print(QPrinter *printer)
+{
+#ifndef QT_NO_PRINTER
+    resize(printer->width(), printer->height());
+    render(printer);
+#endif
+}
+
diff --git a/demos/spreadsheet/printview.h b/demos/spreadsheet/printview.h
new file mode 100644
index 0000000..3f2b918
--- /dev/null
+++ b/demos/spreadsheet/printview.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PRINTVIEW_H
+#define PRINTVIEW_H
+
+#include <QTableView>
+
+class PrintView : public QTableView
+{
+    Q_OBJECT
+
+public:
+    PrintView();
+
+public Q_SLOTS:
+    void print(QPrinter *printer);
+};
+
+#endif // PRINTVIEW_H
+
+
diff --git a/demos/spreadsheet/spreadsheet.cpp b/demos/spreadsheet/spreadsheet.cpp
new file mode 100644
index 0000000..742855e
--- /dev/null
+++ b/demos/spreadsheet/spreadsheet.cpp
@@ -0,0 +1,631 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "spreadsheet.h"
+#include "spreadsheetdelegate.h"
+#include "spreadsheetitem.h"
+#include "printview.h"
+
+SpreadSheet::SpreadSheet(int rows, int cols, QWidget *parent)
+        : QMainWindow(parent)
+{
+    addToolBar(toolBar = new QToolBar());
+    formulaInput = new QLineEdit();
+
+    cellLabel = new QLabel(toolBar);
+    cellLabel->setMinimumSize(80, 0);
+
+    toolBar->addWidget(cellLabel);
+    toolBar->addWidget(formulaInput);
+
+    table = new QTableWidget(rows, cols, this);
+    for (int c = 0; c < cols; ++c) {
+        QString character(QChar('A' + c));
+        table->setHorizontalHeaderItem(c, new QTableWidgetItem(character));
+    }
+
+    table->setItemPrototype(table->item(rows -1, cols - 1));
+    table->setItemDelegate(new SpreadSheetDelegate());
+
+    createActions();
+    updateColor(0);
+    setupMenuBar();
+    setupContents();
+    setCentralWidget(table);
+
+    statusBar();
+    connect(table, SIGNAL(currentItemChanged(QTableWidgetItem*, QTableWidgetItem*)),
+            this, SLOT(updateStatus(QTableWidgetItem*)));
+    connect(table, SIGNAL(currentItemChanged(QTableWidgetItem*, QTableWidgetItem*)),
+            this, SLOT(updateColor(QTableWidgetItem*)));
+    connect(table, SIGNAL(currentItemChanged(QTableWidgetItem*,QTableWidgetItem*)),
+            this, SLOT(updateLineEdit(QTableWidgetItem*)));
+    connect(table, SIGNAL(itemChanged(QTableWidgetItem*)),
+            this, SLOT(updateStatus(QTableWidgetItem*)));
+    connect(formulaInput, SIGNAL(returnPressed()), this, SLOT(returnPressed()));
+    connect(table, SIGNAL(itemChanged(QTableWidgetItem*)),
+            this, SLOT(updateLineEdit(QTableWidgetItem*)));
+
+    setWindowTitle(tr("Spreadsheet"));
+}
+
+void SpreadSheet::createActions()
+{
+    cell_sumAction = new QAction(tr("Sum"), this);
+    connect(cell_sumAction, SIGNAL(triggered()), this, SLOT(actionSum()));
+
+    cell_addAction = new QAction(tr("&Add"), this);
+    cell_addAction->setShortcut(Qt::CTRL | Qt::Key_Plus);
+    connect(cell_addAction, SIGNAL(triggered()), this, SLOT(actionAdd()));
+
+    cell_subAction = new QAction(tr("&Subtract"), this);
+    cell_subAction->setShortcut(Qt::CTRL | Qt::Key_Minus);
+    connect(cell_subAction, SIGNAL(triggered()), this, SLOT(actionSubtract()));
+
+    cell_mulAction = new QAction(tr("&Multiply"), this);
+    cell_mulAction->setShortcut(Qt::CTRL | Qt::Key_multiply);
+    connect(cell_mulAction, SIGNAL(triggered()), this, SLOT(actionMultiply()));
+
+    cell_divAction = new QAction(tr("&Divide"), this);
+    cell_divAction->setShortcut(Qt::CTRL | Qt::Key_division);
+    connect(cell_divAction, SIGNAL(triggered()), this, SLOT(actionDivide()));
+
+    fontAction = new QAction(tr("Font..."), this);
+    fontAction->setShortcut(Qt::CTRL | Qt::Key_F);
+    connect(fontAction, SIGNAL(triggered()), this, SLOT(selectFont()));
+
+    colorAction = new QAction(QPixmap(16, 16), tr("Background &Color..."), this);
+    connect(colorAction, SIGNAL(triggered()), this, SLOT(selectColor()));
+
+    clearAction = new QAction(tr("Clear"), this);
+    clearAction->setShortcut(Qt::Key_Delete);
+    connect(clearAction, SIGNAL(triggered()), this, SLOT(clear()));
+
+    aboutSpreadSheet = new QAction(tr("About Spreadsheet"), this);
+    connect(aboutSpreadSheet, SIGNAL(triggered()), this, SLOT(showAbout()));
+
+    exitAction = new QAction(tr("E&xit"), this);
+    connect(exitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+
+    printAction = new QAction(tr("&Print"), this);
+    connect(printAction, SIGNAL(triggered()), this, SLOT(print()));
+
+    firstSeparator = new QAction(this);
+    firstSeparator->setSeparator(true);
+
+    secondSeparator = new QAction(this);
+    secondSeparator->setSeparator(true);
+}
+
+void SpreadSheet::setupMenuBar()
+{
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(printAction);
+    fileMenu->addAction(exitAction);
+
+    QMenu *cellMenu = menuBar()->addMenu(tr("&Cell"));
+    cellMenu->addAction(cell_addAction);
+    cellMenu->addAction(cell_subAction);
+    cellMenu->addAction(cell_mulAction);
+    cellMenu->addAction(cell_divAction);
+    cellMenu->addAction(cell_sumAction);
+    cellMenu->addSeparator();
+    cellMenu->addAction(colorAction);
+    cellMenu->addAction(fontAction);
+
+    menuBar()->addSeparator();
+
+    QMenu *aboutMenu = menuBar()->addMenu(tr("&Help"));
+    aboutMenu->addAction(aboutSpreadSheet);
+}
+
+void SpreadSheet::updateStatus(QTableWidgetItem *item)
+{
+    if (item && item == table->currentItem()) {
+        statusBar()->showMessage(item->data(Qt::StatusTipRole).toString(),
+                                 1000);
+        cellLabel->setText(tr("Cell: (%1)").arg(encode_pos(table->row(item),
+                                                           table->column(item))));
+    }
+}
+
+void SpreadSheet::updateColor(QTableWidgetItem *item)
+{
+    QPixmap pix(16, 16);
+    QColor col;
+    if (item)
+        col = item->backgroundColor();
+    if (!col.isValid())
+        col = palette().base().color();
+
+    QPainter pt(&pix);
+    pt.fillRect(0, 0, 16, 16, col);
+
+    QColor lighter = col.light();
+    pt.setPen(lighter);
+    QPoint lightFrame[] = { QPoint(0, 15), QPoint(0, 0), QPoint(15, 0) };
+    pt.drawPolyline(lightFrame, 3);
+
+    pt.setPen(col.dark());
+    QPoint darkFrame[] = { QPoint(1, 15), QPoint(15, 15), QPoint(15, 1) };
+    pt.drawPolyline(darkFrame, 3);
+
+    pt.end();
+
+    colorAction->setIcon(pix);
+}
+
+void SpreadSheet::updateLineEdit(QTableWidgetItem *item)
+{
+    if (item != table->currentItem())
+        return;
+    if (item)
+        formulaInput->setText(item->data(Qt::EditRole).toString());
+    else
+        formulaInput->clear();
+}
+
+void SpreadSheet::returnPressed()
+{
+    QString text = formulaInput->text();
+    int row = table->currentRow();
+    int col = table->currentColumn();
+    QTableWidgetItem *item = table->item(row, col);
+    if (!item)
+        table->setItem(row, col, new SpreadSheetItem(text));
+    else
+        item->setData(Qt::EditRole, text);
+    table->viewport()->update();
+}
+
+void SpreadSheet::selectColor()
+{
+    QTableWidgetItem *item = table->currentItem();
+    QColor col = item ? item->backgroundColor() : table->palette().base().color();
+    col = QColorDialog::getColor(col, this);
+    if (!col.isValid())
+        return;
+
+    QList<QTableWidgetItem*> selected = table->selectedItems();
+    if (selected.count() == 0)
+        return;
+
+    foreach(QTableWidgetItem *i, selected)
+        if (i)
+            i->setBackgroundColor(col);
+
+    updateColor(table->currentItem());
+}
+
+void SpreadSheet::selectFont()
+{
+    QList<QTableWidgetItem*> selected = table->selectedItems();
+    if (selected.count() == 0)
+        return;
+
+    bool ok = false;
+    QFont fnt = QFontDialog::getFont(&ok, font(), this);
+
+    if (!ok)
+        return;
+    foreach(QTableWidgetItem *i, selected)
+        if (i)
+            i->setFont(fnt);
+}
+
+bool SpreadSheet::runInputDialog(const QString &title,
+                                 const QString &c1Text,
+                                 const QString &c2Text,
+                                 const QString &opText,
+                                 const QString &outText,
+                                 QString *cell1, QString *cell2, QString *outCell)
+{
+    QStringList rows, cols;
+    for (int c = 0; c < table->columnCount(); ++c)
+        cols << QChar('A' + c);
+    for (int r = 0; r < table->rowCount(); ++r)
+        rows << QString::number(1 + r);
+
+    QDialog addDialog(this);
+    addDialog.setWindowTitle(title);
+
+    QGroupBox group(title, &addDialog);
+    group.setMinimumSize(250, 100);
+
+    QLabel cell1Label(c1Text, &group);
+    QComboBox cell1RowInput(&group);
+    int c1Row, c1Col;
+    decode_pos(*cell1, &c1Row, &c1Col);
+    cell1RowInput.addItems(rows);
+    cell1RowInput.setCurrentIndex(c1Row);
+
+    QComboBox cell1ColInput(&group);
+    cell1ColInput.addItems(cols);
+    cell1ColInput.setCurrentIndex(c1Col);
+
+    QLabel operatorLabel(opText, &group);
+    operatorLabel.setAlignment(Qt::AlignHCenter);
+
+    QLabel cell2Label(c2Text, &group);
+    QComboBox cell2RowInput(&group);
+    int c2Row, c2Col;
+    decode_pos(*cell2, &c2Row, &c2Col);
+    cell2RowInput.addItems(rows);
+    cell2RowInput.setCurrentIndex(c2Row);
+    QComboBox cell2ColInput(&group);
+    cell2ColInput.addItems(cols);
+    cell2ColInput.setCurrentIndex(c2Col);
+
+    QLabel equalsLabel("=", &group);
+    equalsLabel.setAlignment(Qt::AlignHCenter);
+
+    QLabel outLabel(outText, &group);
+    QComboBox outRowInput(&group);
+    int outRow, outCol;
+    decode_pos(*outCell, &outRow, &outCol);
+    outRowInput.addItems(rows);
+    outRowInput.setCurrentIndex(outRow);
+    QComboBox outColInput(&group);
+    outColInput.addItems(cols);
+    outColInput.setCurrentIndex(outCol);
+
+    QPushButton cancelButton(tr("Cancel"), &addDialog);
+    connect(&cancelButton, SIGNAL(clicked()), &addDialog, SLOT(reject()));
+
+    QPushButton okButton(tr("OK"), &addDialog);
+    okButton.setDefault(true);
+    connect(&okButton, SIGNAL(clicked()), &addDialog, SLOT(accept()));
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->addStretch(1);
+    buttonsLayout->addWidget(&okButton);
+    buttonsLayout->addSpacing(10);
+    buttonsLayout->addWidget(&cancelButton);
+
+    QVBoxLayout *dialogLayout = new QVBoxLayout(&addDialog);
+    dialogLayout->addWidget(&group);
+    dialogLayout->addStretch(1);
+    dialogLayout->addItem(buttonsLayout);
+
+    QHBoxLayout *cell1Layout = new QHBoxLayout;
+    cell1Layout->addWidget(&cell1Label);
+    cell1Layout->addSpacing(10);
+    cell1Layout->addWidget(&cell1ColInput);
+    cell1Layout->addSpacing(10);
+    cell1Layout->addWidget(&cell1RowInput);
+
+    QHBoxLayout *cell2Layout = new QHBoxLayout;
+    cell2Layout->addWidget(&cell2Label);
+    cell2Layout->addSpacing(10);
+    cell2Layout->addWidget(&cell2ColInput);
+    cell2Layout->addSpacing(10);
+    cell2Layout->addWidget(&cell2RowInput);
+
+    QHBoxLayout *outLayout = new QHBoxLayout;
+    outLayout->addWidget(&outLabel);
+    outLayout->addSpacing(10);
+    outLayout->addWidget(&outColInput);
+    outLayout->addSpacing(10);
+    outLayout->addWidget(&outRowInput);
+
+    QVBoxLayout *vLayout = new QVBoxLayout(&group);
+    vLayout->addItem(cell1Layout);
+    vLayout->addWidget(&operatorLabel);
+    vLayout->addItem(cell2Layout);
+    vLayout->addWidget(&equalsLabel);
+    vLayout->addStretch(1);
+    vLayout->addItem(outLayout);
+
+    if (addDialog.exec()) {
+        *cell1 = cell1ColInput.currentText() + cell1RowInput.currentText();
+        *cell2 = cell2ColInput.currentText() + cell2RowInput.currentText();
+        *outCell = outColInput.currentText() + outRowInput.currentText();
+        return true;
+    }
+
+    return false;
+}
+
+void SpreadSheet::actionSum()
+{
+    int row_first = 0;
+    int row_last = 0;
+    int row_cur = 0;
+
+    int col_first = 0;
+    int col_last = 0;
+    int col_cur = 0;
+
+    QList<QTableWidgetItem*> selected = table->selectedItems();
+
+    if (!selected.isEmpty()) {
+        QTableWidgetItem *first = selected.first();
+        QTableWidgetItem *last = selected.last();
+        row_first = table->row(first);
+        row_last = table->row(last);
+        col_first = table->column(first);
+        col_last = table->column(last);
+    }
+
+    QTableWidgetItem *current = table->currentItem();
+
+    if (current) {
+        row_cur = table->row(current);
+        col_cur = table->column(current);
+    }
+
+    QString cell1 = encode_pos(row_first, col_first);
+    QString cell2 = encode_pos(row_last, col_last);
+    QString out = encode_pos(row_cur, col_cur);
+
+    if (runInputDialog(tr("Sum cells"), tr("First cell:"), tr("Last cell:"),
+                       QString("%1").arg(QChar(0x03a3)), tr("Output to:"),
+                       &cell1, &cell2, &out)) {
+        int row, col;
+        decode_pos(out, &row, &col);
+        table->item(row, col)->setText(tr("sum %1 %2").arg(cell1, cell2));
+    }
+}
+
+void SpreadSheet::actionMath_helper(const QString &title, const QString &op)
+{
+    QString cell1 = "C1";
+    QString cell2 = "C2";
+    QString out = "C3";
+
+    QTableWidgetItem *current = table->currentItem();
+    if (current)
+        out = encode_pos(table->currentRow(), table->currentColumn());
+
+    if (runInputDialog(title, tr("Cell 1"), tr("Cell 2"), op, tr("Output to:"),
+                       &cell1, &cell2, &out)) {
+        int row, col;
+        decode_pos(out, &row, &col);
+        table->item(row, col)->setText(tr("%1, %2, %3").arg(op, cell1, cell2));
+    }
+}
+
+void SpreadSheet::actionAdd()
+{
+    actionMath_helper(tr("Addition"), "+");
+}
+
+void SpreadSheet::actionSubtract()
+{
+    actionMath_helper(tr("Subtraction"), "-");
+}
+
+void SpreadSheet::actionMultiply()
+{
+    actionMath_helper(tr("Multiplication"), "*");
+}
+void SpreadSheet::actionDivide()
+{
+    actionMath_helper(tr("Division"), "/");
+}
+
+void SpreadSheet::clear()
+{
+    foreach (QTableWidgetItem *i, table->selectedItems())
+        i->setText("");
+}
+
+void SpreadSheet::setupContextMenu()
+{
+    addAction(cell_addAction);
+    addAction(cell_subAction);
+    addAction(cell_mulAction);
+    addAction(cell_divAction);
+    addAction(cell_sumAction);
+    addAction(firstSeparator);
+    addAction(colorAction);
+    addAction(fontAction);
+    addAction(secondSeparator);
+    addAction(clearAction);
+    setContextMenuPolicy(Qt::ActionsContextMenu);
+}
+
+void SpreadSheet::setupContents()
+{
+    QColor titleBackground(Qt::lightGray);
+    QFont titleFont = table->font();
+    titleFont.setBold(true);
+
+    // column 0
+    table->setItem(0, 0, new SpreadSheetItem("Item"));
+    table->item(0, 0)->setBackgroundColor(titleBackground);
+    table->item(0, 0)->setToolTip("This column shows the purchased item/service");
+    table->item(0, 0)->setFont(titleFont);
+
+    table->setItem(1, 0, new SpreadSheetItem("AirportBus"));
+    table->setItem(2, 0, new SpreadSheetItem("Flight (Munich)"));
+    table->setItem(3, 0, new SpreadSheetItem("Lunch"));
+    table->setItem(4, 0, new SpreadSheetItem("Flight (LA)"));
+    table->setItem(5, 0, new SpreadSheetItem("Taxi"));
+    table->setItem(6, 0, new SpreadSheetItem("Diinner"));
+    table->setItem(7, 0, new SpreadSheetItem("Hotel"));
+    table->setItem(8, 0, new SpreadSheetItem("Flight (Oslo)"));
+    table->setItem(9, 0, new SpreadSheetItem("Total:"));
+
+    table->item(9, 0)->setFont(titleFont);
+    table->item(9, 0)->setBackgroundColor(Qt::lightGray);
+
+    // column 1
+    table->setItem(0, 1, new SpreadSheetItem("Date"));
+    table->item(0, 1)->setBackgroundColor(titleBackground);
+    table->item(0, 1)->setToolTip("This column shows the purchase date, double click to change");
+    table->item(0, 1)->setFont(titleFont);
+
+    table->setItem(1, 1, new SpreadSheetItem("15/6/2006"));
+    table->setItem(2, 1, new SpreadSheetItem("15/6/2006"));
+    table->setItem(3, 1, new SpreadSheetItem("15/6/2006"));
+    table->setItem(4, 1, new SpreadSheetItem("21/5/2006"));
+    table->setItem(5, 1, new SpreadSheetItem("16/6/2006"));
+    table->setItem(6, 1, new SpreadSheetItem("16/6/2006"));
+    table->setItem(7, 1, new SpreadSheetItem("16/6/2006"));
+    table->setItem(8, 1, new SpreadSheetItem("18/6/2006"));
+
+    table->setItem(9, 1, new SpreadSheetItem());
+    table->item(9, 1)->setBackgroundColor(Qt::lightGray);
+
+    // column 2
+    table->setItem(0, 2, new SpreadSheetItem("Price"));
+    table->item(0, 2)->setBackgroundColor(titleBackground);
+    table->item(0, 2)->setToolTip("This collumn shows the price of the purchase");
+    table->item(0, 2)->setFont(titleFont);
+
+    table->setItem(1, 2, new SpreadSheetItem("150"));
+    table->setItem(2, 2, new SpreadSheetItem("2350"));
+    table->setItem(3, 2, new SpreadSheetItem("-14"));
+    table->setItem(4, 2, new SpreadSheetItem("980"));
+    table->setItem(5, 2, new SpreadSheetItem("5"));
+    table->setItem(6, 2, new SpreadSheetItem("120"));
+    table->setItem(7, 2, new SpreadSheetItem("300"));
+    table->setItem(8, 2, new SpreadSheetItem("1240"));
+
+    table->setItem(9, 2, new SpreadSheetItem());
+
+    // column 3
+    table->setItem(0, 3, new SpreadSheetItem("Currency"));
+    table->item(0, 3)->setBackgroundColor(titleBackground);
+    table->item(0, 3)->setToolTip("This column shows the currency");
+    table->item(0, 3)->setFont(titleFont);
+
+    table->setItem(1, 3, new SpreadSheetItem("NOK"));
+    table->setItem(2, 3, new SpreadSheetItem("NOK"));
+    table->setItem(3, 3, new SpreadSheetItem("EUR"));
+    table->setItem(4, 3, new SpreadSheetItem("EUR"));
+    table->setItem(5, 3, new SpreadSheetItem("USD"));
+    table->setItem(6, 3, new SpreadSheetItem("USD"));
+    table->setItem(7, 3, new SpreadSheetItem("USD"));
+    table->setItem(8, 3, new SpreadSheetItem("USD"));
+
+    table->setItem(9, 3, new SpreadSheetItem());
+    table->item(9,3)->setBackgroundColor(Qt::lightGray);
+
+    // column 4
+    table->setItem(0, 4, new SpreadSheetItem("Ex. Rate"));
+    table->item(0, 4)->setBackgroundColor(titleBackground);
+    table->item(0, 4)->setToolTip("This column shows the exchange rate to NOK");
+    table->item(0, 4)->setFont(titleFont);
+
+    table->setItem(1, 4, new SpreadSheetItem("1"));
+    table->setItem(2, 4, new SpreadSheetItem("1"));
+    table->setItem(3, 4, new SpreadSheetItem("8"));
+    table->setItem(4, 4, new SpreadSheetItem("8"));
+    table->setItem(5, 4, new SpreadSheetItem("7"));
+    table->setItem(6, 4, new SpreadSheetItem("7"));
+    table->setItem(7, 4, new SpreadSheetItem("7"));
+    table->setItem(8, 4, new SpreadSheetItem("7"));
+
+    table->setItem(9, 4, new SpreadSheetItem());
+    table->item(9,4)->setBackgroundColor(Qt::lightGray);
+
+    // column 5
+    table->setItem(0, 5, new SpreadSheetItem("NOK"));
+    table->item(0, 5)->setBackgroundColor(titleBackground);
+    table->item(0, 5)->setToolTip("This column shows the expenses in NOK");
+    table->item(0, 5)->setFont(titleFont);
+
+    table->setItem(1, 5, new SpreadSheetItem("* C2 E2"));
+    table->setItem(2, 5, new SpreadSheetItem("* C3 E3"));
+    table->setItem(3, 5, new SpreadSheetItem("* C4 E4"));
+    table->setItem(4, 5, new SpreadSheetItem("* C5 E5"));
+    table->setItem(5, 5, new SpreadSheetItem("* C6 E6"));
+    table->setItem(6, 5, new SpreadSheetItem("* C7 E7"));
+    table->setItem(7, 5, new SpreadSheetItem("* C8 E8"));
+    table->setItem(8, 5, new SpreadSheetItem("* C9 E9"));
+
+    table->setItem(9, 5, new SpreadSheetItem("sum F2 F9"));
+    table->item(9,5)->setBackgroundColor(Qt::lightGray);
+}
+
+const char *htmlText =
+"<HTML>"
+"<p><b>This demo shows use of <c>QTableWidget</c> with custom handling for"
+" individual cells.</b></p>"
+"<p>Using a customized table item we make it possible to have dynamic"
+" output in different cells. The content that is implemented for this"
+" particular demo is:"
+"<ul>"
+"<li>Adding two cells.</li>"
+"<li>Subtracting one cell from another.</li>"
+"<li>Multiplying two cells.</li>"
+"<li>Dividing one cell with another.</li>"
+"<li>Summing the contents of an arbitrary number of cells.</li>"
+"</HTML>";
+
+void SpreadSheet::showAbout()
+{
+    QMessageBox::about(this, "About Spreadsheet", htmlText);
+}
+
+void decode_pos(const QString &pos, int *row, int *col)
+{
+    if (pos.isEmpty()) {
+        *col = -1;
+        *row = -1;
+    } else {
+        *col = pos.at(0).toLatin1() - 'A';
+        *row = pos.right(pos.size() - 1).toInt() - 1;
+    }
+}
+
+QString encode_pos(int row, int col)
+{
+    return QString(col + 'A') + QString::number(row + 1);
+}
+
+
+void SpreadSheet::print()
+{
+#ifndef QT_NO_PRINTER
+    QPrinter printer(QPrinter::ScreenResolution);
+    QPrintPreviewDialog dlg(&printer);
+    PrintView view;
+    view.setModel(table->model());
+    connect(&dlg, SIGNAL(paintRequested(QPrinter *)),
+            &view, SLOT(print(QPrinter *)));
+    dlg.exec();
+#endif
+}
+
diff --git a/demos/spreadsheet/spreadsheet.h b/demos/spreadsheet/spreadsheet.h
new file mode 100644
index 0000000..944433d
--- /dev/null
+++ b/demos/spreadsheet/spreadsheet.h
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SPREADSHEET_H
+#define SPREADSHEET_H
+
+#include <QMainWindow>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QLabel;
+class QLineEdit;
+class QToolBar;
+class QTableWidgetItem;
+class QTableWidget;
+QT_END_NAMESPACE
+
+class SpreadSheet : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+
+    SpreadSheet(int rows, int cols, QWidget *parent = 0);
+
+public slots:
+    void updateStatus(QTableWidgetItem *item);
+    void updateColor(QTableWidgetItem *item);
+    void updateLineEdit(QTableWidgetItem *item);
+    void returnPressed();
+    void selectColor();
+    void selectFont();
+    void clear();
+    void showAbout();
+
+    void print();
+
+    void actionSum();
+    void actionSubtract();
+    void actionAdd();
+    void actionMultiply();
+    void actionDivide();  
+
+protected:
+    void setupContextMenu();
+    void setupContents();
+
+    void setupMenuBar();
+    void createActions();
+
+    void actionMath_helper(const QString &title, const QString &op);
+    bool runInputDialog(const QString &title,
+                        const QString &c1Text,
+                        const QString &c2Text,
+                        const QString &opText,
+                        const QString &outText,
+                        QString *cell1, QString *cell2, QString *outCell);
+private:
+    QToolBar *toolBar;
+    QAction *colorAction;
+    QAction *fontAction;
+    QAction *firstSeparator;
+    QAction *cell_sumAction;
+    QAction *cell_addAction;
+    QAction *cell_subAction;
+    QAction *cell_mulAction;
+    QAction *cell_divAction;
+    QAction *secondSeparator;
+    QAction *clearAction;
+    QAction *aboutSpreadSheet;
+    QAction *exitAction;
+
+    QAction *printAction;
+
+    QLabel *cellLabel;
+    QTableWidget *table;
+    QLineEdit *formulaInput;
+
+};
+
+void decode_pos(const QString &pos, int *row, int *col);
+QString encode_pos(int row, int col);
+
+
+#endif // SPREADSHEET_H
+
diff --git a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro
new file mode 100644
index 0000000..b62f244
--- /dev/null
+++ b/demos/spreadsheet/spreadsheet.pro
@@ -0,0 +1,33 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Thu Mar 5 14:39:33 2009
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+CONFIG += qt warn_on
+#unix:contains(QT_CONFIG, dbus):QT += dbus
+
+# Input
+HEADERS += printview.h spreadsheet.h spreadsheetdelegate.h spreadsheetitem.h
+SOURCES += main.cpp \
+           printview.cpp \
+           spreadsheet.cpp \
+           spreadsheetdelegate.cpp \
+           spreadsheetitem.cpp
+RESOURCES += spreadsheet.qrc
+
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/spreadsheet
+sources.files = $$SOURCES $$RESOURCES *.pro images
+sources.path = $$[QT_INSTALL_DEMOS]/spreadsheet
+INSTALLS += target sources
+
diff --git a/demos/spreadsheet/spreadsheet.qrc b/demos/spreadsheet/spreadsheet.qrc
new file mode 100644
index 0000000..13f496d
--- /dev/null
+++ b/demos/spreadsheet/spreadsheet.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+	<file>images/interview.png</file>
+</qresource>
+</RCC>
diff --git a/demos/spreadsheet/spreadsheetdelegate.cpp b/demos/spreadsheet/spreadsheetdelegate.cpp
new file mode 100644
index 0000000..465c92f
--- /dev/null
+++ b/demos/spreadsheet/spreadsheetdelegate.cpp
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "spreadsheetdelegate.h"
+#include <QtGui>
+
+SpreadSheetDelegate::SpreadSheetDelegate(QObject *parent)
+        : QItemDelegate(parent) {}
+
+QWidget *SpreadSheetDelegate::createEditor(QWidget *parent,
+                                          const QStyleOptionViewItem &,
+                                          const QModelIndex &index) const
+{
+    if (index.column() == 1) {
+        QDateTimeEdit *editor = new QDateTimeEdit(parent);
+        editor->setDisplayFormat("dd/M/yyy");
+        editor->setCalendarPopup(true);
+        return editor;
+    }
+
+    QLineEdit *editor = new QLineEdit(parent);
+
+    // create a completer with the strings in the column as model
+    QStringList allStrings;
+    for (int i = 1; i<index.model()->rowCount(); i++) {
+        QString strItem(index.model()->data(index.sibling(i, index.column()),
+            Qt::EditRole).toString());
+
+        if (!allStrings.contains(strItem))
+            allStrings.append(strItem);
+    }
+
+    QCompleter *autoComplete = new QCompleter(allStrings);
+    editor->setCompleter(autoComplete);
+    connect(editor, SIGNAL(editingFinished()),
+        this, SLOT(commitAndCloseEditor()));
+    return editor;
+}
+
+void SpreadSheetDelegate::commitAndCloseEditor()
+{
+    QLineEdit *editor = qobject_cast<QLineEdit *>(sender());
+    emit commitData(editor);
+    emit closeEditor(editor);
+}
+
+void SpreadSheetDelegate::setEditorData(QWidget *editor,
+    const QModelIndex &index) const
+{
+    QLineEdit *edit = qobject_cast<QLineEdit*>(editor);
+    if (edit) {
+        edit->setText(index.model()->data(index, Qt::EditRole).toString());
+    } else {
+        QDateTimeEdit *dateEditor = qobject_cast<QDateTimeEdit *>(editor);
+        if (dateEditor) {
+            dateEditor->setDate(QDate::fromString(
+            index.model()->data(index, Qt::EditRole).toString(),
+            "d/M/yy"));
+        }
+    }
+}
+
+void SpreadSheetDelegate::setModelData(QWidget *editor,
+    QAbstractItemModel *model, const QModelIndex &index) const
+{
+    QLineEdit *edit = qobject_cast<QLineEdit *>(editor);
+    if (edit) {
+        model->setData(index, edit->text());
+    } else {
+        QDateTimeEdit *dateEditor = qobject_cast<QDateTimeEdit *>(editor);
+        if (dateEditor) {
+            model->setData(index, dateEditor->date().toString("dd/M/yyy"));
+        }
+    }
+}
+
diff --git a/demos/spreadsheet/spreadsheetdelegate.h b/demos/spreadsheet/spreadsheetdelegate.h
new file mode 100644
index 0000000..3b7b9ac
--- /dev/null
+++ b/demos/spreadsheet/spreadsheetdelegate.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SPREADSHEETDELEGATE_H
+#define SPREADSHEETDELEGATE_H
+
+#include <QItemDelegate>
+#include "spreadsheet.h"
+
+class SpreadSheetDelegate : public QItemDelegate
+{
+    Q_OBJECT
+
+public:
+    SpreadSheetDelegate(QObject *parent = 0);
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &,
+                          const QModelIndex &index) const;
+    void setEditorData(QWidget *editor, const QModelIndex &index) const;
+    void setModelData(QWidget *editor, QAbstractItemModel *model,
+                      const QModelIndex &index) const;
+
+private slots:
+    void commitAndCloseEditor();
+};
+
+#endif // SPREADSHEETDELEGATE_H
+
diff --git a/demos/spreadsheet/spreadsheetitem.cpp b/demos/spreadsheet/spreadsheetitem.cpp
new file mode 100644
index 0000000..8f94b87
--- /dev/null
+++ b/demos/spreadsheet/spreadsheetitem.cpp
@@ -0,0 +1,167 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "spreadsheetitem.h"
+
+SpreadSheetItem::SpreadSheetItem()
+        : QTableWidgetItem(), isResolving(false)
+{
+}
+
+SpreadSheetItem::SpreadSheetItem(const QString &text)
+        : QTableWidgetItem(text), isResolving(false)
+{
+}
+
+QTableWidgetItem *SpreadSheetItem::clone() const
+{
+    SpreadSheetItem *item = new SpreadSheetItem();
+    *item = *this;
+    return item;
+}
+
+QVariant SpreadSheetItem::data(int role) const
+{
+    if (role == Qt::EditRole || role == Qt::StatusTipRole)
+        return formula();
+
+    if (role == Qt::DisplayRole)
+        return display();
+
+    QString t = display().toString();
+    bool isNumber = false;
+    int number = t.toInt(&isNumber);
+
+    if (role == Qt::TextColorRole) {
+        if (!isNumber)
+            return qVariantFromValue(QColor(Qt::black));
+        else if (number < 0)
+            return qVariantFromValue(QColor(Qt::red));
+        return qVariantFromValue(QColor(Qt::blue));
+    }
+
+     if (role == Qt::TextAlignmentRole)
+         if (!t.isEmpty() && (t.at(0).isNumber() || t.at(0) == '-'))
+             return (int)(Qt::AlignRight | Qt::AlignVCenter);
+
+     return QTableWidgetItem::data(role);
+ }
+
+void SpreadSheetItem::setData(int role, const QVariant &value)
+{
+    QTableWidgetItem::setData(role, value);
+    if (tableWidget())
+        tableWidget()->viewport()->update();
+}
+
+QVariant SpreadSheetItem::display() const
+{
+    // avoid circular dependencies
+    if (isResolving)
+        return QVariant();
+
+    isResolving = true;
+    QVariant result = computeFormula(formula(), tableWidget(), this);
+    isResolving = false;
+    return result;
+}
+
+QVariant SpreadSheetItem::computeFormula(const QString &formula,
+                                         const QTableWidget *widget,
+                                         const QTableWidgetItem *self)
+{
+    // check if the s tring is actually a formula or not
+    QStringList list = formula.split(' ');
+    if (list.isEmpty() || !widget)
+        return formula; // it is a normal string
+
+    QString op = list.value(0).toLower();
+
+    int firstRow = -1;
+    int firstCol = -1;
+    int secondRow = -1;
+    int secondCol = -1;
+
+    if (list.count() > 1)
+        decode_pos(list.value(1), &firstRow, &firstCol);
+
+    if (list.count() > 2)
+        decode_pos(list.value(2), &secondRow, &secondCol);
+
+    const QTableWidgetItem *start = widget->item(firstRow, firstCol);
+    const QTableWidgetItem *end = widget->item(secondRow, secondCol);
+
+    int firstVal = start ? start->text().toInt() : 0;
+    int secondVal = end ? end->text().toInt() : 0;
+
+    QVariant result;
+    if (op == "sum") {
+        int sum = 0;
+        for (int r = firstRow; r <= secondRow; ++r) {
+            for (int c = firstCol; c <= secondCol; ++c) {
+                const QTableWidgetItem *tableItem = widget->item(r, c);
+                if (tableItem && tableItem != self)
+                    sum += tableItem->text().toInt();
+            }
+        }
+
+        result = sum;
+    } else if (op == "+") {
+        result = (firstVal + secondVal);
+    } else if (op == "-") {
+        result = (firstVal - secondVal);
+    } else if (op == "*") {
+        result = (firstVal * secondVal);
+    } else if (op == "/") {
+        if (secondVal == 0)
+            result = QString("nan");
+        else
+            result = (firstVal / secondVal);
+    } else if (op == "=") {
+        if (start)
+            result = start->text();
+    } else {
+        result = formula;
+    }
+
+    return result;
+}
+
diff --git a/demos/spreadsheet/spreadsheetitem.h b/demos/spreadsheet/spreadsheetitem.h
new file mode 100644
index 0000000..5996d73
--- /dev/null
+++ b/demos/spreadsheet/spreadsheetitem.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SPREADSHEETITEM_H
+#define SPREADSHEETITEM_H
+
+#include <QTableWidgetItem>
+#include <QtGui>
+#include "spreadsheet.h"
+
+class SpreadSheetItem : public QTableWidgetItem
+{
+public:
+    SpreadSheetItem();
+    SpreadSheetItem(const QString &text);
+
+    QTableWidgetItem *clone() const;
+
+    QVariant data(int role) const;
+    void setData(int role, const QVariant &value);
+    QVariant display() const;
+
+    inline QString formula() const
+    { return QTableWidgetItem::data(Qt::DisplayRole).toString(); }
+
+    static QVariant computeFormula(const QString &formula,
+                                   const QTableWidget *widget,
+                                   const QTableWidgetItem *self = 0);
+
+private:
+    mutable bool isResolving;
+};
+
+#endif // SPREADSHEETITEM_H
+
diff --git a/demos/sqlbrowser/browser.cpp b/demos/sqlbrowser/browser.cpp
new file mode 100644
index 0000000..f7b24db
--- /dev/null
+++ b/demos/sqlbrowser/browser.cpp
@@ -0,0 +1,247 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "browser.h"
+#include "qsqlconnectiondialog.h"
+
+#include <QtGui>
+#include <QtSql>
+
+Browser::Browser(QWidget *parent)
+    : QWidget(parent)
+{
+    setupUi(this);
+
+    table->addAction(insertRowAction);
+    table->addAction(deleteRowAction);
+
+    if (QSqlDatabase::drivers().isEmpty())
+        QMessageBox::information(this, tr("No database drivers found"),
+                                 tr("This demo requires at least one Qt database driver. "
+                                    "Please check the documentation how to build the "
+                                    "Qt SQL plugins."));
+
+    emit statusMessage(tr("Ready."));
+}
+
+Browser::~Browser()
+{
+}
+
+void Browser::exec()
+{
+    QSqlQueryModel *model = new QSqlQueryModel(table);
+    model->setQuery(QSqlQuery(sqlEdit->toPlainText(), connectionWidget->currentDatabase()));
+    table->setModel(model);
+
+    if (model->lastError().type() != QSqlError::NoError)
+        emit statusMessage(model->lastError().text());
+    else if (model->query().isSelect())
+        emit statusMessage(tr("Query OK."));
+    else
+        emit statusMessage(tr("Query OK, number of affected rows: %1").arg(
+                           model->query().numRowsAffected()));
+
+    updateActions();
+}
+
+QSqlError Browser::addConnection(const QString &driver, const QString &dbName, const QString &host,
+                            const QString &user, const QString &passwd, int port)
+{
+    static int cCount = 0;
+
+    QSqlError err;
+    QSqlDatabase db = QSqlDatabase::addDatabase(driver, QString("Browser%1").arg(++cCount));
+    db.setDatabaseName(dbName);
+    db.setHostName(host);
+    db.setPort(port);
+    if (!db.open(user, passwd)) {
+        err = db.lastError();
+        db = QSqlDatabase();
+        QSqlDatabase::removeDatabase(QString("Browser%1").arg(cCount));
+    }
+    connectionWidget->refresh();
+
+    return err;
+}
+
+void Browser::addConnection()
+{
+    QSqlConnectionDialog dialog(this);
+    if (dialog.exec() != QDialog::Accepted)
+        return;
+
+    if (dialog.useInMemoryDatabase()) {
+        QSqlDatabase::database("in_mem_db", false).close();
+        QSqlDatabase::removeDatabase("in_mem_db");
+        QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "in_mem_db");
+        db.setDatabaseName(":memory:");
+        if (!db.open())
+            QMessageBox::warning(this, tr("Unable to open database"), tr("An error occurred while "
+                                                                         "opening the connection: ") + db.lastError().text());
+        QSqlQuery q("", db);
+        q.exec("drop table Movies");
+        q.exec("drop table Names");
+        q.exec("create table Movies (id integer primary key, Title varchar, Director varchar, Rating number)");
+        q.exec("insert into Movies values (0, 'Metropolis', 'Fritz Lang', '8.4')");
+        q.exec("insert into Movies values (1, 'Nosferatu, eine Symphonie des Grauens', 'F.W. Murnau', '8.1')");
+        q.exec("insert into Movies values (2, 'Bis ans Ende der Welt', 'Wim Wenders', '6.5')");
+        q.exec("insert into Movies values (3, 'Hardware', 'Richard Stanley', '5.2')");
+        q.exec("insert into Movies values (4, 'Mitchell', 'Andrew V. McLaglen', '2.1')");
+        q.exec("create table Names (id integer primary key, Firstname varchar, Lastname varchar, City varchar)");
+        q.exec("insert into Names values (0, 'Sala', 'Palmer', 'Morristown')");
+        q.exec("insert into Names values (1, 'Christopher', 'Walker', 'Morristown')");
+        q.exec("insert into Names values (2, 'Donald', 'Duck', 'Andeby')");
+        q.exec("insert into Names values (3, 'Buck', 'Rogers', 'Paris')");
+        q.exec("insert into Names values (4, 'Sherlock', 'Holmes', 'London')");
+        connectionWidget->refresh();
+    } else {
+        QSqlError err = addConnection(dialog.driverName(), dialog.databaseName(), dialog.hostName(),
+                           dialog.userName(), dialog.password(), dialog.port());
+        if (err.type() != QSqlError::NoError)
+            QMessageBox::warning(this, tr("Unable to open database"), tr("An error occurred while "
+                                       "opening the connection: ") + err.text());
+    }
+}
+
+void Browser::showTable(const QString &t)
+{
+    QSqlTableModel *model = new QSqlTableModel(table, connectionWidget->currentDatabase());
+    model->setEditStrategy(QSqlTableModel::OnRowChange);
+    model->setTable(t);
+    model->select();
+    if (model->lastError().type() != QSqlError::NoError)
+        emit statusMessage(model->lastError().text());
+    table->setModel(model);
+    table->setEditTriggers(QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed);
+
+    connect(table->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
+            this, SLOT(currentChanged()));
+    updateActions();
+}
+
+void Browser::showMetaData(const QString &t)
+{
+    QSqlRecord rec = connectionWidget->currentDatabase().record(t);
+    QStandardItemModel *model = new QStandardItemModel(table);
+
+    model->insertRows(0, rec.count());
+    model->insertColumns(0, 7);
+
+    model->setHeaderData(0, Qt::Horizontal, "Fieldname");
+    model->setHeaderData(1, Qt::Horizontal, "Type");
+    model->setHeaderData(2, Qt::Horizontal, "Length");
+    model->setHeaderData(3, Qt::Horizontal, "Precision");
+    model->setHeaderData(4, Qt::Horizontal, "Required");
+    model->setHeaderData(5, Qt::Horizontal, "AutoValue");
+    model->setHeaderData(6, Qt::Horizontal, "DefaultValue");
+
+
+    for (int i = 0; i < rec.count(); ++i) {
+        QSqlField fld = rec.field(i);
+        model->setData(model->index(i, 0), fld.name());
+        model->setData(model->index(i, 1), fld.typeID() == -1
+                ? QString(QVariant::typeToName(fld.type()))
+                : QString("%1 (%2)").arg(QVariant::typeToName(fld.type())).arg(fld.typeID()));
+        model->setData(model->index(i, 2), fld.length());
+        model->setData(model->index(i, 3), fld.precision());
+        model->setData(model->index(i, 4), fld.requiredStatus() == -1 ? QVariant("?")
+                : QVariant(bool(fld.requiredStatus())));
+        model->setData(model->index(i, 5), fld.isAutoValue());
+        model->setData(model->index(i, 6), fld.defaultValue());
+    }
+
+    table->setModel(model);
+    table->setEditTriggers(QAbstractItemView::NoEditTriggers);
+
+    updateActions();
+}
+
+void Browser::insertRow()
+{
+    QSqlTableModel *model = qobject_cast<QSqlTableModel *>(table->model());
+    if (!model)
+        return;
+
+    QModelIndex insertIndex = table->currentIndex();
+    int row = insertIndex.row() == -1 ? 0 : insertIndex.row();
+    model->insertRow(row);
+    insertIndex = model->index(row, 0);
+    table->setCurrentIndex(insertIndex);
+    table->edit(insertIndex);
+}
+
+void Browser::deleteRow()
+{
+    QSqlTableModel *model = qobject_cast<QSqlTableModel *>(table->model());
+    if (!model)
+        return;
+
+    model->setEditStrategy(QSqlTableModel::OnManualSubmit);
+
+    QModelIndexList currentSelection = table->selectionModel()->selectedIndexes();
+    for (int i = 0; i < currentSelection.count(); ++i) {
+        if (currentSelection.at(i).column() != 0)
+            continue;
+        model->removeRow(currentSelection.at(i).row());
+    }
+
+    model->submitAll();
+    model->setEditStrategy(QSqlTableModel::OnRowChange);
+
+    updateActions();
+}
+
+void Browser::updateActions()
+{
+    bool enableIns = qobject_cast<QSqlTableModel *>(table->model());
+    bool enableDel = enableIns && table->currentIndex().isValid();
+
+    insertRowAction->setEnabled(enableIns);
+    deleteRowAction->setEnabled(enableDel);
+}
+
+void Browser::about()
+{
+    QMessageBox::about(this, tr("About"), tr("The SQL Browser demonstration "
+        "show how a data browser can be used to visualize the results of SQL"
+        "statements on a live database"));
+}
diff --git a/demos/sqlbrowser/browser.h b/demos/sqlbrowser/browser.h
new file mode 100644
index 0000000..787675b
--- /dev/null
+++ b/demos/sqlbrowser/browser.h
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BROWSER_H
+#define BROWSER_H
+
+#include <QWidget>
+#include "ui_browserwidget.h"
+
+class ConnectionWidget;
+QT_FORWARD_DECLARE_CLASS(QTableView)
+QT_FORWARD_DECLARE_CLASS(QPushButton)
+QT_FORWARD_DECLARE_CLASS(QTextEdit)
+QT_FORWARD_DECLARE_CLASS(QSqlError)
+
+class Browser: public QWidget, private Ui::Browser
+{
+    Q_OBJECT
+public:
+    Browser(QWidget *parent = 0);
+    virtual ~Browser();
+
+    QSqlError addConnection(const QString &driver, const QString &dbName, const QString &host,
+                  const QString &user, const QString &passwd, int port = -1);
+
+    void insertRow();
+    void deleteRow();
+    void updateActions();
+
+public slots:
+    void exec();
+    void showTable(const QString &table);
+    void showMetaData(const QString &table);
+    void addConnection();
+    void currentChanged() { updateActions(); }
+    void about();
+
+    void on_insertRowAction_triggered()
+    { insertRow(); }
+    void on_deleteRowAction_triggered()
+    { deleteRow(); }
+    void on_connectionWidget_tableActivated(const QString &table)
+    { showTable(table); }
+    void on_connectionWidget_metaDataRequested(const QString &table)
+    { showMetaData(table); }
+    void on_submitButton_clicked()
+    {
+        exec();
+        sqlEdit->setFocus();
+    }
+    void on_clearButton_clicked()
+    {
+        sqlEdit->clear();
+        sqlEdit->setFocus();
+    }
+
+signals:
+    void statusMessage(const QString &message);
+};
+
+#endif
diff --git a/demos/sqlbrowser/browserwidget.ui b/demos/sqlbrowser/browserwidget.ui
new file mode 100644
index 0000000..20946f0
--- /dev/null
+++ b/demos/sqlbrowser/browserwidget.ui
@@ -0,0 +1,199 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>Browser</class>
+ <widget class="QWidget" name="Browser" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>765</width>
+    <height>515</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Qt SQL Browser</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QSplitter" name="splitter_2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>7</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="ConnectionWidget" name="connectionWidget" >
+      <property name="sizePolicy" >
+       <sizepolicy>
+        <hsizetype>13</hsizetype>
+        <vsizetype>7</vsizetype>
+        <horstretch>1</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+     <widget class="QTableView" name="table" >
+      <property name="sizePolicy" >
+       <sizepolicy>
+        <hsizetype>7</hsizetype>
+        <vsizetype>7</vsizetype>
+        <horstretch>2</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="contextMenuPolicy" >
+       <enum>Qt::ActionsContextMenu</enum>
+      </property>
+      <property name="selectionBehavior" >
+       <enum>QAbstractItemView::SelectRows</enum>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>3</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize" >
+      <size>
+       <width>16777215</width>
+       <height>180</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>SQL Query</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QTextEdit" name="sqlEdit" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>3</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize" >
+         <size>
+          <width>0</width>
+          <height>18</height>
+         </size>
+        </property>
+        <property name="baseSize" >
+         <size>
+          <width>0</width>
+          <height>120</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>1</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="clearButton" >
+          <property name="text" >
+           <string>&amp;Clear</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="submitButton" >
+          <property name="text" >
+           <string>&amp;Submit</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+  <action name="insertRowAction" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
+   <property name="text" >
+    <string>&amp;Insert Row</string>
+   </property>
+   <property name="statusTip" >
+    <string>Inserts a new Row</string>
+   </property>
+  </action>
+  <action name="deleteRowAction" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
+   <property name="text" >
+    <string>&amp;Delete Row</string>
+   </property>
+   <property name="statusTip" >
+    <string>Deletes the current Row</string>
+   </property>
+  </action>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>ConnectionWidget</class>
+   <extends>QTreeView</extends>
+   <header>connectionwidget.h</header>
+   <container>0</container>
+   <pixmap></pixmap>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>sqlEdit</tabstop>
+  <tabstop>clearButton</tabstop>
+  <tabstop>submitButton</tabstop>
+  <tabstop>connectionWidget</tabstop>
+  <tabstop>table</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/demos/sqlbrowser/connectionwidget.cpp b/demos/sqlbrowser/connectionwidget.cpp
new file mode 100644
index 0000000..7df28ac
--- /dev/null
+++ b/demos/sqlbrowser/connectionwidget.cpp
@@ -0,0 +1,165 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "connectionwidget.h"
+
+#include <QtGui>
+#include <QtSql>
+
+ConnectionWidget::ConnectionWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    tree = new QTreeWidget(this);
+    tree->setObjectName(QLatin1String("tree"));
+    tree->setHeaderLabels(QStringList(tr("database")));
+    tree->header()->setResizeMode(QHeaderView::Stretch);
+    QAction *refreshAction = new QAction(tr("Refresh"), tree);
+    metaDataAction = new QAction(tr("Show Schema"), tree);
+    connect(refreshAction, SIGNAL(triggered()), SLOT(refresh()));
+    connect(metaDataAction, SIGNAL(triggered()), SLOT(showMetaData()));
+    tree->addAction(refreshAction);
+    tree->addAction(metaDataAction);
+    tree->setContextMenuPolicy(Qt::ActionsContextMenu);
+
+    layout->addWidget(tree);
+
+    QMetaObject::connectSlotsByName(this);
+}
+
+ConnectionWidget::~ConnectionWidget()
+{
+}
+
+static QString qDBCaption(const QSqlDatabase &db)
+{
+    QString nm = db.driverName();
+    nm.append(QLatin1Char(':'));
+    if (!db.userName().isEmpty())
+        nm.append(db.userName()).append(QLatin1Char('@'));
+    nm.append(db.databaseName());
+    return nm;
+}
+
+void ConnectionWidget::refresh()
+{
+    tree->clear();
+    QStringList connectionNames = QSqlDatabase::connectionNames();
+
+    bool gotActiveDb = false;
+    for (int i = 0; i < connectionNames.count(); ++i) {
+        QTreeWidgetItem *root = new QTreeWidgetItem(tree);
+        QSqlDatabase db = QSqlDatabase::database(connectionNames.at(i), false);
+        root->setText(0, qDBCaption(db));
+        if (connectionNames.at(i) == activeDb) {
+            gotActiveDb = true;
+            setActive(root);
+        }
+        if (db.isOpen()) {
+            QStringList tables = db.tables();
+            for (int t = 0; t < tables.count(); ++t) {
+                QTreeWidgetItem *table = new QTreeWidgetItem(root);
+                table->setText(0, tables.at(t));
+            }
+        }
+    }
+    if (!gotActiveDb) {
+        activeDb = connectionNames.value(0);
+        setActive(tree->topLevelItem(0));
+    }
+
+    tree->doItemsLayout(); // HACK
+}
+
+QSqlDatabase ConnectionWidget::currentDatabase() const
+{
+    return QSqlDatabase::database(activeDb);
+}
+
+static void qSetBold(QTreeWidgetItem *item, bool bold)
+{
+    QFont font = item->font(0);
+    font.setBold(bold);
+    item->setFont(0, font);
+}
+
+void ConnectionWidget::setActive(QTreeWidgetItem *item)
+{
+    for (int i = 0; i < tree->topLevelItemCount(); ++i) {
+        if (tree->topLevelItem(i)->font(0).bold())
+            qSetBold(tree->topLevelItem(i), false);
+    }
+
+    if (!item)
+        return;
+
+    qSetBold(item, true);
+    activeDb = QSqlDatabase::connectionNames().value(tree->indexOfTopLevelItem(item));
+}
+
+void ConnectionWidget::on_tree_itemActivated(QTreeWidgetItem *item, int /* column */)
+{
+
+    if (!item)
+        return;
+
+    if (!item->parent()) {
+        setActive(item);
+    } else {
+        setActive(item->parent());
+        emit tableActivated(item->text(0));
+    }
+}
+
+void ConnectionWidget::showMetaData()
+{
+    QTreeWidgetItem *cItem = tree->currentItem();
+    if (!cItem || !cItem->parent())
+        return;
+    setActive(cItem->parent());
+    emit metaDataRequested(cItem->text(0));
+}
+
+void ConnectionWidget::on_tree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *)
+{
+    metaDataAction->setEnabled(current && current->parent());
+}
+
diff --git a/demos/sqlbrowser/connectionwidget.h b/demos/sqlbrowser/connectionwidget.h
new file mode 100644
index 0000000..5c48414
--- /dev/null
+++ b/demos/sqlbrowser/connectionwidget.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CONNECTIONWIDGET_H
+#define CONNECTIONWIDGET_H
+
+#include <QWidget>
+
+QT_FORWARD_DECLARE_CLASS(QTreeWidget)
+QT_FORWARD_DECLARE_CLASS(QTreeWidgetItem)
+QT_FORWARD_DECLARE_CLASS(QSqlDatabase)
+QT_FORWARD_DECLARE_CLASS(QMenu)
+
+class ConnectionWidget: public QWidget
+{
+    Q_OBJECT
+public:
+    ConnectionWidget(QWidget *parent = 0);
+    virtual ~ConnectionWidget();
+
+    QSqlDatabase currentDatabase() const;
+
+signals:
+    void tableActivated(const QString &table);
+    void metaDataRequested(const QString &tableName);
+
+public slots:
+    void refresh();
+    void showMetaData();
+    void on_tree_itemActivated(QTreeWidgetItem *item, int column);
+    void on_tree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
+
+private:
+    void setActive(QTreeWidgetItem *);
+
+    QTreeWidget *tree;
+    QAction *metaDataAction;
+    QString activeDb;
+};
+
+#endif
diff --git a/demos/sqlbrowser/main.cpp b/demos/sqlbrowser/main.cpp
new file mode 100644
index 0000000..b7b7fe5
--- /dev/null
+++ b/demos/sqlbrowser/main.cpp
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "browser.h"
+
+#include <QtCore>
+#include <QtGui>
+#include <QtSql>
+
+void addConnectionsFromCommandline(const QStringList &args, Browser *browser)
+{
+    for (int i = 1; i < args.count(); ++i) {
+        QUrl url(args.at(i), QUrl::TolerantMode);
+        if (!url.isValid()) {
+            qWarning("Invalid URL: %s", qPrintable(args.at(i)));
+            continue;
+        }
+        QSqlError err = browser->addConnection(url.scheme(), url.path().mid(1), url.host(),
+                                               url.userName(), url.password(), url.port(-1));
+        if (err.type() != QSqlError::NoError)
+            qDebug() << "Unable to open connection:" << err;
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QMainWindow mainWin;
+    mainWin.setWindowTitle(QObject::tr("Qt SQL Browser"));
+
+    Browser browser(&mainWin);
+    mainWin.setCentralWidget(&browser);
+
+    QMenu *fileMenu = mainWin.menuBar()->addMenu(QObject::tr("&File"));
+    fileMenu->addAction(QObject::tr("Add &Connection..."), &browser, SLOT(addConnection()));
+    fileMenu->addSeparator();
+    fileMenu->addAction(QObject::tr("&Quit"), &app, SLOT(quit()));
+
+    QMenu *helpMenu = mainWin.menuBar()->addMenu(QObject::tr("&Help"));
+    helpMenu->addAction(QObject::tr("About"), &browser, SLOT(about()));
+    helpMenu->addAction(QObject::tr("About Qt"), qApp, SLOT(aboutQt()));
+
+    QObject::connect(&browser, SIGNAL(statusMessage(QString)),
+                     mainWin.statusBar(), SLOT(showMessage(QString)));
+
+    addConnectionsFromCommandline(app.arguments(), &browser);
+    mainWin.show();
+    if (QSqlDatabase::connectionNames().isEmpty())
+        QMetaObject::invokeMethod(&browser, "addConnection", Qt::QueuedConnection);
+
+    return app.exec();
+}
diff --git a/demos/sqlbrowser/qsqlconnectiondialog.cpp b/demos/sqlbrowser/qsqlconnectiondialog.cpp
new file mode 100644
index 0000000..a2e3c89
--- /dev/null
+++ b/demos/sqlbrowser/qsqlconnectiondialog.cpp
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qsqlconnectiondialog.h"
+#include "ui_qsqlconnectiondialog.h"
+
+#include <QSqlDatabase>
+
+QSqlConnectionDialog::QSqlConnectionDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    ui.setupUi(this);
+
+    QStringList drivers = QSqlDatabase::drivers();
+
+    // remove compat names
+    drivers.removeAll("QMYSQL3");
+    drivers.removeAll("QOCI8");
+    drivers.removeAll("QODBC3");
+    drivers.removeAll("QPSQL7");
+    drivers.removeAll("QTDS7");
+
+    if (!drivers.contains("QSQLITE"))
+        ui.dbCheckBox->setEnabled(false);
+
+    ui.comboDriver->addItems(drivers);
+}
+
+QSqlConnectionDialog::~QSqlConnectionDialog()
+{
+}
+
+QString QSqlConnectionDialog::driverName() const
+{
+    return ui.comboDriver->currentText();
+}
+
+QString QSqlConnectionDialog::databaseName() const
+{
+    return ui.editDatabase->text();
+}
+
+QString QSqlConnectionDialog::userName() const
+{
+    return ui.editUsername->text();
+}
+
+QString QSqlConnectionDialog::password() const
+{
+    return ui.editPassword->text();
+}
+
+QString QSqlConnectionDialog::hostName() const
+{
+    return ui.editHostname->text();
+}
+
+int QSqlConnectionDialog::port() const
+{
+    return ui.portSpinBox->value();
+}
+
+bool QSqlConnectionDialog::useInMemoryDatabase() const
+{
+    return ui.dbCheckBox->isChecked();
+}
+
+void QSqlConnectionDialog::on_okButton_clicked()
+{
+    if (ui.comboDriver->currentText().isEmpty()) {
+        QMessageBox::information(this, tr("No database driver selected"),
+                                 tr("Please select a database driver"));
+        ui.comboDriver->setFocus();
+    } else {
+        accept();
+    }
+}
diff --git a/demos/sqlbrowser/qsqlconnectiondialog.h b/demos/sqlbrowser/qsqlconnectiondialog.h
new file mode 100644
index 0000000..d5f3456
--- /dev/null
+++ b/demos/sqlbrowser/qsqlconnectiondialog.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSQLCONNECTIONDIALOG_H
+#define QSQLCONNECTIONDIALOG_H
+
+#include <QDialog>
+#include <QMessageBox>
+
+#include "ui_qsqlconnectiondialog.h"
+
+class QSqlConnectionDialog: public QDialog
+{
+    Q_OBJECT
+public:
+    QSqlConnectionDialog(QWidget *parent = 0);
+    ~QSqlConnectionDialog();
+
+    QString driverName() const;
+    QString databaseName() const;
+    QString userName() const;
+    QString password() const;
+    QString hostName() const;
+    int port() const;
+    bool useInMemoryDatabase() const;
+
+private slots:
+    void on_okButton_clicked();
+    void on_cancelButton_clicked() { reject(); }
+    void on_dbCheckBox_clicked() { ui.connGroupBox->setEnabled(!ui.dbCheckBox->isChecked()); }
+
+private:
+    Ui::QSqlConnectionDialogUi ui;
+};
+
+#endif
diff --git a/demos/sqlbrowser/qsqlconnectiondialog.ui b/demos/sqlbrowser/qsqlconnectiondialog.ui
new file mode 100644
index 0000000..91a8700
--- /dev/null
+++ b/demos/sqlbrowser/qsqlconnectiondialog.ui
@@ -0,0 +1,224 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>QSqlConnectionDialogUi</class>
+ <widget class="QDialog" name="QSqlConnectionDialogUi" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>315</width>
+    <height>302</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Connect...</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="connGroupBox" >
+     <property name="title" >
+      <string>Connection settings</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="1" >
+       <widget class="QComboBox" name="comboDriver" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="textLabel4" >
+        <property name="text" >
+         <string>&amp;Username:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>editUsername</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="textLabel2" >
+        <property name="text" >
+         <string>D&amp;river</string>
+        </property>
+        <property name="buddy" >
+         <cstring>comboDriver</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLineEdit" name="editDatabase" />
+      </item>
+      <item row="5" column="1" >
+       <widget class="QSpinBox" name="portSpinBox" >
+        <property name="specialValueText" >
+         <string>Default</string>
+        </property>
+        <property name="maximum" >
+         <number>65535</number>
+        </property>
+        <property name="minimum" >
+         <number>-1</number>
+        </property>
+        <property name="value" >
+         <number>-1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="textLabel3" >
+        <property name="text" >
+         <string>Database Name:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>editDatabase</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QLineEdit" name="editPassword" >
+        <property name="echoMode" >
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QLineEdit" name="editUsername" />
+      </item>
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="editHostname" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="textLabel5" >
+        <property name="text" >
+         <string>&amp;Hostname:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>editHostname</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="textLabel5_2" >
+        <property name="text" >
+         <string>P&amp;ort:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>portSpinBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="textLabel4_2" >
+        <property name="text" >
+         <string>&amp;Password:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>editPassword</cstring>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="dbCheckBox" >
+       <property name="text" >
+        <string>Us&amp;e predefined in-memory database</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="text" >
+        <string>&amp;OK</string>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>&amp;Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>comboDriver</tabstop>
+  <tabstop>editDatabase</tabstop>
+  <tabstop>editUsername</tabstop>
+  <tabstop>editPassword</tabstop>
+  <tabstop>editHostname</tabstop>
+  <tabstop>portSpinBox</tabstop>
+  <tabstop>dbCheckBox</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/demos/sqlbrowser/sqlbrowser.pro b/demos/sqlbrowser/sqlbrowser.pro
new file mode 100644
index 0000000..920e8a0
--- /dev/null
+++ b/demos/sqlbrowser/sqlbrowser.pro
@@ -0,0 +1,23 @@
+TEMPLATE        = app
+TARGET          = sqlbrowser
+
+QT              += sql
+
+HEADERS         = browser.h connectionwidget.h qsqlconnectiondialog.h
+SOURCES         = main.cpp browser.cpp connectionwidget.cpp qsqlconnectiondialog.cpp
+
+FORMS           = browserwidget.ui qsqlconnectiondialog.ui
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/sqlbrowser
+sources.files = $$SOURCES $$HEADERS $$FORMS *.pro
+sources.path = $$[QT_INSTALL_DEMOS]/sqlbrowser
+INSTALLS += target sources
+
+wince*: {
+    DEPLOYMENT_PLUGIN += qsqlite
+}
diff --git a/demos/textedit/example.html b/demos/textedit/example.html
new file mode 100644
index 0000000..19b5520
--- /dev/null
+++ b/demos/textedit/example.html
@@ -0,0 +1,79 @@
+<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>QTextEdit Demonstration</title><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:20pt; font-weight:600;">QTextEdit</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">The QTextEdit widget is an advanced editor that supports formatted rich text. It can be used to display HTML and other rich document formats. Internally, QTextEdit uses the QTextDocument class to describe both the high-level structure of each document and the low-level formatting of paragraphs.</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">If you are viewing this document in the <span style=" font-style:italic;">textedit</span> demo, you can edit this document to explore Qt's rich text editing features. We have included some comments in each of the following sections to encourage you to experiment.  </p>
+<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:18pt; font-weight:600;"><span style=" font-size:16pt;">Font and Paragraph Styles</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">QTextEdit supports </span><span style=" font-size:11pt; font-weight:600;">bold</span><span style=" font-size:11pt;">, </span><span style=" font-size:11pt; font-style:italic;">italic</span><span style=" font-size:11pt;">, and </span><span style=" font-size:11pt; text-decoration: underline;">underlined</span><span style=" font-size:11pt;"> font styles, and can display </span><span style=" font-size:11pt; font-weight:600; color:#00007f;">multicolored</span><span style=" font-size:11pt;"> </span><span style=" font-size:11pt; font-weight:600; color:#aa0000;">text</span><span style=" font-size:11pt;">. Font families such as </span><span style=" font-family:'Times'; font-size:11pt; font-weight:600;">Times New Roman</span><span style=" font-size:11pt;"> and </span><span style=" font-family:'Courier'; font-size:11pt; font-weight:600;">Courier</span><span style=" font-size:11pt;"> can also be used directly. </span><span style=" font-size:11pt; font-style:italic;">If you place the cursor in a region of styled text, the controls in the tool bars will change to reflect the current style.</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">Paragraphs can be formatted so that the text is left-aligned, right-aligned, centered, or fully justified.</p>
+<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-style:italic;">Try changing the alignment of some text and resize the editor to see how the text layout changes.</span> </p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; font-weight:600;">Lists</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt; font-weight:600;"><span style=" font-size:11pt; font-weight:400;">Different kinds of lists can be included in rich text documents. Standard bullet lists can be nested, using different symbols for each level of the list: </span></p>
+<ul style="-qt-list-indent: 1;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Disc symbols are typically used for top-level list items. </li></ul>
+<ul type=circle style="-qt-list-indent: 2;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Circle symbols can be used to distinguish between items in lower-level lists.</li></ul>
+<ul type=square style="-qt-list-indent: 3;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Square symbols provide a reasonable alternative to discs and circles. </li></ul>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">Ordered lists can be created that can be used for tables of contents. Different characters can be used to enumerate items, and we can use both Roman and Arabic numerals in the same list structure: </p>
+<ol style="-qt-list-indent: 1;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Introduction</li>
+<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Tools </li></ol>
+<ol type=a style="-qt-list-indent: 2;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Assistant</li>
+<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Designer</li>
+<ol type=A style="-qt-list-indent: 3;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Form Editor</li>
+<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Component Architecture</li></ol>
+<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Linguist</li></ol>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">The list will automatically be renumbered if you add or remove items. <span style=" font-style:italic;">Try adding new sections to the above list or removing existing item to see the numbers change.</span> </p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"></p>
+<p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-size:16pt; font-weight:600;">Images</span></p>
+<p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt; font-weight:600;"><span style=" font-size:11pt; font-weight:400;">Inline images are treated like ordinary ranges of characters in the text editor, so they flow with the surrounding text. Images can also be selected in the same way as text, making it easy to cut, copy, and paste them. </span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><img src=":/images/logo32.png" /><span style=" font-style:italic;"> Try to select this image by clicking and dragging over it with the mouse, or use the text cursor to select it by holding down Shift and using the arrow keys. You can then cut or copy it, and pasting it into different parts of this document.</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-size:16pt; font-weight:600;">Tables</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt; font-weight:600;"><span style=" font-size:11pt; font-weight:400;">QTextEdit can arrange and format tables, supporting features such as row and column spans, text formatting within cells, and size constraints for columns. </span></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"></p>
+<table border="1" align="center" width="90%" cellspacing="0" cellpadding="4">
+<tr>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Development Tools </span></p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Programming Techniques </span></p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Graphical User Interfaces </span></p></td></tr>
+<tr>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">9:00 - 11:00 </span></p></td>
+<td colspan="3">
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Introduction to <span style=" font-style:italic;">Qt </span></p></td></tr>
+<tr>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">11:00 - 13:00 </span></p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Using <span style=" font-style:italic;">qmake</span> </p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Object-oriented Programming </p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Layouts in <span style=" font-style:italic;">Qt</span> </p></td></tr>
+<tr>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">13:00 - 15:00 </span></p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Qt Designer</span> Tutorial </p></td>
+<td rowspan="2">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Extreme Programming </p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Writing Custom Styles </p></td></tr>
+<tr>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">15:00 - 17:00 </span></p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Qt Linguist</span> and Internationalization </p></td>
+<td></td></tr></table>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; font-style:italic;">Try adding text to the cells in the table and experiment with the alignment of the paragraphs.</p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-size:16pt; font-weight:600;">Hyperlinks</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">QTextEdit is designed to support hyperlinks between documents, and this feature is used extensively in </span><span style=" font-size:11pt; font-style:italic;">Qt Assistant</span><span style=" font-size:11pt;">. Hyperlinks are automatically created when an HTML file is imported into an editor. Since the rich text framework supports hyperlinks natively, they can also be created programatically.</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-size:16pt; font-weight:600;">Undo and Redo</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">Full support for undo and redo operations is built into QTextEdit and the underlying rich text framework. Operations on a document can be packaged together to make editing a more comfortable experience for the user.</p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-style:italic;">Try making changes to this document and press Ctrl+Z to undo them. You can always recover  the original contents of the document.</span> </p></body></html>
diff --git a/demos/textedit/images/logo32.png b/demos/textedit/images/logo32.png
new file mode 100644
index 0000000..5f91e98
--- /dev/null
+++ b/demos/textedit/images/logo32.png
diff --git a/demos/textedit/images/mac/editcopy.png b/demos/textedit/images/mac/editcopy.png
new file mode 100644
index 0000000..f551364
--- /dev/null
+++ b/demos/textedit/images/mac/editcopy.png
diff --git a/demos/textedit/images/mac/editcut.png b/demos/textedit/images/mac/editcut.png
new file mode 100644
index 0000000..a784fd5
--- /dev/null
+++ b/demos/textedit/images/mac/editcut.png
diff --git a/demos/textedit/images/mac/editpaste.png b/demos/textedit/images/mac/editpaste.png
new file mode 100644
index 0000000..64c0b2d
--- /dev/null
+++ b/demos/textedit/images/mac/editpaste.png
diff --git a/demos/textedit/images/mac/editredo.png b/demos/textedit/images/mac/editredo.png
new file mode 100644
index 0000000..8875bf2
--- /dev/null
+++ b/demos/textedit/images/mac/editredo.png
diff --git a/demos/textedit/images/mac/editundo.png b/demos/textedit/images/mac/editundo.png
new file mode 100644
index 0000000..a3bd5e0
--- /dev/null
+++ b/demos/textedit/images/mac/editundo.png
diff --git a/demos/textedit/images/mac/exportpdf.png b/demos/textedit/images/mac/exportpdf.png
new file mode 100644
index 0000000..ebb44e6
--- /dev/null
+++ b/demos/textedit/images/mac/exportpdf.png
diff --git a/demos/textedit/images/mac/filenew.png b/demos/textedit/images/mac/filenew.png
new file mode 100644
index 0000000..d3882c7
--- /dev/null
+++ b/demos/textedit/images/mac/filenew.png
diff --git a/demos/textedit/images/mac/fileopen.png b/demos/textedit/images/mac/fileopen.png
new file mode 100644
index 0000000..fc06c5e
--- /dev/null
+++ b/demos/textedit/images/mac/fileopen.png
diff --git a/demos/textedit/images/mac/fileprint.png b/demos/textedit/images/mac/fileprint.png
new file mode 100644
index 0000000..10ca56c
--- /dev/null
+++ b/demos/textedit/images/mac/fileprint.png
diff --git a/demos/textedit/images/mac/filesave.png b/demos/textedit/images/mac/filesave.png
new file mode 100644
index 0000000..b41ecf5
--- /dev/null
+++ b/demos/textedit/images/mac/filesave.png
diff --git a/demos/textedit/images/mac/textbold.png b/demos/textedit/images/mac/textbold.png
new file mode 100644
index 0000000..38400bd
--- /dev/null
+++ b/demos/textedit/images/mac/textbold.png
diff --git a/demos/textedit/images/mac/textcenter.png b/demos/textedit/images/mac/textcenter.png
new file mode 100644
index 0000000..2ef5b2e
--- /dev/null
+++ b/demos/textedit/images/mac/textcenter.png
diff --git a/demos/textedit/images/mac/textitalic.png b/demos/textedit/images/mac/textitalic.png
new file mode 100644
index 0000000..0170ee2
--- /dev/null
+++ b/demos/textedit/images/mac/textitalic.png
diff --git a/demos/textedit/images/mac/textjustify.png b/demos/textedit/images/mac/textjustify.png
new file mode 100644
index 0000000..39cd6c1
--- /dev/null
+++ b/demos/textedit/images/mac/textjustify.png
diff --git a/demos/textedit/images/mac/textleft.png b/demos/textedit/images/mac/textleft.png
new file mode 100644
index 0000000..83a66d5
--- /dev/null
+++ b/demos/textedit/images/mac/textleft.png
diff --git a/demos/textedit/images/mac/textright.png b/demos/textedit/images/mac/textright.png
new file mode 100644
index 0000000..e7c0464
--- /dev/null
+++ b/demos/textedit/images/mac/textright.png
diff --git a/demos/textedit/images/mac/textunder.png b/demos/textedit/images/mac/textunder.png
new file mode 100644
index 0000000..968bac5
--- /dev/null
+++ b/demos/textedit/images/mac/textunder.png
diff --git a/demos/textedit/images/mac/zoomin.png b/demos/textedit/images/mac/zoomin.png
new file mode 100644
index 0000000..d46f5af
--- /dev/null
+++ b/demos/textedit/images/mac/zoomin.png
diff --git a/demos/textedit/images/mac/zoomout.png b/demos/textedit/images/mac/zoomout.png
new file mode 100644
index 0000000..4632656
--- /dev/null
+++ b/demos/textedit/images/mac/zoomout.png
diff --git a/demos/textedit/images/win/editcopy.png b/demos/textedit/images/win/editcopy.png
new file mode 100644
index 0000000..1121b47
--- /dev/null
+++ b/demos/textedit/images/win/editcopy.png
diff --git a/demos/textedit/images/win/editcut.png b/demos/textedit/images/win/editcut.png
new file mode 100644
index 0000000..38e55f7
--- /dev/null
+++ b/demos/textedit/images/win/editcut.png
diff --git a/demos/textedit/images/win/editpaste.png b/demos/textedit/images/win/editpaste.png
new file mode 100644
index 0000000..ffab15a
--- /dev/null
+++ b/demos/textedit/images/win/editpaste.png
diff --git a/demos/textedit/images/win/editredo.png b/demos/textedit/images/win/editredo.png
new file mode 100644
index 0000000..9d679fe
--- /dev/null
+++ b/demos/textedit/images/win/editredo.png
diff --git a/demos/textedit/images/win/editundo.png b/demos/textedit/images/win/editundo.png
new file mode 100644
index 0000000..eee23d2
--- /dev/null
+++ b/demos/textedit/images/win/editundo.png
diff --git a/demos/textedit/images/win/exportpdf.png b/demos/textedit/images/win/exportpdf.png
new file mode 100644
index 0000000..eef5132
--- /dev/null
+++ b/demos/textedit/images/win/exportpdf.png
diff --git a/demos/textedit/images/win/filenew.png b/demos/textedit/images/win/filenew.png
new file mode 100644
index 0000000..af5d122
--- /dev/null
+++ b/demos/textedit/images/win/filenew.png
diff --git a/demos/textedit/images/win/fileopen.png b/demos/textedit/images/win/fileopen.png
new file mode 100644
index 0000000..fc6f17e
--- /dev/null
+++ b/demos/textedit/images/win/fileopen.png
diff --git a/demos/textedit/images/win/fileprint.png b/demos/textedit/images/win/fileprint.png
new file mode 100644
index 0000000..ba7c02d
--- /dev/null
+++ b/demos/textedit/images/win/fileprint.png
diff --git a/demos/textedit/images/win/filesave.png b/demos/textedit/images/win/filesave.png
new file mode 100644
index 0000000..8feec99
--- /dev/null
+++ b/demos/textedit/images/win/filesave.png
diff --git a/demos/textedit/images/win/textbold.png b/demos/textedit/images/win/textbold.png
new file mode 100644
index 0000000..9cbc713
--- /dev/null
+++ b/demos/textedit/images/win/textbold.png
diff --git a/demos/textedit/images/win/textcenter.png b/demos/textedit/images/win/textcenter.png
new file mode 100644
index 0000000..11efb4b
--- /dev/null
+++ b/demos/textedit/images/win/textcenter.png
diff --git a/demos/textedit/images/win/textitalic.png b/demos/textedit/images/win/textitalic.png
new file mode 100644
index 0000000..b30ce14
--- /dev/null
+++ b/demos/textedit/images/win/textitalic.png
diff --git a/demos/textedit/images/win/textjustify.png b/demos/textedit/images/win/textjustify.png
new file mode 100644
index 0000000..9de0c88
--- /dev/null
+++ b/demos/textedit/images/win/textjustify.png
diff --git a/demos/textedit/images/win/textleft.png b/demos/textedit/images/win/textleft.png
new file mode 100644
index 0000000..16f80bc
--- /dev/null
+++ b/demos/textedit/images/win/textleft.png
diff --git a/demos/textedit/images/win/textright.png b/demos/textedit/images/win/textright.png
new file mode 100644
index 0000000..16872df
--- /dev/null
+++ b/demos/textedit/images/win/textright.png
diff --git a/demos/textedit/images/win/textunder.png b/demos/textedit/images/win/textunder.png
new file mode 100644
index 0000000..c72eff5
--- /dev/null
+++ b/demos/textedit/images/win/textunder.png
diff --git a/demos/textedit/images/win/zoomin.png b/demos/textedit/images/win/zoomin.png
new file mode 100644
index 0000000..2e586fc
--- /dev/null
+++ b/demos/textedit/images/win/zoomin.png
diff --git a/demos/textedit/images/win/zoomout.png b/demos/textedit/images/win/zoomout.png
new file mode 100644
index 0000000..a736d39
--- /dev/null
+++ b/demos/textedit/images/win/zoomout.png
diff --git a/demos/textedit/main.cpp b/demos/textedit/main.cpp
new file mode 100644
index 0000000..fa38ecb
--- /dev/null
+++ b/demos/textedit/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "textedit.h"
+#include <QApplication>
+
+int main( int argc, char ** argv )
+{
+    Q_INIT_RESOURCE(textedit);
+
+    QApplication a( argc, argv );
+    TextEdit mw;
+    mw.resize( 700, 800 );
+    mw.show();
+    return a.exec();
+}
diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp
new file mode 100644
index 0000000..128cd6a
--- /dev/null
+++ b/demos/textedit/textedit.cpp
@@ -0,0 +1,688 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "textedit.h"
+
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
+#include <QColorDialog>
+#include <QComboBox>
+#include <QFontComboBox>
+#include <QFile>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QFontDatabase>
+#include <QMenu>
+#include <QMenuBar>
+#include <QPrintDialog>
+#include <QPrinter>
+#include <QTextCodec>
+#include <QTextEdit>
+#include <QToolBar>
+#include <QTextCursor>
+#include <QTextDocumentWriter>
+#include <QTextList>
+#include <QtDebug>
+#include <QCloseEvent>
+#include <QMessageBox>
+#include <QPrintPreviewDialog>
+
+#ifdef Q_WS_MAC
+const QString rsrcPath = ":/images/mac";
+#else
+const QString rsrcPath = ":/images/win";
+#endif
+
+TextEdit::TextEdit(QWidget *parent)
+    : QMainWindow(parent)
+{
+    setupFileActions();
+    setupEditActions();
+    setupTextActions();
+
+    {
+        QMenu *helpMenu = new QMenu(tr("Help"), this);
+        menuBar()->addMenu(helpMenu);
+        helpMenu->addAction(tr("About"), this, SLOT(about()));
+        helpMenu->addAction(tr("About &Qt"), qApp, SLOT(aboutQt()));
+    }
+
+    textEdit = new QTextEdit(this);
+    connect(textEdit, SIGNAL(currentCharFormatChanged(const QTextCharFormat &)),
+            this, SLOT(currentCharFormatChanged(const QTextCharFormat &)));
+    connect(textEdit, SIGNAL(cursorPositionChanged()),
+            this, SLOT(cursorPositionChanged()));
+
+    setCentralWidget(textEdit);
+    textEdit->setFocus();
+    setCurrentFileName(QString());
+
+    fontChanged(textEdit->font());
+    colorChanged(textEdit->textColor());
+    alignmentChanged(textEdit->alignment());
+
+    connect(textEdit->document(), SIGNAL(modificationChanged(bool)),
+            actionSave, SLOT(setEnabled(bool)));
+    connect(textEdit->document(), SIGNAL(modificationChanged(bool)),
+            this, SLOT(setWindowModified(bool)));
+    connect(textEdit->document(), SIGNAL(undoAvailable(bool)),
+            actionUndo, SLOT(setEnabled(bool)));
+    connect(textEdit->document(), SIGNAL(redoAvailable(bool)),
+            actionRedo, SLOT(setEnabled(bool)));
+
+    setWindowModified(textEdit->document()->isModified());
+    actionSave->setEnabled(textEdit->document()->isModified());
+    actionUndo->setEnabled(textEdit->document()->isUndoAvailable());
+    actionRedo->setEnabled(textEdit->document()->isRedoAvailable());
+
+    connect(actionUndo, SIGNAL(triggered()), textEdit, SLOT(undo()));
+    connect(actionRedo, SIGNAL(triggered()), textEdit, SLOT(redo()));
+
+    actionCut->setEnabled(false);
+    actionCopy->setEnabled(false);
+
+    connect(actionCut, SIGNAL(triggered()), textEdit, SLOT(cut()));
+    connect(actionCopy, SIGNAL(triggered()), textEdit, SLOT(copy()));
+    connect(actionPaste, SIGNAL(triggered()), textEdit, SLOT(paste()));
+
+    connect(textEdit, SIGNAL(copyAvailable(bool)), actionCut, SLOT(setEnabled(bool)));
+    connect(textEdit, SIGNAL(copyAvailable(bool)), actionCopy, SLOT(setEnabled(bool)));
+
+    connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardDataChanged()));
+
+    QString initialFile = ":/example.html";
+    const QStringList args = QCoreApplication::arguments();
+    if (args.count() == 2)
+        initialFile = args.at(1);
+
+    if (!load(initialFile))
+        fileNew();
+}
+
+void TextEdit::closeEvent(QCloseEvent *e)
+{
+    if (maybeSave())
+        e->accept();
+    else
+        e->ignore();
+}
+
+void TextEdit::setupFileActions()
+{
+    QToolBar *tb = new QToolBar(this);
+    tb->setWindowTitle(tr("File Actions"));
+    addToolBar(tb);
+
+    QMenu *menu = new QMenu(tr("&File"), this);
+    menuBar()->addMenu(menu);
+
+    QAction *a;
+
+    a = new QAction(QIcon(rsrcPath + "/filenew.png"), tr("&New"), this);
+    a->setShortcut(QKeySequence::New);
+    connect(a, SIGNAL(triggered()), this, SLOT(fileNew()));
+    tb->addAction(a);
+    menu->addAction(a);
+
+    a = new QAction(QIcon(rsrcPath + "/fileopen.png"), tr("&Open..."), this);
+    a->setShortcut(QKeySequence::Open);
+    connect(a, SIGNAL(triggered()), this, SLOT(fileOpen()));
+    tb->addAction(a);
+    menu->addAction(a);
+
+    menu->addSeparator();
+
+    actionSave = a = new QAction(QIcon(rsrcPath + "/filesave.png"), tr("&Save"), this);
+    a->setShortcut(QKeySequence::Save);
+    connect(a, SIGNAL(triggered()), this, SLOT(fileSave()));
+    a->setEnabled(false);
+    tb->addAction(a);
+    menu->addAction(a);
+
+    a = new QAction(tr("Save &As..."), this);
+    connect(a, SIGNAL(triggered()), this, SLOT(fileSaveAs()));
+    menu->addAction(a);
+    menu->addSeparator();
+
+#ifndef QT_NO_PRINTER
+    a = new QAction(QIcon(rsrcPath + "/fileprint.png"), tr("&Print..."), this);
+    a->setShortcut(QKeySequence::Print);
+    connect(a, SIGNAL(triggered()), this, SLOT(filePrint()));
+    tb->addAction(a);
+    menu->addAction(a);
+
+    a = new QAction(QIcon(rsrcPath + "/fileprint.png"), tr("Print Preview..."), this);
+    connect(a, SIGNAL(triggered()), this, SLOT(filePrintPreview()));
+    menu->addAction(a);
+
+    a = new QAction(QIcon(rsrcPath + "/exportpdf.png"), tr("&Export PDF..."), this);
+    a->setShortcut(Qt::CTRL + Qt::Key_D);
+    connect(a, SIGNAL(triggered()), this, SLOT(filePrintPdf()));
+    tb->addAction(a);
+    menu->addAction(a);
+
+    menu->addSeparator();
+#endif
+
+    a = new QAction(tr("&Quit"), this);
+    a->setShortcut(Qt::CTRL + Qt::Key_Q);
+    connect(a, SIGNAL(triggered()), this, SLOT(close()));
+    menu->addAction(a);
+}
+
+void TextEdit::setupEditActions()
+{
+    QToolBar *tb = new QToolBar(this);
+    tb->setWindowTitle(tr("Edit Actions"));
+    addToolBar(tb);
+
+    QMenu *menu = new QMenu(tr("&Edit"), this);
+    menuBar()->addMenu(menu);
+
+    QAction *a;
+    a = actionUndo = new QAction(QIcon(rsrcPath + "/editundo.png"), tr("&Undo"), this);
+    a->setShortcut(QKeySequence::Undo);
+    tb->addAction(a);
+    menu->addAction(a);
+    a = actionRedo = new QAction(QIcon(rsrcPath + "/editredo.png"), tr("&Redo"), this);
+    a->setShortcut(QKeySequence::Redo);
+    tb->addAction(a);
+    menu->addAction(a);
+    menu->addSeparator();
+    a = actionCut = new QAction(QIcon(rsrcPath + "/editcut.png"), tr("Cu&t"), this);
+    a->setShortcut(QKeySequence::Cut);
+    tb->addAction(a);
+    menu->addAction(a);
+    a = actionCopy = new QAction(QIcon(rsrcPath + "/editcopy.png"), tr("&Copy"), this);
+    a->setShortcut(QKeySequence::Copy);
+    tb->addAction(a);
+    menu->addAction(a);
+    a = actionPaste = new QAction(QIcon(rsrcPath + "/editpaste.png"), tr("&Paste"), this);
+    a->setShortcut(QKeySequence::Paste);
+    tb->addAction(a);
+    menu->addAction(a);
+    actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+}
+
+void TextEdit::setupTextActions()
+{
+    QToolBar *tb = new QToolBar(this);
+    tb->setWindowTitle(tr("Format Actions"));
+    addToolBar(tb);
+
+    QMenu *menu = new QMenu(tr("F&ormat"), this);
+    menuBar()->addMenu(menu);
+
+    actionTextBold = new QAction(QIcon(rsrcPath + "/textbold.png"), tr("&Bold"), this);
+    actionTextBold->setShortcut(Qt::CTRL + Qt::Key_B);
+    QFont bold;
+    bold.setBold(true);
+    actionTextBold->setFont(bold);
+    connect(actionTextBold, SIGNAL(triggered()), this, SLOT(textBold()));
+    tb->addAction(actionTextBold);
+    menu->addAction(actionTextBold);
+    actionTextBold->setCheckable(true);
+
+    actionTextItalic = new QAction(QIcon(rsrcPath + "/textitalic.png"), tr("&Italic"), this);
+    actionTextItalic->setShortcut(Qt::CTRL + Qt::Key_I);
+    QFont italic;
+    italic.setItalic(true);
+    actionTextItalic->setFont(italic);
+    connect(actionTextItalic, SIGNAL(triggered()), this, SLOT(textItalic()));
+    tb->addAction(actionTextItalic);
+    menu->addAction(actionTextItalic);
+    actionTextItalic->setCheckable(true);
+
+    actionTextUnderline = new QAction(QIcon(rsrcPath + "/textunder.png"), tr("&Underline"), this);
+    actionTextUnderline->setShortcut(Qt::CTRL + Qt::Key_U);
+    QFont underline;
+    underline.setUnderline(true);
+    actionTextUnderline->setFont(underline);
+    connect(actionTextUnderline, SIGNAL(triggered()), this, SLOT(textUnderline()));
+    tb->addAction(actionTextUnderline);
+    menu->addAction(actionTextUnderline);
+    actionTextUnderline->setCheckable(true);
+
+    menu->addSeparator();
+
+    QActionGroup *grp = new QActionGroup(this);
+    connect(grp, SIGNAL(triggered(QAction *)), this, SLOT(textAlign(QAction *)));
+
+    // Make sure the alignLeft  is always left of the alignRight
+    if (QApplication::isLeftToRight()) {
+        actionAlignLeft = new QAction(QIcon(rsrcPath + "/textleft.png"), tr("&Left"), grp);
+        actionAlignCenter = new QAction(QIcon(rsrcPath + "/textcenter.png"), tr("C&enter"), grp);
+        actionAlignRight = new QAction(QIcon(rsrcPath + "/textright.png"), tr("&Right"), grp);
+    } else {
+        actionAlignRight = new QAction(QIcon(rsrcPath + "/textright.png"), tr("&Right"), grp);
+        actionAlignCenter = new QAction(QIcon(rsrcPath + "/textcenter.png"), tr("C&enter"), grp);
+        actionAlignLeft = new QAction(QIcon(rsrcPath + "/textleft.png"), tr("&Left"), grp);
+    }
+    actionAlignJustify = new QAction(QIcon(rsrcPath + "/textjustify.png"), tr("&Justify"), grp);
+
+    actionAlignLeft->setShortcut(Qt::CTRL + Qt::Key_L);
+    actionAlignLeft->setCheckable(true);
+    actionAlignCenter->setShortcut(Qt::CTRL + Qt::Key_E);
+    actionAlignCenter->setCheckable(true);
+    actionAlignRight->setShortcut(Qt::CTRL + Qt::Key_R);
+    actionAlignRight->setCheckable(true);
+    actionAlignJustify->setShortcut(Qt::CTRL + Qt::Key_J);
+    actionAlignJustify->setCheckable(true);
+
+    tb->addActions(grp->actions());
+    menu->addActions(grp->actions());
+
+    menu->addSeparator();
+
+    QPixmap pix(16, 16);
+    pix.fill(Qt::black);
+    actionTextColor = new QAction(pix, tr("&Color..."), this);
+    connect(actionTextColor, SIGNAL(triggered()), this, SLOT(textColor()));
+    tb->addAction(actionTextColor);
+    menu->addAction(actionTextColor);
+
+
+    tb = new QToolBar(this);
+    tb->setAllowedAreas(Qt::TopToolBarArea | Qt::BottomToolBarArea);
+    tb->setWindowTitle(tr("Format Actions"));
+    addToolBarBreak(Qt::TopToolBarArea);
+    addToolBar(tb);
+
+    comboStyle = new QComboBox(tb);
+    tb->addWidget(comboStyle);
+    comboStyle->addItem("Standard");
+    comboStyle->addItem("Bullet List (Disc)");
+    comboStyle->addItem("Bullet List (Circle)");
+    comboStyle->addItem("Bullet List (Square)");
+    comboStyle->addItem("Ordered List (Decimal)");
+    comboStyle->addItem("Ordered List (Alpha lower)");
+    comboStyle->addItem("Ordered List (Alpha upper)");
+    connect(comboStyle, SIGNAL(activated(int)),
+            this, SLOT(textStyle(int)));
+
+    comboFont = new QFontComboBox(tb);
+    tb->addWidget(comboFont);
+    connect(comboFont, SIGNAL(activated(const QString &)),
+            this, SLOT(textFamily(const QString &)));
+
+    comboSize = new QComboBox(tb);
+    comboSize->setObjectName("comboSize");
+    tb->addWidget(comboSize);
+    comboSize->setEditable(true);
+
+    QFontDatabase db;
+    foreach(int size, db.standardSizes())
+        comboSize->addItem(QString::number(size));
+
+    connect(comboSize, SIGNAL(activated(const QString &)),
+            this, SLOT(textSize(const QString &)));
+    comboSize->setCurrentIndex(comboSize->findText(QString::number(QApplication::font()
+                                                                   .pointSize())));
+}
+
+bool TextEdit::load(const QString &f)
+{
+    if (!QFile::exists(f))
+        return false;
+    QFile file(f);
+    if (!file.open(QFile::ReadOnly))
+        return false;
+
+    QByteArray data = file.readAll();
+    QTextCodec *codec = Qt::codecForHtml(data);
+    QString str = codec->toUnicode(data);
+    if (Qt::mightBeRichText(str)) {
+        textEdit->setHtml(str);
+    } else {
+        str = QString::fromLocal8Bit(data);
+        textEdit->setPlainText(str);
+    }
+
+    setCurrentFileName(f);
+    return true;
+}
+
+bool TextEdit::maybeSave()
+{
+    if (!textEdit->document()->isModified())
+        return true;
+    if (fileName.startsWith(QLatin1String(":/")))
+        return true;
+    QMessageBox::StandardButton ret;
+    ret = QMessageBox::warning(this, tr("Application"),
+                               tr("The document has been modified.\n"
+                                  "Do you want to save your changes?"),
+                               QMessageBox::Save | QMessageBox::Discard
+                               | QMessageBox::Cancel);
+    if (ret == QMessageBox::Save)
+        return fileSave();
+    else if (ret == QMessageBox::Cancel)
+        return false;
+    return true;
+}
+
+void TextEdit::setCurrentFileName(const QString &fileName)
+{
+    this->fileName = fileName;
+    textEdit->document()->setModified(false);
+
+    QString shownName;
+    if (fileName.isEmpty())
+        shownName = "untitled.txt";
+    else
+        shownName = QFileInfo(fileName).fileName();
+
+    setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Rich Text")));
+    setWindowModified(false);
+}
+
+void TextEdit::fileNew()
+{
+    if (maybeSave()) {
+        textEdit->clear();
+        setCurrentFileName(QString());
+    }
+}
+
+void TextEdit::fileOpen()
+{
+    QString fn = QFileDialog::getOpenFileName(this, tr("Open File..."),
+                                              QString(), tr("HTML-Files (*.htm *.html);;All Files (*)"));
+    if (!fn.isEmpty())
+        load(fn);
+}
+
+bool TextEdit::fileSave()
+{
+    if (fileName.isEmpty())
+        return fileSaveAs();
+
+    QTextDocumentWriter writer(fileName);
+    bool success = writer.write(textEdit->document());
+    if (success)
+        textEdit->document()->setModified(false);
+    return success;
+}
+
+bool TextEdit::fileSaveAs()
+{
+    QString fn = QFileDialog::getSaveFileName(this, tr("Save as..."),
+                                              QString(), tr("ODF files (*.odt);;HTML-Files (*.htm *.html);;All Files (*)"));
+    if (fn.isEmpty())
+        return false;
+    if (! (fn.endsWith(".odt", Qt::CaseInsensitive) || fn.endsWith(".htm", Qt::CaseInsensitive) || fn.endsWith(".html", Qt::CaseInsensitive)) )
+        fn += ".odt"; // default
+    setCurrentFileName(fn);
+    return fileSave();
+}
+
+void TextEdit::filePrint()
+{
+#ifndef QT_NO_PRINTER
+    QPrinter printer(QPrinter::HighResolution);
+    QPrintDialog *dlg = new QPrintDialog(&printer, this);
+    if (textEdit->textCursor().hasSelection())
+        dlg->addEnabledOption(QAbstractPrintDialog::PrintSelection);
+    dlg->setWindowTitle(tr("Print Document"));
+    if (dlg->exec() == QDialog::Accepted) {
+        textEdit->print(&printer);
+    }
+    delete dlg;
+#endif
+}
+
+void TextEdit::filePrintPreview()
+{
+#ifndef QT_NO_PRINTER
+    QPrinter printer(QPrinter::HighResolution);
+    QPrintPreviewDialog preview(&printer, this);
+    connect(&preview, SIGNAL(paintRequested(QPrinter *)), SLOT(printPreview(QPrinter *)));
+    preview.exec();
+#endif
+}
+
+void TextEdit::printPreview(QPrinter *printer)
+{
+#ifdef QT_NO_PRINTER
+    Q_UNUSED(printer);
+#else
+    textEdit->print(printer);
+#endif
+}
+
+
+void TextEdit::filePrintPdf()
+{
+#ifndef QT_NO_PRINTER
+//! [0]
+    QString fileName = QFileDialog::getSaveFileName(this, "Export PDF",
+                                                    QString(), "*.pdf");
+    if (!fileName.isEmpty()) {
+        if (QFileInfo(fileName).suffix().isEmpty())
+            fileName.append(".pdf");
+        QPrinter printer(QPrinter::HighResolution);
+        printer.setOutputFormat(QPrinter::PdfFormat);
+        printer.setOutputFileName(fileName);
+        textEdit->document()->print(&printer);
+    }
+//! [0]
+#endif
+}
+
+void TextEdit::textBold()
+{
+    QTextCharFormat fmt;
+    fmt.setFontWeight(actionTextBold->isChecked() ? QFont::Bold : QFont::Normal);
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void TextEdit::textUnderline()
+{
+    QTextCharFormat fmt;
+    fmt.setFontUnderline(actionTextUnderline->isChecked());
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void TextEdit::textItalic()
+{
+    QTextCharFormat fmt;
+    fmt.setFontItalic(actionTextItalic->isChecked());
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void TextEdit::textFamily(const QString &f)
+{
+    QTextCharFormat fmt;
+    fmt.setFontFamily(f);
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void TextEdit::textSize(const QString &p)
+{
+    qreal pointSize = p.toFloat();
+    if (p.toFloat() > 0) {
+        QTextCharFormat fmt;
+        fmt.setFontPointSize(pointSize);
+        mergeFormatOnWordOrSelection(fmt);
+    }
+}
+
+void TextEdit::textStyle(int styleIndex)
+{
+    QTextCursor cursor = textEdit->textCursor();
+
+    if (styleIndex != 0) {
+        QTextListFormat::Style style = QTextListFormat::ListDisc;
+
+        switch (styleIndex) {
+            default:
+            case 1:
+                style = QTextListFormat::ListDisc;
+                break;
+            case 2:
+                style = QTextListFormat::ListCircle;
+                break;
+            case 3:
+                style = QTextListFormat::ListSquare;
+                break;
+            case 4:
+                style = QTextListFormat::ListDecimal;
+                break;
+            case 5:
+                style = QTextListFormat::ListLowerAlpha;
+                break;
+            case 6:
+                style = QTextListFormat::ListUpperAlpha;
+                break;
+        }
+
+        cursor.beginEditBlock();
+
+        QTextBlockFormat blockFmt = cursor.blockFormat();
+
+        QTextListFormat listFmt;
+
+        if (cursor.currentList()) {
+            listFmt = cursor.currentList()->format();
+        } else {
+            listFmt.setIndent(blockFmt.indent() + 1);
+            blockFmt.setIndent(0);
+            cursor.setBlockFormat(blockFmt);
+        }
+
+        listFmt.setStyle(style);
+
+        cursor.createList(listFmt);
+
+        cursor.endEditBlock();
+    } else {
+        // ####
+        QTextBlockFormat bfmt;
+        bfmt.setObjectIndex(-1);
+        cursor.mergeBlockFormat(bfmt);
+    }
+}
+
+void TextEdit::textColor()
+{
+    QColor col = QColorDialog::getColor(textEdit->textColor(), this);
+    if (!col.isValid())
+        return;
+    QTextCharFormat fmt;
+    fmt.setForeground(col);
+    mergeFormatOnWordOrSelection(fmt);
+    colorChanged(col);
+}
+
+void TextEdit::textAlign(QAction *a)
+{
+    if (a == actionAlignLeft)
+        textEdit->setAlignment(Qt::AlignLeft | Qt::AlignAbsolute);
+    else if (a == actionAlignCenter)
+        textEdit->setAlignment(Qt::AlignHCenter);
+    else if (a == actionAlignRight)
+        textEdit->setAlignment(Qt::AlignRight | Qt::AlignAbsolute);
+    else if (a == actionAlignJustify)
+        textEdit->setAlignment(Qt::AlignJustify);
+}
+
+void TextEdit::currentCharFormatChanged(const QTextCharFormat &format)
+{
+    fontChanged(format.font());
+    colorChanged(format.foreground().color());
+}
+
+void TextEdit::cursorPositionChanged()
+{
+    alignmentChanged(textEdit->alignment());
+}
+
+void TextEdit::clipboardDataChanged()
+{
+    actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+}
+
+void TextEdit::about()
+{
+    QMessageBox::about(this, tr("About"), tr("This example demonstrates Qt's "
+        "rich text editing facilities in action, providing an example "
+        "document for you to experiment with."));
+}
+
+void TextEdit::mergeFormatOnWordOrSelection(const QTextCharFormat &format)
+{
+    QTextCursor cursor = textEdit->textCursor();
+    if (!cursor.hasSelection())
+        cursor.select(QTextCursor::WordUnderCursor);
+    cursor.mergeCharFormat(format);
+    textEdit->mergeCurrentCharFormat(format);
+}
+
+void TextEdit::fontChanged(const QFont &f)
+{
+    comboFont->setCurrentIndex(comboFont->findText(QFontInfo(f).family()));
+    comboSize->setCurrentIndex(comboSize->findText(QString::number(f.pointSize())));
+    actionTextBold->setChecked(f.bold());
+    actionTextItalic->setChecked(f.italic());
+    actionTextUnderline->setChecked(f.underline());
+}
+
+void TextEdit::colorChanged(const QColor &c)
+{
+    QPixmap pix(16, 16);
+    pix.fill(c);
+    actionTextColor->setIcon(pix);
+}
+
+void TextEdit::alignmentChanged(Qt::Alignment a)
+{
+    if (a & Qt::AlignLeft) {
+        actionAlignLeft->setChecked(true);
+    } else if (a & Qt::AlignHCenter) {
+        actionAlignCenter->setChecked(true);
+    } else if (a & Qt::AlignRight) {
+        actionAlignRight->setChecked(true);
+    } else if (a & Qt::AlignJustify) {
+        actionAlignJustify->setChecked(true);
+    }
+}
+
diff --git a/demos/textedit/textedit.doc b/demos/textedit/textedit.doc
new file mode 100644
index 0000000..53279b9
--- /dev/null
+++ b/demos/textedit/textedit.doc
@@ -0,0 +1,18 @@
+/*!   \page textedit-example.html
+
+  \ingroup examples
+  \title Text Edit Example
+
+  This example displays a text editor with the user interface written
+  in pure C++. 
+  
+  A similar example which uses \link designer-manual.book Qt
+  Designer\endlink to produce the user interface is in the \link
+  designer-manual.book Qt Designer manual\endlink.
+
+
+  See \c{$QTDIR/examples/textedit} for the source code.
+
+*/
+
+
diff --git a/demos/textedit/textedit.h b/demos/textedit/textedit.h
new file mode 100644
index 0000000..1fb09f9
--- /dev/null
+++ b/demos/textedit/textedit.h
@@ -0,0 +1,129 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TEXTEDIT_H
+#define TEXTEDIT_H
+
+#include <QMainWindow>
+#include <QMap>
+#include <QPointer>
+
+QT_FORWARD_DECLARE_CLASS(QAction)
+QT_FORWARD_DECLARE_CLASS(QComboBox)
+QT_FORWARD_DECLARE_CLASS(QFontComboBox)
+QT_FORWARD_DECLARE_CLASS(QTextEdit)
+QT_FORWARD_DECLARE_CLASS(QTextCharFormat)
+QT_FORWARD_DECLARE_CLASS(QMenu)
+
+class TextEdit : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    TextEdit(QWidget *parent = 0);
+
+protected:
+    virtual void closeEvent(QCloseEvent *e);
+
+private:
+    void setupFileActions();
+    void setupEditActions();
+    void setupTextActions();
+    bool load(const QString &f);
+    bool maybeSave();
+    void setCurrentFileName(const QString &fileName);
+
+private slots:
+    void fileNew();
+    void fileOpen();
+    bool fileSave();
+    bool fileSaveAs();
+    void filePrint();
+    void filePrintPreview();
+    void filePrintPdf();
+
+    void textBold();
+    void textUnderline();
+    void textItalic();
+    void textFamily(const QString &f);
+    void textSize(const QString &p);
+    void textStyle(int styleIndex);
+    void textColor();
+    void textAlign(QAction *a);
+
+    void currentCharFormatChanged(const QTextCharFormat &format);
+    void cursorPositionChanged();
+
+    void clipboardDataChanged();
+    void about();
+    void printPreview(QPrinter *);
+
+private:
+    void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
+    void fontChanged(const QFont &f);
+    void colorChanged(const QColor &c);
+    void alignmentChanged(Qt::Alignment a);
+
+    QAction *actionSave,
+        *actionTextBold,
+        *actionTextUnderline,
+        *actionTextItalic,
+        *actionTextColor,
+        *actionAlignLeft,
+        *actionAlignCenter,
+        *actionAlignRight,
+        *actionAlignJustify,
+        *actionUndo,
+        *actionRedo,
+        *actionCut,
+        *actionCopy,
+        *actionPaste;
+
+    QComboBox *comboStyle;
+    QFontComboBox *comboFont;
+    QComboBox *comboSize;
+
+    QToolBar *tb;
+    QString fileName;
+    QTextEdit *textEdit;
+};
+
+#endif
diff --git a/demos/textedit/textedit.pro b/demos/textedit/textedit.pro
new file mode 100644
index 0000000..1ef4256
--- /dev/null
+++ b/demos/textedit/textedit.pro
@@ -0,0 +1,21 @@
+TEMPLATE        = app
+TARGET          = textedit
+
+CONFIG          += qt warn_on
+
+HEADERS         = textedit.h
+SOURCES         = textedit.cpp \
+                  main.cpp
+
+RESOURCES += textedit.qrc
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/textedit
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images
+sources.path = $$[QT_INSTALL_DEMOS]/textedit
+INSTALLS += target sources
+
diff --git a/demos/textedit/textedit.qrc b/demos/textedit/textedit.qrc
new file mode 100644
index 0000000..7d6efd7
--- /dev/null
+++ b/demos/textedit/textedit.qrc
@@ -0,0 +1,44 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+  <file>images/logo32.png</file>
+  <file>images/mac/editcopy.png</file>
+  <file>images/mac/editcut.png</file>
+  <file>images/mac/editpaste.png</file>
+  <file>images/mac/editredo.png</file>
+  <file>images/mac/editundo.png</file>
+  <file>images/mac/exportpdf.png</file>
+  <file>images/mac/filenew.png</file>
+  <file>images/mac/fileopen.png</file>
+  <file>images/mac/fileprint.png</file>
+  <file>images/mac/filesave.png</file>
+  <file>images/mac/textbold.png</file>
+  <file>images/mac/textcenter.png</file>
+  <file>images/mac/textitalic.png</file>
+  <file>images/mac/textjustify.png</file>
+  <file>images/mac/textleft.png</file>
+  <file>images/mac/textright.png</file>
+  <file>images/mac/textunder.png</file>
+  <file>images/mac/zoomin.png</file>
+  <file>images/mac/zoomout.png</file>
+  <file>images/win/editcopy.png</file>
+  <file>images/win/editcut.png</file>
+  <file>images/win/editpaste.png</file>
+  <file>images/win/editredo.png</file>
+  <file>images/win/editundo.png</file>
+  <file>images/win/exportpdf.png</file>
+  <file>images/win/filenew.png</file>
+  <file>images/win/fileopen.png</file>
+  <file>images/win/fileprint.png</file>
+  <file>images/win/filesave.png</file>
+  <file>images/win/textbold.png</file>
+  <file>images/win/textcenter.png</file>
+  <file>images/win/textitalic.png</file>
+  <file>images/win/textjustify.png</file>
+  <file>images/win/textleft.png</file>
+  <file>images/win/textright.png</file>
+  <file>images/win/textunder.png</file>
+  <file>images/win/zoomin.png</file>
+  <file>images/win/zoomout.png</file>
+  <file>example.html</file>
+</qresource>
+</RCC>
diff --git a/demos/undo/commands.cpp b/demos/undo/commands.cpp
new file mode 100644
index 0000000..4802e34
--- /dev/null
+++ b/demos/undo/commands.cpp
@@ -0,0 +1,180 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "commands.h"
+
+static const int setShapeRectCommandId = 1;
+static const int setShapeColorCommandId = 2;
+
+/******************************************************************************
+** AddShapeCommand
+*/
+
+AddShapeCommand::AddShapeCommand(Document *doc, const Shape &shape, QUndoCommand *parent)
+    : QUndoCommand(parent)
+{
+    m_doc = doc;
+    m_shape = shape;
+}
+
+void AddShapeCommand::undo()
+{
+    m_doc->deleteShape(m_shapeName);
+}
+
+void AddShapeCommand::redo()
+{
+    // A shape only gets a name when it is inserted into a document
+    m_shapeName = m_doc->addShape(m_shape);
+    setText(QObject::tr("Add %1").arg(m_shapeName));
+}
+
+/******************************************************************************
+** RemoveShapeCommand
+*/
+
+RemoveShapeCommand::RemoveShapeCommand(Document *doc, const QString &shapeName,
+                                        QUndoCommand *parent)
+    : QUndoCommand(parent)
+{
+    setText(QObject::tr("Remove %1").arg(shapeName));
+    m_doc = doc;
+    m_shape = doc->shape(shapeName);
+    m_shapeName = shapeName;
+}
+
+void RemoveShapeCommand::undo()
+{
+    m_shapeName = m_doc->addShape(m_shape);
+}
+
+void RemoveShapeCommand::redo()
+{
+    m_doc->deleteShape(m_shapeName);
+}
+
+/******************************************************************************
+** SetShapeColorCommand
+*/
+
+SetShapeColorCommand::SetShapeColorCommand(Document *doc, const QString &shapeName,
+                                            const QColor &color, QUndoCommand *parent)
+    : QUndoCommand(parent)
+{
+    setText(QObject::tr("Set %1's color").arg(shapeName));
+
+    m_doc = doc;
+    m_shapeName = shapeName;
+    m_oldColor = doc->shape(shapeName).color();
+    m_newColor = color;
+}
+
+void SetShapeColorCommand::undo()
+{
+    m_doc->setShapeColor(m_shapeName, m_oldColor);
+}
+
+void SetShapeColorCommand::redo()
+{
+    m_doc->setShapeColor(m_shapeName, m_newColor);
+}
+
+bool SetShapeColorCommand::mergeWith(const QUndoCommand *command)
+{
+    if (command->id() != setShapeColorCommandId)
+        return false;
+
+    const SetShapeColorCommand *other = static_cast<const SetShapeColorCommand*>(command);
+    if (m_shapeName != other->m_shapeName)
+        return false;
+
+    m_newColor = other->m_newColor;
+    return true;
+}
+
+int SetShapeColorCommand::id() const
+{
+    return setShapeColorCommandId;
+}
+
+/******************************************************************************
+** SetShapeRectCommand
+*/
+
+SetShapeRectCommand::SetShapeRectCommand(Document *doc, const QString &shapeName,
+                                            const QRect &rect, QUndoCommand *parent)
+    : QUndoCommand(parent)
+{
+    setText(QObject::tr("Change %1's geometry").arg(shapeName));
+
+    m_doc = doc;
+    m_shapeName = shapeName;
+    m_oldRect = doc->shape(shapeName).rect();
+    m_newRect = rect;
+}
+
+void SetShapeRectCommand::undo()
+{
+    m_doc->setShapeRect(m_shapeName, m_oldRect);
+}
+
+void SetShapeRectCommand::redo()
+{
+    m_doc->setShapeRect(m_shapeName, m_newRect);
+}
+
+bool SetShapeRectCommand::mergeWith(const QUndoCommand *command)
+{
+    if (command->id() != setShapeRectCommandId)
+        return false;
+
+    const SetShapeRectCommand *other = static_cast<const SetShapeRectCommand*>(command);
+    if (m_shapeName != other->m_shapeName)
+        return false;
+
+    m_newRect = other->m_newRect;
+    return true;
+}
+
+int SetShapeRectCommand::id() const
+{
+    return setShapeRectCommandId;
+}
diff --git a/demos/undo/commands.h b/demos/undo/commands.h
new file mode 100644
index 0000000..f98cb6d
--- /dev/null
+++ b/demos/undo/commands.h
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COMMANDS_H
+#define COMMANDS_H
+
+#include <QUndoCommand>
+#include "document.h"
+
+class AddShapeCommand : public QUndoCommand
+{
+public:
+    AddShapeCommand(Document *doc, const Shape &shape, QUndoCommand *parent = 0);
+    void undo();
+    void redo();
+
+private:
+    Document *m_doc;
+    Shape m_shape;
+    QString m_shapeName;
+};
+
+class RemoveShapeCommand : public QUndoCommand
+{
+public:
+    RemoveShapeCommand(Document *doc, const QString &shapeName, QUndoCommand *parent = 0);
+    void undo();
+    void redo();
+
+private:
+    Document *m_doc;
+    Shape m_shape;
+    QString m_shapeName;
+};
+
+class SetShapeColorCommand : public QUndoCommand
+{
+public:
+    SetShapeColorCommand(Document *doc, const QString &shapeName, const QColor &color,
+                            QUndoCommand *parent = 0);
+
+    void undo();
+    void redo();
+
+    bool mergeWith(const QUndoCommand *command);
+    int id() const;
+
+private:
+    Document *m_doc;
+    QString m_shapeName;
+    QColor m_oldColor;
+    QColor m_newColor;
+};
+
+class SetShapeRectCommand : public QUndoCommand
+{
+public:
+    SetShapeRectCommand(Document *doc, const QString &shapeName, const QRect &rect,
+                            QUndoCommand *parent = 0);
+
+    void undo();
+    void redo();
+
+    bool mergeWith(const QUndoCommand *command);
+    int id() const;
+
+private:
+    Document *m_doc;
+    QString m_shapeName;
+    QRect m_oldRect;
+    QRect m_newRect;
+};
+
+#endif // COMMANDS_H
diff --git a/demos/undo/document.cpp b/demos/undo/document.cpp
new file mode 100644
index 0000000..df435fd
--- /dev/null
+++ b/demos/undo/document.cpp
@@ -0,0 +1,445 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qevent.h>
+#include <QPainter>
+#include <QTextStream>
+#include <QUndoStack>
+#include "document.h"
+#include "commands.h"
+
+static const int resizeHandleWidth = 6;
+
+/******************************************************************************
+** Shape
+*/
+
+const QSize Shape::minSize(80, 50);
+
+Shape::Shape(Type type, const QColor &color, const QRect &rect)
+    : m_type(type), m_rect(rect), m_color(color)
+{
+}
+
+Shape::Type Shape::type() const
+{
+    return m_type;
+}
+
+QRect Shape::rect() const
+{
+    return m_rect;
+}
+
+QColor Shape::color() const
+{
+    return m_color;
+}
+
+QString Shape::name() const
+{
+    return m_name;
+}
+
+QRect Shape::resizeHandle() const
+{
+    QPoint br = m_rect.bottomRight();
+    return QRect(br - QPoint(resizeHandleWidth, resizeHandleWidth), br);
+}
+
+QString Shape::typeToString(Type type)
+{
+    QString result;
+
+    switch (type) {
+        case Rectangle:
+            result = QLatin1String("Rectangle");
+            break;
+        case Circle:
+            result = QLatin1String("Circle");
+            break;
+        case Triangle:
+            result = QLatin1String("Triangle");
+            break;
+    }
+
+    return result;
+}
+
+Shape::Type Shape::stringToType(const QString &s, bool *ok)
+{
+    if (ok != 0)
+        *ok = true;
+
+    if (s == QLatin1String("Rectangle"))
+        return Rectangle;
+    if (s == QLatin1String("Circle"))
+        return Circle;
+    if (s == QLatin1String("Triangle"))
+        return Triangle;
+
+    if (ok != 0)
+        *ok = false;
+    return Rectangle;
+}
+
+/******************************************************************************
+** Document
+*/
+
+Document::Document(QWidget *parent)
+    : QWidget(parent), m_currentIndex(-1), m_mousePressIndex(-1), m_resizeHandlePressed(false)
+{
+    m_undoStack = new QUndoStack(this);
+
+    setAutoFillBackground(true);
+    setBackgroundRole(QPalette::Base);
+
+    QPalette pal = palette();
+    pal.setBrush(QPalette::Base, QPixmap(":/icons/background.png"));
+    pal.setColor(QPalette::HighlightedText, Qt::red);
+    setPalette(pal);
+}
+
+QString Document::addShape(const Shape &shape)
+{
+    QString name = Shape::typeToString(shape.type());
+    name = uniqueName(name);
+
+    m_shapeList.append(shape);
+    m_shapeList[m_shapeList.count() - 1].m_name = name;
+    setCurrentShape(m_shapeList.count() - 1);
+
+    return name;
+}
+
+void Document::deleteShape(const QString &shapeName)
+{
+    int index = indexOf(shapeName);
+    if (index == -1)
+        return;
+
+    update(m_shapeList.at(index).rect());
+
+    m_shapeList.removeAt(index);
+
+    if (index <= m_currentIndex) {
+        m_currentIndex = -1;
+        if (index == m_shapeList.count())
+            --index;
+        setCurrentShape(index);
+    }
+}
+
+Shape Document::shape(const QString &shapeName) const
+{
+    int index = indexOf(shapeName);
+    if (index == -1)
+        return Shape();
+    return m_shapeList.at(index);
+}
+
+void Document::setShapeRect(const QString &shapeName, const QRect &rect)
+{
+    int index = indexOf(shapeName);
+    if (index == -1)
+        return;
+
+    Shape &shape = m_shapeList[index];
+
+    update(shape.rect());
+    update(rect);
+
+    shape.m_rect = rect;
+}
+
+void Document::setShapeColor(const QString &shapeName, const QColor &color)
+{
+
+    int index = indexOf(shapeName);
+    if (index == -1)
+        return;
+
+    Shape &shape = m_shapeList[index];
+    shape.m_color = color;
+
+    update(shape.rect());
+}
+
+QUndoStack *Document::undoStack() const
+{
+    return m_undoStack;
+}
+
+bool Document::load(QTextStream &stream)
+{
+    m_shapeList.clear();
+
+    while (!stream.atEnd()) {
+        QString shapeType, shapeName, colorName;
+        int left, top, width, height;
+        stream >> shapeType >> shapeName >> colorName >> left >> top >> width >> height;
+        if (stream.status() != QTextStream::Ok)
+            return false;
+        bool ok;
+        Shape::Type type = Shape::stringToType(shapeType, &ok);
+        if (!ok)
+            return false;
+        QColor color(colorName);
+        if (!color.isValid())
+            return false;
+
+        Shape shape(type);
+        shape.m_name = shapeName;
+        shape.m_color = color;
+        shape.m_rect = QRect(left, top, width, height);
+
+        m_shapeList.append(shape);
+    }
+
+    m_currentIndex = m_shapeList.isEmpty() ? -1 : 0;
+
+    return true;
+}
+
+void Document::save(QTextStream &stream)
+{
+    for (int i = 0; i < m_shapeList.count(); ++i) {
+        const Shape &shape = m_shapeList.at(i);
+        QRect r = shape.rect();
+        stream << Shape::typeToString(shape.type()) << QLatin1Char(' ')
+                << shape.name() << QLatin1Char(' ')
+                << shape.color().name() << QLatin1Char(' ')
+                << r.left() << QLatin1Char(' ')
+                << r.top() << QLatin1Char(' ')
+                << r.width() << QLatin1Char(' ')
+                << r.height();
+        if (i != m_shapeList.count() - 1)
+            stream << QLatin1Char('\n');
+    }
+    m_undoStack->setClean();
+}
+
+QString Document::fileName() const
+{
+    return m_fileName;
+}
+
+void Document::setFileName(const QString &fileName)
+{
+    m_fileName = fileName;
+}
+
+int Document::indexAt(const QPoint &pos) const
+{
+    for (int i = m_shapeList.count() - 1; i >= 0; --i) {
+        if (m_shapeList.at(i).rect().contains(pos))
+            return i;
+    }
+    return -1;
+}
+
+void Document::mousePressEvent(QMouseEvent *event)
+{
+    event->accept();
+    int index = indexAt(event->pos());;
+    if (index != -1) {
+        setCurrentShape(index);
+
+        const Shape &shape = m_shapeList.at(index);
+        m_resizeHandlePressed = shape.resizeHandle().contains(event->pos());
+
+        if (m_resizeHandlePressed)
+            m_mousePressOffset = shape.rect().bottomRight() - event->pos();
+        else
+            m_mousePressOffset = event->pos() - shape.rect().topLeft();
+    }
+    m_mousePressIndex = index;
+}
+
+void Document::mouseReleaseEvent(QMouseEvent *event)
+{
+    event->accept();
+    m_mousePressIndex = -1;
+}
+
+void Document::mouseMoveEvent(QMouseEvent *event)
+{
+    event->accept();
+
+    if (m_mousePressIndex == -1)
+        return;
+
+    const Shape &shape = m_shapeList.at(m_mousePressIndex);
+
+    QRect rect;
+    if (m_resizeHandlePressed) {
+        rect = QRect(shape.rect().topLeft(), event->pos() + m_mousePressOffset);
+    } else {
+        rect = shape.rect();
+        rect.moveTopLeft(event->pos() - m_mousePressOffset);
+    }
+
+    QSize size = rect.size().expandedTo(Shape::minSize);
+    rect.setSize(size);
+
+    m_undoStack->push(new SetShapeRectCommand(this, shape.name(), rect));
+}
+
+static QGradient gradient(const QColor &color, const QRect &rect)
+{
+    QColor c = color;
+    c.setAlpha(160);
+    QLinearGradient result(rect.topLeft(), rect.bottomRight());
+    result.setColorAt(0, c.dark(150));
+    result.setColorAt(0.5, c.light(200));
+    result.setColorAt(1, c.dark(150));
+    return result;
+}
+
+static QPolygon triangle(const QRect &rect)
+{
+    QPolygon result(3);
+    result.setPoint(0, rect.center().x(), rect.top());
+    result.setPoint(1, rect.right(), rect.bottom());
+    result.setPoint(2, rect.left(), rect.bottom());
+    return result;
+}
+
+void Document::paintEvent(QPaintEvent *event)
+{
+    QRegion paintRegion = event->region();
+    QPainter painter(this);
+    QPalette pal = palette();
+
+    for (int i = 0; i < m_shapeList.count(); ++i) {
+        const Shape &shape = m_shapeList.at(i);
+
+        if (!paintRegion.contains(shape.rect()))
+            continue;
+
+        QPen pen = pal.text().color();
+        pen.setWidth(i == m_currentIndex ? 2 : 1);
+        painter.setPen(pen);
+        painter.setBrush(gradient(shape.color(), shape.rect()));
+
+        QRect rect = shape.rect();
+        rect.adjust(1, 1, -resizeHandleWidth/2, -resizeHandleWidth/2);
+
+        // paint the shape
+        switch (shape.type()) {
+            case Shape::Rectangle:
+                painter.drawRect(rect);
+                break;
+            case Shape::Circle:
+                painter.setRenderHint(QPainter::Antialiasing);
+                painter.drawEllipse(rect);
+                painter.setRenderHint(QPainter::Antialiasing, false);
+                break;
+            case Shape::Triangle:
+                painter.setRenderHint(QPainter::Antialiasing);
+                painter.drawPolygon(triangle(rect));
+                painter.setRenderHint(QPainter::Antialiasing, false);
+                break;
+        }
+
+        // paint the resize handle
+        painter.setPen(pal.text().color());
+        painter.setBrush(Qt::white);
+        painter.drawRect(shape.resizeHandle().adjusted(0, 0, -1, -1));
+
+        // paint the shape name
+        painter.setBrush(pal.text());
+        if (shape.type() == Shape::Triangle)
+            rect.adjust(0, rect.height()/2, 0, 0);
+        painter.drawText(rect, Qt::AlignCenter, shape.name());
+    }
+}
+
+void Document::setCurrentShape(int index)
+{
+    QString currentName;
+
+    if (m_currentIndex != -1)
+        update(m_shapeList.at(m_currentIndex).rect());
+
+    m_currentIndex = index;
+
+    if (m_currentIndex != -1) {
+        const Shape &current = m_shapeList.at(m_currentIndex);
+        update(current.rect());
+        currentName = current.name();
+    }
+
+    emit currentShapeChanged(currentName);
+}
+
+int Document::indexOf(const QString &shapeName) const
+{
+    for (int i = 0; i < m_shapeList.count(); ++i) {
+        if (m_shapeList.at(i).name() == shapeName)
+            return i;
+    }
+    return -1;
+}
+
+QString Document::uniqueName(const QString &name) const
+{
+    QString unique;
+
+    for (int i = 0; ; ++i) {
+        unique = name;
+        if (i > 0)
+            unique += QString::number(i);
+        if (indexOf(unique) == -1)
+            break;
+    }
+
+    return unique;
+}
+
+QString Document::currentShapeName() const
+{
+    if (m_currentIndex == -1)
+        return QString();
+    return m_shapeList.at(m_currentIndex).name();
+}
+
diff --git a/demos/undo/document.h b/demos/undo/document.h
new file mode 100644
index 0000000..0b12ad0
--- /dev/null
+++ b/demos/undo/document.h
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DOCUMENT_H
+#define DOCUMENT_H
+
+#include <QWidget>
+
+QT_FORWARD_DECLARE_CLASS(QUndoStack)
+QT_FORWARD_DECLARE_CLASS(QTextStream)
+
+class Shape
+{
+public:
+    enum Type { Rectangle, Circle, Triangle };
+
+    Shape(Type type = Rectangle, const QColor &color = Qt::red, const QRect &rect = QRect());
+
+    Type type() const;
+    QString name() const;
+    QRect rect() const;
+    QRect resizeHandle() const;
+    QColor color() const;
+
+    static QString typeToString(Type type);
+    static Type stringToType(const QString &s, bool *ok = 0);
+
+    static const QSize minSize;
+
+private:
+    Type m_type;
+    QRect m_rect;
+    QColor m_color;
+    QString m_name;
+
+    friend class Document;
+};
+
+class Document : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Document(QWidget *parent = 0);
+
+    QString addShape(const Shape &shape);
+    void deleteShape(const QString &shapeName);
+    Shape shape(const QString &shapeName) const;
+    QString currentShapeName() const;
+
+    void setShapeRect(const QString &shapeName, const QRect &rect);
+    void setShapeColor(const QString &shapeName, const QColor &color);
+
+    bool load(QTextStream &stream);
+    void save(QTextStream &stream);
+
+    QString fileName() const;
+    void setFileName(const QString &fileName);
+
+    QUndoStack *undoStack() const;
+
+signals:
+    void currentShapeChanged(const QString &shapeName);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+
+private:
+    void setCurrentShape(int index);
+    int indexOf(const QString &shapeName) const;
+    int indexAt(const QPoint &pos) const;
+    QString uniqueName(const QString &name) const;
+
+    QList<Shape> m_shapeList;
+    int m_currentIndex;
+    int m_mousePressIndex;
+    QPoint m_mousePressOffset;
+    bool m_resizeHandlePressed;
+    QString m_fileName;
+
+    QUndoStack *m_undoStack;
+};
+
+#endif // DOCUMENT_H
diff --git a/demos/undo/icons/background.png b/demos/undo/icons/background.png
new file mode 100644
index 0000000..3bc5ed8
--- /dev/null
+++ b/demos/undo/icons/background.png
diff --git a/demos/undo/icons/blue.png b/demos/undo/icons/blue.png
new file mode 100644
index 0000000..4e181bb
--- /dev/null
+++ b/demos/undo/icons/blue.png
diff --git a/demos/undo/icons/circle.png b/demos/undo/icons/circle.png
new file mode 100644
index 0000000..ed16c6e
--- /dev/null
+++ b/demos/undo/icons/circle.png
diff --git a/demos/undo/icons/exit.png b/demos/undo/icons/exit.png
new file mode 100644
index 0000000..539cb2e
--- /dev/null
+++ b/demos/undo/icons/exit.png
diff --git a/demos/undo/icons/fileclose.png b/demos/undo/icons/fileclose.png
new file mode 100644
index 0000000..c5483d1
--- /dev/null
+++ b/demos/undo/icons/fileclose.png
diff --git a/demos/undo/icons/filenew.png b/demos/undo/icons/filenew.png
new file mode 100644
index 0000000..57e57e3
--- /dev/null
+++ b/demos/undo/icons/filenew.png
diff --git a/demos/undo/icons/fileopen.png b/demos/undo/icons/fileopen.png
new file mode 100644
index 0000000..33e0d63
--- /dev/null
+++ b/demos/undo/icons/fileopen.png
diff --git a/demos/undo/icons/filesave.png b/demos/undo/icons/filesave.png
new file mode 100644
index 0000000..57fd5e2
--- /dev/null
+++ b/demos/undo/icons/filesave.png
diff --git a/demos/undo/icons/green.png b/demos/undo/icons/green.png
new file mode 100644
index 0000000..e2e7cc9
--- /dev/null
+++ b/demos/undo/icons/green.png
diff --git a/demos/undo/icons/ok.png b/demos/undo/icons/ok.png
new file mode 100644
index 0000000..e355ea9
--- /dev/null
+++ b/demos/undo/icons/ok.png
diff --git a/demos/undo/icons/rectangle.png b/demos/undo/icons/rectangle.png
new file mode 100644
index 0000000..3a7d979
--- /dev/null
+++ b/demos/undo/icons/rectangle.png
diff --git a/demos/undo/icons/red.png b/demos/undo/icons/red.png
new file mode 100644
index 0000000..58c3e72
--- /dev/null
+++ b/demos/undo/icons/red.png
diff --git a/demos/undo/icons/redo.png b/demos/undo/icons/redo.png
new file mode 100644
index 0000000..5591517
--- /dev/null
+++ b/demos/undo/icons/redo.png
diff --git a/demos/undo/icons/remove.png b/demos/undo/icons/remove.png
new file mode 100644
index 0000000..7a7b048
--- /dev/null
+++ b/demos/undo/icons/remove.png
diff --git a/demos/undo/icons/triangle.png b/demos/undo/icons/triangle.png
new file mode 100644
index 0000000..2969131
--- /dev/null
+++ b/demos/undo/icons/triangle.png
diff --git a/demos/undo/icons/undo.png b/demos/undo/icons/undo.png
new file mode 100644
index 0000000..8cf63a8
--- /dev/null
+++ b/demos/undo/icons/undo.png
diff --git a/demos/undo/main.cpp b/demos/undo/main.cpp
new file mode 100644
index 0000000..f36a6e8
--- /dev/null
+++ b/demos/undo/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "mainwindow.h"
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(undo);
+
+    QApplication app(argc, argv);
+
+    MainWindow win;
+    win.resize(800, 600);
+    win.show();
+
+    return app.exec();
+};
diff --git a/demos/undo/mainwindow.cpp b/demos/undo/mainwindow.cpp
new file mode 100644
index 0000000..409fd14
--- /dev/null
+++ b/demos/undo/mainwindow.cpp
@@ -0,0 +1,446 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QUndoGroup>
+#include <QUndoStack>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QTextStream>
+#include <QToolButton>
+#include "document.h"
+#include "mainwindow.h"
+#include "commands.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    setupUi(this);
+
+    QWidget *w = documentTabs->widget(0);
+    documentTabs->removeTab(0);
+    delete w;
+
+    connect(actionOpen, SIGNAL(triggered()), this, SLOT(openDocument()));
+    connect(actionClose, SIGNAL(triggered()), this, SLOT(closeDocument()));
+    connect(actionNew, SIGNAL(triggered()), this, SLOT(newDocument()));
+    connect(actionSave, SIGNAL(triggered()), this, SLOT(saveDocument()));
+    connect(actionExit, SIGNAL(triggered()), this, SLOT(close()));
+    connect(actionRed, SIGNAL(triggered()), this, SLOT(setShapeColor()));
+    connect(actionGreen, SIGNAL(triggered()), this, SLOT(setShapeColor()));
+    connect(actionBlue, SIGNAL(triggered()), this, SLOT(setShapeColor()));
+    connect(actionAddCircle, SIGNAL(triggered()), this, SLOT(addShape()));
+    connect(actionAddRectangle, SIGNAL(triggered()), this, SLOT(addShape()));
+    connect(actionAddTriangle, SIGNAL(triggered()), this, SLOT(addShape()));
+    connect(actionRemoveShape, SIGNAL(triggered()), this, SLOT(removeShape()));
+    connect(actionAddRobot, SIGNAL(triggered()), this, SLOT(addRobot()));
+    connect(actionAddSnowman, SIGNAL(triggered()), this, SLOT(addSnowman()));
+    connect(actionAbout, SIGNAL(triggered()), this, SLOT(about()));
+    connect(actionAboutQt, SIGNAL(triggered()), this, SLOT(aboutQt()));
+
+    connect(undoLimit, SIGNAL(valueChanged(int)), this, SLOT(updateActions()));
+    connect(documentTabs, SIGNAL(currentChanged(int)), this, SLOT(updateActions()));
+
+    actionOpen->setShortcut(QString("Ctrl+O"));
+    actionClose->setShortcut(QString("Ctrl+W"));
+    actionNew->setShortcut(QString("Ctrl+N"));
+    actionSave->setShortcut(QString("Ctrl+S"));
+    actionExit->setShortcut(QString("Ctrl+Q"));
+    actionRemoveShape->setShortcut(QString("Del"));
+    actionRed->setShortcut(QString("Alt+R"));
+    actionGreen->setShortcut(QString("Alt+G"));
+    actionBlue->setShortcut(QString("Alt+B"));
+    actionAddCircle->setShortcut(QString("Alt+C"));
+    actionAddRectangle->setShortcut(QString("Alt+L"));
+    actionAddTriangle->setShortcut(QString("Alt+T"));
+
+    m_undoGroup = new QUndoGroup(this);
+    undoView->setGroup(m_undoGroup);
+    undoView->setCleanIcon(QIcon(":/icons/ok.png"));
+
+    QAction *undoAction = m_undoGroup->createUndoAction(this);
+    QAction *redoAction = m_undoGroup->createRedoAction(this);
+    undoAction->setIcon(QIcon(":/icons/undo.png"));
+    redoAction->setIcon(QIcon(":/icons/redo.png"));
+    menuShape->insertAction(menuShape->actions().at(0), undoAction);
+    menuShape->insertAction(undoAction, redoAction);
+
+    toolBar->addAction(undoAction);
+    toolBar->addAction(redoAction);
+
+    newDocument();
+    updateActions();
+};
+
+void MainWindow::updateActions()
+{
+    Document *doc = currentDocument();
+    m_undoGroup->setActiveStack(doc == 0 ? 0 : doc->undoStack());
+    QString shapeName = doc == 0 ? QString() : doc->currentShapeName();
+
+    actionAddRobot->setEnabled(doc != 0);
+    actionAddSnowman->setEnabled(doc != 0);
+    actionAddCircle->setEnabled(doc != 0);
+    actionAddRectangle->setEnabled(doc != 0);
+    actionAddTriangle->setEnabled(doc != 0);
+    actionClose->setEnabled(doc != 0);
+    actionSave->setEnabled(doc != 0 && !doc->undoStack()->isClean());
+    undoLimit->setEnabled(doc != 0 && doc->undoStack()->count() == 0);
+
+    if (shapeName.isEmpty()) {
+        actionRed->setEnabled(false);
+        actionGreen->setEnabled(false);
+        actionBlue->setEnabled(false);
+        actionRemoveShape->setEnabled(false);
+    } else {
+        Shape shape = doc->shape(shapeName);
+        actionRed->setEnabled(shape.color() != Qt::red);
+        actionGreen->setEnabled(shape.color() != Qt::green);
+        actionBlue->setEnabled(shape.color() != Qt::blue);
+        actionRemoveShape->setEnabled(true);
+    }
+
+    if (doc != 0) {
+        int index = documentTabs->indexOf(doc);
+        Q_ASSERT(index != -1);
+        static const QIcon unsavedIcon(":/icons/filesave.png");
+        documentTabs->setTabIcon(index, doc->undoStack()->isClean() ? QIcon() : unsavedIcon);
+
+        if (doc->undoStack()->count() == 0)
+            doc->undoStack()->setUndoLimit(undoLimit->value());
+    }
+}
+
+void MainWindow::openDocument()
+{
+    QString fileName = QFileDialog::getOpenFileName(this);
+    if (fileName.isEmpty())
+        return;
+
+    QFile file(fileName);
+    if (!file.open(QIODevice::ReadOnly)) {
+        QMessageBox::warning(this,
+                            tr("File error"),
+                            tr("Failed to open\n%1").arg(fileName));
+        return;
+    }
+    QTextStream stream(&file);
+
+    Document *doc = new Document();
+    if (!doc->load(stream)) {
+        QMessageBox::warning(this,
+                            tr("Parse error"),
+                            tr("Failed to parse\n%1").arg(fileName));
+        delete doc;
+        return;
+    }
+
+    doc->setFileName(fileName);
+    addDocument(doc);
+}
+
+QString MainWindow::fixedWindowTitle(const Document *doc) const
+{
+    QString title = doc->fileName();
+
+    if (title.isEmpty())
+        title = tr("Unnamed");
+    else
+        title = QFileInfo(title).fileName();
+
+    QString result;
+
+    for (int i = 0; ; ++i) {
+        result = title;
+        if (i > 0)
+            result += QString::number(i);
+
+        bool unique = true;
+        for (int j = 0; j < documentTabs->count(); ++j) {
+            const QWidget *widget = documentTabs->widget(j);
+            if (widget == doc)
+                continue;
+            if (result == documentTabs->tabText(j)) {
+                unique = false;
+                break;
+            }
+        }
+
+        if (unique)
+            break;
+    }
+
+    return result;
+}
+
+void MainWindow::addDocument(Document *doc)
+{
+    if (documentTabs->indexOf(doc) != -1)
+        return;
+    m_undoGroup->addStack(doc->undoStack());
+    documentTabs->addTab(doc, fixedWindowTitle(doc));
+    connect(doc, SIGNAL(currentShapeChanged(QString)), this, SLOT(updateActions()));
+    connect(doc->undoStack(), SIGNAL(indexChanged(int)), this, SLOT(updateActions()));
+    connect(doc->undoStack(), SIGNAL(cleanChanged(bool)), this, SLOT(updateActions()));
+
+    setCurrentDocument(doc);
+}
+
+void MainWindow::setCurrentDocument(Document *doc)
+{
+    documentTabs->setCurrentWidget(doc);
+}
+
+Document *MainWindow::currentDocument() const
+{
+    return qobject_cast<Document*>(documentTabs->currentWidget());
+}
+
+void MainWindow::removeDocument(Document *doc)
+{
+    int index = documentTabs->indexOf(doc);
+    if (index == -1)
+        return;
+
+    documentTabs->removeTab(index);
+    m_undoGroup->removeStack(doc->undoStack());
+    disconnect(doc, SIGNAL(currentShapeChanged(QString)), this, SLOT(updateActions()));
+    disconnect(doc->undoStack(), SIGNAL(indexChanged(int)), this, SLOT(updateActions()));
+    disconnect(doc->undoStack(), SIGNAL(cleanChanged(bool)), this, SLOT(updateActions()));
+
+    if (documentTabs->count() == 0) {
+        newDocument();
+        updateActions();
+    }
+}
+
+void MainWindow::saveDocument()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    for (;;) {
+        QString fileName = doc->fileName();
+
+        if (fileName.isEmpty())
+            fileName = QFileDialog::getSaveFileName(this);
+        if (fileName.isEmpty())
+            break;
+
+        QFile file(fileName);
+        if (!file.open(QIODevice::WriteOnly)) {
+            QMessageBox::warning(this,
+                                tr("File error"),
+                                tr("Failed to open\n%1").arg(fileName));
+            doc->setFileName(QString());
+        } else {
+            QTextStream stream(&file);
+            doc->save(stream);
+            doc->setFileName(fileName);
+
+            int index = documentTabs->indexOf(doc);
+            Q_ASSERT(index != -1);
+            documentTabs->setTabText(index, fixedWindowTitle(doc));
+
+            break;
+        }
+    }
+}
+
+void MainWindow::closeDocument()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    if (!doc->undoStack()->isClean()) {
+        int button
+            = QMessageBox::warning(this,
+                            tr("Unsaved changes"),
+                            tr("Would you like to save this document?"),
+                            QMessageBox::Yes, QMessageBox::No);
+        if (button == QMessageBox::Yes)
+            saveDocument();
+    }
+
+    removeDocument(doc);
+    delete doc;
+}
+
+void MainWindow::newDocument()
+{
+    addDocument(new Document());
+}
+
+static QColor randomColor()
+{
+    int r = (int) (3.0*(rand()/(RAND_MAX + 1.0)));
+    switch (r) {
+        case 0:
+            return Qt::red;
+        case 1:
+            return Qt::green;
+        default:
+            break;
+    }
+    return Qt::blue;
+}
+
+static QRect randomRect(const QSize &s)
+{
+    QSize min = Shape::minSize;
+
+    int left = (int) ((0.0 + s.width() - min.width())*(rand()/(RAND_MAX + 1.0)));
+    int top = (int) ((0.0 + s.height() - min.height())*(rand()/(RAND_MAX + 1.0)));
+    int width = (int) ((0.0 + s.width() - left - min.width())*(rand()/(RAND_MAX + 1.0))) + min.width();
+    int height = (int) ((0.0 + s.height() - top - min.height())*(rand()/(RAND_MAX + 1.0))) + min.height();
+
+    return QRect(left, top, width, height);
+}
+
+void MainWindow::addShape()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    Shape::Type type;
+
+    if (sender() == actionAddCircle)
+        type = Shape::Circle;
+    else if (sender() == actionAddRectangle)
+        type = Shape::Rectangle;
+    else if (sender() == actionAddTriangle)
+        type = Shape::Triangle;
+    else return;
+
+    Shape newShape(type, randomColor(), randomRect(doc->size()));
+    doc->undoStack()->push(new AddShapeCommand(doc, newShape));
+}
+
+void MainWindow::removeShape()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    QString shapeName = doc->currentShapeName();
+    if (shapeName.isEmpty())
+        return;
+
+    doc->undoStack()->push(new RemoveShapeCommand(doc, shapeName));
+}
+
+void MainWindow::setShapeColor()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    QString shapeName = doc->currentShapeName();
+    if (shapeName.isEmpty())
+        return;
+
+    QColor color;
+
+    if (sender() == actionRed)
+        color = Qt::red;
+    else if (sender() == actionGreen)
+        color = Qt::green;
+    else if (sender() == actionBlue)
+        color = Qt::blue;
+    else
+        return;
+
+    if (color == doc->shape(shapeName).color())
+        return;
+
+    doc->undoStack()->push(new SetShapeColorCommand(doc, shapeName, color));
+}
+
+void MainWindow::addSnowman()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    // Create a macro command using beginMacro() and endMacro()
+
+    doc->undoStack()->beginMacro(tr("Add snowman"));
+    doc->undoStack()->push(new AddShapeCommand(doc,
+                            Shape(Shape::Circle, Qt::blue, QRect(51, 30, 97, 95))));
+    doc->undoStack()->push(new AddShapeCommand(doc,
+                            Shape(Shape::Circle, Qt::blue, QRect(27, 123, 150, 133))));
+    doc->undoStack()->push(new AddShapeCommand(doc,
+                            Shape(Shape::Circle, Qt::blue, QRect(11, 253, 188, 146))));
+    doc->undoStack()->endMacro();
+}
+
+void MainWindow::addRobot()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    // Compose a macro command by explicitly adding children to a parent command
+
+    QUndoCommand *parent = new QUndoCommand(tr("Add robot"));
+
+    new AddShapeCommand(doc, Shape(Shape::Rectangle, Qt::green, QRect(115, 15, 81, 70)), parent);
+    new AddShapeCommand(doc, Shape(Shape::Rectangle, Qt::green, QRect(82, 89, 148, 188)), parent);
+    new AddShapeCommand(doc, Shape(Shape::Rectangle, Qt::green, QRect(76, 280, 80, 165)), parent);
+    new AddShapeCommand(doc, Shape(Shape::Rectangle, Qt::green, QRect(163, 280, 80, 164)), parent);
+    new AddShapeCommand(doc, Shape(Shape::Circle, Qt::blue, QRect(116, 25, 80, 50)), parent);
+    new AddShapeCommand(doc, Shape(Shape::Rectangle, Qt::green, QRect(232, 92, 80, 127)), parent);
+    new AddShapeCommand(doc, Shape(Shape::Rectangle, Qt::green, QRect(2, 92, 80, 125)), parent);
+
+    doc->undoStack()->push(parent);
+}
+
+void MainWindow::about()
+{
+    QMessageBox::about(this, tr("About Undo"), tr("The Undo demonstration shows how to use the Qt Undo framework."));
+}
+
+void MainWindow::aboutQt()
+{
+    QMessageBox::aboutQt(this, tr("About Qt"));
+}
diff --git a/demos/undo/mainwindow.h b/demos/undo/mainwindow.h
new file mode 100644
index 0000000..5340e94
--- /dev/null
+++ b/demos/undo/mainwindow.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include "ui_mainwindow.h"
+
+class Document;
+
+class MainWindow : public QMainWindow, public Ui::MainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+
+    void addDocument(Document *doc);
+    void removeDocument(Document *doc);
+    void setCurrentDocument(Document *doc);
+    Document *currentDocument() const;
+
+public slots:
+    void openDocument();
+    void saveDocument();
+    void closeDocument();
+    void newDocument();
+
+    void addShape();
+    void removeShape();
+    void setShapeColor();
+
+    void addSnowman();
+    void addRobot();
+
+    void about();
+    void aboutQt();
+
+private slots:
+    void updateActions();
+
+private:
+    QUndoGroup *m_undoGroup;
+
+    QString fixedWindowTitle(const Document *doc) const;
+};
+
+#endif // MAINWINDOW_H
diff --git a/demos/undo/mainwindow.ui b/demos/undo/mainwindow.ui
new file mode 100644
index 0000000..91a0b43
--- /dev/null
+++ b/demos/undo/mainwindow.ui
@@ -0,0 +1,322 @@
+<ui version="4.0" >
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>567</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="iconSize" >
+   <size>
+    <width>32</width>
+    <height>32</height>
+   </size>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QVBoxLayout" >
+    <property name="margin" >
+     <number>0</number>
+    </property>
+    <property name="spacing" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QTabWidget" name="documentTabs" >
+      <property name="currentIndex" >
+       <number>0</number>
+      </property>
+      <widget class="QWidget" name="tab" >
+       <attribute name="title" >
+        <string>Tab 1</string>
+       </attribute>
+      </widget>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>567</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuFile" >
+    <property name="title" >
+     <string>File</string>
+    </property>
+    <addaction name="actionNew" />
+    <addaction name="actionOpen" />
+    <addaction name="actionSave" />
+    <addaction name="actionClose" />
+    <addaction name="separator" />
+    <addaction name="actionExit" />
+   </widget>
+   <widget class="QMenu" name="menuShape" >
+    <property name="title" >
+     <string>Edit</string>
+    </property>
+    <widget class="QMenu" name="menuMacros" >
+     <property name="title" >
+      <string>Macros</string>
+     </property>
+     <addaction name="actionAddRobot" />
+     <addaction name="actionAddSnowman" />
+    </widget>
+    <addaction name="separator" />
+    <addaction name="actionAddCircle" />
+    <addaction name="actionAddRectangle" />
+    <addaction name="actionAddTriangle" />
+    <addaction name="actionRemoveShape" />
+    <addaction name="separator" />
+    <addaction name="actionRed" />
+    <addaction name="actionGreen" />
+    <addaction name="actionBlue" />
+    <addaction name="separator" />
+    <addaction name="menuMacros" />
+   </widget>
+   <widget class="QMenu" name="menuHelp" >
+    <property name="title" >
+     <string>Help</string>
+    </property>
+    <addaction name="actionAbout" />
+    <addaction name="actionAboutQt" />
+   </widget>
+   <addaction name="menuFile" />
+   <addaction name="menuShape" />
+   <addaction name="menuHelp" />
+  </widget>
+  <widget class="QStatusBar" name="statusbar" />
+  <widget class="QToolBar" name="toolBar" >
+   <property name="windowTitle" >
+    <string>File actions</string>
+   </property>
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak" >
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionNew" />
+   <addaction name="actionOpen" />
+   <addaction name="actionSave" />
+   <addaction name="actionClose" />
+   <addaction name="separator" />
+  </widget>
+  <widget class="QToolBar" name="shapeToolBar" >
+   <property name="windowTitle" >
+    <string>Shape actions</string>
+   </property>
+   <property name="orientation" >
+    <enum>Qt::Vertical</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <enum>LeftToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak" >
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionAddRectangle" />
+   <addaction name="actionAddCircle" />
+   <addaction name="actionAddTriangle" />
+   <addaction name="actionRemoveShape" />
+   <addaction name="separator" />
+   <addaction name="actionRed" />
+   <addaction name="actionGreen" />
+   <addaction name="actionBlue" />
+  </widget>
+  <widget class="QDockWidget" name="dockWidget" >
+   <property name="windowTitle" >
+    <string>Undo Stack</string>
+   </property>
+   <attribute name="dockWidgetArea" >
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents" >
+    <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>4</number>
+     </property>
+     <item>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="label" >
+         <property name="text" >
+          <string>Undo limit</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="undoLimit" />
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QUndoView" name="undoView" >
+       <property name="alternatingRowColors" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <action name="actionOpen" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/fileopen.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Open</string>
+   </property>
+  </action>
+  <action name="actionClose" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/fileclose.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Close</string>
+   </property>
+  </action>
+  <action name="actionNew" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/filenew.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;New</string>
+   </property>
+  </action>
+  <action name="actionSave" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/filesave.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Save</string>
+   </property>
+  </action>
+  <action name="actionExit" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/exit.png</iconset>
+   </property>
+   <property name="text" >
+    <string>E&amp;xit</string>
+   </property>
+  </action>
+  <action name="actionRed" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/red.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Red</string>
+   </property>
+  </action>
+  <action name="actionGreen" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/green.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Green</string>
+   </property>
+  </action>
+  <action name="actionBlue" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/blue.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Blue</string>
+   </property>
+  </action>
+  <action name="actionAddRectangle" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/rectangle.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Add Rectangle</string>
+   </property>
+  </action>
+  <action name="actionAddCircle" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/circle.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Add Circle</string>
+   </property>
+  </action>
+  <action name="actionRemoveShape" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/remove.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Remove Shape</string>
+   </property>
+  </action>
+  <action name="actionAddRobot" >
+   <property name="text" >
+    <string>Add robot</string>
+   </property>
+  </action>
+  <action name="actionAddSnowman" >
+   <property name="text" >
+    <string>Add snowan</string>
+   </property>
+  </action>
+  <action name="actionAddTriangle" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/triangle.png</iconset>
+   </property>
+   <property name="text" >
+    <string>addTriangle</string>
+   </property>
+  </action>
+  <action name="actionAbout" >
+   <property name="text" >
+    <string>About</string>
+   </property>
+  </action>
+  <action name="actionAboutQt" >
+   <property name="text" >
+    <string>About Qt</string>
+   </property>
+  </action>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QUndoView</class>
+   <extends>QListView</extends>
+   <header>qundoview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="undo.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/demos/undo/undo.pro b/demos/undo/undo.pro
new file mode 100644
index 0000000..e26d07c
--- /dev/null
+++ b/demos/undo/undo.pro
@@ -0,0 +1,17 @@
+SOURCES += main.cpp mainwindow.cpp commands.cpp document.cpp
+HEADERS += mainwindow.h commands.h document.h
+FORMS += mainwindow.ui
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+RESOURCES += undo.qrc
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/undo
+sources.files = $$SOURCES $$HEADERS *.pro icons $$RESOURCES $$FORMS
+sources.path = $$[QT_INSTALL_DEMOS]/undo
+INSTALLS += target sources
+
diff --git a/demos/undo/undo.qrc b/demos/undo/undo.qrc
new file mode 100644
index 0000000..65619b8
--- /dev/null
+++ b/demos/undo/undo.qrc
@@ -0,0 +1,20 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>icons/background.png</file>
+        <file>icons/blue.png</file>
+        <file>icons/circle.png</file>
+        <file>icons/exit.png</file>
+        <file>icons/fileclose.png</file>
+        <file>icons/filenew.png</file>
+        <file>icons/fileopen.png</file>
+        <file>icons/filesave.png</file>
+        <file>icons/green.png</file>
+        <file>icons/ok.png</file>
+        <file>icons/rectangle.png</file>
+        <file>icons/red.png</file>
+        <file>icons/redo.png</file>
+        <file>icons/remove.png</file>
+        <file>icons/triangle.png</file>
+        <file>icons/undo.png</file>
+    </qresource>
+</RCC>
diff --git a/dist/README b/dist/README
new file mode 100644
index 0000000..110be1c
--- /dev/null
+++ b/dist/README
@@ -0,0 +1,134 @@
+This is Qt version %VERSION%.
+
+Qt is a comprehensive cross-platform C++ application framework. Qt 4
+introduces new features and many improvements over the 3.x series. See
+http://doc.trolltech.com/latest/qt4-intro.html for details.
+
+The Qt 4.x series is not binary compatible or source compatible with
+the 3.x series. For more information on porting from Qt 3 to Qt 4, see
+http://doc.trolltech.com/latest/porting4.html.
+
+
+INSTALLING Qt
+
+On Windows and Mac OS X, if you want to install the precompiled binary
+packages, simply launch the package and follow the instructions in the
+installation wizard.
+
+On Mac OS X, the binary package requires Mac OS X 10.4.x (Tiger) or
+later and GCC 4.0.1 to develop applications. Its applications will run
+on Mac OS X 10.3.9 and above.
+
+If you have a source package (a .tar.gz, .tar.bz2, or .zip file),
+follow the instructions in the INSTALL file.
+
+
+DEMOS AND EXAMPLES
+
+Once Qt is installed, we suggest that you take a look at the demos and
+examples to see Qt in action. Run the Qt Examples and Demos either by
+typing 'qtdemo' on the command line or through the desktop's Start
+menu. On Mac OS X, you can find it in /Developers/Applications/Qt.
+
+
+REFERENCE DOCUMENTATION
+
+The Qt reference documentation is available locally in Qt's doc/html
+directory. You can use Qt Assistant to view it; to launch Assistant,
+type 'assistant' on the command line or use the Start menu. On Mac OS
+X, you can find it in /Developer/Applications/Qt.  The latest
+documentation is available at http://doc.trolltech.com/.
+
+
+SUPPORTED PLATFORMS
+
+For this release, the following platforms have been tested:
+
+  win32-g++        (mingw)
+  win32-msvc
+  win32-msvc2003
+  win32-msvc2005
+  win32-msvc2008
+
+  aix-xlc
+  aix-xlc-64
+  hpux-acc
+  hpux-acc-64
+  hpux-acc-o64
+  hpux-g++
+  hpux-g++-64
+  hpuxi-acc-32
+  hpuxi-acc-64
+  linux-g++
+  linux-icc
+  linux-icc-32
+  linux-icc-64
+  solaris-cc
+  solaris-cc-64
+  solaris-g++
+  solaris-g++-64
+
+  macx-g++
+  macx-g++42
+
+  qws/linux-x86-g++
+  qws/linux-arm-g++
+
+  wince50standard-armv4i-msvc2005
+  wince50standard-armv4i-msvc2008
+  wince50standard-mipsii-msvc2005
+  wince50standard-mipsii-msvc2008
+  wince50standard-x86-msvc2005
+  wince50standard-x86-msvc2008
+  wincewm50pocket-msvc2005
+  wincewm50pocket-msvc2008
+  wincewm50smart-msvc2005
+  wincewm50smart-msvc2008
+  wincewm60professional-msvc2005
+  wincewm60professional-msvc2008
+  wincewm60standard-msvc2005
+  wincewm60standard-msvc2008
+
+For a complete list of supported platforms, see
+http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/
+
+For a description of Qt's platform support policy, see
+http://www.qtsoftware.com/support-services/support/platform-support-policy
+
+
+COMMERCIAL EDITIONS
+
+Desktop Edition licensees can use all the modules provided with their
+Qt package.
+
+GUI Framework licensees may only use the classes contained in
+the QtCore, QtGui (except QGraphicsView), QtTest, QtDBus and
+Qt3Support modules.
+
+For a full listing of the contents of each module, please refer to 
+http://doc.trolltech.com/4.4/modules.html.
+
+
+HOW TO REPORT A BUG
+
+If you think you have found a bug in Qt, we would like to hear about
+it so that we can fix it. Before reporting a bug, please check
+http://qtsoftware.com/developer/faqs/ and
+http://qtsoftware.com/products/appdev/platform/platforms/ to see if the to see if
+the issue is already known.
+
+Always include the following information in your bug report: the name
+and version number of your compiler; the name and version number of
+your operating system; the version of Qt you are using, and what
+configure options it was compiled with.
+
+If the problem you are reporting is only visible at run-time, try to
+create a small test program that shows the problem when run. Often,
+such a program can be created with some minor changes to one of the
+many example programs in Qt's examples directory. Please submit the
+bug report using the Task Tracker on the Trolltech website:
+
+http://qtsoftware.com/developer/task-tracker
+
+
+Qt is a trademark of Nokia Corporation and/or its subsidiary(-ies).
diff --git a/dist/changes-0.92 b/dist/changes-0.92
new file mode 100644
index 0000000..1226d65
--- /dev/null
+++ b/dist/changes-0.92
@@ -0,0 +1,101 @@
+Here is a list of changes in Qt from 0.91 to 0.92.  Also look out
+for a few new classes; QPrinter, QFileDialog, QDir and QFileInfo.
+
+
+QApplication:
+-------------
+  Use setMainWidget( x ), not exec( x ).
+
+QString:
+--------
+  upper(), lower(), stripWhiteSpace() and simplifyWhiteSpace() etc.
+  do NOT modify the string, instead they return a new string.
+
+QList and QVector:
+------------------
+  Changed argument in QList::toVector() from reference to pointer
+  Changed argument in QVector::toList() from reference to pointer
+  Removed QVector::apply()
+  Removed QList::apply()
+
+QPainter:
+---------
+  pen(), brush() and font() no longer returns references.
+  You cannot do this any longer:
+	QPainter p;
+	...
+        p.pen().setColor( red );
+	p.brush().setStyle( NoBrush );
+  Instead, set a new pen or brush:
+	p.setPen( red );
+	p.setBrush( NoBrush );
+  This enables us to do better optimization, particularly for complex
+  programs.
+
+QFile, QFileInfo (new):
+-----------------------
+  Removed QFile::setFileName, 
+  QFile::isRegular   => QFileInfo::isFile
+  QFile::isDirectory => QFileInfo::isDir
+  QFile::isSymLink   => QFileInfo::isSymLink
+
+Q2DMatrix/QWMatrix:
+---------
+  Q2DMatrix has been replaced with QWMatrix (qwmatrix.h)
+
+QPixmap:
+--------
+  enableImageCache() renamed to setOptimization().
+  Optimization is now default ON.  See doc for other optimization functions.
+
+QImage:
+-------
+  scanline() => scanLine()
+
+QLineEdit/QLCDNumber:
+---------------------
+  signal textChanged( char * ) => textChanged( const char * );
+  slot   display( char * )     => display( const char * )
+
+QCursor:
+--------
+    hourGlassCursor => waitCursor
+
+QButton and friends:
+--------------------
+    QIconButton removed, setPixmap() added to QButton to replace QIconButton
+
+QTableWidget:
+-------------
+    Renamed to QTableView (qtablevw.h)
+    Using int to identify rows and columns, not long.
+
+QRangeControl:
+--------------
+    Using int values, not long.
+
+QScrollBar:
+-----------
+    Using int values, not long.
+
+QListBox:
+---------
+    removed setStrList(), use clear(); insertStrList( ... , 0 ); instead 
+
+QColor:
+-------
+    setRGB => setRgb
+    getRGB => rgb
+    setHSV => setHsv
+    getHSV => hsv
+
+QFontMetrics and QFontInfo:
+---------------------------
+    Get font metrics from QWidget::fontMetrics() and QPainter::fontMetrics().
+    Get font info    from QWidget::fontInfo()    and QPainter::fontInfo().
+    The QFontMetrics(QFont) constructor no longer works.
+    We had to do these changes to support printing and Windows.
+
+
+There are more changes, left out because we consider them minor and
+uninteresting or because we forgot to mention them. :)
diff --git a/dist/changes-0.93 b/dist/changes-0.93
new file mode 100644
index 0000000..892395b
--- /dev/null
+++ b/dist/changes-0.93
@@ -0,0 +1,74 @@
+Here is a list of (major) changes in Qt from 0.92 to 0.93.
+
+Bug-fixes, optimizations and much improved documentation, of course.
+
+There are not many changes in the API interface.
+Here's a list of the most important changes.
+
+
+QApplication:
+-------
+  setCursor(), restoreCursor() now uses a stack of cursors.
+  quit() is now a slot.
+  exit() replaces the old static quit() function.
+
+
+QColor:
+-------
+  New constructor that makes you set an RGB or HSV color directly,
+    like this: QColor(320, 255, 240, QColor::Hsv)
+
+
+QObject:
+--------
+  Has now a timerEvent(), which was moved from QWidget.
+  Compatible with old code.
+
+
+QPainter:
+---------
+  GC caching (internal optimization) makes drawing very fast.
+
+  drawShade* obsolete, moved to qdrawutl.h and renamed to qDrawShade*
+    - These are now global functions that take QPainter * and QColorGroup
+    - Added qDrawWinPanel and qDrawWinButton for Windows 95 look
+    - Added qDrawPlainRect
+
+
+QPixmap:
+-------
+  New fill() function that fills the pixmap with the background color
+    OR background pixmap of a widget.
+
+
+QRect:
+------
+  fixup() renamed to normalize(), returns a new QRect.
+
+
+QWidget:
+-------
+  New function setCaption(), setIcon() and setIconText(), moved from QWindow.
+
+
+New classes:
+------------
+  QSocketNotifier, makes it possible to write async socket code.
+
+
+New global functions:
+---------------------
+  qInstallMsgHandler() and qRound(), in qglobal.h.
+
+
+moc:
+----
+  Supports templates.
+
+
+Documentation:
+--------------
+  A tutorial.
+  Template classes (QArray, QList etc.) are documented.
+  Many more links in the examples.
+  Postscript documentation (around 400 pages).
diff --git a/dist/changes-0.94 b/dist/changes-0.94
new file mode 100644
index 0000000..5353e12
--- /dev/null
+++ b/dist/changes-0.94
@@ -0,0 +1,33 @@
+Here is a list of (major) changes in Qt from 0.93 to 0.94.
+
+Bug-fixes, optimizations and much improved documentation, of course.
+
+There are not many changes in the API interface.
+
+
+QTextStream:
+------------
+  eos() renamed to eof() for iostream compatibility.
+  operator>> for double, float, char*, QString are implemented
+  get() and getline() added.
+
+
+QDataStream:
+------------
+  eos() renamed to eof() for iostream compatibility.
+
+
+QPixmap:
+--------
+  Support for transparency: setMask(QBitmap) and bitBlt.
+
+
+QImage:
+-------
+  Scanline data is aligned on a 32 bit boundary (it used to be 8
+  bits). Conversion to and from QPixmap is now faster.
+
+
+Documentation:
+--------------
+  More documentation fixes.
diff --git a/dist/changes-0.95 b/dist/changes-0.95
new file mode 100644
index 0000000..205a476
--- /dev/null
+++ b/dist/changes-0.95
@@ -0,0 +1,54 @@
+Here is a list of (major) changes in Qt from 0.93 to 0.95.
+
+Bug-fixes, optimizations and much improved documentation, of course.
+
+There are few changes in the API (Qt header files).
+
+
+QPixmap:
+--------
+  Can draw transparent pixmaps. Call QPixmap::setMask(QBitmap) to
+  set a mask.
+
+
+QPainter:
+---------
+  Unified transformation. setWindow() and setViewport() now use
+  the same code as setWorldXForm() etc.
+  Internal xform routines have been optimized.
+
+
+QButton:
+--------
+  isUp() is obsolete, use !isDown() instead.
+  isOff() is obsolete, use !isOn() instead.
+  switchOn() is obsolete, use setOn(TRUE) instead.
+  switchOff() is obsolete, use setOn(FALSE) instead.
+
+
+QPushButton:
+------------
+  A push button can now be a toggle button.
+
+
+QWidget:
+--------
+  isActive() was never used and is now obsolete.
+
+
+QTextStream:
+------------
+  eos() renamed to eof() for iostream compatibility.
+  operator>> for double, float, char*, QString are implemented
+  get() and getline() added.
+
+
+QDataStream:
+------------
+  eos() renamed to eof() for iostream compatibility.
+
+
+QImage:
+-------
+  Scanline data is aligned on a 32 bit boundary (it used to be 8
+  bits). Conversion to and from QPixmap is now faster.
diff --git a/dist/changes-0.96 b/dist/changes-0.96
new file mode 100644
index 0000000..52555d1
--- /dev/null
+++ b/dist/changes-0.96
@@ -0,0 +1,263 @@
+Here is a list of (major) changes in Qt from 0.95 to 0.96.
+
+Bug-fixes, optimizations and improved documentation, of course.
+QClipboard is new.
+
+There are some changes in the API (Qt header files).  Some functions have
+been renamed or the arguments have changed. The old versions of these
+functions have been obsoleted. A call to an obsoleted function will by
+default generate a runtime warning the first time it is called, but it
+will be executed correctly. If you really need to ship code fast, you can
+turn off the runtime obsolescence warnings by calling
+qSuppressObsoleteWarnings().
+
+Obsoleted functions will disappear in a future release.  To get
+compile-time errors for each use of an obsoleted function, compile your
+code with -DTEST_OBSOLETE. You should recompile without this option when
+you have upgraded your code (otherwise, you may get linking errors). 
+Note: it is probably not a good idea to compile the Qt library with
+-DTEST_OBSOLETE, it may cause problems if you try to link or run
+programs that use obsoleted functions.
+
+For new users: obsoleted functions are no longer documented, in fact they
+are not even visible in the documentation.
+
+*************** Changes that might affect runtime behavior *****************
+
+QFileInfo:
+----------
+  size() returns uint(previousy int), 0 if the size cannot be fetched (was -1).
+	Use isFile() to check.
+
+
+QPopupMenu
+------------
+  When a popup menu is a submenu (directly or as a subsub...menu) of a
+  menu bar(QMenuBar), the menu bar will now always emit the activated() or
+  highlighted() signal when a submenu emits these signals. This fix might
+  have undesired effects if you previously have worked around it by
+  connecting to signals both in menu bar and its submenus.
+
+*************** Changes that might generate compile errors *****************
+**************           when compiling old code           *****************
+
+QDataStream:
+-----------
+  Serialization of int and uint is no longer supported. Use INT32 and
+  UINT32 instead. This had to be changed in order to run Qt on 64-bit
+  architectures.
+
+
+QImage:
+-------
+  24-bpp pixel format no longer supported, use 32-bpp instead.
+
+  This means that you have to use uint* instead of uchar* when accessing
+  pixel values. You cannot use the uchar* pointer directly, because the
+  pixel format depends on the byte order on the underlying platform. Use
+  qRgb() and friends (qcolor.h) to access the pixels.
+
+
+QWidget:
+--------
+  setMouseTracking() does not return bool. Call hasMouseTracking() to
+  determine the mouse tracking state. (This only affects code that
+  actually uses the return value.)
+
+  (There are other changes in QWidget, see below)
+
+
+*************** Type changes that might generate warnings: *****************
+
+
+QCache/QIntCache:
+-----------------
+  Using int/uint instead of long/ulong.
+
+
+QDate/QTime/QDateTime:
+----------------------
+  Using int/uint instead of long/ulong (MS-DOS required long).
+
+
+QIODevice/QBuffer/QFile:
+------------------------
+  Using int/uint instead of long/ulong.
+
+
+QKeyEvent:
+----------
+  ascii() now returns int (previously uchar).
+
+
+QTableView:
+------------
+  uint used instead of ulong (tableFlags() etc.)
+
+
+QTextStream:
+------------
+  int used instead of long (flags() etc.)
+
+
+*****************         Obsoleted functions         **********************
+
+QAccel:
+-------
+  enable(), disable() and isDisabled() are obsolete.
+  Use setEnabled(TRUE/FALSE) and !isEnabled() instead.
+  isItemDisabled(), enableItem(), disableItem() are obsolete.
+  Use !isItemEnabled(), setItemEnabled(TRUE/FALSE) instead.
+
+
+QApplication:
+-------------
+  cursor(), setCursor() and restoreCursor() obsoleted.
+  Use overrideCursor(), setOverrideCursor() and restoreOverrideCursor()
+  instead.
+
+
+QBitmap:
+--------
+  Constructor takes "const uchar *bits" instead of "const char *"
+  because of sign problems (uchar = unsigned char). Old constructors are
+  obsolete.
+
+
+QButton:
+--------
+  toggleButton() is obsolete, renamed to isToggleButton().
+
+
+QColor:
+-------
+  The functions QRED, QGREEN, QBLUE, QRGB, QGRAY obsolete.
+  Instead, use  qRed, qGreen, qBlue, qRgb, qGray.
+
+
+QComboBox:
+----------
+  setStrList() obsolete, use clear() + insertStrList() instead.
+  string() obsolete, use text() instead.
+
+
+QLCDNumber:
+----------
+  longValue() is obsolete, use intValue() instead.
+
+
+QListbox:
+---------
+  The macro LBI_String is obsolete, use LBI_text instead.
+  string() obsolete, use text() instead.
+  stringCopy() and setStringCopy() are obsolete.
+
+
+QMenuData:
+----------
+  string() obsolete, use text() instead.
+  isItemDisabled(), enableItem(), disableItem() are obsolete.
+  Use !isItemEnabled(), setItemEnabled(TRUE/FALSE) instead.
+  checkItem() and uncheckItem() are obsolete.
+  Use setItemChecked(TRUE/FALSE) instead.
+
+
+QPainter: 
+--------- 
+
+  drawBezier() is obsolete, general Bezier curves are rarely used and
+  cost too much. Qt will only support drawQuadBezier() (four-point
+  Bezier) in the future.
+
+QPointArray:
+-----------
+  move() is obsolete, use translate() instead.
+  bezier() is obsolete, general Bezier curves are rarely used and
+  cost too much. Qt will only support quadBezier() (four-point
+  Bezier) in the future.
+
+
+
+QRect:
+------
+  move() is obsolete, use moveBy() instead.
+  setTopLeft(), setTopRight(), setBottomLeft(), setBottomRight() and
+  setCenter() is obsolete, use moveTopLeft(), moveTopRight(),
+  moveBottomLeft(), moveBottomRight() and moveCenter() instead.
+
+
+QRegion:
+-------
+  move() is obsolete, use translate() instead.
+
+
+QSocketNotifier:
+----------------
+  enabled() is obsolete. Use isEnabled() instead.
+
+
+QWidget:
+--------
+  enable(), disable() and isDisabled() are obsolete.
+  Use setEnabled(TRUE/FALSE) and !isEnabled() instead.
+
+  setMinimumSize(), setMaximumSize(), minimumSize(), maximumSize() are obsolete
+  use setMinSize(), setMaxSize(), minSize(), maxSize() instead.
+
+  enableUpdates() obsolete, use isUpdatesEnabled()/setUpdatesEnabled().
+
+  id() is obsolete, it has been renamed to winId().
+
+***************** All other changes from 0.95 to 0.96 **********************
+
+moc
+----------
+    Gives a warning if no output is generated.
+
+
+qglobal.h:
+----------
+  INT32 and UINT32 typedefs changed to work with DEC Alpha.
+
+
+QApplication:
+-------------
+  clipboard() is new.
+
+
+QButtonGroup:
+-------------
+  Exclusive group setting added (isExclusive and setExclusive).
+  find() is new.
+
+
+QColor:
+-------
+  New type QRgb (uint), used for RGB triplet.
+
+
+QLineEdit:
+----------
+  You can now mark text, and copy and paste to/from the clipboard.
+
+
+QPaintDevice:
+---------
+  The bitblt function now takes an ignoreMask parameter. It has a default
+  value, so no old code will be broken.
+
+QPrinter:
+------------
+  fixed minor bugs in handling of polygons and beziers.
+
+
+QWidget:
+--------
+  New protected virtual functions styleChange(), backgroundColorChange(),
+  backgroundPixmapChange(), paletteChange() and fontChange().
+  These functions are called from setStyle(), setBackgroundColor() etc.
+  You can reimplement them to if you need to know when widget properties
+  changed and to optimize updates.
+
+  The destroyed() signal has been moved to QObject.
+
diff --git a/dist/changes-0.98 b/dist/changes-0.98
new file mode 100644
index 0000000..a36abeb
--- /dev/null
+++ b/dist/changes-0.98
@@ -0,0 +1,98 @@
+Here is a list of (major) changes in Qt from 0.96 to 0.98.
+As usual, we fixed some bugs and improved the documentation.
+
+
+*************** Changes that might affect runtime behavior *****************
+
+QWidget:
+--------
+  setMinimumSize() and setMaximumSize() now force the widget to 
+  a legal size.  resize() and setGeometry() obey the widget's
+  minimum/maximum size.
+
+  The default behaviour of QWidget::closeEvent is now to hide the widget,
+  not to delete it as before (which was potentially dangerous). This means
+  that if you have a top level widget and the user closes it via the close
+  box, it will now hide itself if you have not reimplemented closeEvent().
+  See the QWidget::closeEvent() and QCloseEvent documentation for details.
+
+  (There are other changes in QWidget, see below)
+
+
+*************** Changes that might generate compile errors *****************
+**************           when compiling old code           *****************
+
+Disabled copy constructors and operators=
+----------------------------------------- 
+  Copy constructors and operators= are disabled in the classes that cannot
+  be copied (this includes all classes that inherit from QObject). This
+  will let the compiler find bugs in your code, you'll get compile time 
+  errors where you most probably would have gotten core dumps before. 
+  This change has been done in the following classes:
+
+    QAccel QApplication QBuffer QButton QButtonGroup QCheckBox QClipboard
+    QComboBox QConnection QDataStream QDialog QFile QFileDialog QFrame
+    QGroupBox QIODevice QImageIO QLCDNumber QLabel QLineEdit QListBox
+    QMenuBar QMenuData QMenuItem QMessageBox QMetaObject QObject
+    QPSPrinter QPaintDevice QPainter QPicture QPopupMenu QPrintDialog
+    QPrinter QPushButton QRadioButton QRangeControl QScrollBar QSignal
+    QSocketNotifier QTableView QTextStream QTimer QWidget QWindow
+
+  The other classes all have sensible copy constructors and operators=.
+
+QDate:
+------
+  These were protected, now private:
+	static const char *monthNames[];
+ 	static const char *weekdayNames[];
+	uint  	 jd;
+
+QListBox:
+---------
+  The internals of QListBox are completely reworked. Definition of custom
+  QListBoxItems is now much easier. This is *not* compatible with the old
+  way of defining custom QLBItems. See the QListBoxItem documentation for
+  details.
+
+QTime:
+------
+  This was protected, now private:
+	uint   ds;
+
+*************** Type changes that might generate warnings: *****************
+
+none
+
+*****************         Obsoleted functions         **********************
+
+none
+
+***************** All other changes from 0.96 to 0.98 **********************
+
+moc:
+----
+  Moc previously gave a syntax error when the word "class" was found
+  in a string outside a class declaration. This bug has now been
+  fixed.
+
+  More moc arguments, check the manpage for details.
+
+QFont:
+------
+  Two new convenience functions; bold() and setBold().
+
+QLabel:
+-------
+  setMargin() and margin() are new. setMargin() specifies a minimum margin
+  when the label contents are justified.
+
+QWidget:
+--------
+  You can specify a custom widget frame for top level widgets, including
+  no frame at all. See the widget constructor doc. for details.
+
+  Qt now has enter and leave events. Reimplement the virtual functions  
+  void enterEvent( QEvent * ) and void leaveEvent( QEvent * ) to receive
+  events when the mouse cursor leaves or enters the visible part of the
+  widget.
+
diff --git a/dist/changes-0.99 b/dist/changes-0.99
new file mode 100644
index 0000000..80be555
--- /dev/null
+++ b/dist/changes-0.99
@@ -0,0 +1,60 @@
+Here is a list of user-visible changes in Qt from 0.98 to 0.99.
+As usual, we fixed some bugs and improved the documentation.
+
+Qt 0.99 includes makefiles for Linux, Solaris, SunOS, FreeBSD, OSF/1,
+Irix, BSD/OS, SCO and HP-UX. 
+
+
+*************** Changes that might affect runtime behavior *****************
+
+none
+
+*************** Changes that might generate compile errors *****************
+**************           when compiling old code           *****************
+
+QVector:
+--------
+
+Removed operator const type**().
+
+*************** Type changes that might generate warnings: *****************
+
+none
+
+*****************         Obsoleted functions         **********************
+
+none
+
+***************** All other changes from 0.98 to 0.99 **********************
+
+QApplication:
+-------------
+Added beep() to make a sound.
+
+
+QFileInfo
+---------
+Added readLink() to return the name of the file a symlink points to,
+fixed bug in isSymlink().
+
+
+QPrinter:
+---------
+The X11 version now supports landscape printing and different paper sizes.
+
+
+QTableView:
+-----------
+The functions horizontalScrollBar and verticalScrollBar gives access
+to the internal scroll bars so you can connect to their signals.
+
+
+QWidget:
+--------
+Added sizeHint virtual function which is implemented in subclasses to 
+return a recommended size.
+
+Added new function setFixedSize() to set both the minimum and maximum sizes
+at the same time.
+
+Added clearFocus() function to take keyboard focus from the widget.
diff --git a/dist/changes-1.0 b/dist/changes-1.0
new file mode 100644
index 0000000..cf9f7a1
--- /dev/null
+++ b/dist/changes-1.0
@@ -0,0 +1,62 @@
+Here is a list of user-visible changes in Qt from 0.99 to 1.0.
+As usual, we fixed some bugs and improved the documentation.
+
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+QComboBox:
+----------
+The combo box is resized to the largest item when automatic resizing
+is enabled. In 0.99 it resized itself to the current item.
+
+
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+none
+
+
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+none
+
+
+
+****************************************************************************
+*                         Obsoleted functions                              *
+****************************************************************************
+
+All pre-1.0 obsoleted functions are now removed.
+
+
+
+****************************************************************************
+*                 All other changes from 0.99 to 1.0                       *
+****************************************************************************
+
+QBitmap:
+--------
+Added constructor that takes a file name. Loads an image from file.
+
+
+QDialog:
+--------
+QDialog inherits QWidget instead of QWindow.
+
+
+QPixmap:
+--------
+Added constructor that takes a file name. Loads an image from file.
+
+
+QTimer:
+-------
+Added static function singleShot(). Convenient function.
diff --git a/dist/changes-1.1 b/dist/changes-1.1
new file mode 100644
index 0000000..ff9d2a7
--- /dev/null
+++ b/dist/changes-1.1
@@ -0,0 +1,110 @@
+Here is a list of user-visible changes in Qt from 1.0 to 1.1.  As
+usual, we fixed some bugs, made some more speedups, and improved the
+documentation.
+
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+We've added keyboard interface to more widgets, and changed the
+default focus policy radically.  For example, by default you can TAB
+to button, but it does not grab focus when you click it.  The new
+QWidget::setFocusPolicy() function can be used to change focus policy
+for all widgets.
+
+The font matching algorithm has been tweaked in order to provide more
+predictable fonts in more cases.  For some users (such as those with a
+75dpi X server and only 100dpi fonts installed) it may change the
+output of some programs.
+
+sizeHint() and hence default size has been tweaked for some widgets;
+QMenuBar and QPushButton in particular.
+
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+We've renamed "declare" in qgeneric.h to Q_DECLARE due to naming
+conflicts.  Though we try to provide backward compatibility, there may
+be problems for a few programs.
+
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+none
+
+
+****************************************************************************
+*                         Obsoleted functions                              *
+****************************************************************************
+
+none
+
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+QTabDialog (and QTabBar) provide a tabbed dialog.  examples/pref shows
+simple usage of QTabDialog.
+
+QMultiLineEditor is the long-awaited multi-line editor.
+
+QGridLayout provides grid-like geometry management for any widget,
+with flexible row/column elasticity, minimum and maximum sizes.
+
+QBoxLayout provides more complex and powerful geometry management:
+boxes and widgets stacked inside other boxes, and finally a top-level
+box connected to a widget.
+
+QToolTip provides tool tips for any widget.
+
+
+****************************************************************************
+*		       Other changes from 1.0 to 1.1			   *
+****************************************************************************
+
+Added QApplication::setColorMode() and colorMode().
+
+Added QColor::setAllocContext() and friends; these functions enable
+applications to allocate discardable colors and then discard them.
+
+Removed some GNU-make features from the makefiles.
+
+Added a QPalette constructor to construct an entire palette from a single
+background color, for convenience.
+
+moc output now has a version number #define.
+
+AIX support added.  IRIX and NetBSD fixed.
+
+Rewrote a couple of functions to work around compiler bugs, or
+purify/boundschecker overzealousness.
+
+Fixed that ugly man-page SYNOPSIS bug.
+
+Added the static function QMessageBox::query().
+
+QRect::unite() now produces the desired results if exactly one of the
+rectangles is invalid.
+
+QObject::parent() is now public.
+
+QPainter::drawWinFocusRect() draws a Windows 95-style focus rectangle.
+(A focus rectangle can not be drawn using ordinary Windows drawing
+functions.)
+
+QApplication::processEvents() added to cater for long-running
+computations; it processes one round of window system events and
+timers and then returns.
+
+QComboBox has been extended to provide an editable combo box and Motif
+2.x compatible look and feel.
+
+We've also added a host of new workarounds for bugs in Borland C++,
+Microsoft VC++, DEC CXX and HP CC.
diff --git a/dist/changes-1.2 b/dist/changes-1.2
new file mode 100644
index 0000000..d4d2c2c
--- /dev/null
+++ b/dist/changes-1.2
@@ -0,0 +1,119 @@
+Here is a list of user-visible changes in Qt from 1.1 to 1.2.  As
+usual, we fixed some bugs, made some more speedups, and improved the
+documentation.
+
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+QGridLayout::addWidget() and addMultiCellWidget(): The align parameter
+is now interpreted correctly. (Previously up/down and right/left were
+reversed.) If you have worked around this bug, your widgets may now be
+incorrectly aligned.
+
+QWidget: Every widget is now guaranteed move and resize events. The
+event is deferred until the first show(). This may cause problems in
+rare cases involving event filters.
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+none
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+none
+
+****************************************************************************
+* 			Deprecated functions				   *
+****************************************************************************
+
+QApplication::setColorMode() and colorMode() will be obsoleted. Use
+setColorSpec() and colorSpec() instead.
+
+qchecksum() will be obsoleted. Please use qChecksum() instead.
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+QSlider is a widget to input values from a range. If you have been
+using a standalone QScrollBar, you will probably want to switch to a
+QSlider.
+
+OpenGL/Mesa support: QGLWidget, QGLContext and QGLFormat. To use these
+classes you need to build the Qt/OpenGL library (qgl) in qt/opengl/src.
+
+****************************************************************************
+*		       Other changes from 1.1 to 1.2			   *
+****************************************************************************
+
+QApplication::setColorSpec() can specify private colormaps or
+non-default visuals
+
+New function QButton::setAutoRepeat().
+
+QComboBox: New function currentText(), two new insertion policies:
+AfterCurrent and BeforeCurrent.
+
+QCursor: added new global cursor blankCursor.
+
+QFont::key(), new function for caching.
+
+QFontMetrics::QFontMetrics( const QFont& ) new constructor gives
+fontmetrics directly for a font. This is much faster than using
+QWidget::fontMetrics() or QPainter::fontmetrics().
+
+QImage: image load/save functions:
+		QImage( const char *filename )
+		imageFormat(), load(), loadFromData(), save()
+		operator>>(), operator<<()
+	XPM support, QImage( const *xpm[] )
+	Alpha channel support: 
+		hasAlphaBuffer(), setAlphaBuffer()
+		createAlphaMask(), 
+	Automatic mask generaton: createHeuristicMask() 
+	Filling the entire image: fill()
+
+QLCDNumber now supports filled segments:
+	setSegmentStyle(), segmentStyle()
+
+QLabel now supports accellerated labels:
+	setBuddy(), buddy() and a  new constructor.
+
+QLineEdit new functions:
+	show/hide frame: setFrame(), frame()
+	password entry mode: setEchoMode(), echoMode()
+
+QMouseEvent: x() and y() convenience functions.
+
+QPainter: new constructor QPainter( const QPaintDevice* ) does automatic
+begin() and end(). New function	flush().
+
+QPixmap new functions:
+	serialNumber() for caching purposes.
+	selfMask()  QPixmap( const char *xpm[] )
+	createHeuristicMask()
+
+QPopupMenu: Added functions to enable checkmarks:
+	setCheckable(), isCheckable()
+
+QScrollBar: sizeHint() implemented.
+
+QTabBar now supports keyboard input. New function currentTab().
+
+QTabDialog: new function setOKButton().
+
+Added support for XFree86 on OS/2.
+
+New examples:
+	examples/tooltip demonstrates dynamic tooltips	
+	examples/table demonstrates QTableView
+	examples/hello is a different program
+
+examples/xshape has been removed.
diff --git a/dist/changes-1.30 b/dist/changes-1.30
new file mode 100644
index 0000000..255d89c
--- /dev/null
+++ b/dist/changes-1.30
@@ -0,0 +1,278 @@
+Here is a list of user-visible changes in Qt from 1.2 to 1.30.  As
+usual, we fixed some bugs, made some more speedups, and improved the
+documentation.
+
+Keyboard accelerators and traversal are significantly improved.
+
+Two new extensions included with Qt 1.30. They are not part of the library:
+
+Netscape plugin support. You can now write portable Netscape plugins
+using Qt. See the qt/extensions/nsplugin directory in the distribution.
+
+The ImageIO extension library gives a framework for adding new image
+formats, including PNG and JPEG in this release. See the qt/extensions/imageio
+directory in the distribution.
+
+The OpenGL extension for Qt now resides in qt/extensions.
+
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+* QProgressBar displays a progress bar.
+
+* QProgressDialog uses QProgressBar to give the user feedback during long
+  operations, as well as a means of aborting.
+
+* QMovie supports animated GIFs and incremental loading of images.
+
+* QHBoxLayout and QVBoxLayout are convenience classes giving a simpler
+  interface to QBoxLayout.
+
+* QValidator provides a mechanism for validating input.
+
+
+****************************************************************************
+*		       Enhancements from 1.2 to 1.30			   *
+****************************************************************************
+
+QFont now supports charsets latin1 through latin9.
+
+New command-line arguments: -style motif and -style windows are
+accepted, as well as -style=motif and -style=windows, -visual, -ncols,
+-cmap.
+
+QMultiLineEdit is usable for much bigger documents than in 1.2
+
+More sizeHint() functions added, some existing ones tweaked.
+
+Many widgets have improved look and feel, particularly changes to
+Windows GUI style to match Windows more closely.
+
+Improved Postscript output.
+
+Color handling has been improved; better 32-to-8 conversion; Qt
+prefers to use Macintosh/Netscape color cube in 8-bit mode; more and
+better dithering support.
+
+GIF and PPM support.
+
+QMessageBox has a number of new static functions to replace the
+venerable message(): information(), warning(), critical() and about().
+
+QPopupMenu can now display icon and text in the same item.
+
+QPopupMenu::exec() to pop up a synchronous popup menu.
+
+QListBox now supports multi selection.
+
+QWidget::setBackgroundMode() gives a powerful way of managing widget
+backgrounds, to reduce flicker.
+
+QWidget::setIcon() now works under both X11 and Windows.
+
+The file dialog now remembers the previously selected directory.
+
+QApplication::setWinStyleHighlightColor() sets the highlight color in
+windows style.
+
+QApplication::setDoubleClickInterval() sets the double click timeout
+
+The layout example is new and more informative.
+
+There is a new openGL example; extension/opengl/examples/box/ shows
+how to control an openGL widget using Qt user interface components.
+
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+Tab/Shift-Tab handling has been improved a lot; this means that
+widgets which couldn't get keyboard focus before now can.
+
+Some widgets (buttons, tab bars, tab dialogs) semi-automatically set
+up keyboard accelerators. ( setText("E&xit") will give Alt-X as an
+accelerator.)  In some very rare cases, this will cause changes of
+behaviour.
+
+The QColor::light() function now works, and anything which relied on
+its buggy behaviour might be a little darker than expected until changed,
+usually just recompiling (the default argument has also changed).
+
+The colors used have been tuned a bit; pixmaps that "know" the RGB
+values of colorGroup().background() and the like will look just a tiny
+bit wrong.
+
+QApplication calls setlocale to the local environment, except for
+LC_NUMERIC which is set to the C locale. This means that input/output
+of floating point numbers will always use '.' as the decimal separator, 
+while all other locale dependant operations will use the default locale.
+ 
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+none
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+none
+
+****************************************************************************
+* 			Deprecated functions				   *
+****************************************************************************
+
+QApplication::setColorMode()
+ - see QApplication::setColorSpec(int)
+QRegion::xor()
+ - see QRegion::eor()
+QMessageBox::message()
+ - see QMessageBox::information/warning/critical
+QMultiLineEdit::getCursorPosition()
+ - see QMultiLineEdit::cursorPosition()
+QTabDialog::setOKButton()
+ - see QTabDialog::setOkButton()
+
+****************************************************************************
+*      New public/protected functions added to existing classes            *
+****************************************************************************
+
+QAccel::repairEventFilter()
+QApplication::activeModalWidget()
+QApplication::activePopupWidget()
+QApplication::allWidgets()
+QApplication::doubleClickInterval()
+QApplication::hasGlobalMouseTracking()
+QApplication::processEvents(int)
+QApplication::processOneEvent()
+QApplication::setDoubleClickInterval(int)
+QApplication::setGlobalMouseTracking(bool)
+QApplication::setWinStyleHighlightColor(QColor const &)
+QApplication::winStyleHighlightColor()
+QApplication::x11ProcessEvent(_XEvent *)
+QBoxLayout::className() const
+QButton::accel() const
+QButton::animateClick()
+QButton::enabledChange(bool)
+QButton::setAccel(int)
+QComboBox::clearValidator()
+QComboBox::setStyle(GUIStyle)
+QComboBox::setValidator(QValidator *)
+QComboBox::validator() const
+QDir::convertSeparators(char const *)
+QFrame::sizeHint() const
+QGridLayout::addColSpacing(int, int)
+QGridLayout::addRowSpacing(int, int)
+QGridLayout::className() const
+QImage::convertDepth(int, int) const
+QImage::create(QSize const &, int, int, QImage::Endian)
+QImage::createAlphaMask(int) const
+QImage::inputFormats()
+QImage::outputFormats()
+QImage::pixel(int, int) const
+QImage::pixelIndex(int, int) const
+QImage::setPixel(int, int, unsigned int)
+QImage::valid(int, int) const
+QImageIO::inputFormats()
+QImageIO::outputFormats()
+QLabel::movie() const
+QLabel::setMovie(QMovie const &)
+QLayout::className() const
+QLineEdit::clearValidator()
+QLineEdit::setValidator(QValidator *)
+QLineEdit::sizeHint() const
+QLineEdit::validator() const
+QListBox::clearSelection()
+QListBox::focusOutEvent(QFocusEvent *)
+QListBox::highlighted(char const *)
+QListBox::isMultiSelection() const
+QListBox::isSelected(int) const
+QListBox::selected(char const *)
+QListBox::selectionChanged()
+QListBox::setMultiSelection(bool)
+QListBox::setSelected(int, bool)
+QListBox::toggleCurrentItem()
+QMenuBar::heightForWidth(int) const
+QMenuBar::leaveEvent(QEvent *)
+QMenuBar::separator() const
+QMenuBar::setSeparator(QMenuBar::Separator)
+QMenuData::changeItem(QPixmap const &, char const *, int)
+QMenuData::insertItem(QPixmap const &, char const *, QObject const *, char const *, int)
+QMenuData::insertItem(QPixmap const &, char const *, QPopupMenu *, int, int)
+QMenuData::insertItem(QPixmap const &, char const *, int, int)
+QMessageBox::about(QWidget *, char const *, char const *)
+QMessageBox::aboutQt(QWidget *, char const *)
+QMessageBox::buttonText(int) const
+QMessageBox::critical(QWidget *, char const *, char const *, char const *, char const *, char const *, int, int)
+QMessageBox::critical(QWidget *, char const *, char const *, int, int, int)
+QMessageBox::icon() const
+QMessageBox::iconPixmap() const
+QMessageBox::information(QWidget *, char const *, char const *, char const *, char const *, char const *, int, int)
+QMessageBox::information(QWidget *, char const *, char const *, int, int, int)
+QMessageBox::setButtonText(int, char const *)
+QMessageBox::setIcon(QMessageBox::Icon)
+QMessageBox::setIconPixmap(QPixmap const &)
+QMessageBox::setStyle(GUIStyle)
+QMessageBox::standardIcon(QMessageBox::Icon, GUIStyle)
+QMessageBox::warning(QWidget *, char const *, char const *, char const *, char const *, char const *, int, int)
+QMessageBox::warning(QWidget *, char const *, char const *, int, int, int)
+QMultiLineEdit::cursorPoint() const
+QMultiLineEdit::cursorPosition(int *, int *) const
+QMultiLineEdit::getMarkedRegion(int *, int *, int *, int *) const
+QPainter::drawPoints(QPointArray const &, int, int)
+QPainter::drawWinFocusRect( int, int, int, int, const QColor & )
+QPalette::detach()
+QPicture::data() const
+QPicture::isNull() const
+QPicture::setData(char const *, unsigned int)
+QPicture::size() const
+QPixmap::convertFromImage(QImage const &, int)
+QPixmap::load(char const *, char const *, int)
+QPixmap::loadFromData(unsigned char const *, unsigned int, char const *, int)
+QPopupMenu::exec()
+QPopupMenu::setActiveItem(int)
+QRegion::eor(QRegion const &) const
+QSize::transpose()
+QTabBar::setCurrentTab(QTab *)
+QTabBar::setCurrentTab(int)
+QTabBar::setShape(QTabBar::Shape)
+QTabBar::shape() const
+QTabBar::tab(int)
+QTabBar::tabList()
+QTabDialog::addTab(QWidget *, QTab *)
+QTabDialog::hasOkButton() const
+QTabDialog::selected(char const *)
+QTabDialog::setTabBar(QTabBar *)
+QTabDialog::showPage(QWidget *)
+QTabDialog::styleChange(GUIStyle)
+QTabDialog::tabBar() const
+QTabDialog::tabLabel(QWidget *)
+QTableView::minViewX() const
+QTableView::minViewY() const
+QTableView::updateTableSize()
+QToolTip::font()
+QToolTip::palette()
+QToolTip::setFont(QFont const &)
+QToolTip::setPalette(QPalette const &)
+QWidget::backgroundMode() const
+QWidget::create(unsigned int, bool, bool)
+QWidget::destroy(bool, bool)
+QWidget::focusProxy() const
+QWidget::focusWidget() const
+QWidget::isVisibleToTLW() const
+QWidget::setBackgroundMode(QWidget::BackgroundMode)
+QWidget::setFixedHeight(int)
+QWidget::setFixedWidth(int)
+QWidget::setFocusProxy(QWidget *)
+QWidget::setMaximumHeight(int)
+QWidget::setMaximumWidth(int)
+QWidget::setMinimumHeight(int)
+QWidget::setMinimumWidth(int)
+QWidget::setTabOrder(QWidget *, QWidget *)
+QWidget::update(QRect const &)
diff --git a/dist/changes-1.31 b/dist/changes-1.31
new file mode 100644
index 0000000..b6b2d65
--- /dev/null
+++ b/dist/changes-1.31
@@ -0,0 +1,34 @@
+1.31 is a bug-fix release of Qt and only contains minor changes compared
+to Qt 1.30
+
+Here is a list of the bug-fixes made in Qt from 1.30 to 1.31.
+
+Changing the font of a QButton, QPushButton, QCheckBox or QRadioButton now
+works correctly.
+
+QRadiobutton:    Correct toggling in a QButtonGroup when activated by an
+                 accelerator.
+
+QPopupMenu:      Items updated correctly when activated by an accelerator.
+
+QProgressBar:    Base color is no longer fixed to white.
+
+QProgressDialog: setLabel() and setCancelButton() now ensure that a given
+	         widget is shown and is a child of QProgressDialog.
+
+QWidget:         setEnabled( FALSE ) now moves focus correctly.
+
+QLineEdit and
+QMultiLineEdit:  In keyPressEvent() backspace no longer inserts an
+                 unprintable character with some rare keyboard layouts.
+
+QMenubar:        Mouse presses on items without any popup menu are now
+		 always recognized.
+
+Changes to fix compile problems under IRIX.
+
+Changes to fix compile problems on some versions of AIX.
+
+Changes to fix compile problems with aCC on HP-UX.
+
+Minor documentation fixes.
diff --git a/dist/changes-1.39-19980327 b/dist/changes-1.39-19980327
new file mode 100644
index 0000000..3c5843d
--- /dev/null
+++ b/dist/changes-1.39-19980327
@@ -0,0 +1,963 @@
+src/widgets/qlabel.cpp    2.21  agulbra  +9 -5
+
+  new sizeHint(); "yes\nyes" is as tall as "Yes\nYes"
+
+
+src/tools/qstrlist.h    2.7  hanord  +10 -9  (1997/10/16)
+
+  Fixed STL crash reported by ust@egd.igd.fhg.de
+
+
+src/kernel/qregion.cpp    2.5  agulbra  +3 -3  (1997/10/19)
+src/kernel/qregion.h    2.6  agulbra  +2 -2
+
+  USL C++ understands xor
+
+
+src/kernel/qkeycode.h    2.5  hanord  +13 -2  (1997/10/22)
+
+  Added function keys F25..F35 for X only
+
+
+src/widgets/qpushbt.cpp    2.33  hanord  +5 -9
+
+  Always clear button background in Windows style
+
+
+src/widgets/qpushbt.cpp    2.32  hanord  +8 -8
+
+  Fixed background color for windows style
+
+
+src/kernel/qcur_win.cpp    2.5  hanord  +15 -5
+
+  Fix the cursor bug on Win95
+
+
+src/kernel/qobject.cpp    2.36  eiriken  +3 -3
+src/kernel/qwid_win.cpp    2.39  eiriken  +19 -17
+
+  Fixed bugs in setMaximumSize and setMinimumSize
+
+
+src/widgets/qlabel.cpp    2.23  agulbra  +11 -2
+src/widgets/qlabel.h    2.5  agulbra  +2 -1
+
+  add clear()
+
+
+src/kernel/qapp.cpp    2.38  eiriken  +8 -2  (1997/10/31)
+
+  Added warning in QApplication::palette() if called before a QApplication
+  is created.
+
+
+src/kernel/qcolor.h    2.8  hanord  +6 -7
+
+  Fixed the color== operator
+
+
+src/kernel/qcol_win.cpp    2.16  hanord  +13 -41
+src/kernel/qcolor.cpp    2.12  hanord  +118 -36
+src/kernel/qcolor.h    2.7  hanord  +7 -6
+
+  Moved platform independent functions into qcolor.cpp
+  Optimized setNamedColor for #RRGGBB style color names.
+  Doc warns that RGB bit format may change in the future.
+  setRgb(QRgb) optimized.
+  Added static class member color_init (not a global file variable)
+
+
+src/kernel/qapp_win.cpp    2.64  hanord  +67 -50
+
+  Detects the Windows version using GetVersionEx.
+  Moved the timer function to the appropriate section.
+
+
+src/kernel/qclb_x11.cpp    2.4  agulbra  +6 -5
+
+  call XInternAtoms() once instead of XInternAtom N times.  should
+  improve start-up time by about 3-5 times the ping time to the server.
+
+
+src/widgets/qlistbox.h    2.12  agulbra  +2 -1  (1997/11/09)
+
+  don't let down-arrow set the current item to be half-visible
+
+
+src/kernel/qpainter.cpp    2.17  hanord  +61 -5  (1997/11/12)
+src/kernel/qpainter.h    2.12  hanord  +2 -1
+
+  Added new begin() which takes a paint device and a widget to copy pen, font
+  etc. from.
+  Fixed inverted dense pattern on Windows.
+
+
+src/widgets/qslider.cpp    2.45  paul  +3 -2
+
+  fixing bug when setting value in constructor followed by resetting value
+  to zero.
+
+
+src/kernel/qimage.cpp    2.65.2.1  agulbra  +4 -4
+
+  avoid segfaults for image handlers where either read or
+  write is 0.  enables gif image handlers.
+
+
+src/qt.pro    2.6  agulbra  +4 -2  (1997/11/20)
+src/kernel/qdragobject.cpp    2.1  agulbra  initial checkin
+src/kernel/qdragobject.h    2.1  agulbra  initial checkin
+src/kernel/qevent.h    2.6  agulbra  +59 -2
+src/widgets/qlined.cpp    2.54  agulbra  +92 -3
+src/widgets/qlined.h    2.19  agulbra  +3 -1
+
+  QDragObject and related goodies.  not ready for prime time, but hey!
+
+
+src/widgets/qcombo.cpp    2.68  agulbra  +52 -2
+src/widgets/qcombo.h    2.20  agulbra  +5 -1
+
+  new function setListBox() - allows custom combos like the ones in ACT
+
+
+src/kernel/qapp_win.cpp    2.65  warwick  +4 -3
+src/kernel/qwid_win.cpp    2.43  warwick  +51 -19
+
+  Reimplement QWidget::recreate(), using almost same code as X11 version.
+
+
+src/kernel/qptr_win.cpp    2.21.2.1  hanord  +8 -8  (1997/11/25)
+
+  Fixed bad dense patterns
+
+
+src/widgets/qchkbox.cpp    2.17  warwick  +16 -7  (1997/11/28)
+src/widgets/qradiobt.cpp    2.21  warwick  +18 -7
+
+  Check pixmap in sizeHint()
+
+
+src/kernel/qpainter.h    2.14  hanord  +3 -1  (1997/12/02)
+
+  Added xForm and xFormDev with index,npoints arguments
+
+
+src/kernel/qpainter.cpp    2.19  hanord  +399 -2
+src/kernel/qptr_x11.cpp    2.31  hanord  +45 -333
+
+  Moved platform-independent xForm functions into qpainter.cpp.
+  Fixed bugs in drawPoints, drawPolyline, drawLineSegments and
+  drawPolygon where index > 0 or npoints < array size.
+  Added xForm(pointarray,index,size) and similar xFormDev().
+  Now Purify should shut up.
+  Removed some tests for cpen.style() != NoPen.  Makes some code
+  somewhat slower, but makes QPainter more consistent.
+
+
+src/kernel/qptd_x11.cpp    2.9  hanord  +11 -3
+src/kernel/qptr_x11.cpp    2.30  hanord  +11 -5
+
+  Set graphics exposures to FALSE except when bitBlt from widget to widget
+
+
+src/kernel/qpm_win.cpp    2.29  hanord  +12 -12
+
+  When converting an image to a pixmap, don't create a new pixmap unless
+  the depth or dimension changes.
+
+
+src/widgets/qlined.cpp    2.56  agulbra  +64 -41
+src/widgets/qlined.h    2.21  agulbra  +6 -3
+
+  various small fixes, mostly to draw correctly.  added setFont() and
+  setEnabled() to update correctly, I guess we need setStyle() and
+  setPalette() too.
+
+
+src/dialogs/qmsgbox.cpp    2.40  warwick  +8 -6  (1997/12/08)
+
+  Correct layout for text smaller than icon.
+
+
+src/widgets/qprogbar.cpp    2.15  warwick  +22 -8
+
+  Ensure display is up-to-date when a progress bar is re-used.
+
+
+src/kernel/qptr_x11.cpp    2.32  warwick  +4 -2
+
+  Fix out-of-bounds clipping.
+
+
+src/kernel/qapp_win.cpp    2.67  hanord  +23 -8
+
+  Get the app name even for console applications (when WinMain isn't called)
+
+
+src/kernel/qasyncimageio.cpp    1.23  warwick  +57 -26
+src/kernel/qasyncimageio.h    1.12  warwick  +2 -1
+
+  Handle nasty GIFs.
+
+
+src/widgets/qspinbox.cpp    2.24  aavit  +170 -25  (1997/12/09)
+src/widgets/qspinbox.h    2.14  aavit  +17 -8
+
+  Improved QSpinbox - now easier to subclass; and "Auto" choice added.
+
+
+src/tools/qregexp.cpp    2.6  hanord  +15 -12
+
+  Fixed serious bug: regular expression with characters > 127 now works.
+
+
+src/kernel/qprn_x11.cpp    2.6  warwick  +3 -3
+
+  QPrinter::newPage() previous always returned FALSE.  Fixed.
+
+
+src/widgets/qscrbar.cpp    2.30  agulbra  +6 -6
+
+  be a bit kinder and gentler about the hot zone in windows style.  the
+  old limit (30 pixels to either side of the bar) was too tight
+
+
+src/kernel/qapp_win.cpp    2.68  hanord  +6 -3  (1997/12/15)
+
+  Fixed the modal loop problem related to synch popups with signals
+
+
+src/widgets/qlined.cpp    2.57  agulbra  +8 -8  (1998/01/05)
+
+  don't allow paste from ****'ed line edits
+
+
+src/kernel/qasyncimageio.cpp    1.25  warwick  +14 -6  (1998/01/06)
+
+  Be more forgiving about broken GIF - as forgiving as netscape
+
+
+src/kernel/qasyncimageio.cpp    1.24  warwick  +5 -2
+
+  Protection against more broken GIFs.
+
+
+extensions/xt/doc.conf    1.1  warwick  initial checkin  (1998/01/07)
+extensions/xt/doc/annotated.doc    1.1  warwick  initial checkin
+extensions/xt/doc/classes.doc    1.1  warwick  initial checkin
+extensions/xt/doc/examples.doc    1.1  warwick  initial checkin
+extensions/xt/doc/index.doc    1.1  warwick  initial checkin
+extensions/xt/examples/mainlyMotif/editor.cpp    1.1  warwick  initial checkin
+extensions/xt/examples/mainlyMotif/editor.pro    1.1  warwick  initial checkin
+extensions/xt/examples/mainlyQt/editor.cpp    1.1  warwick  initial checkin
+extensions/xt/examples/mainlyQt/editor.pro    1.1  warwick  initial checkin
+extensions/xt/examples/mainlyXt/editor.cpp    1.1  warwick  initial checkin
+extensions/xt/examples/mainlyXt/editor.pro    1.1  warwick  initial checkin
+extensions/xt/src/qxt.cpp    1.1  warwick  initial checkin
+extensions/xt/src/qxt.h    1.1  warwick  initial checkin
+extensions/xt/src/qxt.pro    1.1  warwick  initial checkin
+
+  Qt Xt/Motif Extension, examples, docs.
+
+
+src/kernel/qevent.cpp    2.7  paul  +48 -9  (1998/01/08)
+src/kernel/qevent.h    2.9  paul  +17 -1
+src/kernel/qgmanagr.cpp    2.22  paul  +97 -10
+src/kernel/qgmanagr.h    2.7  paul  +3 -1
+src/kernel/qlayout.cpp    2.27  paul  +2 -23
+src/kernel/qwid_win.cpp    2.44  paul  +19 -3
+src/kernel/qwidget.cpp    2.85  paul  +10 -2
+
+  New events ChildInserted, ChildRemoved and LayoutHint. Not tested on Windows.
+  Use new events in GM.
+
+
+src/qt.pro    2.11  paul  +2 -0
+src/widgets/qsplitter.cpp    1.1  paul  initial checkin
+src/widgets/qsplitter.h    1.1  paul  initial checkin
+
+  New widget QSplitter
+
+
+src/kernel/qpntarry.cpp    2.12  warwick  +4 -4
+
+  Fix quad bezier for small curves
+
+
+src/kernel/qwidget.cpp    2.87  agulbra  +71 -16
+src/kernel/qwidget.h    2.38  agulbra  +5 -2
+src/kernel/qwindefs.h    2.20  agulbra  +2 -1
+
+  added setAutoMinimumSize().  fixed a couple of documentation errors.
+
+
+src/kernel/qwid_win.cpp    2.45  warwick  +4 -3  (1998/01/13)
+
+  Fix case of recreate(0,...) on tlw.
+
+
+src/widgets/qbutton.cpp    2.40.2.1  agulbra  +7 -7
+
+  paint correctly when there is a background color
+
+
+src/widgets/qlined.cpp    2.58  paul  +18 -8  (1998/01/14)
+
+  Correct cursor when end(). Better blinking
+
+
+src/dialogs/qtabdlg.cpp    2.36  agulbra  +172 -213
+src/dialogs/qtabdlg.h    2.17  agulbra  +2 -1
+src/kernel/qgmanagr.cpp    2.23  agulbra  +22 -21
+src/widgets/qtabbar.cpp    2.30  agulbra  +12 -15
+src/widgets/qwidgetstack.cpp    2.1  agulbra  initial checkin
+src/widgets/qwidgetstack.h    2.1  agulbra  initial checkin
+
+  The new class QWidgetStack encapsulates a bunch of widgets of the same
+  size, where the one on top of the stack is visible.  It provides slots
+  to raise any of the widgets to the top of the stack and so on.
+  
+  QTabDialog now uses QWidgetStack.  A couple of hacks went away, and it
+  now uses QBoxLayout to manage its children.  Some more minor changes
+  are desirable here.
+  
+  QTabBar now uses autoMinimumSize() appropriately, and is closer to the
+  new Windows look and feel (ie. it lost the bold stuff).  QTabDialog is
+  adapted accordingly.
+  
+  QGManager now has a one-line VERY INEFFICENT fix that SORELY NEEDS
+  OPTIMIZATION to make layout hint events propagate outwards correctly.
+  There's about twenty hashes on the relevant line.  This change is the
+  whole point of the check-in: Most things that use QWidgetStack will
+  really need this fix.  Paul, optimize it, please?
+
+
+src/kernel/qobject.cpp    2.42  agulbra  +13 -2
+
+  show geometry and visibility too in dumpObjectTree()
+
+
+src/qt.pro    2.12  agulbra  +10 -0
+src/widgets/qmainwindow.cpp    2.1  agulbra  initial checkin
+src/widgets/qmainwindow.h    2.1  agulbra  initial checkin
+src/widgets/qstatusbar.cpp    2.1  agulbra  initial checkin
+src/widgets/qstatusbar.h    2.1  agulbra  initial checkin
+src/widgets/qtoolbar.cpp    2.1  agulbra  initial checkin
+src/widgets/qtoolbar.h    2.1  agulbra  initial checkin
+src/widgets/qtoolbutton.cpp    2.1  agulbra  initial checkin
+src/widgets/qtoolbutton.h    2.1  agulbra  initial checkin
+
+  several new classes.  very rough and ready, but they're good enough to
+  talk about and play with.
+
+
+src/widgets/qframe.cpp    2.11  paul  +33 -5
+src/widgets/qframe.h    2.4  paul  +8 -2
+
+  New function setMargin()
+
+
+examples/showimg/showimg.cpp    2.18  warwick  +25 -6  (1998/01/21)
+examples/showimg/showimg.h    2.6  warwick  +3 -1
+src/kernel/qimage.h    2.22  warwick  +5 -1
+
+  QImage::smoothScale(int with, int height)
+
+
+src/widgets/qpopmenu.h    2.10  agulbra  +3 -2
+
+  new signal aboutToShow(), like the one in QTabDialog.
+
+
+src/tools/qstring.cpp    2.16  warwick  +44 -3  (1998/01/23)
+
+  Make QString implicitly shared.  Activates in Qt 2.00.
+  Try enabling this protection next time you have some weird bug.
+
+
+src/kernel/qclb_x11.cpp    2.6  hanord  +155 -46
+
+  INCR paste works.
+
+
+src/qt.pro    2.13  agulbra  +2 -0
+src/widgets/qwhatsthis.cpp    2.1  agulbra  initial checkin
+src/widgets/qwhatsthis.h    2.1  agulbra  initial checkin
+
+  what's this?  
+  it's not perfect, but it definitely is nice.
+
+
+extensions/imageio/src/qpngio.cpp    1.6  warwick  +9 -4  (1998/01/27)
+
+  Don't set alpha if not necessary.
+
+
+src/kernel/qpm_win.cpp    2.31  hanord  +5 -11
+
+  Preserves mask when converting an image to a pixmap
+
+
+src/kernel/qapp.cpp    2.42  agulbra  +7 -7
+
+  corrected dark shadow colour - has been too dark since warwick fixed
+  QColor::dark().
+
+
+src/kernel/qprn_win.cpp    2.6  hanord  +11 -5
+
+  Printing now works on DeskJet 890c (StretchDIBits didn't work)
+  We now do StretchBlt.
+
+
+src/widgets/qpopmenu.h    2.12  warwick  +2 -1  (1998/02/06)
+
+  Allow position in QPopupMenu::exec(...)
+
+
+src/kernel/qpntarry.cpp    2.13  warwick  +14 -15
+
+  QPointArray::makeArc() now works with negative "alen" angle.
+   - QPainter::drawArc() uses this for arcs under transformation.
+
+
+src/widgets/qbttngrp.cpp    2.8  aavit  +34 -10
+src/widgets/qbttngrp.h    2.3  aavit  +2 -1
+
+  bugfix: Untoggling of other buttons in an exclusive group
+  if a button was set with setChecked() did not work.
+
+
+src/widgets/qslider.cpp    2.47  agulbra  +15 -28
+
+  made valueChanged() work correctly with middle-button dragging when
+  !tracking().  simplified the mouse state machine a little.
+
+
+src/tools/qdir.cpp    2.16  hanord  +4 -8  (1998/02/11)
+src/tools/qfile.cpp    2.13  hanord  +36 -2
+src/tools/qfile.h    2.3  hanord  +4 -1
+
+  Added QFile::remove() which removes a file
+
+
+src/widgets/qlined.cpp    2.60  agulbra  +12 -2  (1998/02/19)
+src/widgets/qlined.h    2.23  agulbra  +5 -3
+
+  add clear(), make setText() and insert() public
+
+
+src/widgets/qlistview.cpp    2.52  agulbra  +33 -2
+src/widgets/qlistview.h    2.25  agulbra  +3 -1
+
+  added a sizeHint()
+
+
+src/tools/qdir.cpp    2.17  agulbra  +4 -4
+src/tools/qfileinf.cpp    2.7  agulbra  +5 -4
+
+  do what the docs say for absFilePath() (ie. no /usr/../usr/bin/ls names)
+
+
+src/widgets/qtablevw.cpp    2.41  agulbra  +31 -23
+
+  scrollLast*Cell and clipToCell could not be combined.  now they can.
+
+
+src/widgets/qframe.cpp    2.13  warwick  +4 -4  (1998/02/20)
+
+  Fix Box and H/VLine frames with margin() != 0.
+
+
+src/qt.pro    2.15  warwick  +2 -0
+src/widgets/qlabelled.cpp    1.1  warwick  initial checkin
+src/widgets/qlabelled.h    1.1  warwick  initial checkin
+
+  QLabelled widget (experimental)
+
+
+src/kernel/qapp.cpp    2.45  agulbra  +28 -13
+src/kernel/qapp_win.cpp    2.73  agulbra  +14 -13
+
+  deliver mouse events to application-wide event filters even if the
+  receiver object is disabled.  this allows tooltips to work for
+  disabled widgets.
+
+
+src/widgets/qcombo.h    2.23  agulbra  +3 -2
+
+  make eventFilter() public.  this may break binary compatibility on
+  msvc++, if anyone's built a dll yet.
+
+
+src/widgets/qradiobt.cpp    2.23  agulbra  +7 -17
+
+  support exclusive button group behaviour even when one of the buttons
+  is not a QRadioButton.
+
+
+src/qt.pro    2.16  paul  +6 -0
+src/widgets/qgrid.cpp    1.1  paul  initial checkin
+src/widgets/qgrid.h    1.1  paul  initial checkin
+src/widgets/qhbox.cpp    1.1  paul  initial checkin
+src/widgets/qhbox.h    1.1  paul  initial checkin
+src/widgets/qvbox.cpp    1.1  paul  initial checkin
+src/widgets/qvbox.h    1.1  paul  initial checkin
+
+  New layout widgets
+
+
+src/tools/qdstream.h    2.4  warwick  +2 -2
+
+  QDataStream::eof() now returns TRUE if no device is set (as documented).
+
+
+src/tools/qfile.cpp    2.14  warwick  +36 -19
+src/tools/qiodev.cpp    2.8  warwick  +8 -5
+
+  Test the file in QFile::open(FILE*) to see if it is seekable (not a
+  char device, fifo, or socket), rather than assuming stdin/out/err are not.
+  Set type to Sequential for such files, not default Direct.
+  
+  Don't use feof(fh) to mean at()==size().  QFile::atEnd() now works the
+  same as QIODevice and QBuffer.
+  
+  setStatus(IO_ReadError) in appropriate places (wasn't ever set for files).
+  Reading EOF is considered an error in the QIODevice model (see QBuffer).
+
+
+src/kernel/qasyncimageio.cpp    1.26  warwick  +37 -30
+src/kernel/qasyncimageio.h    1.13  warwick  +2 -2
+
+  Work for even weirder GIFs.
+
+
+src/tools/qfile.cpp    2.16  agulbra  +5 -4  (1998/02/25)
+
+  -1 in case of error...
+
+
+src/qt.pro    2.17  paul  +2 -0
+src/widgets/qbuttonrow.cpp    1.1  paul  initial checkin
+src/widgets/qbuttonrow.h    1.1  paul  initial checkin
+
+  New layout widget
+
+
+examples/aclock/GNUmakefile    2.1  hanord  initial checkin
+examples/aclock/Makefile    2.2  hanord  +6 -53
+examples/aclock/aclock.pro    1.4  hanord  +6 -6
+examples/application/GNUmakefile    1.1  hanord  initial checkin
+examples/application/application.pro    1.2  hanord  +6 -6
+examples/biff/GNUmakefile    2.1  hanord  initial checkin
+examples/biff/Makefile    2.2  hanord  +6 -54
+examples/biff/biff.pro    1.4  hanord  +6 -6
+examples/connect/GNUmakefile    2.1  hanord  initial checkin
+examples/connect/Makefile    2.2  hanord  +6 -46
+examples/connect/connect.pro    1.4  hanord  +5 -5
+examples/cursor/GNUmakefile    2.1  hanord  initial checkin
+examples/cursor/Makefile    2.2  hanord  +6 -46
+examples/cursor/cursor.pro    1.4  hanord  +5 -5
+examples/dclock/GNUmakefile    2.1  hanord  initial checkin
+examples/dclock/Makefile    2.2  hanord  +6 -54
+examples/dclock/dclock.pro    1.4  hanord  +6 -6
+examples/desktop/GNUmakefile    2.1  hanord  initial checkin
+examples/desktop/Makefile    2.2  hanord  +6 -46
+examples/desktop/desktop.pro    1.4  hanord  +5 -5
+examples/dirview/GNUmakefile    1.1  hanord  initial checkin
+examples/drawdemo/GNUmakefile    2.1  hanord  initial checkin
+examples/drawdemo/Makefile    2.2  hanord  +6 -52
+examples/drawdemo/drawdemo.pro    1.4  hanord  +5 -5
+examples/forever/GNUmakefile    2.1  hanord  initial checkin
+examples/forever/Makefile    2.3  hanord  +6 -42
+examples/forever/forever.pro    1.4  hanord  +5 -5
+examples/hello/GNUmakefile    2.1  hanord  initial checkin
+examples/hello/Makefile    2.8  hanord  +6 -61
+examples/hello/hello.pro    1.5  hanord  +6 -5
+examples/layout/GNUmakefile    1.1  hanord  initial checkin
+examples/layout/Makefile    1.11  hanord  +7 -50
+examples/layout/layout.pro    1.5  hanord  +5 -4
+examples/life/GNUmakefile    2.1  hanord  initial checkin
+examples/life/Makefile    2.2  hanord  +6 -57
+examples/life/life.pro    2.3  hanord  +8 -8
+examples/menu/GNUmakefile    2.1  hanord  initial checkin
+examples/menu/Makefile    2.4  hanord  +6 -55
+examples/menu/menu.pro    2.3  hanord  +5 -5
+examples/movies/GNUmakefile    1.1  hanord  initial checkin
+examples/movies/Makefile    1.11  hanord  +6 -50
+examples/movies/movies.pro    1.4  hanord  +5 -5
+examples/network/GNUmakefile    1.1  hanord  initial checkin
+examples/network/Makefile    1.7  hanord  +6 -82
+examples/picture/GNUmakefile    2.1  hanord  initial checkin
+examples/picture/Makefile    2.2  hanord  +6 -49
+examples/picture/picture.pro    1.2  hanord  +6 -3
+examples/pref/GNUmakefile    1.1  hanord  initial checkin
+examples/pref/Makefile    1.4  hanord  +6 -53
+examples/pref/pref.pro    1.4  hanord  +6 -6
+examples/progress/GNUmakefile    1.1  hanord  initial checkin
+examples/progress/Makefile    1.9  hanord  +6 -47
+examples/progress/progress.pro    1.3  hanord  +5 -5
+examples/qmag/GNUmakefile    2.1  hanord  initial checkin
+examples/qmag/Makefile    2.2  hanord  +6 -52
+examples/qmag/qmag.pro    2.3  hanord  +5 -5
+examples/qwerty/GNUmakefile    1.1  hanord  initial checkin
+examples/qwerty/Makefile    1.6  hanord  +5 -66
+examples/qwerty/qwerty.pro    1.4  hanord  +6 -6
+examples/scrollview/GNUmakefile    1.1  hanord  initial checkin
+examples/scrollview/Makefile    1.4  hanord  +6 -56
+examples/scrollview/scrollview.pro    1.3  hanord  +5 -5
+examples/sheet/GNUmakefile    2.1  hanord  initial checkin
+examples/sheet/Makefile    2.3  hanord  +6 -59
+examples/showimg/GNUmakefile    2.1  hanord  initial checkin
+examples/showimg/Makefile    2.12  hanord  +6 -58
+examples/showimg/showimg.pro    2.7  hanord  +6 -9
+examples/table/GNUmakefile    1.1  hanord  initial checkin
+examples/table/Makefile    1.5  hanord  +5 -67
+examples/table/table.pro    1.4  hanord  +6 -6
+examples/tetrix/GNUmakefile    2.1  hanord  initial checkin
+examples/tetrix/Makefile    2.5  hanord  +6 -70
+examples/tetrix/tetrix.pro    2.4  hanord  +14 -14
+examples/tictac/GNUmakefile    2.1  hanord  initial checkin
+examples/tictac/Makefile    2.2  hanord  +6 -54
+examples/tictac/tictac.pro    2.3  hanord  +6 -6
+examples/timestmp/GNUmakefile    2.1  hanord  initial checkin
+examples/timestmp/Makefile    2.2  hanord  +6 -46
+examples/tooltip/GNUmakefile    1.1  hanord  initial checkin
+examples/tooltip/Makefile    1.3  hanord  +6 -53
+examples/tooltip/tooltip.pro    1.3  hanord  +6 -6
+examples/validator/GNUmakefile    1.1  hanord  initial checkin
+examples/validator/Makefile    1.3  hanord  +6 -38
+examples/widgets/GNUmakefile    2.1  hanord  initial checkin
+examples/widgets/Makefile    2.4  hanord  +6 -67
+examples/widgets/widgets.pro    2.3  hanord  +5 -9
+examples/xform/GNUmakefile    2.1  hanord  initial checkin
+examples/xform/Makefile    2.4  hanord  +6 -52
+examples/xform/xform.pro    2.3  hanord  +6 -5
+src/GNUmakefile    2.1  hanord  initial checkin
+src/Makefile    2.22  hanord  +6 -156
+
+  New makefile system
+
+
+src/widgets/qframe.cpp    2.14  agulbra  +6 -6
+
+  no reason to call drawContents() in [HV]Line mode
+
+
+src/kernel/qfont.cpp    2.18  warwick  +3 -2
+src/kernel/qfontdta.h    2.8  warwick  +2 -1
+src/kernel/qfontmet.h    2.6  warwick  +9 -3
+src/kernel/qpainter.cpp    2.20  warwick  +564 -2
+src/kernel/qpainter.h    2.16  warwick  +2 -1
+src/kernel/qptr_x11.cpp    2.34  warwick  +2 -546
+
+  QPainter::drawText(...tf...) now takes into account the left and
+  right bearings of the font.  The bounding rectangle of text may now
+  be slightly larger (particularly italic text).  QFontMetrics has
+  the additional functionality allowing this.
+
+
+src/kernel/qaccel.cpp    2.8  agulbra  +70 -2  (1998/02/28)
+
+  added common accelerator keys for later inclusion into docs
+
+
+src/kernel/qfont.cpp    2.21  warwick  +110 -2  (1998/03/01)
+src/kernel/qfontmet.h    2.8  warwick  +7 -1
+src/kernel/qpainter.cpp    2.22  warwick  +43 -26
+src/kernel/qpainter.h    2.17  warwick  +5 -1
+src/widgets/qchkbox.cpp    2.18  warwick  +23 -29
+src/widgets/qpushbt.cpp    2.35  warwick  +5 -5
+src/widgets/qradiobt.cpp    2.24  warwick  +24 -29
+
+  QFontMetrics::size() and QFontMetrics::boundingRect() with all the
+  functionality of QPainter::boundingRect() - code now shared.
+  
+  Use QFontMetrics::size() in button size hints, thus allowing multi-line
+  button labels.  Position checkbox/radiobutton top-left.
+
+
+src/kernel/qpm_x11.cpp    2.30  eiriken  +78 -3  (1998/03/02)
+
+  Fix convertToImage() for pixmaps with other than 8-bit-per-channel.
+
+
+src/kernel/qpixmap.cpp    2.24  hanord  +7 -33
+src/kernel/qpixmap.h    2.16  hanord  +21 -2
+src/kernel/qpm_win.cpp    2.32  hanord  +110 -51
+src/kernel/qpm_x11.cpp    2.31  hanord  +165 -84
+src/kernel/qptd_win.cpp    2.7  hanord  +102 -29
+src/kernel/qptd_x11.cpp    2.10  hanord  +41 -11
+
+  Implemented masked bitBlt for Windows 95.
+  Added QPixmap::setOptimization() which replaces the old optimize function.
+  E.g. setOptimization(QPixmap::BestOptim) to get much faster masked bitBlts.
+  Removed the dirty system, instead delete cached data whenever the pixmap
+  is changed.
+
+
+src/kernel/qprinter.h    2.3  eiriken  +6 -1
+src/kernel/qprn_win.cpp    2.7  eiriken  +17 -7
+src/kernel/qprn_x11.cpp    2.7  eiriken  +10 -5
+src/kernel/qpsprn.cpp    2.9  eiriken  +8 -10
+
+  Take display vs. font resolution into account for printer font metrics.
+
+
+src/kernel/qpshdr.txt    2.3  agulbra  +91 -3
+src/kernel/qpsprn.cpp    2.10  agulbra  +644 -88
+
+  added iso-8859-1 support
+  
+  also added better font support.  try to print palatino, and the printer
+  goes "hm, is palatino installed?  if not, perhaps garamond is installed?
+  if not, is times installed?  if not, well, courier MUST work".
+  
+  finally, if I understand the postscript book correctly I think I made
+  two-font postscript text output a little faster.  the code now attempts
+  to use variables for fonts and call findfont/makefont just once per font
+  change per page.
+  
+  this code is not perfect.  the hacky stuff that does font substitution
+  needs tweaking, and at present the code believes that all the world is
+  iso-8859-1.  will fix that.
+  
+  postscript is fun.
+
+
+src/widgets/qmenudta.cpp    2.10  warwick  +4 -4
+
+  Fix this->changeItem(this->pixmap(), "crashme")
+
+
+src/kernel/qapp_win.cpp    2.74  agulbra  +7 -2  (1998/03/10)
+
+  Set WState_Visible correctly when the window is (de)iconified.
+  
+
+src/kernel/qdrawutl.cpp    2.16  warwick  +5 -3  (1998/03/11)
+src/kernel/qpmcache.cpp    2.3  warwick  +77 -5
+src/kernel/qpmcache.h    2.3  warwick  +3 -1
+src/kernel/qptr_x11.cpp    2.36  warwick  +5 -3
+src/tools/qgcache.cpp    2.5  warwick  +10 -2
+
+  Fix extremely-unlikely-to-be-triggered undeleted cached pixmaps.
+  Provide safer QPixmapCache find() and insert().
+
+
+src/widgets/qbutton.h    2.14  agulbra  +3 -2  (1998/03/12)
+
+  add toggle()
+
+
+src/tools/qregexp.cpp    2.7  agulbra  +23 -18
+
+  implement [] in wildcard mode
+
+
+src/kernel/qobject.cpp    2.44  agulbra  +29 -11
+src/kernel/qobject.h    2.9  agulbra  +5 -1
+src/widgets/qbuttonrow.cpp    1.3  agulbra  +8 -6
+src/widgets/qframe.cpp    2.16  agulbra  +4 -4
+src/widgets/qheader.cpp    2.30  agulbra  +6 -4
+src/widgets/qlcdnum.cpp    2.9  agulbra  +7 -5
+src/widgets/qmainwindow.cpp    2.9  agulbra  +4 -3
+src/widgets/qscrbar.cpp    2.33  agulbra  +14 -14
+src/widgets/qslider.cpp    2.48  agulbra  +4 -4
+src/widgets/qtablevw.cpp    2.42  agulbra  +10 -8
+src/widgets/qtoolbar.cpp    2.10  agulbra  +4 -4
+
+  provide QObject::name( const char * defaultName ).
+  
+  use name( "unnamed" ) in all the debug() calls, to avoid segfaults
+  where printf() won't handle null pointers.
+
+
+src/tools/qstring.cpp    2.18  agulbra  +5 -9
+
+  toDouble() of a null string now sets ok to FALSE
+
+
+src/widgets/qcombo.cpp    2.73  agulbra  +54 -49
+src/widgets/qcombo.h    2.25  agulbra  +3 -1
+
+  tweaked size hint for toolbar use.  provide functions to change the
+  line-edit without changint the combo's contents.
+
+
+src/kernel/qapp_win.cpp    2.78  warwick  +13 -2
+
+  Don't let Windows beep on WM_SYSCHAR events.
+  Beep on unaccepted accelerations.
+
+
+src/kernel/qpainter.cpp    2.29  hanord  +96 -17
+src/kernel/qptr_x11.cpp    2.40  hanord  +2 -70
+
+  Fixed QPainter::drawPixmap() bug (mono bitmaps with self-masks)
+  Moved platform indep. code to qpainter.cpp
+  Put back CtorBegin
+
+
+src/widgets/qbttngrp.cpp    2.9  agulbra  +14 -2
+src/widgets/qbttngrp.h    2.5  agulbra  +3 -1
+
+  added setButton() - very useful when you want to force one member of
+  an exclusive button group to on but not keep around pointers to
+  umpteen radio buttons.
+
+
+src/kernel/qprinter.cpp    2.5  agulbra  +31 -6
+src/kernel/qprinter.h    2.5  agulbra  +6 -2
+
+  added setPageOrder()
+
+
+src/kernel/qobject.cpp    2.45  agulbra  +18 -2
+
+  give better warnings in case of connect() mismatches.
+
+
+src/dialogs/qprndlg.cpp    2.4  agulbra  +258 -112
+src/dialogs/qprndlg.h    2.5  agulbra  +9 -2
+
+  it's finished.  please have a look.  and please do debug.  I don't
+  know about any bugs now, but I'm sure there are some.
+
+
+src/widgets/qcombo.cpp    2.75  agulbra  +15 -6
+
+  magic hack to make combos usable in dialogs.  (QDialog breaks the
+  combo Enter key press.)
+
+
+src/dialogs/qprndlg.cpp    2.3  agulbra  +543 -187
+src/dialogs/qprndlg.h    2.4  agulbra  +24 -10
+src/kernel/qprn_x11.cpp    2.8  agulbra  +4 -2
+
+  new better-looking print dialog and a new static function to configure
+  a QPrinter (replaces QPrinter::setup() - kernel/* should not use
+  dialogs/*).
+  
+  noteworthy points:
+  
+   - the new static function appears to write over something it
+     shouldn't.  I don't see why, but it does seem to cause crashes
+     later on.  the old function works.  I'm committing so I can run
+     purify on solaris.
+   - the dialog lacks accelerators.
+   - I haven't put in solaris /etc/lp/ support yet.  should be fairly
+     easy, but I haven't done it.
+   - the layout will benefit from Warwick's alternative space
+     distribution
+   - the awful message in qprndlg.h is gone gone gone.
+
+
+src/dialogs/qprndlg.cpp    2.5  agulbra  +119 -23  (1998/03/15)
+
+  /etc/lp support
+
+
+src/widgets/qcombo.cpp    2.76  agulbra  +2 -3
+
+  don't ignore key events, just don't accept them.
+
+
+src/kernel/qapp.cpp    2.48  agulbra  +3 -2
+src/kernel/qfont.cpp    2.27  agulbra  +11 -5
+
+  look at $LANG and try to pick an application font that suits $LANG.
+  the application font used is 12-point helvetica.  if the locale isn't
+  in the list I built from XFree86's locale.alias, I assume 8859-1 is
+  okay.
+  
+  copy character set from defFont in the relevant QFont constructor.
+  
+  this code assumes that helvetica includes the appropriate character
+  set.
+
+
+examples/qmag/qmag.cpp    2.13  warwick  +39 -2
+
+  Crazy hard-disk chewing MultiSave option.  Great when you want to make
+  animated GIFs for your web pages.
+
+
+src/dialogs/qprndlg.cpp    2.8  warwick  +4 -4
+src/kernel/qsize.cpp    2.6  warwick  +9 -3
+src/kernel/qsize.h    2.6  warwick  +9 -3
+
+  Add QSize::expandedTo(), and boundedTo().
+
+
+src/kernel/qwidget.cpp    2.92  agulbra  +7 -6
+
+  remove the widget's willingness to accept focus-in events very early
+  in the destructor
+
+
+src/tools/qgdict.cpp    2.11  warwick  +56 -11  (1998/03/17)
+src/tools/qgdict.h    2.3  warwick  +3 -1
+
+  Add QDict::resize(int).
+
+
+src/widgets/qlined.cpp    2.64  agulbra  +46 -9
+src/widgets/qlined.h    2.25  agulbra  +6 -2
+
+  add setSelection() and setCursorPosition()
+
+
+src/widgets/qcombo.cpp    2.77  agulbra  +86 -11
+src/widgets/qcombo.h    2.26  agulbra  +4 -1
+
+  setAutoCompletion() - works really nicely.
+
+
+src/kernel/qiconset.cpp    2.1  agulbra  initial checkin
+src/kernel/qiconset.h    2.1  agulbra  initial checkin
+
+  QIconSet first checking.  QIconSet is neat: You give it one or more
+  icons, and it completes the set so you get large and small disabled,
+  active and normal icons.  QToolButton uses it, QMenuData will soon.
+
+
+src/kernel/qpainter.cpp    2.31  agulbra  +18 -2
+src/kernel/qpainter.h    2.22  agulbra  +2 -1
+
+  added drawImage() by request of eng.  did NOT implement the QPrinter
+  shortcut he asked for.
+
+
+src/kernel/qapp.cpp    2.49  warwick  +10 -6  (1998/03/19)
+
+  Ensure mouserelease goes to widget that got mousepress.
+  Document -ncols better.
+
+
+examples/qdir/GNUmakefile    1.1  warwick  initial checkin
+examples/qdir/Makefile    1.1  warwick  initial checkin
+examples/qdir/qdir.cpp    1.1  warwick  initial checkin
+
+  Tests QFileDialog features.
+
+
+extensions/nsplugin/src/qnp.cpp    1.18  warwick  +4 -1
+
+  Work for multi-visual displays.
+
+
+extensions/opengl/examples/box/.cvsignore    1.2  aavit  +0 -1
+extensions/opengl/examples/box/glbox.cpp    1.4  aavit  +15 -6
+extensions/opengl/examples/box/glbox.h    1.5  aavit  +2 -1
+extensions/opengl/examples/gear/gear.cpp    1.5  aavit  +26 -35
+extensions/opengl/src/qgl.cpp    1.18  aavit  +127 -41
+extensions/opengl/src/qgl.h    1.8  aavit  +80 -77
+
+  New features in OpenGL extension:
+  1) virtual initalizeGL() method in QGLWidget; facilitates easier GL initialization.
+  2) Added support for using shared OpenGL display lists
+  3) Added sharedbox example showing this feature.
+
+
diff --git a/dist/changes-1.39-19980406 b/dist/changes-1.39-19980406
new file mode 100644
index 0000000..63b3dbb
--- /dev/null
+++ b/dist/changes-1.39-19980406
@@ -0,0 +1,286 @@
+src/kernel/qpainter.cpp    2.127  agulbra  +37 -6  (1998/03/30)
+
+  sort of parse $LANG
+
+
+src/kernel/qpainter.cpp    2.35  warwick  +5 -4  (1998/03/30)
+
+  Fix TAB expansion in QPainter::drawText (and hence QMultiLineEdit).
+
+
+src/widgets/qlined.cpp    2.68  agulbra  +3 -3
+
+  didn't repaint cursor properly when moving the cursor leftwards
+
+
+src/kernel/qfnt_x11.cpp    2.34  warwick  +20 -13  (1998/03/31)
+
+  Some fonts don't have per_char information.
+
+
+src/kernel/qrgn_win.cpp    2.6  hanord  +11 -9  (1998/04/01)
+
+  Bug fixes for the new getRects and boundingRect functions
+
+
+src/kernel/qregion.h    2.8  hanord  +4 -1
+src/kernel/qrgn_win.cpp    2.5  hanord  +42 -2
+src/kernel/qrgn_x11.cpp    2.5  hanord  +50 -2
+
+  New QRegion functions:
+    boundingRect() returns the bounding rectangle of the region
+    getRects() returns an array of the rectangles that make up the region
+
+
+src/widgets/qmainwindow.cpp    2.13  agulbra  +46 -3  (1998/04/02)
+src/widgets/qmainwindow.h    2.9  agulbra  +9 -4
+src/widgets/qtoolbar.cpp    2.15  agulbra  +20 -5
+src/widgets/qtoolbar.h    2.7  agulbra  +5 -2
+src/widgets/qtoolbutton.cpp    2.20  agulbra  +25 -17
+
+  button pixmap size change support
+
+
+src/kernel/qiconset.cpp    2.5  agulbra  +18 -4
+src/kernel/qiconset.h    2.3  agulbra  +4 -3
+src/widgets/qpushbt.cpp    2.37  agulbra  +62 -3
+src/widgets/qpushbt.h    2.7  agulbra  +5 -1
+src/widgets/qtoolbutton.cpp    2.19  agulbra  +31 -5
+src/widgets/qtoolbutton.h    2.4  agulbra  +6 -2
+
+  new functionality, menu buttons
+
+
+src/kernel/qgmanagr.cpp    2.30  paul  +18 -2
+src/kernel/qgmanagr.h    2.11  paul  +3 -2
+src/widgets/qhbox.cpp    1.9  paul  +53 -2
+src/widgets/qhbox.h    1.6  paul  +6 -1
+
+  pack() added, addStretch() now work
+
+
+src/kernel/qpainter.cpp    2.37  warwick  +36 -8  (1998/04/03)
+src/kernel/qpainter.h    2.23  warwick  +11 -1
+
+  Add more QPainter::drawImage calls (but still not implement QPrinter stuff)
+
+
+src/widgets/qmainwindow.cpp    2.14  warwick  +4 -4
+src/widgets/qmainwindow.h    2.10  warwick  +2 -2
+
+  Allow WFlags to QMainWindow.
+
+
+src/kernel/qregion.cpp    2.7  warwick  +4 -2
+src/kernel/qrgn_x11.cpp    2.6  warwick  +4 -3
+
+  Disable BOP
+
+
+src/widgets/qscrollview.cpp    2.23  warwick  +7 -5
+src/widgets/qscrollview.h    2.13  warwick  +2 -2
+
+  Emit signal earlier.
+
+
+src/widgets/qscrollview.cpp    2.22  warwick  +34 -16
+src/widgets/qscrollview.h    2.12  warwick  +3 -1
+
+  Low level hook for painting on existing painter.
+  Direct position set function.
+
+
+src/kernel/qimage.cpp    2.80  warwick  +64 -6
+
+  Optimize a very common case.
+
+
+examples/showimg/showimg.cpp    2.21  warwick  +67 -9
+examples/showimg/showimg.h    2.8  warwick  +7 -0
+
+  Use new QImage bitBlt
+
+
+src/dialogs/qprndlg.cpp    2.15  agulbra  +35 -2
+src/dialogs/qprndlg.h    2.8  agulbra  +2 -1
+src/kernel/qprinter.cpp    2.7  agulbra  +53 -8
+src/kernel/qprinter.h    2.6  agulbra  +6 -2
+
+  added QPrinter::ColorMode and corresponding stuff in the printer
+  dialog.
+
+
+src/kernel/qimage.cpp    2.79  warwick  +183 -3
+src/kernel/qimage.h    2.25  warwick  +16 -1
+src/kernel/qpaintd.h    2.6  warwick  +5 -1
+src/kernel/qpainter.cpp    2.36  warwick  +12 -2
+src/kernel/qpixmap.h    2.19  warwick  +3 -1
+
+  bitBlt for QImages
+     - copy image subarea to position in paintdevice or an image
+
+
+src/kernel/qgmanagr.cpp    2.31  paul  +89 -25
+
+  handle empty layouts in a slightly better way
+
+
+src/dialogs/qprndlg.cpp    2.17  agulbra  +14 -5
+
+  move focus intelligently when the users clicks 'print to file' or
+  'print to printer'
+
+
+src/dialogs/qfiledlg.cpp    2.51  agulbra  +64 -4
+src/dialogs/qfiledlg.h    2.13  agulbra  +5 -1
+
+  new function, addWidgets().  very limited extensibility, designed so
+  that it's easier to reimplement it as syntax sugar if/when we put in a
+  proper extension method.
+
+
+src/dialogs/qprndlg.cpp    2.16  agulbra  +7 -12
+
+  no A3
+
+
+src/dialogs/qfiledlg.cpp    2.52  agulbra  +11 -7
+
+  save a little memory, be a little bug-free
+
+
+src/widgets/qcombo.cpp    2.81  agulbra  +24 -19
+
+  use 1-pixel frame around lineedit in motif style.
+
+
+src/widgets/qmainwindow.cpp    2.15  agulbra  +82 -14
+src/widgets/qmainwindow.h    2.11  agulbra  +7 -4
+src/widgets/qtoolbar.cpp    2.16  agulbra  +46 -11
+src/widgets/qtoolbar.h    2.8  agulbra  +8 -2
+src/widgets/qtoolbutton.cpp    2.21  agulbra  +4 -4
+
+  various improvements in look&feel, stretchable space, stretchable widgets
+
+
+src/kernel/qpainter.cpp    2.38  hanord  +72 -64  (1998/04/04)
+src/kernel/qpainter.h    2.24  hanord  +14 -4
+src/kernel/qptr_x11.cpp    2.43  hanord  +115 -2
+
+  Added QPainter::drawTiledPixmap, not for Windows yet
+
+
+src/kernel/qpainter.cpp    2.39  hanord  +6 -2
+src/kernel/qpainter.h    2.25  hanord  +8 -2
+src/kernel/qptr_x11.cpp    2.44  hanord  +5 -6
+
+  Added overloaded drawTiledPixmap( const QRect &r, const QPixmap &pm )
+
+
+src/widgets/qlistview.cpp    2.87  warwick  +5 -5
+src/widgets/qscrollview.cpp    2.25  warwick  +266 -96
+src/widgets/qscrollview.h    2.15  warwick  +19 -5
+
+  Allow arbitrary child objects positioned at int coords in QScrollView.
+
+
+src/widgets/qlistview.cpp    2.86  warwick  +5 -5
+src/widgets/qscrollview.cpp    2.24  warwick  +35 -11
+src/widgets/qscrollview.h    2.14  warwick  +3 -2
+
+  Fix refresh problen in QScrollView.
+
+
+examples/widgets/widgets.cpp    2.39  warwick  +4 -0
+
+  Show bug in recreate
+
+
+examples/scrollview/scrollview.cpp    1.8  warwick  +49 -5
+
+  Test new arbitrary-number-of-children code.
+
+
+src/qt.pro    2.20  warwick  +2 -0
+
+  fix dependencies
+
+
+src/widgets/qstatusbar.cpp    2.4  agulbra  +4 -2
+
+  less flicker
+
+
+src/widgets/qmainwindow.cpp    2.16  agulbra  +10 -18
+src/widgets/qtoolbar.cpp    2.17  agulbra  +6 -5
+
+  move motif style away from what the OSF probably would have done,
+  closer towards what Netscape and Microsoft has done.
+
+
+src/kernel/qptr_x11.cpp    2.45  hanord  +8 -11
+
+  tilepixmap optimized for the common case (no mask)
+
+src/widgets/qmenudta.cpp    2.13  eiriken  +101 -2  (1998/04/05)
+src/widgets/qmenudta.h    2.10  eiriken  +12 -1
+
+  Added new insertItem functions
+
+
+src/widgets/qmlined.cpp    2.89  eiriken  +14 -1
+src/widgets/qmlined.h    2.33  eiriken  +3 -1
+
+  Added setFixedVisibleLines
+
+
+src/widgets/qscrollview.cpp    2.29  warwick  +10 -4
+src/widgets/qscrollview.h    2.17  warwick  +2 -1
+
+  Fix child deletion.
+
+
+src/widgets/qscrollview.cpp    2.32  warwick  +2 -2
+src/widgets/qtoolbutton.cpp    2.22  warwick  +12 -2
+
+  Focus indication in toolbutton.
+
+
+src/kernel/qfocusdata.h    2.1  warwick  initial checkin
+src/kernel/qwidget.cpp    2.97  warwick  +24 -15
+src/kernel/qwidget.h    2.47  warwick  +4 -2
+src/widgets/qscrollview.cpp    2.31  warwick  +59 -7
+src/widgets/qscrollview.h    2.18  warwick  +3 -1
+
+  Focus traversal among QScrollView children.
+
+
+examples/scrollview/scrollview.cpp    1.9  warwick  +19 -20
+src/widgets/qlistview.cpp    2.88  warwick  +18 -18
+src/widgets/qscrollview.cpp    2.27  warwick  +38 -61
+src/widgets/qscrollview.h    2.16  warwick  +2 -1
+
+  Negate position sense.
+
+
+src/dialogs/qprndlg.cpp    2.18  hanord  +4 -3
+src/kernel/qprn_x11.cpp    2.9  hanord  +4 -4
+
+  QPrinter::setup() uses the QPrintDialog::getPrinterSetup() function
+
+
+src/kernel/qptr_win.cpp    2.31  hanord  +108 -2
+
+  Tiled pixmap implemented, but no optimization yet
+
+src/widgets/qlined.cpp    2.69  agulbra  +21 -3
+
+  handle double-click correctly
+  handle c-k
+
+src/widgets/qlistview.cpp    2.90  eiriken  +17 -2  (1998/04/06)
+src/widgets/qlistview.h    2.42  eiriken  +2 -1
+src/widgets/qstatusbar.cpp    2.5  eiriken  +8 -7
+
+  Added rightButtonPressed signal and removed the resizer
+
diff --git a/dist/changes-1.39-19980414 b/dist/changes-1.39-19980414
new file mode 100644
index 0000000..11e9b37
--- /dev/null
+++ b/dist/changes-1.39-19980414
@@ -0,0 +1,173 @@
+examples/qdir/qdir.cpp    1.2  warwick  +4 -3  (1998/04/06)
+
+  better captions
+
+
+src/widgets/qscrollview.cpp    2.34  warwick  +11 -1
+
+  clean up in destructor code.
+
+
+src/widgets/qlined.cpp    2.70  agulbra  +6 -4
+
+  don't start drags just now
+
+
+examples/scrollview/scrollview.cpp    1.10  warwick  +2 -2
+
+  make it Big
+
+
+src/kernel/qapp_x11.cpp    2.127  agulbra  +37 -6
+src/kernel/qfont.h    2.9  agulbra  +3 -2
+
+  sort of parse $LANG
+
+
+examples/application/main.cpp    1.2  warwick  +3 -2
+
+  use setMainWidget
+
+
+extensions/opengl/src/qgl.pro    1.8  warwick  +1 -1  (1998/04/08)
+
+  Building libqgl doesn't need -lqgl
+
+
+src/dialogs/qfiledlg.cpp    2.54  agulbra  +74 -21
+src/dialogs/qfiledlg.h    2.14  agulbra  +5 -3
+
+  allow setting of initial file name when using statics.  
+
+src/dialogs/qfiledlg.cpp    2.55  agulbra  +11 -11
+
+  allow setting thename of a nonexistent file as initial default in
+  getSaveFileName()
+
+
+src/kernel/qpsprn.cpp    2.13  agulbra  +4 -4
+
+  avoid at-least-a-warning-at-most-an-UMR.
+
+
+src/moc/moc.pro    1.9  warwick  +1 -1
+
+  include qt include
+
+
+extensions/opengl/src/qgl.pro    1.9  warwick  +1 -1
+
+  more -lqgl
+
+
+src/tools/qglobal.h    2.48  agulbra  +4 -1
+
+  openbsd
+
+
+src/widgets/qsplitter.h    1.7  agulbra  +3 -3
+
+  remove semicolon after Q_OBJECT
+
+
+src/dialogs/qfiledlg.cpp    2.53  agulbra  +15 -3
+
+  say "Readable, writable" and so on instead of ASHR (shades of MS-DOS)
+
+
+src/widgets/qlcdnum.cpp    2.11  agulbra  +17 -2
+src/widgets/qlcdnum.h    2.7  agulbra  +3 -1
+
+  sizeHint().  decent minimum size using the golden mean.
+
+
+src/moc/GNUmakefile    2.4  warwick  +11 -3
+src/moc/moc.pro    1.8  warwick  +1 -1
+src/moc/moc.t    1.11  warwick  +1 -1
+src/moc/moc.t    1.10  warwick  +1 -1
+
+  yacc flags
+
+
+src/kernel/qpainter.cpp    2.40  warwick  +4 -4  (1998/04/09)
+src/widgets/qmlined.cpp    2.90  warwick  +4 -2
+src/widgets/qscrollview.cpp    2.35  warwick  +39 -33
+
+  Fixed cursor position in QMultiLineEdit.
+  Fixed focus navigation in QScrollView.
+
+
+src/widgets/qscrollview.cpp    2.36  agulbra  +8 -3
+
+  be a little more careful about event processing - removeChild() was
+  called from QScrollViewData destructor and didn't like that.
+
+
+src/kernel/qprn_x11.cpp    2.10  agulbra  +62 -77
+src/kernel/qpsprn.cpp    2.14  agulbra  +1525 -157
+src/kernel/qpsprn.h    2.5  agulbra  +17 -9
+
+  added support for character encodings other than iso 8859-1.  the
+  header is computed dynamically; the fonts and encodings used on the
+  first few pages are put in the header, any other fonts and encodings
+  are added to the output stream as necessary.  removed the need for a
+  temporary file.  rewrote the font name cache so two QPSPrinter objects
+  printing at the same time won't conflict.  put back in the header size
+  compression.
+
+
+src/widgets/qcombo.cpp    2.82  warwick  +3 -3  (1998/04/13)
+
+  Correct sizeHint.
+
+
+src/widgets/qscrollview.cpp    2.37  warwick  +22 -18
+src/widgets/qscrollview.h    2.19  warwick  +1 -2
+
+  Improve focus tabbing.
+
+
+src/kernel/qwidget.cpp    2.98  warwick  +60 -16
+src/kernel/qwidget.h    2.48  warwick  +3 -1
+
+  Inherit *parents* palette, not application palette *** CHANGED BEHAVIOUR ***
+  Generalize isEnabledToTLW and isVisibleToTLW
+
+
+src/widgets/qtablevw.cpp    2.44  warwick  +8 -28
+
+  Propagate palette changes to scrollbars.
+  Combine common code.
+
+
+src/widgets/qlistview.cpp    2.91  warwick  +24 -6
+src/widgets/qlistview.h    2.43  warwick  +5 -3
+
+  Provide parent() of list view item.
+
+
+src/widgets/qlistbox.cpp    2.61  warwick  +45 -3
+src/widgets/qlistbox.h    2.15  warwick  +6 -2
+
+  Update maxItemWidth on font change.
+  Add sizeHint()
+
+src/kernel/qregion.cpp    2.8  hanord  +84 -51  (1998/04/14)
+src/kernel/qregion.h    2.9  hanord  +12 -3
+src/kernel/qrgn_win.cpp    2.11  hanord  +39 -25
+src/kernel/qrgn_x11.cpp    2.11  hanord  +48 -29
+
+  Removed the internal (and slow) byte array.
+  Uses the region rectangles for saving complex regions.
+
+
+src/widgets/qchkbox.cpp    2.20  warwick  +5 -4
+src/widgets/qradiobt.cpp    2.25  warwick  +9 -4
+
+  Small sizeHint when no text or pixmap.
+
+
+src/kernel/qptr_win.cpp    2.32  agulbra  +5 -2
+src/kernel/qptr_x11.cpp    2.46  agulbra  +5 -2
+
+  clip properly in drawPixmap().
diff --git a/dist/changes-1.39-19980506 b/dist/changes-1.39-19980506
new file mode 100644
index 0000000..35d9ed0
--- /dev/null
+++ b/dist/changes-1.39-19980506
@@ -0,0 +1,555 @@
+doc/classes.doc    1.5  warwick  +3 -3
+
+  4 columns, not 3.
+
+
+doc/headers.doc    1.5  warwick  +4 -2
+
+  Multicolumns.
+
+
+doc/moc.doc    2.11  eiriken  +11 -4
+
+  Corrected nested classes bug
+
+
+examples/application/application.cpp    1.4  agulbra  +2 -3
+
+  updated for new qtoolbar api
+
+
+examples/scrollview/scrollview.cpp    1.11  warwick  +25 -9
+
+  Use older style.
+
+
+extensions/opengl/examples/sharedbox/GNUmakefile    1.1  hanord  initial checkin
+extensions/opengl/examples/sharedbox/Makefile    1.2  hanord  +6 -90
+
+  new makefiles
+
+
+extensions/opengl/examples/sharedbox/sharedbox.pro    1.2  hanord  +1 -1
+
+  Added "opengl" to CONFIG
+
+
+src/dialogs/qfiledlg.cpp    2.56  paul  +3 -3
+
+  make it compile on windows
+
+
+src/dialogs/qfiledlg.cpp    2.57  warwick  +6 -5
+
+  Implement "initial selection" for Win-specific calls.
+
+
+src/dialogs/qfiledlg.cpp    2.58  agulbra  +21 -2
+
+  insert the root drives in the paths combo
+
+
+src/dialogs/qfiledlg.cpp    2.59  agulbra  +11 -11
+
+  alight size stuff correctly
+  list all drives under windows
+  
+  there's an aborted attempt at handling double-click in multi-column
+  view in there, too.  I'll think about it and complete it asap.
+
+
+src/dialogs/qfiledlg.cpp    2.60  agulbra  +21 -8
+
+  draw the icons again.
+
+
+src/dialogs/qfiledlg.cpp    2.61  agulbra  +23 -6
+
+  output date and time in a better format.  handle column width better.
+
+
+src/dialogs/qfiledlg.cpp    2.62  agulbra  +190 -23
+src/dialogs/qfiledlg.h    2.15  agulbra  +20 -1
+
+  more polish.  in this round:
+   - correct handling of double-click and arrow keys in the multi-column
+     list (partly done using an evil hack, see mouseDoubleClickEvent())
+   - the ability to install file type icons (the default draws a
+     directory icon, nothing else)
+   - correct enter handling in the paths and types combo boxes
+   - correct tab order
+
+
+src/dialogs/qfiledlg.cpp    2.63  agulbra  +21 -26
+
+  setEnabled( cd up button )
+  tweak accessibility texts
+
+
+src/dialogs/qfiledlg.cpp    2.64  hanord  +3 -3
+
+  Adds cast to avoid compiling problem for MSVC++
+
+
+src/dialogs/qfiledlg.cpp    2.65  agulbra  +29 -7
+
+  experimental filename completion.  hacky and a little buggy in certain
+  odd and harmless cases.
+
+
+src/dialogs/qfiledlg.h    2.16  agulbra  +4 -5
+
+  remove unnecessary friend declaration
+
+
+src/dialogs/qprndlg.cpp    2.19  agulbra  +3 -3
+
+  work around broken gcc warning
+
+
+src/kernel/qapp_win.cpp    2.84  warwick  +5 -2
+
+  Work-around focus problem with recreate.
+
+
+src/kernel/qapp_win.cpp    2.85  warwick  +5 -4
+
+  Robustness.
+
+
+src/kernel/qapp_x11.cpp    2.128  warwick  +9 -9
+src/kernel/qclb_x11.cpp    2.9  warwick  +4 -4
+src/kernel/qcol_x11.cpp    2.26  warwick  +13 -12
+src/kernel/qimage.cpp    2.83  warwick  +11 -10
+src/kernel/qnpsupport.cpp    2.7  warwick  +3 -3
+src/kernel/qpm_x11.cpp    2.33  warwick  +12 -12
+src/kernel/qpsprn.cpp    2.16  warwick  +3 -3
+src/kernel/qrgn_x11.cpp    2.12  warwick  +3 -3
+src/kernel/qt_xdnd.cpp    2.7  warwick  +5 -5
+src/kernel/qwid_x11.cpp    2.89  warwick  +21 -19
+src/tools/qdatetm.cpp    2.12  warwick  +4 -4
+
+  Avoid warnings.
+
+
+src/kernel/qapp_x11.cpp    2.130  warwick  +3 -3
+
+  strcasecmp -> qstricmp
+
+
+src/kernel/qapp_x11.cpp    2.131  agulbra  +14 -3
+src/kernel/qclipbrd.cpp    2.7  agulbra  +2 -6
+src/kernel/qdnd_win.cpp    2.3  agulbra  +23 -1
+src/kernel/qdnd_x11.cpp    2.3  agulbra  +84 -8
+src/kernel/qdragobject.cpp    2.11  agulbra  +24 -23
+src/kernel/qdragobject.h    2.7  agulbra  +6 -3
+
+  some more stuff works
+
+
+src/kernel/qapp_x11.cpp    2.132  eiriken  +4 -3
+src/kernel/qcol_x11.cpp    2.27  eiriken  +6 -4
+src/kernel/qimage.cpp    2.84  eiriken  +11 -7
+src/kernel/qmetaobj.cpp    2.7  eiriken  +6 -4
+src/kernel/qmovie.cpp    1.31  eiriken  +8 -5
+src/kernel/qpm_x11.cpp    2.34  eiriken  +6 -4
+src/kernel/qwid_win.cpp    2.52  eiriken  +4 -4
+src/kernel/qwid_x11.cpp    2.91  eiriken  +4 -4
+src/kernel/qwidget.cpp    2.101  eiriken  +6 -4
+
+  Check for delete[] 0 to avoid purify warnings.
+
+
+src/kernel/qclb_x11.cpp    2.8  hanord  +5 -2
+
+  Debugging code commented out
+
+
+src/kernel/qclipbrd.h    2.4  agulbra  +2 -1
+src/kernel/qfocusdata.h    2.2  agulbra  +2 -2
+src/widgets/qlistview.h    2.45  agulbra  +3 -3
+src/widgets/qsplitter.h    1.8  agulbra  +2 -2
+
+  "friend class", not "friend"
+
+
+src/kernel/qdnd_win.cpp    2.2  agulbra  +2 -2
+src/kernel/qdnd_x11.cpp    2.2  agulbra  +3 -3
+src/kernel/qevent.h    2.13  agulbra  +2 -2
+
+  return a proper object for the drag data, not a reference to a
+  probably-deleted object.
+
+
+src/kernel/qdnd_x11.cpp    2.4  agulbra  +24 -18
+src/kernel/qdragobject.h    2.8  agulbra  +1 -2
+
+  another little bit.
+
+
+src/kernel/qdnd_x11.cpp    2.5  agulbra  +6 -24
+
+  drop some of the debugging messages
+
+
+src/kernel/qevent.cpp    2.13  aavit  +9 -6
+
+  Doc.
+
+
+src/kernel/qfnt_win.cpp    2.26  warwick  +4 -4
+
+  Typo.  Will fix (unreported) strange problems with some fonts on Windows.
+
+
+src/kernel/qgmanagr.cpp    2.32  warwick  +26 -22
+
+  Flatten.
+
+
+src/kernel/qimage.cpp    2.82  warwick  +6 -3
+src/widgets/qlistbox.cpp    2.62  warwick  +14 -2
+src/widgets/qlistview.cpp    2.98  warwick  +4 -4
+src/widgets/qscrollview.cpp    2.41  warwick  +5 -5
+
+  docs
+
+
+src/kernel/qpaintdc.h    2.5  eiriken  +4 -2
+src/kernel/qpainter.cpp    2.44  eiriken  +38 -11
+src/kernel/qprn_win.cpp    2.8  eiriken  +31 -13
+src/kernel/qpsprn.cpp    2.18  eiriken  +46 -30
+src/kernel/qpsprn.h    2.6  eiriken  +4 -1
+src/kernel/qptr_win.cpp    2.34  eiriken  +4 -2
+src/kernel/qregion.h    2.10  eiriken  +2 -1
+
+  drawImage support in QPrinter
+
+
+src/kernel/qpainter.cpp    2.41  warwick  +17 -2
+
+  Fix OpaqueMode in drawText(...QRect...).
+
+
+src/kernel/qpainter.cpp    2.42  warwick  +5 -9
+
+  fix.
+
+
+src/kernel/qpainter.cpp    2.43  warwick  +2 -12
+
+  Revert drawText semantics changed.
+
+
+src/kernel/qpainter.cpp    2.45  hanord  +6 -2
+src/kernel/qprn_win.cpp    2.9  hanord  +5 -4
+
+  Fixed Windows-specific typos, now compiles
+
+
+src/kernel/qprn_x11.cpp    2.11  agulbra  +14 -6
+
+  avoid getdtablesize(), and set FD_CLOEXEC on just the X connection
+  instead of on all open files.
+
+
+src/kernel/qpsprn.cpp    2.15  agulbra  +6 -6
+
+  mention the defining rfc for koi8-r
+
+
+src/kernel/qpsprn.cpp    2.17  warwick  +438 -428
+
+  Avoid a HUGE C string, save some memory.
+
+
+src/kernel/qptd_x11.cpp    2.12  warwick  +4 -4
+
+  Restore speed of normal-optimized pixmaps to Qt 1.3x height.
+
+
+src/kernel/qptd_x11.cpp    2.13  hanord  +7 -9
+
+  Warwick's change ACK'd
+
+
+src/kernel/qptr_win.cpp    2.32  agulbra  +5 -2
+src/kernel/qptr_x11.cpp    2.46  agulbra  +5 -2
+
+  clip properly in drawPixmap().
+
+
+src/kernel/qptr_x11.cpp    2.47  eiriken  +21 -17
+
+  Fixed infinite loop bug in internal function drawTile and
+  renamed variables to make the code readable.
+
+
+src/kernel/qregion.cpp    2.8  hanord  +84 -51
+src/kernel/qregion.h    2.9  hanord  +12 -3
+src/kernel/qrgn_win.cpp    2.11  hanord  +39 -25
+src/kernel/qrgn_x11.cpp    2.11  hanord  +48 -29
+
+  Removed the internal (and slow) byte array.
+  Uses the region rectangles for saving complex regions.
+
+
+src/kernel/qregion.cpp    2.9  warwick  +14 -2
+
+  Implement missing function.
+
+
+src/kernel/qsignalmapper.cpp    1.2  warwick  +2 -2
+src/kernel/qsignalmapper.h    1.2  warwick  +2 -2
+
+  fix function name
+
+
+src/kernel/qsignalmapper.cpp    1.3  warwick  +2 -2
+src/widgets/qtablevw.cpp    2.45  warwick  +3 -3
+
+  oops
+
+
+src/kernel/qwid_win.cpp    2.51  agulbra  +7 -2
+
+  if recreating a widget with no children that accept focus, and which
+  does not accept focus itself, to be a top-level widget, set up a focus
+  chain.  hopefully this will fix a focus bug on windows.
+
+
+src/kernel/qwidget.cpp    2.100  agulbra  +4 -4
+src/kernel/qwidget.cpp    2.99  agulbra  +9 -7
+
+  try a little harder to make QWidget::focusWidget() return something.
+  this should make focus in top-level widgets created by recreate()
+  behave like in top-level widgets created by new.
+
+
+src/moc/moc.1    2.6  eiriken  +20 -5
+
+  Corrected nested classes bug.
+
+
+src/moc/moc.y    2.21  eiriken  +3 -5
+
+  Removed warning "unexpected ':'" in nested classes.
+
+
+src/qt.pro    2.21  warwick  +2 -1
+
+  Dependencies under Windows.
+
+
+src/qt.pro    2.23  warwick  +2 -0
+src/kernel/qsignalmapper.cpp    1.1  warwick  initial checkin
+src/kernel/qsignalmapper.h    1.1  warwick  initial checkin
+
+  QSignalMapper - like a button group superclass.
+
+
+src/tools/qdir.cpp    2.19  agulbra  +36 -4
+src/tools/qdir.h    2.7  agulbra  +3 -1
+
+  added new QDir::drives()
+  
+  this breaks windows horribly, because I simply couldn't remember the
+  function call to use there.  haavard, add a few lines of code in the
+  morning, will you?
+
+
+src/tools/qdir.cpp    2.20  agulbra  +18 -10
+
+  implement drives() for windows.  now to test.
+
+
+src/tools/qfile.cpp    2.20  warwick  +10 -10
+
+  Casts from off_t to int.
+
+
+src/tools/qglobal.h    2.49  warwick  +4 -1
+
+  GNU Hurd
+
+
+src/tools/qglobal.h    2.50  warwick  +4 -1
+
+  DG Unix
+
+
+src/tools/qtstream.cpp    2.12  warwick  +14 -4
+src/widgets/qscrollview.cpp    2.42  warwick  +7 -1
+
+  doc
+
+
+src/widgets/qchkbox.cpp    2.20  warwick  +5 -4
+src/widgets/qradiobt.cpp    2.25  warwick  +9 -4
+
+  Small sizeHint when no text or pixmap.
+
+
+src/widgets/qcombo.cpp    2.83  agulbra  +10 -2
+
+  make sure highlighted() is emitted whenever current changes, as per
+  val gough's bug report.
+
+
+src/widgets/qframe.cpp    2.17  agulbra  +13 -2
+
+  added a hack to make kscd binaries keep working.  put in a nice
+  #if QT_VERSION >= 200 so the hack won't stay too long.
+
+
+src/widgets/qlabel.cpp    2.28  warwick  +6 -3
+
+  Flicker-free when no background.
+
+
+src/widgets/qlined.cpp    2.71  warwick  +3 -3
+
+  Efficiency.
+
+
+src/widgets/qlined.cpp    2.73  agulbra  +2 -10
+
+  disable some buggy code
+
+
+src/widgets/qlined.h    2.26  agulbra  +5 -4
+
+  make validateAndSet() public.  It's not a trvial function, but it
+  appears that event filters can reasonably want to use it.
+
+
+src/widgets/qlistview.cpp    2.100  agulbra  +30 -28
+
+  slightly better pixmap support
+
+
+src/widgets/qlistview.cpp    2.101  agulbra  +27 -9
+
+  added an evil hack to make sizeHint() return more realistic values
+  before the automagic column resizing magic has done its job.
+
+
+src/widgets/qlistview.cpp    2.102  agulbra  +3 -3
+
+  the list view is now the viewport's focus proxy, rather than the other
+  way around.
+
+
+src/widgets/qlistview.cpp    2.103  agulbra  +6 -7
+
+  fixed some logical/actual confusion.
+
+
+src/widgets/qlistview.cpp    2.92  agulbra  +22 -13
+
+  hamdle quick drags correctly, as per dimitri van heesch's bug report.
+
+
+src/widgets/qlistview.cpp    2.93  warwick  +3 -3
+src/widgets/qlistview.h    2.46  warwick  +2 -2
+
+  paintBranches is non-const
+
+
+src/widgets/qlistview.cpp    2.94  warwick  +6 -7
+
+  Remove unnecessary initial repaints.
+
+
+src/widgets/qlistview.cpp    2.95  agulbra  +16 -12
+
+  try to draw a little more efficiently by using OpaqueMode, and by
+  never inserting list view items into the repaint dict twice.  exposes
+  a QPainter::drawText() bug.
+
+
+src/widgets/qlistview.cpp    2.96  agulbra  +178 -53
+src/widgets/qlistview.h    2.47  agulbra  +13 -5
+
+  added column alignment (worked first try) and real pixmap support
+  (untested - I try not to push my luck)
+
+
+src/widgets/qlistview.cpp    2.97  agulbra  +13 -11
+
+  draw focus rectangle in the correct place
+
+
+src/widgets/qlistview.cpp    2.99  warwick  +9 -12
+
+  Revert change that required drawText semantics changed.
+
+
+src/widgets/qlistview.h    2.44  agulbra  +2 -1
+
+  avoid hiding text(int) with text() in qchecklistitem
+
+
+src/widgets/qmainwindow.cpp    2.17  agulbra  +35 -34
+src/widgets/qmainwindow.h    2.12  agulbra  +4 -3
+
+  handle children being deleted
+
+
+src/widgets/qmenubar.cpp    2.48  warwick  +9 -3
+src/widgets/qpopmenu.cpp    2.67  warwick  +4 -2
+
+  Accept keys so they don't propagate.
+
+
+src/widgets/qmenubar.cpp    2.49  warwick  +2 -5
+src/widgets/qpopmenu.cpp    2.68  warwick  +2 -4
+
+  undo accept()
+
+
+src/widgets/qmenubar.cpp    2.50  agulbra  +3 -4
+
+  remove unused variable
+
+
+src/widgets/qpopmenu.cpp    2.70  agulbra  +13 -16
+src/widgets/qpopmenu.cpp    2.69  agulbra  +10 -3
+
+  minor tweak of right/left submenu position algorithm
+
+
+src/widgets/qpopmenu.cpp    2.71  warwick  +5 -2
+
+  Add a reminder.
+
+
+src/widgets/qscrollview.cpp    2.39  warwick  +86 -67
+
+  Docs.
+  Remove over-optimization.
+
+
+src/widgets/qscrollview.cpp    2.40  warwick  +3 -3
+
+  Simplify.
+
+
+src/widgets/qscrollview.cpp    2.43  warwick  +45 -12
+
+  Propagate mouse events.
+
+
+src/widgets/qscrollview.h    2.20  warwick  +6 -1
+
+  Propagate mouse evetns.
+
+
+src/widgets/qtoolbutton.cpp    2.23  warwick  +4 -3
+
+  Make receiver/slot optional.
+
+
+src/widgets/qvalidator.cpp    2.18  agulbra  +19 -6
+
+  validate number of decimals.  amy watson.
diff --git a/dist/changes-1.39-19980529 b/dist/changes-1.39-19980529
new file mode 100644
index 0000000..6c40f61
--- /dev/null
+++ b/dist/changes-1.39-19980529
@@ -0,0 +1,232 @@
+
+src/dialogs/qfiledlg.cpp    2.67  aavit  +24 -1
+
+  Fixed non-modality bug in GetOpen/SaveFileName on Windows.
+
+
+src/dialogs/qprndlg.cpp    2.21  agulbra  +14 -11
+
+  avoid double-delete of invisible QButtonGroup objects
+
+
+src/dialogs/qprndlg.cpp    2.22  eiriken  +4 -3
+src/tools/qregexp.cpp    2.9  eiriken  +4 -3
+src/widgets/qheader.cpp    2.36  eiriken  +5 -3
+src/widgets/qmenubar.cpp    2.51  eiriken  +6 -4
+src/widgets/qwhatsthis.cpp    2.12  eiriken  +3 -3
+
+  More tests before delete [] to avoid purify warnings.
+
+
+src/kernel/qapp_win.cpp    2.86  agulbra  +10 -19
+src/kernel/qapp_x11.cpp    2.134  agulbra  +35 -44
+
+  move the pending-events iterator to the next event before dispatching
+  the current one.  prevents recursion if enter_loop() is called within
+  the event handler.
+
+
+src/kernel/qapp_x11.cpp    2.133  warwick  +12 -4
+src/kernel/qevent.h    2.16  warwick  +27 -1
+src/kernel/qwidget.cpp    2.103  warwick  +9 -2
+
+  Provide Event_Hide and Event_Show.
+
+
+src/kernel/qasyncimageio.cpp    1.31  warwick  +32 -16
+src/kernel/qasyncimageio.h    1.16  warwick  +7 -1
+src/kernel/qasyncio.cpp    1.8  warwick  +3 -2
+src/kernel/qimage.cpp    2.88  warwick  +11 -2
+src/kernel/qpainter.cpp    2.47  warwick  +10 -4
+
+  QAsyncImageIO classes are now public.
+
+
+src/kernel/qdragobject.cpp    2.12  agulbra  +10 -4
+
+  stop the drag when appropriate
+
+
+src/kernel/qevent.cpp    2.14  agulbra  +24 -2
+src/kernel/qevent.h    2.15  agulbra  +2 -1
+
+  added new convenience function provides( const char * mimeType )
+
+
+src/kernel/qevent.h    2.14  agulbra  +2 -2
+
+  return a real QByteArray
+
+
+src/kernel/qpainter.cpp    2.48  warwick  +4 -4
+
+  Fix bitBlt with negative width/height.
+
+
+src/kernel/qpicture.cpp    2.4  eiriken  +13 -2
+
+  Added support for drawImage()
+
+ 
+src/kernel/qprn_x11.cpp    2.12  agulbra  +18 -10
+
+   close open files before exec'ing lpr.
+
+
+src/kernel/qpsprn.cpp    2.20  eiriken  +100 -24
+src/kernel/qpsprn.h    2.7  eiriken  +3 -2
+src/kernel/qptr_x11.cpp    2.48  eiriken  +4 -3
+src/kernel/qrgn_x11.cpp    2.13  eiriken  +3 -3
+
+  QPrinter now supports clipping of any arbitrary region.
+  The catch is that resolution is 72 dpi.
+  
+  Fixed bug in save()/restore() over page boundaries
+
+
+src/kernel/qpsprn.cpp    2.23  agulbra  +6 -3
+
+  setPen() immediately before drawPoly(most things) did not work.  now
+  it does.
+
+
+src/kernel/qptr_x11.cpp    2.49  warwick  +13 -2
+
+  Probably fix aix-g++ internal compiler error.
+
+
+src/kernel/qregion.cpp    2.10  eiriken  +7 -5
+src/kernel/qregion.h    2.11  eiriken  +2 -3
+
+  Rename  getRects() to rects()
+
+
+src/kernel/qregion.cpp    2.12  hanord  +18 -56
+
+  New region serializing code, writes only raw rectangles.
+  In Qt pre 2.0, we write a sort of recursive structure for backward
+  compatibility. It's large and inefficient. In Qt 2.0, we start using
+  a much slimmer structure and the reading code for this has already
+  been added for Qt 1.40.  I.e. Qt 1.3x programs won't be able to read
+  regions serialized with Qt 2.x.
+
+
+src/kernel/qregion.h    2.12  hanord  +2 -7
+src/kernel/qrgn_win.cpp    2.13  hanord  +12 -44
+src/kernel/qrgn_x11.cpp    2.15  hanord  +15 -50
+
+  Simplified the implementation, now it works with rects only,
+
+
+src/kernel/qwid_win.cpp    2.53  agulbra  +4 -3
+src/kernel/qwid_x11.cpp    2.92  agulbra  +4 -3
+
+  update() with w == 0 || h == 0 is a no-op, so exit quickly
+
+
+src/kernel/qwid_win.cpp    2.54  agulbra  +6 -2
+src/kernel/qwid_x11.cpp    2.93  agulbra  +8 -2
+src/kernel/qwidget.cpp    2.104  agulbra  +3 -10
+src/widgets/qmainwindow.cpp    2.20  agulbra  +16 -6
+
+  make isVisible() return TRUE during showEvent(), to match
+  e.g. resizeEvent().  make QMainWindow fix its geometry when toolbars
+  are hidden and shown.
+
+
+src/kernel/qwidget.h    2.49  agulbra  +2 -6
+
+  removed autoMinimumSize
+
+
+src/widgets/qbttngrp.cpp    2.10  agulbra  +3 -3
+
+  don't delete buttons in the list
+
+
+src/widgets/qbuttonrow.cpp    1.6  paul  +1 -1
+src/widgets/qbuttonrow.h    1.4  paul  +1 -1
+src/widgets/qgrid.cpp    1.9  paul  +1 -1
+src/widgets/qgrid.h    1.7  paul  +1 -1
+src/widgets/qhbox.cpp    1.10  paul  +1 -1
+src/widgets/qhbox.h    1.7  paul  +1 -1
+src/widgets/qlabelled.cpp    1.5  paul  +1 -1
+src/widgets/qlabelled.h    1.4  paul  +1 -1
+src/widgets/qvbox.cpp    1.5  paul  +1 -1
+src/widgets/qvbox.h    1.5  paul  +1 -1
+
+  removing the layout widgets from the library, moved to examples/layouts
+
+
+src/widgets/qheader.cpp    2.38  paul  +121 -62
+src/widgets/qheader.h    2.18  paul  +6 -11
+
+  Implemented setClickEnabled, setResizeEnabled and setMovingEnabled
+
+
+src/widgets/qlined.cpp    2.74  aavit  +8 -5
+src/widgets/qspinbox.cpp    2.30  aavit  +52 -19
+src/widgets/qspinbox.h    2.17  aavit  +3 -1
+
+  lineedit: better sizehint()
+  spinbox: added valuechanged( const char* ) signal
+
+
+src/widgets/qlined.cpp    2.75  agulbra  +11 -6
+
+  start drags when appropriate
+  fold multi-line paste to one line instead of truncating to the \n
+
+
+src/widgets/qlistview.cpp    2.109  agulbra  +17 -12
+src/widgets/qlistview.h    2.48  agulbra  +4 -4
+
+  addColumn() return the column number
+
+
+src/widgets/qmainwindow.cpp    2.18  warwick  +18 -2
+src/widgets/qmainwindow.h    2.13  warwick  +2 -1
+
+  Show/Hide event filters
+
+
+src/widgets/qmainwindow.cpp    2.19  agulbra  +19 -17
+src/widgets/qmainwindow.h    2.14  agulbra  +11 -11
+
+  make set* private as they're not really meaningful any more.
+
+src/widgets/qmainwindow.cpp    2.22  agulbra  +17 -1
+
+  be slightly more clever about autodetecting menu and status bar.
+
+
+src/widgets/qscrollview.cpp    2.45  warwick  +8 -4
+
+  Only enable WPaintClever in viewport if specifically requested.
+
+
+src/widgets/qstatusbar.cpp    2.8  agulbra  +9 -4
+
+  make sure the status bar is tall enough for text, even when there's
+  nothing in it.
+
+
+src/widgets/qtablevw.cpp    2.46  agulbra  +4 -4
+
+  last{Row,Col}Visible() could return >= num{Row,Col}s.  no more.
+
+
+src/kernel/qapp_x11.cpp    2.137  eiriken  +5 -2
+
+  Fixed bug when there are no events in the X queue and there are posted
+  events. The posted events will now be handled.
+
+
+src/kernel/qwidget.cpp    2.106  eiriken  +5 -2
+
+  Fixed bug in destruction of main widget. The application now
+  actually quits.
+
+src/kernel/qapp.cpp    2.55  hanord  +8 -4
+
+  The QApplication contructor now accepts argc=0 and argv=0.
diff --git a/dist/changes-1.39-19980611 b/dist/changes-1.39-19980611
new file mode 100644
index 0000000..d99b636
--- /dev/null
+++ b/dist/changes-1.39-19980611
@@ -0,0 +1,194 @@
+doc/binary.doc    1.2  warwick  +23 -26
+
+  Include margins into header graphic
+
+
+doc/examples.doc    2.15  agulbra  +19 -2
+examples/dirview/dirview.cpp    1.8  agulbra  +2 -2
+src/widgets/qlistview.cpp    2.112  agulbra  +163 -28
+src/widgets/qlistview.h    2.49  agulbra  +4 -4
+
+  rename children() to childCount()
+  add two images to the docs
+  update dirview and add it to the docs
+
+
+src/dialogs/qfiledlg.cpp    2.68  hanord  +8 -12
+
+  Rewrote setFilter to use QString and mid() - simpler code.
+  Borland C++ complained about modifying const char *.
+
+
+src/dialogs/qfiledlg.cpp    2.69  agulbra  +9 -7
+src/dialogs/qmsgbox.cpp    2.48  agulbra  +3 -1
+src/dialogs/qprndlg.cpp    2.26  agulbra  +213 -2
+src/widgets/qwidgetstack.cpp    2.6  agulbra  +8 -3
+
+  Call setPalettePropagation() and setFontPropagation() in the
+  initialization.  Note that QWidgetStack now defaults to use
+  AllChildren.
+
+
+src/dialogs/qmsgbox.cpp    2.47  hanord  +3 -3
+
+  icon widget gets widget name "icon" (previously none)
+  buttons get widget names button1, button2 (previously space before number)
+
+
+src/dialogs/qprndlg.cpp    2.24  agulbra  +163 -7
+
+  parse /etc/lp/member and /etc/printers.conf.  we still probably don't
+  detect the printers on irix and digital unix (except through sheer
+  good luck - I suppose there is a chance that digital or sgi might
+  choose to be compatible with something).
+
+
+src/dialogs/qprndlg.cpp    2.25  agulbra  +10 -10
+
+  one more minor cleanup.
+  
+  looks like the code we have works on both irix and digital unix.
+
+
+src/kernel/qapp_win.cpp    2.88  hanord  +2 -3
+
+  Posted event fix
+
+
+src/kernel/qapp_win.cpp    2.89  agulbra  +2 -2
+src/kernel/qapp_x11.cpp    2.138  agulbra  +3 -3
+
+  don't delete events destined for other objects in target-specific
+  sendPostedEvents()
+
+
+src/kernel/qasyncimageio.cpp    1.33  warwick  +42 -42
+src/kernel/qasyncimageio.h    1.17  warwick  +15 -15
+
+  New names.
+
+
+src/kernel/qdnd_x11.cpp    2.14  agulbra  +8 -5
+src/kernel/qdragobject.cpp    2.14  agulbra  +21 -9
+
+  right cursor
+
+
+src/kernel/qdnd_x11.cpp    2.15  agulbra  +6 -9
+
+  comment out old debug messages; delete some
+
+
+src/kernel/qdragobject.cpp    2.15  agulbra  +4 -6
+
+  ignore totally unexpected events
+
+
+src/kernel/qfnt_win.cpp    2.28  agulbra  +4 -4
+src/kernel/qfont.cpp    2.34  agulbra  +2 -4
+
+  be slightly more robust about setting the character encoding to the
+  defFont's.
+
+
+src/kernel/qfont.cpp    2.31  agulbra  +115 -63
+
+  overhauled class documentation; man function descriptions probably
+  also need an overhaul.
+
+
+src/kernel/qfont.cpp    2.32  agulbra  +56 -65
+
+  fixed some typos; removed some misleading text from the function
+  descriptions.
+
+
+src/kernel/qgmanagr.cpp    2.34  paul  +22 -66
+
+  Rolled back "empty layout" change, since it broke existing code.
+
+
+src/kernel/qiconset.cpp    2.9  paul  +16 -8
+
+  Handle mask better when generating disabled pixmaps
+
+
+src/kernel/qprn_x11.cpp    2.14  agulbra  +12 -1
+
+  if the application hasn't specified a non-default print program, try
+  HARD to find a decent lpr or lp.
+
+
+src/kernel/qpsprn.cpp    2.25  agulbra  +12 -7
+
+  discussed the "sometimes cannot print to /usr/bin/lpr even though
+  every other program works perfectly" bug with the code.
+  
+  also shrunk the output by a few bytes by removing extraneous newlines
+  and one comment.
+
+
+src/tools/qdatetm.cpp    2.14  agulbra  +19 -5
+
+  QDateTime::addSecs() used to not work across midnight or backwards.
+
+
+src/tools/qglobal.h    2.51  agulbra  +4 -2
+
+  detect unixware 7; detect bool on more irix stuff
+
+
+src/widgets/qbttngrp.cpp    2.12  agulbra  +5 -1
+
+  mention the existence of set*Propagation()
+
+
+src/widgets/qbutton.cpp    2.60  agulbra  +16 -17
+src/widgets/qbutton.h    2.16  agulbra  +3 -2
+
+  make setDown() public; this breaks binary compatibility on MSVC++
+  
+  The way to start a context menu on press used to be to make a
+  synthetic QMouseEvent indicating a release, and sendEvent() that.
+  not terribly nice.
+
+
+src/widgets/qheader.cpp    2.41  paul  +6 -1
+
+  Fix "Index out of range" bug.
+
+
+src/widgets/qlined.cpp    2.78  agulbra  +3 -6
+
+  when pasting multi-line stuff, fold to one line.
+
+
+src/widgets/qlined.cpp    2.79  paul  +2 -2
+
+  Fix "index out of range" bug when typing past maxLength.
+
+
+src/widgets/qpopmenu.cpp    2.75  aavit  +2 -2
+
+  minimal improvement of checkmark look in windows style.
+
+
+src/widgets/qsplitter.cpp    1.13  agulbra  +12 -12
+
+  more doc; mention setFixed()
+
+
+src/widgets/qtoolbar.cpp    2.21  agulbra  +46 -12
+
+  paint a tool bar handle in motif style too
+
+
+src/widgets/qtoolbar.cpp    2.22  paul  +3 -2
+
+  Don't override max/min sizes for children
+
+
+src/widgets/qtoolbutton.cpp    2.27  agulbra  +24 -22
+
+  handle text label correctly; check for null pointer; minor doc
+  improvements
diff --git a/dist/changes-1.39-19980616 b/dist/changes-1.39-19980616
new file mode 100644
index 0000000..831dd87
--- /dev/null
+++ b/dist/changes-1.39-19980616
@@ -0,0 +1,810 @@
+doc/metaobjects.doc    2.9  warwick  +3 -3
+doc/tutorial.doc    2.13  warwick  +4 -4
+examples/aclock/aclock.h    2.3  warwick  +2 -2
+examples/aclock/main.cpp    2.3  warwick  +2 -2
+examples/application/application.cpp    1.12  warwick  +8 -8
+examples/application/main.cpp    1.6  warwick  +2 -2
+examples/biff/biff.cpp    2.3  warwick  +2 -2
+examples/biff/biff.h    2.3  warwick  +2 -2
+examples/biff/main.cpp    2.3  warwick  +2 -2
+examples/connect/connect.cpp    2.5  warwick  +2 -2
+examples/cursor/cursor.cpp    2.3  warwick  +2 -2
+examples/dclock/dclock.cpp    2.4  warwick  +2 -2
+examples/dclock/dclock.h    2.3  warwick  +2 -2
+examples/dclock/main.cpp    2.3  warwick  +2 -2
+examples/desktop/desktop.cpp    2.4  warwick  +2 -2
+examples/dirview/dirview.cpp    1.9  warwick  +2 -2
+examples/dirview/main.cpp    1.7  warwick  +2 -2
+examples/drawdemo/drawdemo.cpp    2.7  warwick  +5 -5
+examples/forever/forever.cpp    2.4  warwick  +2 -2
+examples/hello/hello.cpp    2.5  warwick  +2 -2
+examples/hello/main.cpp    2.6  warwick  +2 -2
+examples/layout/layout.cpp    1.6  warwick  +6 -6
+examples/layouts/layouts.cpp    1.5  warwick  +6 -6
+examples/layouts/qtbuttonrow.cpp    1.4  warwick  +4 -3
+examples/layouts/qthbox.cpp    1.4  warwick  +2 -2
+examples/life/life.cpp    2.5  warwick  +4 -4
+examples/life/lifedlg.cpp    2.8  warwick  +5 -5
+examples/life/main.cpp    2.3  warwick  +2 -2
+examples/menu/menu.cpp    2.15  warwick  +4 -4
+examples/movies/main.cpp    1.11  warwick  +4 -4
+examples/network/connection.cpp    1.7  warwick  +2 -2
+examples/network/finger.cpp    1.7  warwick  +6 -6
+examples/network/prime.cpp    1.6  warwick  +5 -5
+examples/network/primed.cpp    1.8  warwick  +4 -4
+examples/network/primespeed.cpp    1.5  warwick  +5 -5
+examples/network/server.cpp    1.8  warwick  +2 -2
+examples/network/share.cpp    1.6  warwick  +4 -4
+examples/picture/picture.cpp    1.6  warwick  +3 -3
+examples/pref/main.cpp    1.7  warwick  +2 -2
+examples/pref/pref.cpp    1.20  warwick  +5 -5
+examples/progress/progress.cpp    1.13  warwick  +4 -4
+examples/qdir/qdir.cpp    1.6  warwick  +3 -3
+examples/qmag/qmag.cpp    2.16  warwick  +5 -5
+examples/qwerty/main.cpp    1.6  warwick  +2 -2
+examples/qwerty/qwerty.cpp    1.11  warwick  +7 -7
+examples/qwerty/qwerty.h    1.8  warwick  +2 -2
+examples/scrollview/scrollview.cpp    1.15  warwick  +6 -6
+examples/sheet/main.cpp    2.5  warwick  +2 -2
+examples/sheet/sheet.cpp    2.5  warwick  +2 -2
+examples/sheet/sheetdlg.cpp    2.5  warwick  +2 -2
+examples/sheet/sheetdlg.h    2.3  warwick  +2 -2
+examples/sheet/table.cpp    2.4  warwick  +2 -2
+examples/sheet/table.h    2.4  warwick  +3 -3
+examples/showimg/main.cpp    2.18  warwick  +2 -2
+examples/showimg/showimg.cpp    2.24  warwick  +5 -5
+examples/table/main.cpp    1.4  warwick  +3 -3
+examples/table/table.h    1.5  warwick  +2 -2
+examples/tetrix/qdragapp.cpp    2.3  warwick  +5 -4
+examples/tetrix/qdragapp.h    2.3  warwick  +2 -2
+examples/tetrix/qtetrix.cpp    2.7  warwick  +3 -3
+examples/tetrix/qtetrix.h    2.4  warwick  +3 -3
+examples/tictac/main.cpp    2.3  warwick  +2 -2
+examples/tictac/tictac.cpp    2.8  warwick  +6 -6
+examples/tictac/tictac.h    2.3  warwick  +2 -2
+examples/timestmp/timestmp.cpp    2.4  warwick  +3 -3
+examples/tooltip/main.cpp    1.5  warwick  +2 -2
+examples/tooltip/tooltip.cpp    1.6  warwick  +2 -2
+examples/validator/main.cpp    1.5  warwick  +2 -2
+examples/validator/motor.cpp    1.9  warwick  +3 -3
+examples/validator/vw.cpp    1.8  warwick  +4 -4
+examples/widgets/widgets.cpp    2.43  warwick  +13 -13
+examples/xform/xform.cpp    2.9  warwick  +8 -8
+extensions/imageio/src/qjpegio.cpp    1.5  warwick  +2 -2
+extensions/imageio/src/qpngio.cpp    1.7  warwick  +2 -2
+extensions/nsplugin/examples/grapher/grapher.cpp    1.10  warwick  +3 -3
+extensions/nsplugin/examples/qtimage/qtimage.cpp    1.6  warwick  +2 -2
+extensions/nsplugin/examples/trivial/trivial.cpp    1.7  warwick  +1 -1
+extensions/nsplugin/src/qnp.cpp    1.19  warwick  +9 -9
+extensions/opengl/examples/box/globjwin.cpp    1.4  warwick  +4 -4
+extensions/opengl/examples/box/main.cpp    1.4  warwick  +1 -1
+extensions/opengl/examples/gear/gear.cpp    1.6  warwick  +1 -1
+extensions/opengl/examples/sharedbox/globjwin.cpp    1.2  warwick  +4 -4
+extensions/opengl/examples/sharedbox/main.cpp    1.2  warwick  +1 -1
+extensions/xt/examples/mainlyMotif/editor.cpp    1.3  warwick  +2 -2
+extensions/xt/examples/mainlyQt/editor.cpp    1.2  warwick  +2 -2
+extensions/xt/examples/mainlyXt/editor.cpp    1.2  warwick  +2 -2
+extensions/xt/src/qxt.cpp    1.3  warwick  +6 -6
+extensions/xt/src/qxt.h    1.2  warwick  +2 -2
+src/qt.pro    2.26  warwick  +110 -110
+src/qtinternal.pro    2.7  warwick  +5 -5
+src/dialogs/qfiledialog.cpp    2.71  warwick  +12 -12
+src/dialogs/qfiledialog.h    2.18  warwick  +4 -4
+src/dialogs/qfiledlg.cpp    2.71  warwick  +1 -1
+src/dialogs/qfiledlg.h    2.18  warwick  +2 -146
+src/dialogs/qfontdialog.cpp    2.13  warwick  +7 -7
+src/dialogs/qmessagebox.cpp    2.49  warwick  +5 -5
+src/dialogs/qmessagebox.h    2.26  warwick  +4 -4
+src/dialogs/qmsgbox.cpp    2.49  warwick  +1 -1
+src/dialogs/qmsgbox.h    2.26  warwick  +1 -132
+src/dialogs/qprintdialog.cpp    2.28  warwick  +10 -10
+src/dialogs/qprintdialog.h    2.9  warwick  +4 -4
+src/dialogs/qprndlg.cpp    2.28  warwick  +1 -1
+src/dialogs/qprndlg.h    2.9  warwick  +2 -63
+src/dialogs/qprogdlg.cpp    2.27  warwick  +1 -1
+src/dialogs/qprogdlg.h    2.14  warwick  +2 -75
+src/dialogs/qprogressdialog.cpp    2.27  warwick  +6 -6
+src/dialogs/qprogressdialog.h    2.14  warwick  +6 -6
+src/dialogs/qtabdialog.cpp    2.41  warwick  +7 -6
+src/dialogs/qtabdialog.h    2.19  warwick  +4 -4
+src/dialogs/qtabdlg.cpp    2.41  warwick  +1 -1
+src/dialogs/qtabdlg.h    2.19  warwick  +1 -84
+src/kernel/qaccel.cpp    2.13  warwick  +2 -2
+src/kernel/qapp.cpp    2.57  warwick  +1 -1
+src/kernel/qapp.h    2.27  warwick  +1 -205
+src/kernel/qapp_os2.cpp    2.5  warwick  +4 -3
+src/kernel/qapp_win.cpp    2.90  warwick  +1 -1
+src/kernel/qapp_x11.cpp    2.141  warwick  +1 -1
+src/kernel/qapplication.cpp    2.57  warwick  +13 -11
+src/kernel/qapplication.h    2.27  warwick  +5 -5
+src/kernel/qapplication_win.cpp    2.90  warwick  +9 -7
+src/kernel/qapplication_x11.cpp    2.141  warwick  +13 -11
+src/kernel/qasyncio.cpp    1.9  warwick  +2 -2
+src/kernel/qclb_win.cpp    2.7  warwick  +1 -1
+src/kernel/qclb_x11.cpp    2.13  warwick  +1 -1
+src/kernel/qclipboard.cpp    2.9  warwick  +4 -4
+src/kernel/qclipboard.h    2.5  warwick  +4 -4
+src/kernel/qclipboard_win.cpp    2.7  warwick  +4 -4
+src/kernel/qclipboard_x11.cpp    2.13  warwick  +5 -5
+src/kernel/qclipbrd.cpp    2.9  warwick  +1 -1
+src/kernel/qclipbrd.h    2.5  warwick  +2 -55
+src/kernel/qcol_win.cpp    2.18  warwick  +1 -1
+src/kernel/qcol_x11.cpp    2.31  warwick  +1 -1
+src/kernel/qcolor.cpp    2.15  warwick  +2 -2
+src/kernel/qcolor.h    2.10  warwick  +2 -2
+src/kernel/qcolor_win.cpp    2.18  warwick  +2 -2
+src/kernel/qcolor_x11.cpp    2.31  warwick  +4 -4
+src/kernel/qconnect.cpp    2.5  warwick  +1 -1
+src/kernel/qconnect.h    2.5  warwick  +2 -46
+src/kernel/qconnection.cpp    2.5  warwick  +3 -3
+src/kernel/qconnection.h    2.5  warwick  +4 -4
+src/kernel/qcur_os2.cpp    2.3  warwick  +2 -2
+src/kernel/qcur_win.cpp    2.7  warwick  +1 -1
+src/kernel/qcur_x11.cpp    2.11  warwick  +1 -1
+src/kernel/qcursor.cpp    2.8  warwick  +2 -2
+src/kernel/qcursor_win.cpp    2.7  warwick  +3 -3
+src/kernel/qcursor_x11.cpp    2.11  warwick  +3 -3
+src/kernel/qdialog.cpp    2.19  warwick  +5 -4
+src/kernel/qdnd_win.cpp    2.6  warwick  +2 -2
+src/kernel/qdnd_x11.cpp    2.18  warwick  +8 -7
+src/kernel/qdragobject.cpp    2.17  warwick  +4 -3
+src/kernel/qdrawutil.cpp    2.18  warwick  +3 -3
+src/kernel/qdrawutil.h    2.7  warwick  +4 -4
+src/kernel/qdrawutl.cpp    2.18  warwick  +1 -1
+src/kernel/qdrawutl.h    2.7  warwick  +2 -91
+src/kernel/qevent.h    2.17  warwick  +2 -2
+src/kernel/qfnt_win.cpp    2.30  warwick  +1 -1
+src/kernel/qfnt_x11.cpp    2.39  warwick  +1 -1
+src/kernel/qfont.cpp    2.35  warwick  +11 -11
+src/kernel/qfont.h    2.10  warwick  +2 -2
+src/kernel/qfont_win.cpp    2.30  warwick  +5 -5
+src/kernel/qfont_x11.cpp    2.39  warwick  +2 -2
+src/kernel/qfontdata.h    2.11  warwick  +4 -4
+src/kernel/qfontdta.h    2.11  warwick  +2 -65
+src/kernel/qfontinf.h    2.7  warwick  +1 -79
+src/kernel/qfontinfo.h    2.7  warwick  +4 -4
+src/kernel/qfontmet.h    2.14  warwick  +1 -95
+src/kernel/qfontmetrics.h    2.14  warwick  +4 -4
+src/kernel/qgmanager.cpp    2.36  warwick  +5 -5
+src/kernel/qgmanager.h    2.13  warwick  +4 -4
+src/kernel/qgmanagr.cpp    2.36  warwick  +1 -1
+src/kernel/qgmanagr.h    2.13  warwick  +2 -84
+src/kernel/qiconset.cpp    2.10  warwick  +2 -2
+src/kernel/qimage.cpp    2.91  warwick  +3 -3
+src/kernel/qlayout.h    2.18  warwick  +2 -2
+src/kernel/qmetaobj.cpp    2.9  warwick  +1 -1
+src/kernel/qmetaobj.h    2.4  warwick  +2 -66
+src/kernel/qmetaobject.cpp    2.9  warwick  +5 -4
+src/kernel/qmetaobject.h    2.4  warwick  +5 -5
+src/kernel/qmovie.cpp    1.33  warwick  +3 -3
+src/kernel/qmutex.h    1.5  warwick  +2 -2
+src/kernel/qnpsupport.cpp    2.11  warwick  +6 -6
+src/kernel/qobjcoll.h    2.6  warwick  +1 -1
+src/kernel/qobjdefs.h    2.4  warwick  +1 -78
+src/kernel/qobject.cpp    2.51  warwick  +5 -4
+src/kernel/qobject.h    2.10  warwick  +2 -2
+src/kernel/qobjectdefs.h    2.4  warwick  +4 -4
+src/kernel/qobjectdict.h    2.1  warwick  initial checkin
+src/kernel/qobjectlist.h    2.1  warwick  initial checkin
+src/kernel/qpaintd.h    2.7  warwick  +1 -170
+src/kernel/qpaintdc.h    2.6  warwick  +2 -97
+src/kernel/qpaintdevice.h    2.7  warwick  +6 -6
+src/kernel/qpaintdevice_win.cpp    2.10  warwick  +5 -5
+src/kernel/qpaintdevice_x11.cpp    2.15  warwick  +6 -6
+src/kernel/qpaintdevicedefs.h    2.6  warwick  +5 -5
+src/kernel/qpaintdevicemetrics.cpp    2.4  warwick  +3 -3
+src/kernel/qpaintdevicemetrics.h    2.3  warwick  +7 -7
+src/kernel/qpainter.cpp    2.53  warwick  +7 -7
+src/kernel/qpainter.h    2.26  warwick  +5 -5
+src/kernel/qpainter_win.cpp    2.37  warwick  +5 -5
+src/kernel/qpainter_x11.cpp    2.52  warwick  +4 -4
+src/kernel/qpalette.cpp    2.18  warwick  +2 -2
+src/kernel/qpalette.h    2.14  warwick  +2 -2
+src/kernel/qpdevmet.cpp    2.4  warwick  +1 -1
+src/kernel/qpdevmet.h    2.3  warwick  +2 -37
+src/kernel/qpic_win.cpp    2.3  warwick  +1 -1
+src/kernel/qpic_x11.cpp    2.3  warwick  +1 -1
+src/kernel/qpicture.cpp    2.6  warwick  +3 -3
+src/kernel/qpicture.h    2.5  warwick  +2 -2
+src/kernel/qpixmap.cpp    2.26  warwick  +2 -2
+src/kernel/qpixmap.h    2.20  warwick  +2 -2
+src/kernel/qpixmap_win.cpp    2.35  warwick  +3 -3
+src/kernel/qpixmap_x11.cpp    2.37  warwick  +3 -3
+src/kernel/qpixmapcache.cpp    2.7  warwick  +3 -3
+src/kernel/qpixmapcache.h    2.4  warwick  +4 -4
+src/kernel/qpm_win.cpp    2.35  warwick  +1 -1
+src/kernel/qpm_x11.cpp    2.37  warwick  +1 -1
+src/kernel/qpmcache.cpp    2.7  warwick  +1 -1
+src/kernel/qpmcache.h    2.4  warwick  +2 -31
+src/kernel/qpntarry.cpp    2.16  warwick  +1 -1
+src/kernel/qpntarry.h    2.7  warwick  +1 -155
+src/kernel/qpoint.cpp    2.4  warwick  +3 -3
+src/kernel/qpoint.h    2.3  warwick  +2 -2
+src/kernel/qpointarray.cpp    2.16  warwick  +6 -6
+src/kernel/qpointarray.h    2.7  warwick  +4 -4
+src/kernel/qprinter.cpp    2.9  warwick  +3 -3
+src/kernel/qprinter.h    2.7  warwick  +2 -2
+src/kernel/qprinter_win.cpp    2.11  warwick  +2 -2
+src/kernel/qprinter_x11.cpp    2.16  warwick  +6 -6
+src/kernel/qprn_win.cpp    2.11  warwick  +1 -1
+src/kernel/qprn_x11.cpp    2.16  warwick  +1 -1
+src/kernel/qpsprinter.cpp    2.26  warwick  +4 -4
+src/kernel/qpsprinter.h    2.8  warwick  +5 -5
+src/kernel/qpsprn.cpp    2.26  warwick  +1 -1
+src/kernel/qpsprn.h    2.8  warwick  +2 -70
+src/kernel/qptd_os2.cpp    2.3  warwick  +2 -2
+src/kernel/qptd_win.cpp    2.10  warwick  +1 -1
+src/kernel/qptd_x11.cpp    2.15  warwick  +1 -1
+src/kernel/qptr_os2.cpp    2.4  warwick  +2 -2
+src/kernel/qptr_win.cpp    2.37  warwick  +1 -1
+src/kernel/qptr_x11.cpp    2.52  warwick  +1 -1
+src/kernel/qrect.cpp    2.8  warwick  +3 -3
+src/kernel/qregion.cpp    2.14  warwick  +3 -3
+src/kernel/qregion_win.cpp    2.15  warwick  +2 -2
+src/kernel/qregion_x11.cpp    2.16  warwick  +2 -2
+src/kernel/qrgn_os2.cpp    2.4  warwick  +2 -2
+src/kernel/qrgn_win.cpp    2.15  warwick  +1 -1
+src/kernel/qrgn_x11.cpp    2.16  warwick  +1 -1
+src/kernel/qsemimodal.cpp    2.6  warwick  +2 -2
+src/kernel/qsignal.cpp    2.5  warwick  +2 -2
+src/kernel/qsize.cpp    2.9  warwick  +3 -3
+src/kernel/qsocketnotifier.cpp    2.7  warwick  +3 -3
+src/kernel/qsocketnotifier.h    2.4  warwick  +4 -4
+src/kernel/qsocknot.cpp    2.7  warwick  +1 -1
+src/kernel/qsocknot.h    2.4  warwick  +2 -60
+src/kernel/qt_x11.cpp    2.4  warwick  +1 -1
+src/kernel/qthread.h    1.5  warwick  +2 -2
+src/kernel/qtimer.cpp    2.9  warwick  +4 -3
+src/kernel/qwid_os2.cpp    2.6  warwick  +3 -2
+src/kernel/qwid_win.cpp    2.56  warwick  +1 -1
+src/kernel/qwid_x11.cpp    2.96  warwick  +1 -1
+src/kernel/qwidcoll.h    2.5  warwick  +1 -1
+src/kernel/qwidget.cpp    2.111  warwick  +10 -8
+src/kernel/qwidget.h    2.50  warwick  +5 -5
+src/kernel/qwidget_win.cpp    2.56  warwick  +11 -9
+src/kernel/qwidget_x11.cpp    2.96  warwick  +10 -8
+src/kernel/qwidgetintdict.h    2.1  warwick  initial checkin
+src/kernel/qwidgetlist.h    2.1  warwick  initial checkin
+src/kernel/qwindefs.h    2.23  warwick  +1 -313
+src/kernel/qwindowdefs.h    2.23  warwick  +5 -5
+src/kernel/qwmatrix.cpp    2.5  warwick  +3 -3
+src/kernel/qwmatrix.h    2.3  warwick  +3 -3
+src/moc/GNUmakefile    2.5  warwick  +13 -13
+src/moc/Makefile    2.10  warwick  +42 -42
+src/moc/moc.pro    1.10  warwick  +4 -4
+src/moc/moc.y    2.23  warwick  +5 -5
+src/tools/qbitarray.cpp    2.7  warwick  +5 -5
+src/tools/qbitarray.h    2.5  warwick  +4 -4
+src/tools/qbitarry.cpp    2.7  warwick  +1 -1
+src/tools/qbitarry.h    2.5  warwick  +2 -134
+src/tools/qbuffer.h    2.5  warwick  +2 -2
+src/tools/qcollect.cpp    2.5  warwick  +1 -1
+src/tools/qcollect.h    2.3  warwick  +2 -46
+src/tools/qcollection.cpp    2.5  warwick  +3 -3
+src/tools/qcollection.h    2.3  warwick  +4 -4
+src/tools/qdatastream.cpp    2.14  warwick  +3 -3
+src/tools/qdatastream.h    2.6  warwick  +5 -5
+src/tools/qdatetime.cpp    2.15  warwick  +6 -6
+src/tools/qdatetime.h    2.4  warwick  +4 -4
+src/tools/qdatetm.cpp    2.15  warwick  +1 -1
+src/tools/qdatetm.h    2.4  warwick  +2 -180
+src/tools/qdir.cpp    2.22  warwick  +3 -3
+src/tools/qdir.h    2.8  warwick  +2 -2
+src/tools/qdstream.cpp    2.14  warwick  +1 -1
+src/tools/qdstream.h    2.6  warwick  +2 -117
+src/tools/qfile.cpp    2.22  warwick  +2 -2
+src/tools/qfile.h    2.5  warwick  +2 -2
+src/tools/qfiledef.h    2.8  warwick  +3 -153
+src/tools/qfiledefs.h    2.8  warwick  +2 -2
+src/tools/qfileinf.cpp    2.11  warwick  +1 -1
+src/tools/qfileinf.h    2.3  warwick  +2 -96
+src/tools/qfileinfo.cpp    2.11  warwick  +6 -6
+src/tools/qfileinfo.h    2.3  warwick  +5 -5
+src/tools/qgcache.h    2.3  warwick  +2 -2
+src/tools/qgdict.cpp    2.16  warwick  +2 -2
+src/tools/qgdict.h    2.5  warwick  +2 -2
+src/tools/qglist.cpp    2.5  warwick  +2 -2
+src/tools/qglist.h    2.3  warwick  +2 -2
+src/tools/qglobal.cpp    2.15  warwick  +2 -2
+src/tools/qglobal.h    2.52  warwick  +2 -2
+src/tools/qgvector.cpp    2.7  warwick  +2 -2
+src/tools/qgvector.h    2.3  warwick  +2 -2
+src/tools/qintcach.h    2.3  warwick  +1 -168
+src/tools/qintcache.h    2.3  warwick  +4 -4
+src/tools/qiodev.cpp    2.11  warwick  +1 -1
+src/tools/qiodev.h    2.5  warwick  +2 -128
+src/tools/qiodevice.cpp    2.11  warwick  +3 -3
+src/tools/qiodevice.h    2.5  warwick  +4 -4
+src/tools/qstring.cpp    2.21  warwick  +2 -2
+src/tools/qstrlist.h    2.11  warwick  +2 -2
+src/tools/qstrvec.h    2.4  warwick  +2 -2
+src/tools/qtextstream.cpp    2.15  warwick  +4 -4
+src/tools/qtextstream.h    2.7  warwick  +5 -5
+src/tools/qtstream.cpp    2.15  warwick  +1 -1
+src/tools/qtstream.h    2.7  warwick  +2 -216
+src/widgets/qbttngrp.cpp    2.13  warwick  +1 -1
+src/widgets/qbttngrp.h    2.6  warwick  +2 -61
+src/widgets/qbutton.cpp    2.61  warwick  +3 -3
+src/widgets/qbutton.h    2.17  warwick  +2 -2
+src/widgets/qbuttongroup.cpp    2.13  warwick  +3 -3
+src/widgets/qbuttongroup.h    2.6  warwick  +5 -5
+src/widgets/qcheckbox.cpp    2.23  warwick  +5 -5
+src/widgets/qcheckbox.h    2.6  warwick  +4 -4
+src/widgets/qchkbox.cpp    2.23  warwick  +1 -1
+src/widgets/qchkbox.h    2.6  warwick  +2 -47
+src/widgets/qcombo.cpp    2.87  warwick  +1 -1
+src/widgets/qcombo.h    2.27  warwick  +2 -132
+src/widgets/qcombobox.cpp    2.87  warwick  +8 -8
+src/widgets/qcombobox.h    2.27  warwick  +3 -3
+src/widgets/qframe.cpp    2.19  warwick  +2 -2
+src/widgets/qgroupbox.cpp    2.12  warwick  +3 -3
+src/widgets/qgroupbox.h    2.4  warwick  +4 -4
+src/widgets/qgrpbox.cpp    2.12  warwick  +1 -1
+src/widgets/qgrpbox.h    2.4  warwick  +2 -46
+src/widgets/qheader.cpp    2.45  warwick  +3 -3
+src/widgets/qheader.h    2.19  warwick  +2 -2
+src/widgets/qlabel.cpp    2.32  warwick  +2 -2
+src/widgets/qlcdnum.cpp    2.13  warwick  +1 -1
+src/widgets/qlcdnum.h    2.8  warwick  +2 -95
+src/widgets/qlcdnumber.cpp    2.13  warwick  +4 -4
+src/widgets/qlcdnumber.h    2.8  warwick  +5 -5
+src/widgets/qlined.cpp    2.81  warwick  +1 -1
+src/widgets/qlined.h    2.28  warwick  +2 -138
+src/widgets/qlineedit.cpp    2.81  warwick  +7 -7
+src/widgets/qlineedit.h    2.28  warwick  +4 -4
+src/widgets/qlistbox.cpp    2.69  warwick  +4 -4
+src/widgets/qlistbox.h    2.16  warwick  +2 -2
+src/widgets/qlistview.cpp    2.117  warwick  +3 -3
+src/widgets/qmainwindow.cpp    2.27  warwick  +4 -3
+src/widgets/qmenubar.cpp    2.54  warwick  +3 -3
+src/widgets/qmenubar.h    2.11  warwick  +2 -2
+src/widgets/qmenudata.cpp    2.16  warwick  +5 -5
+src/widgets/qmenudata.h    2.11  warwick  +4 -4
+src/widgets/qmenudta.cpp    2.16  warwick  +1 -1
+src/widgets/qmenudta.h    2.11  warwick  +1 -182
+src/widgets/qmlined.cpp    2.93  warwick  +1 -1
+src/widgets/qmlined.h    2.36  warwick  +2 -189
+src/widgets/qmultilined.cpp    2.93  warwick  +6 -6
+src/widgets/qmultilined.h    2.36  warwick  +5 -5
+src/widgets/qpopmenu.cpp    2.78  warwick  +1 -1
+src/widgets/qpopmenu.h    2.14  warwick  +2 -110
+src/widgets/qpopupmenu.cpp    2.78  warwick  +6 -6
+src/widgets/qpopupmenu.h    2.14  warwick  +6 -6
+src/widgets/qprogbar.cpp    2.19  warwick  +1 -1
+src/widgets/qprogbar.h    2.9  warwick  +2 -65
+src/widgets/qprogressbar.cpp    2.19  warwick  +5 -5
+src/widgets/qprogressbar.h    2.9  warwick  +4 -4
+src/widgets/qpushbt.cpp    2.41  warwick  +1 -1
+src/widgets/qpushbt.h    2.8  warwick  +2 -70
+src/widgets/qpushbutton.cpp    2.41  warwick  +6 -6
+src/widgets/qpushbutton.h    2.8  warwick  +4 -4
+src/widgets/qradiobt.cpp    2.28  warwick  +1 -1
+src/widgets/qradiobt.h    2.8  warwick  +2 -55
+src/widgets/qradiobutton.cpp    2.28  warwick  +6 -6
+src/widgets/qradiobutton.h    2.8  warwick  +4 -4
+src/widgets/qrangecontrol.cpp    2.6  warwick  +3 -3
+src/widgets/qrangecontrol.h    2.3  warwick  +4 -4
+src/widgets/qrangect.cpp    2.6  warwick  +1 -1
+src/widgets/qrangect.h    2.3  warwick  +2 -76
+src/widgets/qscrbar.cpp    2.38  warwick  +1 -1
+src/widgets/qscrbar.h    2.6  warwick  +2 -115
+src/widgets/qscrollbar.cpp    2.38  warwick  +3 -3
+src/widgets/qscrollbar.h    2.6  warwick  +6 -6
+src/widgets/qscrollview.cpp    2.46  warwick  +5 -4
+src/widgets/qscrollview.h    2.21  warwick  +2 -2
+src/widgets/qslider.cpp    2.52  warwick  +2 -2
+src/widgets/qslider.h    2.23  warwick  +2 -2
+src/widgets/qspinbox.cpp    2.35  warwick  +3 -3
+src/widgets/qspinbox.h    2.20  warwick  +2 -2
+src/widgets/qsplitter.cpp    1.16  warwick  +2 -2
+src/widgets/qstatusbar.cpp    2.14  warwick  +3 -3
+src/widgets/qtableview.cpp    2.49  warwick  +5 -5
+src/widgets/qtableview.h    2.10  warwick  +4 -4
+src/widgets/qtablevw.cpp    2.49  warwick  +1 -1
+src/widgets/qtablevw.h    2.10  warwick  +2 -241
+src/widgets/qtoolbar.cpp    2.23  warwick  +5 -4
+src/widgets/qtoolbutton.cpp    2.28  warwick  +3 -3
+src/widgets/qtooltip.cpp    2.47  warwick  +4 -4
+src/widgets/qwellarray.cpp    1.4  warwick  +4 -3
+src/widgets/qwellarray.h    1.5  warwick  +2 -2
+src/widgets/qwhatsthis.cpp    2.15  warwick  +3 -3
+src/widgets/qwidgetstack.cpp    2.7  warwick  +3 -2
+tutorial/t1/main.cpp    2.1  warwick  +2 -2
+tutorial/t10/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t10/main.cpp    2.3  warwick  +4 -4
+tutorial/t11/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t11/main.cpp    2.3  warwick  +4 -4
+tutorial/t12/cannon.cpp    2.3  warwick  +1 -1
+tutorial/t12/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t12/main.cpp    2.3  warwick  +4 -4
+tutorial/t13/cannon.cpp    2.3  warwick  +1 -1
+tutorial/t13/gamebrd.cpp    2.1  warwick  +3 -3
+tutorial/t13/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t13/main.cpp    2.3  warwick  +1 -1
+tutorial/t14/cannon.cpp    2.3  warwick  +1 -1
+tutorial/t14/gamebrd.cpp    2.2  warwick  +3 -3
+tutorial/t14/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t14/main.cpp    2.3  warwick  +1 -1
+tutorial/t2/main.cpp    2.1  warwick  +2 -2
+tutorial/t3/main.cpp    2.1  warwick  +2 -2
+tutorial/t4/main.cpp    2.1  warwick  +2 -2
+tutorial/t5/main.cpp    2.1  warwick  +4 -4
+tutorial/t6/main.cpp    2.1  warwick  +4 -4
+tutorial/t7/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t7/main.cpp    2.1  warwick  +4 -4
+tutorial/t8/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t8/main.cpp    2.1  warwick  +4 -4
+tutorial/t9/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t9/main.cpp    2.3  warwick  +4 -4
+
+  The Big Renaming of '98
+
+
+doc/tutorial.doc    2.14  agulbra  +4 -4
+
+  new header files
+
+
+examples/validator/motor.cpp    1.8  agulbra  +2 -71
+examples/validator/motor.h    1.7  agulbra  +2 -29
+examples/validator/vw.cpp    1.7  agulbra  +11 -11
+examples/validator/vw.h    1.4  agulbra  +3 -3
+
+  some fixes for current QSpinBox
+
+
+extensions/nsplugin/src/qnp.pro    1.2  warwick  +1 -1
+
+  tmake workaround
+
+
+src/dialogs/qfiledialog.cpp    2.70  agulbra  +46 -1
+src/dialogs/qfiledialog.h    2.17  agulbra  +3 -1
+src/dialogs/qfiledlg.cpp    2.70  agulbra  +46 -1
+src/dialogs/qfiledlg.h    2.17  agulbra  +3 -1
+
+  support multile file types
+
+
+src/dialogs/qfiledlg.h    2.19  warwick  +0 -0
+src/dialogs/qmsgbox.h    2.27  warwick  +0 -0
+src/dialogs/qprndlg.h    2.10  warwick  +0 -0
+src/dialogs/qprogdlg.h    2.15  warwick  +0 -0
+src/dialogs/qtabdlg.h    2.20  warwick  +0 -0
+src/kernel/qapp.h    2.28  warwick  +0 -0
+src/kernel/qclipbrd.h    2.6  warwick  +0 -0
+src/kernel/qconnect.h    2.6  warwick  +0 -0
+src/kernel/qdrawutl.h    2.8  warwick  +0 -0
+src/kernel/qfontdta.h    2.12  warwick  +0 -0
+src/kernel/qfontinf.h    2.8  warwick  +0 -0
+src/kernel/qfontmet.h    2.15  warwick  +0 -0
+src/kernel/qgmanagr.h    2.14  warwick  +0 -0
+src/kernel/qmetaobj.h    2.5  warwick  +0 -0
+src/kernel/qobjdefs.h    2.5  warwick  +0 -0
+src/kernel/qpaintd.h    2.8  warwick  +0 -0
+src/kernel/qpaintdc.h    2.7  warwick  +0 -0
+src/kernel/qpdevmet.h    2.4  warwick  +0 -0
+src/kernel/qpmcache.h    2.5  warwick  +0 -0
+src/kernel/qpntarry.h    2.8  warwick  +0 -0
+src/kernel/qpsprn.h    2.9  warwick  +0 -0
+src/kernel/qsocknot.h    2.5  warwick  +0 -0
+src/kernel/qwindefs.h    2.24  warwick  +0 -0
+src/tools/qbitarry.h    2.6  warwick  +0 -0
+src/tools/qcollect.h    2.4  warwick  +0 -0
+src/tools/qdatetm.h    2.5  warwick  +0 -0
+src/tools/qdstream.h    2.7  warwick  +0 -0
+src/tools/qfiledef.h    2.9  warwick  +0 -0
+src/tools/qfileinf.h    2.4  warwick  +0 -0
+src/tools/qintcach.h    2.4  warwick  +0 -0
+src/tools/qiodev.h    2.6  warwick  +0 -0
+src/tools/qtstream.h    2.8  warwick  +0 -0
+src/widgets/qbttngrp.h    2.7  warwick  +0 -0
+src/widgets/qchkbox.h    2.7  warwick  +0 -0
+src/widgets/qcombo.h    2.28  warwick  +0 -0
+src/widgets/qgrpbox.h    2.5  warwick  +0 -0
+src/widgets/qlcdnum.h    2.9  warwick  +0 -0
+src/widgets/qlined.h    2.29  warwick  +0 -0
+src/widgets/qmenudta.h    2.12  warwick  +0 -0
+src/widgets/qmlined.h    2.37  warwick  +0 -0
+src/widgets/qpopmenu.h    2.15  warwick  +0 -0
+src/widgets/qprogbar.h    2.10  warwick  +0 -0
+src/widgets/qpushbt.h    2.9  warwick  +0 -0
+src/widgets/qradiobt.h    2.9  warwick  +0 -0
+src/widgets/qrangect.h    2.4  warwick  +0 -0
+src/widgets/qscrbar.h    2.7  warwick  +0 -0
+src/widgets/qtablevw.h    2.11  warwick  +0 -0
+
+  Move compatibility files out of the way.
+
+
+src/dialogs/qprintdialog.cpp    2.27  agulbra  +67 -1
+src/dialogs/qprndlg.cpp    2.27  agulbra  +67 -1
+
+  val's irix 6.3 printer discovery code
+
+
+src/kernel/qapp.cpp    2.56  agulbra  +14 -6
+src/kernel/qapplication.cpp    2.56  agulbra  +14 -6
+src/kernel/qasyncimageio.cpp    1.34  agulbra  +53 -15
+src/kernel/qregion.cpp    2.13  agulbra  +1 -8
+src/kernel/qregion.h    2.13  agulbra  +1 -4
+src/widgets/qheader.cpp    2.44  agulbra  +4 -5
+
+  Reginald Stadlbauer's alpha's egcs said to do this.  it doesn't like
+  static objects with non-default constructors.
+
+
+src/kernel/qapp_os2.cpp    2.6  warwick  +1 -1
+src/kernel/qcol_os2.cpp    2.4  warwick  +1 -1
+src/kernel/qcur_os2.cpp    2.4  warwick  +1 -1
+src/kernel/qfnt_os2.cpp    2.3  warwick  +1 -1
+src/kernel/qpic_os2.cpp    2.3  warwick  +1 -1
+src/kernel/qpm_os2.cpp    2.3  warwick  +1 -1
+src/kernel/qptd_os2.cpp    2.4  warwick  +1 -1
+src/kernel/qptr_os2.cpp    2.5  warwick  +1 -1
+src/kernel/qrgn_os2.cpp    2.5  warwick  +1 -1
+src/kernel/qwid_os2.cpp    2.7  warwick  +1 -1
+
+  Remove OS2 code.
+
+
+src/kernel/qapp_x11.cpp    2.139  hanord  +2 -4
+src/kernel/qapplication_x11.cpp    2.139  hanord  +2 -4
+
+  Fixed keyboard release event bug when the key press was done outside the
+  window (Morten Eriksen bug report).
+
+
+src/kernel/qapp_x11.cpp    2.140  warwick  +5 -5
+src/kernel/qapplication_x11.cpp    2.140  warwick  +5 -5
+src/kernel/qfnt_x11.cpp    2.37  warwick  +9 -23
+src/kernel/qfont_x11.cpp    2.37  warwick  +9 -23
+src/kernel/qimage.cpp    2.90  warwick  +13 -13
+src/kernel/qnpsupport.cpp    2.10  warwick  +2 -1
+src/kernel/qwidget.cpp    2.109  warwick  +17 -16
+
+  Fix pointer-to-int casts that 64-bit compiler don't like.
+
+
+src/kernel/qcol_x11.cpp    2.30  hanord  +2 -2
+src/kernel/qcolor_x11.cpp    2.30  hanord  +2 -2
+src/widgets/qheader.cpp    2.42  hanord  +2 -2
+
+  Don't do big changes in 1.40, wait until 1.49
+
+
+src/kernel/qdialog.cpp    2.18  warwick  +20 -4
+
+  Stay on-screen when centering relative to parent.  This code should
+  be shared.
+
+
+src/kernel/qdnd_x11.cpp    2.15  agulbra  +6 -9
+
+  comment out old debug messages; delete some
+
+
+src/kernel/qdnd_x11.cpp    2.16  agulbra  +8 -5
+
+  workaround for gcc/alpha brokenness.
+
+
+src/kernel/qdnd_x11.cpp    2.17  warwick  +9 -9
+src/kernel/qpainter.cpp    2.52  warwick  +14 -11
+src/kernel/qwid_x11.cpp    2.95  warwick  +2 -2
+src/kernel/qwidget_x11.cpp    2.95  warwick  +2 -2
+src/widgets/qwellarray.cpp    1.3  warwick  +10 -1
+src/widgets/qwellarray.h    1.4  warwick  +2 -1
+
+  Avoid HPUX warnings.
+
+
+src/kernel/qdragobject.cpp    2.15  agulbra  +4 -6
+
+  ignore totally unexpected events
+
+
+src/kernel/qdragobject.cpp    2.16  agulbra  +2 -2
+
+  stop warning
+
+
+src/kernel/qfnt_win.cpp    2.29  warwick  +3 -3
+src/kernel/qfnt_x11.cpp    2.38  warwick  +4 -4
+src/kernel/qfont_win.cpp    2.29  warwick  +3 -3
+src/kernel/qfont_x11.cpp    2.38  warwick  +4 -4
+
+  Fix width(char) for signed characters.
+
+
+src/kernel/qgmanager.cpp    2.35  paul  +48 -20
+src/kernel/qgmanager.h    2.12  paul  +3 -1
+src/kernel/qgmanagr.cpp    2.35  paul  +48 -20
+src/kernel/qgmanagr.h    2.12  paul  +3 -1
+src/kernel/qlayout.cpp    2.32  paul  +36 -22
+
+  Better debug output.
+
+
+src/kernel/qimage.cpp    2.92  warwick  +3 -3
+src/kernel/qlayout.cpp    2.34  agulbra  +10 -25
+src/kernel/qpainter.cpp    2.50  agulbra  +6 -12
+src/tools/qregexp.cpp    2.11  agulbra  +3 -3
+src/widgets/qstatusbar.cpp    2.12  agulbra  +4 -4
+
+  doc
+
+
+src/kernel/qlayout.cpp    2.31  agulbra  +75 -24
+src/widgets/qlistview.cpp    2.114  agulbra  +7 -2
+
+  some docs
+
+
+src/kernel/qlayout.cpp    2.33  agulbra  +183 -34
+src/widgets/qlistview.cpp    2.115  agulbra  +93 -22
+src/widgets/qlistview.h    2.50  agulbra  +4 -1
+src/widgets/qwhatsthis.cpp    2.14  agulbra  +152 -29
+
+  doc, doc, doc.  this round pushes qt over 3250 documented functions.
+  the next milestone is five megs of html doc (sixty-odd k left).
+
+
+src/kernel/qobjcoll.h    2.7  warwick  +4 -20
+src/kernel/qwidcoll.h    2.6  warwick  +3 -14
+
+  Broken in rename.
+
+
+src/kernel/qobjcoll.h    2.8  warwick  +1 -1
+src/kernel/qwidcoll.h    2.7  warwick  +1 -1
+
+  Moved.
+
+
+src/kernel/qpainter.cpp    2.51  warwick  +2 -2
+
+  Improve robustness.
+
+
+src/kernel/qprinter_x11.cpp    2.15  agulbra  +2 -1
+src/kernel/qprn_x11.cpp    2.15  agulbra  +2 -1
+
+  #include <errno.h>; necessary for some unixes
+
+
+src/kernel/qwidget.cpp    2.110  agulbra  +2 -2
+
+  make tab focus change work (at all!) in dialogs
+
+
+src/tools/qfileinf.cpp    2.10  agulbra  +17 -8
+src/tools/qfileinfo.cpp    2.10  agulbra  +17 -8
+
+  double the speed of isSymLink() (and hence the file dialog's repaint)
+  in one easy change.
+
+
+src/tools/qgdict.cpp    2.15  warwick  +2 -2
+
+  64-bit pointer to long fix.
+
+
+src/tools/qstring.cpp    2.20  warwick  +2 -2
+
+  Obscure safety improvement.
+
+
+src/widgets/qcombo.cpp    2.86  agulbra  +2 -2
+src/widgets/qcombobox.cpp    2.86  agulbra  +2 -2
+src/widgets/qlabel.cpp    2.31  agulbra  +2 -2
+
+  fix logic to decide when to locate the listbox above the combo itself
+  instead of below.
+
+
+src/widgets/qheader.cpp    2.43  agulbra  +2 -3
+
+  remove a "this should not happen" debug() because that situation
+  should happen.  can happen, anyway.
+
+
+src/widgets/qlined.cpp    2.80  warwick  +24 -6
+src/widgets/qlined.h    2.27  warwick  +2 -1
+src/widgets/qlineedit.cpp    2.80  warwick  +24 -6
+src/widgets/qlineedit.h    2.27  warwick  +2 -1
+src/widgets/qmlined.cpp    2.92  warwick  +36 -7
+src/widgets/qmlined.h    2.35  warwick  +2 -1
+src/widgets/qmultilined.cpp    2.92  warwick  +36 -7
+src/widgets/qmultilined.h    2.35  warwick  +2 -1
+
+  Make WindowsStyle under X11 still meet the X11 user's expectations
+  regarding auto-copy, while allowing the highlight-and-paste action
+  familiar to Windows users.  A compromise.
+  
+  Also make qmlined more similar to qlined.
+
+
+src/widgets/qlistbox.cpp    2.68  warwick  +2 -2
+
+  Use maximumSize() correctly.
+  (fixes kdisplay background problem)
+
+
+src/widgets/qlistview.cpp    2.116  agulbra  +25 -12
+
+  tweak mouse state machine a little.  make it harder to select a
+  non-selectable item.  doc fixes.
+
+
+src/widgets/qmainwindow.cpp    2.25  agulbra  +3 -5
+src/widgets/qmainwindow.cpp    2.24  agulbra  +245 -26
+src/widgets/qmainwindow.h    2.15  agulbra  +2 -1
+
+  if a dock contained only hidden toolbars, layout would be wrong.
+  also contains ifdef-ed out broken docking code.
+
+
+src/widgets/qmainwindow.cpp    2.26  warwick  +3 -1
+src/widgets/qsplitter.cpp    1.15  warwick  +3 -1
+src/widgets/qstatusbar.cpp    2.13  warwick  +3 -1
+
+  New documentation images.
+
+
+src/widgets/qmainwindow.h    2.16  agulbra  +2 -3
+
+  setRightJustification is now a slot
+
+
+src/widgets/qmenudata.cpp    2.15  warwick  +4 -2
+src/widgets/qmenudta.cpp    2.15  warwick  +4 -2
+
+  Warning about setCheckable in setItemChecked.
+
+
+src/widgets/qpopmenu.cpp    2.76  warwick  +4 -9
+src/widgets/qpopupmenu.cpp    2.76  warwick  +4 -9
+
+  Fix "need more than one off-menu click to cancel" bug.
+  Make Escape only pop down one popup (as per Windows and Motif).
+
+
+src/widgets/qpopmenu.cpp    2.77  warwick  +4 -2
+src/widgets/qpopupmenu.cpp    2.77  warwick  +4 -2
+
+  Correct drop-down-on-no-selection behaviour.
+
+
+src/widgets/qspinbox.cpp    2.33  agulbra  +5 -7
+
+  minor changes; this really need to take the validator into
+  consideration when the user has typed but I can't fix that now.
+
+
+src/widgets/qspinbox.cpp    2.34  agulbra  +18 -3
+src/widgets/qspinbox.h    2.19  agulbra  +3 -1
+
+  handle setEnabled() correctly
+
+
+src/widgets/qsplitter.cpp    1.14  paul  +10 -10
+
+  Fixed off-by-one error
+
+
+src/widgets/qtabbar.h    2.11  agulbra  +2 -1
+
+  one variable wasn't initialized.  initialize it.
+
+
+src/widgets/qtooltip.cpp    2.46  agulbra  +3 -3
+
+  stay up for ten seconds, not four.
+
+
+src/widgets/qvalidator.cpp    2.20  agulbra  +7 -4
+
+  "-" is a valid state for both validator; allows typing of -42 in the
+  natural way if -42 is valid.
+
diff --git a/dist/changes-1.39-19980623 b/dist/changes-1.39-19980623
new file mode 100644
index 0000000..0a40bf9
--- /dev/null
+++ b/dist/changes-1.39-19980623
@@ -0,0 +1,545 @@
+doc/annotated.doc    1.5  warwick  +6 -3
+
+  Try new tabled annotated list.
+
+
+doc/tutorial.doc    2.14  agulbra  +4 -4
+
+  new header files
+
+
+examples/application/application.cpp    1.13  warwick  +2 -2
+examples/layout/layout.cpp    1.7  warwick  +2 -2
+examples/network/finger.cpp    1.8  warwick  +2 -2
+examples/pref/pref.cpp    1.21  warwick  +2 -2
+examples/qwerty/qwerty.h    1.9  warwick  +2 -2
+examples/scrollview/scrollview.cpp    1.16  warwick  +2 -2
+examples/widgets/widgets.cpp    2.44  warwick  +2 -2
+src/widgets/qmultilinedit.cpp    2.94  warwick  +2 -2
+
+  Rename fix - "qmultilinedit.h" not "qmultilined.h"
+
+
+examples/application/application.cpp    1.14  agulbra  +32 -18
+
+  use QWhatsThis
+
+
+examples/application/application.cpp    1.15  warwick  +7 -6
+examples/application/application.h    1.5  warwick  +2 -1
+
+  Use persistent QPrinter.
+
+
+examples/dragdrop/.cvsignore    1.1  warwick  initial checkin
+examples/dragdrop/dragdrop.pro    1.1  warwick  initial checkin
+examples/dragdrop/main.cpp    1.6  warwick  +20 -7
+src/qt.pro    2.28  warwick  +3 -3
+
+  upd
+
+
+examples/dragdrop/GNUmakefile    1.1  warwick  initial checkin
+examples/dragdrop/Makefile    1.1  warwick  initial checkin
+examples/dragdrop/main.cpp    1.2  warwick  +2 -1
+
+  Quit.
+
+
+examples/dragdrop/dropsite.cpp    1.1  agulbra  initial checkin
+examples/dragdrop/dropsite.h    1.1  agulbra  initial checkin
+examples/dragdrop/main.cpp    1.1  agulbra  initial checkin
+
+  kind of like simple.c, except not 2000 lines
+
+
+examples/dragdrop/dropsite.cpp    1.2  warwick  +22 -3
+examples/dragdrop/main.cpp    1.3  warwick  +3 -3
+
+  Fixes, more debug options.
+
+
+examples/dragdrop/dropsite.cpp    1.3  warwick  +36 -34
+examples/dragdrop/main.cpp    1.4  warwick  +2 -2
+
+  Better feedback, more examples.
+
+
+examples/dragdrop/dropsite.cpp    1.4  warwick  +5 -3
+
+  Visualize DragLeave events.
+
+
+examples/dragdrop/dropsite.cpp    1.5  warwick  +15 -43
+examples/dragdrop/dropsite.h    1.2  warwick  +1 -7
+examples/dragdrop/main.cpp    1.5  warwick  +2 -10
+
+  Remove format choice - QImageDragObject deals with that.
+
+
+examples/dragdrop/dropsite.cpp    1.6  warwick  +4 -5
+src/kernel/qdragobject.cpp    2.25  warwick  +11 -6
+src/kernel/qdragobject.h    2.12  warwick  +3 -2
+
+  Set MIME format in QStoredDragObject constructor.
+
+
+examples/dragdrop/dropsite.cpp    1.7  warwick  +10 -3
+examples/dragdrop/dropsite.h    1.3  warwick  +2 -1
+
+  Use Event_DragEnter
+
+
+examples/movies/main.cpp    1.12  warwick  +4 -4
+
+  Warnings, robustness.
+
+
+examples/showimg/.cvsignore    2.1  warwick  +5 -0
+
+  Ignore images
+
+
+extensions/nsplugin/examples/Makefile    1.1  warwick  initial checkin
+extensions/xt/doc.conf    1.4  warwick  +1 -1
+
+  Oddsnends
+
+
+extensions/nsplugin/src/qnp.cpp    1.20  warwick  +19 -20
+
+  show() not required now.
+
+
+extensions/nsplugin/src/qnp.pro    1.2  warwick  +1 -1
+
+  tmake workaround
+
+
+src/compat/qmlined.h    1.2  warwick  +1 -1
+
+  edit not ed
+
+
+src/compat/qobjcoll.h    1.1  warwick  initial checkin
+src/compat/qwidcoll.h    1.1  warwick  initial checkin
+src/kernel/qobjcoll.h    2.8  warwick  +1 -1
+src/kernel/qwidcoll.h    2.7  warwick  +1 -1
+
+  Moved.
+
+
+src/dialogs/qfiledialog.cpp    2.72  agulbra  +79 -54
+
+  avoid one more static
+
+
+src/dialogs/qfiledialog.cpp    2.73  agulbra  +3 -3
+
+  use the right column width in multi-column mode
+
+
+src/dialogs/qfiledialog.cpp    2.74  agulbra  +1 -2
+
+  commit -without- debug feature
+
+
+src/dialogs/qfiledialog.cpp    2.75  agulbra  +22 -8
+
+  handle "type name of directory then press enter" case by switching to
+  that directory
+
+
+src/dialogs/qfiledialog.cpp    2.76  agulbra  +10 -7
+
+  minor tweak to make the ok button change less often
+
+
+src/dialogs/qfiledialog.cpp    2.77  agulbra  +2 -2
+
+  slightly better row height in the multi-column view
+
+
+src/kernel/qapp.cpp    2.56  agulbra  +14 -6
+src/kernel/qapplication.cpp    2.56  agulbra  +14 -6
+src/kernel/qasyncimageio.cpp    1.34  agulbra  +53 -15
+src/kernel/qregion.cpp    2.13  agulbra  +1 -8
+src/kernel/qregion.h    2.13  agulbra  +1 -4
+src/widgets/qheader.cpp    2.44  agulbra  +4 -5
+
+  Reginald Stadlbauer's alpha's egcs said to do this.  it doesn't like
+  static objects with non-default constructors.
+
+
+src/kernel/qapplication_win.cpp    2.91  warwick  +10 -1
+src/kernel/qdnd_x11.cpp    2.20  warwick  +1 -7
+src/kernel/qdragobject.h    2.9  warwick  +1 -4
+src/kernel/qwidget.cpp    2.112  warwick  +4 -11
+src/kernel/qwidget_win.cpp    2.57  warwick  +20 -3
+src/kernel/qwidget_x11.cpp    2.97  warwick  +12 -4
+src/kernel/qwindowdefs.h    2.24  warwick  +5 -1
+
+  Drag&dropery.
+
+
+src/kernel/qapplication_win.cpp    2.93  warwick  +4 -2
+src/kernel/qdnd_win.cpp    2.10  warwick  +483 -135
+src/kernel/qdnd_x11.cpp    2.24  warwick  +21 -1
+src/kernel/qdragobject.cpp    2.18  warwick  +5 -5
+src/kernel/qevent.cpp    2.17  warwick  +1 -21
+src/kernel/qimage.cpp    2.93  warwick  +73 -34
+src/kernel/qwidget_win.cpp    2.59  warwick  +4 -3
+
+  Windows Drap & Drop.
+
+
+src/kernel/qasyncimageio.cpp    1.35  agulbra  +2 -2
+
+  make cleanup() static
+
+
+src/kernel/qasyncimageio.cpp    1.37  warwick  +4 -2
+src/kernel/qasyncimageio.cpp    1.36  warwick  +30 -7
+src/kernel/qdragobject.cpp    2.22  warwick  +7 -5
+src/kernel/qimage.cpp    2.96  warwick  +4 -1
+src/kernel/qimage.cpp    2.95  agulbra  +8 -9
+src/kernel/qimage.cpp    2.92  warwick  +3 -3
+src/tools/qdir.cpp    2.24  agulbra  +7 -1
+
+  doc
+
+
+src/kernel/qclipboard_x11.cpp    2.14  agulbra  +26 -20
+
+  avoid statics that are troublesome on the alpha
+
+
+src/kernel/qdialog.cpp    2.20  agulbra  +39 -18
+
+  frameGeometry() is normally not meaningful before show(), so I
+  switched to a different way of ensuring that the dialog's default
+  position is entirely on-screen.  may not work perfectly with
+  Enlightenment :)
+
+
+src/kernel/qdnd_win.cpp    2.11  warwick  +5 -1
+src/kernel/qdnd_x11.cpp    2.25  warwick  +56 -1
+src/kernel/qdragobject.cpp    2.19  warwick  +8 -59
+
+  Move QDragManager::eventFilter code to X11-specifics.
+
+
+src/kernel/qdnd_win.cpp    2.12  warwick  +44 -31
+
+  Follow DnD API changes.
+  Add leave event.
+
+
+src/kernel/qdnd_win.cpp    2.13  warwick  +8 -3
+src/kernel/qevent.h    2.19  warwick  +15 -5
+
+  DragEnter events and final DragLeave to DropEvent targets.
+
+
+src/kernel/qdnd_win.cpp    2.14  warwick  +2 -6
+
+  spacing
+
+
+src/kernel/qdnd_win.cpp    2.7  warwick  +989 -12
+
+  First inclusion from tests/olednd code.
+
+
+src/kernel/qdnd_win.cpp    2.9  warwick  +162 -98
+
+  DND.
+
+
+src/kernel/qdnd_x11.cpp    2.17  warwick  +9 -9
+src/kernel/qpainter.cpp    2.52  warwick  +14 -11
+src/kernel/qwid_x11.cpp    2.95  warwick  +2 -2
+src/kernel/qwidget_x11.cpp    2.95  warwick  +2 -2
+src/widgets/qwellarray.cpp    1.3  warwick  +10 -1
+src/widgets/qwellarray.h    1.4  warwick  +2 -1
+
+  Avoid HPUX warnings.
+
+
+src/kernel/qdnd_x11.cpp    2.19  agulbra  +29 -25
+
+  egcs/alpha workarounds.
+
+
+src/kernel/qdnd_x11.cpp    2.22  agulbra  +2 -2
+src/kernel/qwidget_x11.cpp    2.98  agulbra  +2 -2
+
+  don't segfault on first registerDropType()
+
+
+src/kernel/qdnd_x11.cpp    2.23  paul  +5 -3
+
+  Ignore windows without clients.
+
+
+src/kernel/qdnd_x11.cpp    2.26  warwick  +18 -1
+src/kernel/qdragobject.cpp    2.20  warwick  +1 -16
+
+  Move DND cursor into X11-specifics.
+
+
+src/kernel/qdnd_x11.cpp    2.27  warwick  +16 -10
+src/kernel/qdragobject.cpp    2.23  warwick  +130 -71
+src/kernel/qdragobject.h    2.11  warwick  +14 -25
+
+  Multi-format QDragObject API.
+
+
+src/kernel/qdnd_x11.cpp    2.28  agulbra  +47 -18
+
+  updated to match windows version
+
+
+src/kernel/qdragobject.cpp    2.21  warwick  +99 -14
+src/kernel/qdragobject.h    2.10  warwick  +45 -3
+
+  QImageDragObject
+  Mark out problem areas for fixing.
+
+
+src/kernel/qdragobject.cpp    2.24  agulbra  +2 -2
+src/kernel/qlayout.cpp    2.35  agulbra  +3 -3
+src/kernel/qpixmapcache.cpp    2.8  agulbra  +2 -1
+src/tools/qgcache.cpp    2.7  agulbra  +12 -8
+src/widgets/qpushbutton.cpp    2.43  agulbra  +3 -3
+
+  speling
+
+
+src/kernel/qdragobject.cpp    2.26  warwick  +9 -17
+src/kernel/qdragobject.h    2.13  warwick  +3 -4
+
+  Simplify QStoredDragObject.
+
+
+src/kernel/qevent.h    2.20  agulbra  +9 -3
+
+  added no-answer-necessary rectangle to drag move event
+
+
+src/kernel/qfocusdata.h    2.3  warwick  +11 -3
+src/widgets/qscrollview.cpp    2.48  warwick  +12 -7
+src/widgets/qscrollview.cpp    2.47  warwick  +6 -4
+
+  Focus wrapping.
+
+
+src/kernel/qfont.cpp    2.36  agulbra  +19 -7
+
+  more alpha/egcs/linux workarounds
+
+
+src/kernel/qfont_x11.cpp    2.40  warwick  +3 -3
+
+  Go gray.
+
+
+src/kernel/qimage.cpp    2.94  warwick  +22 -1
+src/kernel/qimage.h    2.28  warwick  +2 -1
+src/kernel/qpixmap.cpp    2.27  warwick  +24 -1
+src/kernel/qpixmap.h    2.21  warwick  +5 -2
+
+  Convenient input from QByteArray.
+
+
+src/kernel/qimage.cpp    2.97  warwick  +2 -2
+src/kernel/qpixmap.cpp    2.28  warwick  +2 -2
+
+  Fix.
+
+
+src/kernel/qmovie.cpp    1.34  warwick  +11 -2
+
+  Code to be added and tested later.
+
+
+src/kernel/qmovie.cpp    1.35  warwick  +5 -9
+src/kernel/qmovie.h    1.11  warwick  +3 -2
+
+  Provide QDataSource source to QMovie.
+
+
+src/kernel/qobjcoll.h    2.7  warwick  +4 -20
+src/kernel/qwidcoll.h    2.6  warwick  +3 -14
+
+  Broken in rename.
+
+
+src/kernel/qprinter_x11.cpp    2.17  agulbra  +4 -3
+
+  roll back to 1.33 version
+
+
+src/kernel/qwidget.cpp    2.113  paul  +3 -2
+
+  Send queued-up childEvents before the first resize event
+
+
+src/kernel/qwidget.h    2.51  warwick  +3 -1
+
+  Separate sys-dep extra data create/delete.
+
+
+src/qt.pro    2.27  warwick  +1 -0
+src/dialogs/qfiledlg.cpp    2.72  warwick  +2 -1
+src/kernel/qapplication_win.cpp    2.92  warwick  +4 -4
+src/kernel/qdnd_win.cpp    2.8  warwick  +115 -505
+src/kernel/qdnd_x11.cpp    2.21  warwick  +2 -2
+src/kernel/qevent.h    2.18  warwick  +2 -2
+src/kernel/qwidget_win.cpp    2.58  warwick  +3 -1
+
+  Drag&Dropery.
+
+
+src/qt.pro    2.29  warwick  +2 -0
+src/kernel/qfocusdata.cpp    2.1  warwick  initial checkin
+src/kernel/qfocusdata.h    2.4  warwick  +6 -12
+src/kernel/qwidget.cpp    2.114  warwick  +3 -1
+src/widgets/qscrollview.cpp    2.49  warwick  +5 -8
+
+  Make QFocusData clean and public.
+
+
+src/tools/qdir.cpp    2.23  agulbra  +2 -2
+
+  avoid a static.   saves some memory.
+
+
+src/tools/qglobal.cpp    2.16  agulbra  +6 -4
+
+  void statics
+
+
+src/widgets/qbutton.cpp    2.62  agulbra  +5 -9
+
+  emit toggled() and clicked() even if this is a toggle button and will
+  not toggle off.
+
+
+src/widgets/qbutton.cpp    2.63  agulbra  +4 -4
+
+  correct toggling-when-in-group behaviour
+
+
+src/widgets/qheader.cpp    2.46  paul  +4 -4
+
+  Fix off by one error that caused "index out of range".
+
+
+src/widgets/qlistview.cpp    2.118  agulbra  +19 -12
+
+  much faster scrolling in unsorted mode; use about half as much memory
+  per item; free the items properly
+
+
+src/widgets/qlistview.cpp    2.119  agulbra  +2 -2
+
+  unsort/sort correctly
+
+
+src/widgets/qlistview.cpp    2.120  agulbra  +3 -3
+
+  finalize QListViewItem in the right way
+
+
+src/widgets/qlistview.cpp    2.121  agulbra  +35 -17
+
+  cut memory usage by another fifty per cent in the common case.  QLVI
+  now uses 150-200 bytes of memory, down from ~800 last week.
+  
+  default to the correct height (including itemMargin()).
+  
+  change itemMargin default to one pixel, from two.
+  
+  use itemMargin both on the left and on the right edge of each column.
+  
+  ensure that children are sorted correctly in QLV::firstChild(), as
+  they are in QLVI::firstChild().
+
+
+src/widgets/qlistview.h    2.51  agulbra  +2 -2
+
+  make setItemMargin() virtual.  who put in a non-virtual setter
+  function?
+
+
+src/widgets/qmenudata.cpp    2.17  agulbra  +8 -6
+
+  DWIM: call setCheckable() in setItemChecked() if necessary
+
+
+src/widgets/qmultilinedit.h    2.37  warwick  +3 -3
+
+  EDIT, not ED.
+
+
+src/widgets/qpopupmenu.cpp    2.79  warwick  +2 -4
+
+  Roll-back my menu-stays-up "fix".
+
+
+src/widgets/qpopupmenu.cpp    2.80  warwick  +7 -2
+
+  Worse but better fix for allow both popup and pulldown/pushup menus.
+
+
+src/widgets/qpushbutton.cpp    2.42  agulbra  +16 -57
+
+  use alternative (windows-like) motif indication of default button
+  status, rather than the nextstep/xforms/gtk-like indication.
+
+
+src/widgets/qsplitter.cpp    1.17  paul  +6 -5
+src/widgets/qsplitter.h    1.9  paul  +3 -2
+
+  Changed QSplitter::setFixed() to start counting at 0 instead of 1.
+  
+  *** WILL BREAK OLD CODE ***
+  
+  Also introduced FirstWidget and SecondWidget enum values to make setFixed()
+  calls more readable.
+
+
+src/widgets/qsplitter.cpp    1.18  paul  +160 -141
+src/widgets/qsplitter.h    1.10  paul  +16 -17
+
+  Reworked QSplitter API. Splitter now detects its children, addFirstWidget etc
+  disappears.
+  *** WILL BREAK OLD CODE ***
+
+
+src/widgets/qtooltip.cpp    2.48  agulbra  +4 -4
+
+  tweak periods a bit
+
+
+src/widgets/qtooltip.cpp    2.49  agulbra  +4 -3
+
+  paranoia fix: don't let buggy programs introduce an infinte loop by
+  calling tip() with the "wrong" rectangle.
+
+
+src/widgets/qwidgetstack.cpp    2.8  agulbra  +4 -1
+src/widgets/qwidgetstack.h    2.5  agulbra  +5 -1
+
+  aboutToShow()
+
+
+src/widgets/qwidgetstack.cpp    2.9  agulbra  +69 -12
+src/widgets/qwidgetstack.h    2.6  agulbra  +4 -2
+
+  added decent docs.
+  added a visibleWidget() access function
+  added an aboutToShow() signal.
+  fixed "value of NaN" bug (0 vs. -1)
+
diff --git a/dist/changes-1.39-19980625 b/dist/changes-1.39-19980625
new file mode 100644
index 0000000..c71578f
--- /dev/null
+++ b/dist/changes-1.39-19980625
@@ -0,0 +1,119 @@
+
+examples/application/application.cpp    1.14  agulbra  +32 -18
+
+  use QWhatsThis
+
+
+examples/application/application.cpp    1.15  warwick  +7 -6
+examples/application/application.h    1.5  warwick  +2 -1
+
+  Use persistent QPrinter.
+
+
+examples/dragdrop/dropsite.cpp    1.8  warwick  +44 -24
+
+  Improved usage #1.
+
+
+examples/dragdrop/dropsite.cpp    1.9  warwick  +36 -81
+examples/dragdrop/dropsite.h    1.4  warwick  +7 -9
+src/qt.pro    2.30  warwick  +2 -0
+src/kernel/qclipboard_x11.cpp    2.15  warwick  +10 -8
+src/kernel/qdnd_win.cpp    2.15  warwick  +1 -18
+src/kernel/qdnd_x11.cpp    2.33  warwick  +62 -67
+src/kernel/qdragobject.cpp    2.29  warwick  +73 -27
+src/kernel/qdragobject.h    2.16  warwick  +18 -12
+src/kernel/qdropsite.cpp    2.1  warwick  initial checkin
+src/kernel/qdropsite.h    2.1  warwick  initial checkin
+src/kernel/qwidget.h    2.52  warwick  +3 -2
+src/kernel/qwidget_win.cpp    2.60  warwick  +17 -7
+src/kernel/qwidget_x11.cpp    2.99  warwick  +22 -12
+src/kernel/qwindowdefs.h    2.25  warwick  +7 -3
+src/widgets/qlineedit.cpp    2.85  warwick  +3 -3
+
+  Don't declare MIME types for drop sites in advance, just enable drops.
+
+
+examples/examples.pro    2.9  agulbra  +1 -0
+
+  add dragdrop to examples makefile
+
+
+examples/movies/main.cpp    1.13  agulbra  +9 -2
+
+  add use of setFilters().  
+
+
+examples/splitter/splitter.cpp    1.1  paul  initial checkin
+examples/splitter/splitter.pro    1.1  paul  initial checkin
+
+  Simple QSplitter example
+
+
+src/dialogs/qprintdialog.cpp    2.29  warwick  +57 -60
+
+  Fixed QPrinter->QPrintDialog state-transfer bugs.
+
+
+src/kernel/qapplication_x11.cpp    2.142  agulbra  +7 -12
+src/kernel/qdnd_x11.cpp    2.37  agulbra  +22 -23
+src/kernel/qdragobject.cpp    2.32  agulbra  +5 -25
+src/kernel/qdragobject.h    2.19  agulbra  +1 -4
+
+  Completely reworked drag'n'drop.
+
+
+src/kernel/qimage.cpp    2.99  agulbra  +7 -6
+src/kernel/qimage.cpp    2.98  agulbra  +18 -14
+src/kernel/qmovie.cpp    1.38  agulbra  +8 -7
+src/kernel/qmovie.cpp    1.37  agulbra  +12 -3
+
+  discuss patent issues
+
+
+src/widgets/qlineedit.cpp    2.82  agulbra  +2 -3
+
+  reject drags that don't provide text/plain
+
+
+src/widgets/qlistview.cpp    2.122  warwick  +3 -3
+
+  Fix multiple-calls-to-setText() unreported bug.
+
+
+src/widgets/qlistview.cpp    2.123  paul  +16 -21
+src/widgets/qlistview.h    2.52  paul  +2 -2
+
+  Make setPixmap() override default pixmap
+
+
+src/widgets/qlistview.cpp    2.124  agulbra  +16 -17
+
+  adjust drawing of focus rectangle for trees
+
+
+src/widgets/qlistview.cpp    2.126  agulbra  +1 -2
+src/widgets/qlistview.cpp    2.125  agulbra  +6 -2
+
+  try even harder to not sort unless sorting is actually requested.
+
+
+src/widgets/qmultilinedit.cpp    2.95  agulbra  +4 -4
+
+  doc correction
+
+
+src/widgets/qsplitter.cpp    1.19  paul  +48 -45
+
+  fixing odds and ends after the API change
+
+
+src/widgets/qsplitter.cpp    1.23  warwick  +5 -4
+
+  Position internalsplitter in middle of mouse when dragging.
+
+
+src/widgets/qsplitter.cpp    1.24  warwick  +48 -45
+
+  Make bitmaps correspond to splitter dimensions.
+
diff --git a/dist/changes-1.39-19980706 b/dist/changes-1.39-19980706
new file mode 100644
index 0000000..80e814a
--- /dev/null
+++ b/dist/changes-1.39-19980706
@@ -0,0 +1,320 @@
+doc/indices.doc    2.17  agulbra  +4 -4
+doc/misc.doc    2.29  agulbra  +4 -4
+doc/qcache.doc    2.4  agulbra  +598 -304
+doc/qdict.doc    2.5  agulbra  +4 -3
+
+  documented QCache/QIntCache and the iterators, fixed some types
+
+
+doc/indices.doc    2.18  agulbra  +7 -7
+extensions/imageio/doc/index.doc    1.6  agulbra  +3 -3
+extensions/nsplugin/doc/annotated.doc    1.2  agulbra  +2 -2
+extensions/nsplugin/doc/classes.doc    1.2  agulbra  +2 -2
+extensions/opengl/src/qgl.cpp    1.20  agulbra  +5 -6
+extensions/xt/doc/annotated.doc    1.2  agulbra  +2 -2
+extensions/xt/doc/classes.doc    1.2  agulbra  +2 -2
+src/tools/qtextstream.cpp    2.16  agulbra  +1 -2
+
+  finished merge of qt/extensions documentation in one directory.
+
+
+doc/indices.doc    2.20  aavit  +3 -3
+doc/qcache.doc    2.8  aavit  +9 -1
+examples/application/application.cpp    1.16  aavit  +17 -17
+examples/widgets/widgets.cpp    2.45  aavit  +29 -5
+extensions/nsplugin/src/qnp.cpp    1.22  aavit  +5 -5
+extensions/opengl/doc.conf    1.14  aavit  +7 -0
+extensions/opengl/src/qgl.cpp    1.23  aavit  +4 -4
+extensions/xt/doc/index.doc    1.4  aavit  +18 -8
+extensions/xt/src/qxt.cpp    1.5  aavit  +3 -3
+src/dialogs/qmessagebox.cpp    2.50  aavit  +5 -5
+
+  Improved doc of extensions.
+
+
+doc/qcache.doc    2.9  aavit  +47 -8
+
+  Documented the remaining functions in qcache et al.
+
+
+examples/dragdrop/dropsite.cpp    1.12  paul  +76 -22
+examples/dragdrop/dropsite.h    1.5  paul  +14 -2
+examples/dragdrop/main.cpp    1.7  paul  +8 -3
+
+  How to make your own dragobject class
+
+
+examples/dragdrop/dropsite.cpp    1.9  warwick  +36 -81
+examples/dragdrop/dropsite.h    1.4  warwick  +7 -9
+src/qt.pro    2.30  warwick  +2 -0
+src/kernel/qclipboard_x11.cpp    2.15  warwick  +10 -8
+src/kernel/qdnd_win.cpp    2.15  warwick  +1 -18
+src/kernel/qdnd_x11.cpp    2.33  warwick  +62 -67
+src/kernel/qdragobject.cpp    2.29  warwick  +73 -27
+src/kernel/qdragobject.h    2.16  warwick  +18 -12
+src/kernel/qdropsite.cpp    2.1  warwick  initial checkin
+src/kernel/qdropsite.h    2.1  warwick  initial checkin
+src/kernel/qwidget.h    2.52  warwick  +3 -2
+src/kernel/qwidget_win.cpp    2.60  warwick  +17 -7
+src/kernel/qwidget_x11.cpp    2.99  warwick  +22 -12
+src/kernel/qwindowdefs.h    2.25  warwick  +7 -3
+src/widgets/qlineedit.cpp    2.85  warwick  +3 -3
+
+  Don't declare MIME types for drop sites in advance, just enable drops.
+
+
+examples/examples.pro    2.10  hanord  +1 -0
+
+  Added splitter
+
+
+examples/examples.pro    2.9  agulbra  +1 -0
+
+  add dragdrop to examples makefile
+
+
+examples/layouts/layouts.cpp    1.6  aavit  +2 -3
+
+  return value from main to avoid compiler warning
+
+
+extensions/nsplugin/src/qnp.cpp    1.21  agulbra  +34 -24
+extensions/opengl/src/qgl.cpp    1.22  agulbra  +7 -1
+extensions/xt/src/qxt.cpp    1.4  agulbra  +6 -2
+
+  use new \extension in qdoc
+
+
+src/dialogs/qprintdialog.cpp    2.30  aavit  +2 -2
+src/widgets/qspinbox.cpp    2.36  aavit  +22 -29
+src/widgets/qspinbox.h    2.21  aavit  +1 -3
+
+  spinbox: better looking in windows mode (more like win32)
+
+
+src/kernel/qapplication_x11.cpp    2.142  agulbra  +7 -12
+src/kernel/qdnd_x11.cpp    2.37  agulbra  +22 -23
+src/kernel/qdragobject.cpp    2.32  agulbra  +5 -25
+src/kernel/qdragobject.h    2.19  agulbra  +1 -4
+
+  protect another little bit against the other application crashing
+
+
+src/kernel/qclipboard_x11.cpp    2.16  agulbra  +2 -2
+
+  avoid double delete in certain cases.  would cause segfault.
+
+
+src/kernel/qdnd_win.cpp    2.16  warwick  +98 -59
+src/kernel/qdropsite.cpp    2.2  warwick  +3 -3
+src/kernel/qwidget_win.cpp    2.61  warwick  +1 -2
+
+  Update for X11 changes.
+
+
+src/kernel/qdnd_win.cpp    2.17  warwick  +22 -5
+src/kernel/qdnd_x11.cpp    2.36  warwick  +5 -3
+src/kernel/qdragobject.cpp    2.30  warwick  +63 -7
+src/kernel/qdragobject.h    2.17  warwick  +10 -3
+
+  Renaming; make space in API for Copy vs. Move
+
+
+src/kernel/qdnd_x11.cpp    2.32  agulbra  +13 -12
+src/kernel/qdnd_x11.cpp    2.31  agulbra  +33 -8
+
+  support accept/ignore rectangles properly.
+
+
+src/kernel/qdnd_x11.cpp    2.34  agulbra  +7 -2
+src/widgets/qlineedit.cpp    2.86  agulbra  +13 -13
+
+  isAccepted() of one drag enter/move is the default state for the next
+  (until the target changes).
+
+
+src/kernel/qdnd_x11.cpp    2.35  warwick  +20 -13
+
+  Fix lost-leaves.
+
+
+src/kernel/qdnd_x11.cpp    2.38  agulbra  +23 -22
+
+  always give the right cursor
+
+
+src/kernel/qdnd_x11.cpp    2.39  hanord  +2 -2
+
+  Patch from Bernd Unger to compile on irix-n64
+
+
+src/kernel/qdnd_x11.cpp    2.40  hanord  +5 -5
+src/widgets/qheader.cpp    2.47  hanord  +5 -5
+src/widgets/qstatusbar.cpp    2.15  hanord  +12 -12
+src/widgets/qtoolbar.cpp    2.24  hanord  +14 -15
+src/widgets/qtoolbutton.cpp    2.29  hanord  +4 -4
+src/widgets/qwellarray.cpp    1.5  hanord  +8 -10
+
+  Removed Sun CC warnings. All these warnings come from use of local
+  variables inside member functions clashing with private variable names
+  in the class. I think this is a correct warning, because if somebody
+  wants to access a private variable from a member function where it's
+  already used as a local variable, he will be somewhat confused.
+
+
+src/kernel/qdragobject.cpp    2.34  hanord  +3 -2
+
+  Avoid array-bounds error when copying text
+
+
+src/kernel/qdragobject.cpp    2.35  hanord  +15 -18
+src/kernel/qdragobject.h    2.20  hanord  +7 -7
+
+  QStoredDrag::setEncodedData takes a const byte array.
+  parent changed to dragSource everywhere.
+
+
+src/kernel/qimage.cpp    2.102  agulbra  +9 -5
+src/kernel/qpixmap.cpp    2.31  agulbra  +22 -32
+
+  mention the QPixmap/QImage differences prominently.  other minor doc
+  changes.
+
+
+src/kernel/qimage.cpp    2.99  agulbra  +7 -6
+src/kernel/qimage.cpp    2.98  agulbra  +18 -14
+src/kernel/qmovie.cpp    1.38  agulbra  +8 -7
+src/kernel/qmovie.cpp    1.37  agulbra  +12 -3
+
+  warn about unisys $#@! and about possible removal of gif support in a
+  future version of qt.
+
+
+src/kernel/qpainter_win.cpp    2.38  hanord  +2 -3
+src/kernel/qpainter_x11.cpp    2.53  hanord  +2 -3
+
+  Fixed UMR in drawText to external device. Could be serious and crash.
+
+
+src/kernel/qprinter_x11.cpp    2.18  agulbra  +38 -11
+
+  OS/2 fixes from miyata.
+
+
+src/kernel/qpsprinter.cpp    2.28  agulbra  +67 -19
+
+  oops.  we broke kmail by not supporting QFont::AnyCharSet at all.
+  fixed.
+  
+  also contains two other fixes that I'd delayed committing: use
+  colorimage only where available, else image.  produce 78-character
+  lines, not lines of several thousand characters.
+
+
+src/kernel/qpsprinter.cpp    2.29  agulbra  +49 -28
+
+  make the dicts slightly bigger so more level 1 printers are happy.
+  avoid a memory leak in drawPixmap().
+
+
+src/kernel/qwidget.cpp    2.116  hanord  +2 -2
+
+  Does destroy() AFTER deleteExtra(), because deleteExtra() calls
+  deleteSysExtra() which unregisters OLE stuff on Windows (and needs the Win
+  ID).
+
+
+src/moc/moc.1    2.7  hanord  +11 -3
+src/moc/moc.l    2.3  hanord  +57 -7
+src/moc/moc.y    2.24  hanord  +22 -12
+
+  Warwick's support for #ifdef and #ifndef added
+
+
+src/qt.pro    2.33  hanord  +8 -7
+
+  Changed DEPENDPATH to relative, makes makefiles movable.
+  Sorted a couple of filenames.
+
+
+src/qt.pro    2.34  hanord  +1 -1
+
+  Changed version number to 1.40
+
+
+src/tools/qglobal.h    2.53  agulbra  +3 -3
+
+  1.40.  yes it's true.
+
+
+src/tools/qglobal.h    2.55  agulbra  +3 -3
+
+  make one final snapshot
+
+
+src/widgets/qbuttongroup.cpp    2.14  agulbra  +3 -3
+
+  roll back my "don't delete twice" fix: it was a "don't delete once"
+  fix, in fact.  oops.
+
+
+src/widgets/qheader.cpp    2.49  agulbra  +2 -1
+
+  memory leak gone
+
+
+src/widgets/qlabel.cpp    2.34  agulbra  +6 -9
+
+  respect buddy's focus policy and other accessibility.
+
+
+src/widgets/qlineedit.cpp    2.83  agulbra  +4 -4
+
+  use enter event and accept drops in the entire rectangle.
+
+
+src/widgets/qlineedit.cpp    2.84  agulbra  +8 -1
+
+  ...and the drop should happen in the right place.  oooh, this is so
+  polished :)
+
+
+src/widgets/qlineedit.cpp    2.88  agulbra  +2 -2
+
+  avoid memory leak when dragging out of qle
+
+
+src/widgets/qlineedit.cpp    2.89  agulbra  +5 -1
+
+  #ifdef out dnd support.  it works on x11, not quite on windows.
+  besides, having QLineEdit work differently from typical windows
+  widgets and cannot be changed is a bad policy.
+
+
+src/widgets/qlistview.cpp    2.129  agulbra  +3 -2
+
+  don't accept() enter/return key presses.  qdialog.
+
+
+src/widgets/qlistview.cpp    2.130  agulbra  +8 -9
+
+  avoid a couple of memory leaks
+
+
+src/widgets/qprogressbar.cpp    2.21  aavit  +10 -1
+src/widgets/qtableview.cpp    2.51  aavit  +2 -2
+
+  Progressbar: allow changing of guistyle before show(). Should really
+  implement styleChanged(); in 2.0.
+  Tableview: Avoid infinite loop.
+
+
+src/widgets/qspinbox.cpp    2.38  aavit  +2 -2
+src/widgets/qwidgetstack.cpp    2.11  aavit  +13 -9
+
+  Widgetstack: be robust when got no children. spinbox: comment
+
+
+src/widgets/qsplitter.cpp    1.24  warwick  +48 -45
+
+  Make bitmaps correspond to splitter dimensions.
diff --git a/dist/changes-1.40 b/dist/changes-1.40
new file mode 100644
index 0000000..1f5f986
--- /dev/null
+++ b/dist/changes-1.40
@@ -0,0 +1,291 @@
+Here is a list of user-visible changes in Qt from 1.33 to 1.40.  
+
+Qt 1.40 supports drag and drop, with a simple, platform independent
+API. There are eleven new widget classes in 1.40. Asynchronous I/O
+support is now in the official Qt API.
+
+Since Qt no longer supports any platforms that only supports 8.3
+format file names, the file names of the Qt source and include files
+have been made simpler.  #include <qcombobox.h> instead of qcombo.h,
+etc.  The old names are still present for compatibility.
+
+The new Qt Xt/Motif Extension allows Qt widgets and applications to
+coexist with old Xt/Motif-based applications and widgets.
+
+There are more than one hundred new functions added to existing
+classes and, as usual, we fixed some bugs, made some more speedups,
+and improved the documentation.
+
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+* New widgets
+
+  QHeader	- Table header
+  QListView	- Multicolun listview/treeview
+  QMainWindow	- Application main window
+  QScrollView	- Scrolling area (successor of QwViewPort)
+  QSpinBox	- Spin button 
+  QSplitter	- Paned window
+  QStatusBar	- Status bar
+  QToolBar	- Container for tool buttons (and other widgets)
+  QToolButton	- Fancy push button with auto-raise
+  QWhatsThis	- Light weight help system
+  QWidgetStack	- Stack of widgets
+
+* Support classes
+
+  QFileIconProvider	- Provides icons for the file dialog
+  QIconSet		- Set of icons for different states
+  QListViewItem		- Content of a QListView 
+  QCheckListItem	- Checkable list view item
+
+* Drag and drop related classes
+  
+  QDragObject
+  QStoredDrag
+  QTextDrag
+  QImageDrag
+  QDragManager
+  QDropSite
+
+* Asynchronous I/O
+
+  QAsyncIO
+  QDataPump
+  QDataSink
+  QDataSource
+  QDataStream
+  QIODeviceSource
+  QImageConsumer
+  QImageDecoder
+  QImageFormat
+  QImageFormatType
+
+
+* New Events
+ 
+  QShowEvent 
+  QHideEvent 
+  QDragMoveEvent 
+  QDragEnterEvent
+  QDragResponseEvent 
+  QDragLeaveEvent 
+  QDropEvent 
+  QChildEvent 
+
+
+
+****************************************************************************
+*		       Enhancements from 1.33 to 1.40			   *
+****************************************************************************
+
+The file and print dialogs are far better.
+
+Layouts will now automatically readjust if child widgets change 
+maximum/minimum sizes, or are deleted.
+
+QFont now supports KOI8R
+
+The reference documentation of the extensions is now integrated with
+the main reference documentation in the qt/html directory.
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+None known.
+ 
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+none
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+none
+
+****************************************************************************
+* 			Deprecated functions				   *
+****************************************************************************
+Old function:			Replaced by:
+-------------			-----------
+QPixmap::isOptimized		QPixmap::optimization
+QPixmap::optimize		QPixmap::setOptimization
+QPixmap::isGloballyOptimized    QPixmap::defaultOptimization
+QPixmap::optimizeGlobally	QPixmap::setDefaultOptimization
+
+
+****************************************************************************
+*      New global functions
+****************************************************************************
+
+ bitBlt( QImage* dst, int dx, int dy, const QImage* src,
+         int, int, int, int, int conversion_flags );
+
+ bitBlt( QPaintDevice *dst, int, int, const QImage* src,
+	 int, int, int, int, int conversion_flags );
+
+****************************************************************************
+*      New public/protected functions added to existing classes            *
+****************************************************************************
+
+QApplication::sendPostedEvents( QObject *receiver, int event_type ) [static]
+
+QButton::setDown()
+QButton::toggle()
+ 
+QButtonGroup::setButton( int id )
+QButtonGroup::buttonToggled( bool on )
+ 
+QComboBox::setListBox( QListBox * )
+QComboBox::listBox() 
+
+QComboBox::setAutoCompletion( bool )
+QComboBox::autoCompletion() 
+
+QComboBox::clearEdit()
+QComboBox::setEditText( const char * )
+
+QDict::resize()
+
+QDir::drives() [static]
+QDir::remove()
+
+QFileDialog::getExistingDirectory() [static]
+QFileDialog::setIconProvider() [static]
+QFileDialog::iconProvider() [static]
+QFileDialog::setSelection( const char* )
+QFileDialog::setMode( Mode )
+QFileDialog::mode() 
+QFileDialog::setFilter( const char * )
+QFileDialog::setFilters( const char ** )
+QFileDialog::setFilters( const QStrList & )
+QFileDialog::addWidgets( QLabel *, QWidget *, QPushButton * ) [protected]
+
+QFont::isCopyOf( const QFont & ) 
+
+QFontMetrics::minLeftBearing() 
+QFontMetrics::minRightBearing() 
+QFontMetrics::inFont(char)	
+QFontMetrics::leftBearing(char) 
+QFontMetrics::rightBearing(char) 
+QFontMetrics::boundingRect( int x, int y, int w, int h, int flags,
+      			    const char *str, int, int, int *, char ** ) 
+QFontMetrics::size( int flags, char *str, int, int, int *, char ** ) 
+
+QFrame::margin()
+QFrame::setMargin( int )
+
+QGManager::unFreeze()
+QGManager::remove( QWidget *w )
+QGManager::setName( QChain *, const char * )
+
+QGridLayout::numRows()
+QGridLayout::numCols()
+QGridLayout::expand( int rows, int cols )
+
+
+QImage::copy(int x, int y, int w, int h, int conversion_flags=0) 
+QImage::copy(QRect&)	
+QImage::allGray() 
+QImage::isGrayscale() 
+QImage::convertDepthWithPalette( int, QRgb* p, int pc, int cf=0 ) 
+QImage::smoothScale(int width, int height) 
+QImage::loadFromData( QByteArray data, const char *format=0 )
+
+QIntDict::resize()
+
+QLabel::clear()
+ 
+QLCDNumber::sizeHint() const
+
+QLineEdit::setEnabled( bool )
+QLineEdit::setFont( const QFont & )
+QLineEdit::setSelection( int, int )
+QLineEdit::setCursorPosition( int )
+QLineEdit::cursorPosition() const
+QLineEdit::validateAndSet( const char *, int, int, int )
+QLineEdit::insert( const char * )
+QLineEdit::clear()
+QLineEdit::repaintArea( int, int ) [protected]
+ 
+QListBox::setFixedVisibleLines( int lines )
+QListBox::sizeHint()
+QListBox::ensureCurrentVisible( int )
+
+QMenuData::insertItem( const char *text,
+		       const QObject *receiver, const char *member,
+		       int accel, int id, int index = -1 )
+QMenuData::insertItem( const QPixmap &pixmap,
+    		       const QObject *receiver, const char *member,
+    		       int accel, int id, int index = -1 )
+QMenuData::insertItem( const QPixmap &pixmap, const char *text,
+    		       const QObject *receiver, const char *member,
+    		       int accel, int id, int index = -1 )
+QMenuData::findItem( int id, QMenuData ** parent )
+
+ 
+QMovie::QMovie(QDataSource*, int bufsize=1024)
+ 
+QMultiLineEdit::setFixedVisibleLines( int lines )
+
+QObject::tr( const char * ) 
+QObject::name( const char * defaultName )
+
+QPainter::QPainter( const QPaintDevice *, const QWidget * )
+QPainter::begin( const QPaintDevice *, const QWidget * )
+QPainter::xForm( const QPointArray &, int index, int npoints )
+QPainter::xFormDev( const QPointArray &, int index, int npoints )
+QPainter::drawImage()
+QPainter::drawTiledPixmap()
+QPainter::drawPicture( const QPicture & )
+ 
+QPalette::isCopyOf( const QPalette & )
+
+QPixmap::loadFromData( QByteArray data,
+		      const char *,
+		      int )
+QPixmap::optimization()
+QPixmap::setOptimization( Optimization )
+QPixmap::defaultOptimization()
+QPixmap::setDefaultOptimization( Optimization )
+
+QPopupMenu::exec( const QPoint &, int )
+QPopupMenu::aboutToShow()
+
+QPrinter::setPageOrder( PageOrder )
+QPrinter::pageOrder() 
+QPrinter::setColorMode( ColorMode )
+QPrinter::colorMode() 
+
+QPtrDict::resize()
+ 
+QPushButton::setIsMenuButton( bool )
+QPushButton::isMenuButton()
+
+QRegion::QRegion( int x, int y, int w, int h, RegionType = Rectangle )
+QRegion::boundingRect() 
+QRegion::rects()
+ 
+QSize::expandedTo()
+QSize::boundedTo()
+
+QWidget::isEnabledTo(QWidget*) 
+QWidget::isEnabledToTLW() 
+QWidget::fontPropagation() 
+QWidget::setFontPropagation( PropagationMode )
+QWidget::palettePropagation() 
+QWidget::setPalettePropagation( PropagationMode )
+QWidget::isVisibleTo(QWidget*) 
+QWidget::setAcceptDrops( bool on )
+QWidget::acceptDrops()
+QWidget::focusData() [protected]
+
diff --git a/dist/changes-1.41 b/dist/changes-1.41
new file mode 100644
index 0000000..31ccc55
--- /dev/null
+++ b/dist/changes-1.41
@@ -0,0 +1,76 @@
+Here is a list of user-visible changes in Qt from 1.40 to 1.41
+
+QT is now available as a DLL on Windows.
+
+Many bugfixes have been added.  The Windows keys are supported on X11,
+and the file dialog has been improved a little.
+
+Drag and drop has been considerably improved, both on Windows and X11.
+
+QPrinter now knows many more paper sizes.
+
+It now possible to create masked (nonrectangular) widgets.
+
+QScrollBar now supports insanely big ranges.
+
+QSlider now supports page step as well as line step.
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+None.
+
+****************************************************************************
+*		       Enhancements from 1.33 to 1.40			   *
+****************************************************************************
+
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+None.
+ 
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+None
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+None
+
+****************************************************************************
+* 			Deprecated functions				   *
+****************************************************************************
+
+None.
+
+
+****************************************************************************
+*			 New global functions				   *
+****************************************************************************
+
+None.
+
+****************************************************************************
+*      New public/protected functions added to existing classes            *
+****************************************************************************
+
+QFileDialog::getOpenFileNames()
+QProgressDialog::setMinimumDuration( int )
+QProgressDialog::minimumDuration() const
+QMouseEvent::globalPos() const
+QMouseEvent::globalX() const
+QMouseEvent::globalY() const
+QFont::rawName() const
+QWidget::setMask(const QRegion& region)
+QWidget::setMask(QBitmap bitmap)
+QWidget::clearMask()
+QListView/QListViewItem: Various functions to create children in specified order
diff --git a/dist/changes-1.42 b/dist/changes-1.42
new file mode 100644
index 0000000..7e47a53
--- /dev/null
+++ b/dist/changes-1.42
@@ -0,0 +1,71 @@
+Here is a list of user-visible changes in Qt from 1.41 to 1.42.  The
+usual bugfixes have been added.
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+None.
+
+****************************************************************************
+*		       Enhancements from 1.41 to 1.42			   *
+****************************************************************************
+
+The Windows version now builds as a DLL.
+
+The file dialog has various UI tweaks.
+
+More sanity checks have been added.
+
+On X11, the postscript output from a few programs will be much smaller
+than it used to be.
+
+Windows 98 is now treated as a separate version of Windows, like NT
+and Windows 95.
+
+The keyboard interface of buttons groups/dialogs has been improved.
+
+QMultiLineEdit avoids flicker in some cicumstances where it would
+flicker up to now.
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+QKeyEvent now behaves as documented: isAccepted() is TRUE by default
+where it would sometimes default to FALSE.  Some dialogs may depend on
+the bug.  The most likely symptom of such buggy dialogs is that the
+Enter/Return key does not work, and the most likely fix for such bugs
+is to insert "e->ignore();" at the start of keyPressEvent(QKeyEvent*e)
+in such dialogs.
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+None
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+None
+
+****************************************************************************
+* 			Deprecated functions				   *
+****************************************************************************
+
+None.
+
+
+****************************************************************************
+*			 New global functions				   *
+****************************************************************************
+
+None.
+
+****************************************************************************
+*      New public/protected functions added to existing classes            *
+****************************************************************************
+
diff --git a/dist/changes-2.0.1 b/dist/changes-2.0.1
new file mode 100644
index 0000000..4a224bf
--- /dev/null
+++ b/dist/changes-2.0.1
@@ -0,0 +1,101 @@
+Changes in Qt 2.0.1
+-------------------
+
+Qt 2.0.1 is a bugfix release, forward and backward compatible with Qt 2.0.
+While all changes are behind the API, some bugfixes may cause differences
+in runtime behaviour - such fixes are marked in yellow with a "*".
+
+
+General improvements
+--------------------
+
+PNG/IO Fix crash on empty images.
+
+QAccel Fix accelerators using Shift with other metakeys.
+
+QFileInfo Fix for AIX/gcc.
+
+QFontDatabase Fix centered text for extreme-bearing fonts.
+
+QHeader Resizing cells of horizontal header is now more flicker-free.
+
+*QLayout Fix deletion of child layouts.  Let minimumSize() override
+Fixed sizePolicy().
+
+QLcdNumber Reduced flicker.
+
+QLineEdit Home etc. now clear selection even if the cursor doesn't move.
+
+QListBox Draw focus rect correctly.  Fix keyboard navigation.
+
+QListView Make resizing flicker-free.  No selection on release.
+
+QMainWindow Fix crash in addToolBar().
+
+QMap Work on more compilers.
+
+QMenuBar Less flicker.
+
+QPainter Fix QFontMetrics::width(QChar).  Speedup drawText/boundingRect.
+
+*QScrollView Put the scrollbars inside the frame in WindowsStyle.
+
+QSplitter Fix bug where a handle could be moved past the next.
+
+QString Fix QString::replace(QRegExp(),...).  Speed ups.  Fix fill()
+with zero length crash.
+
+QTL AIX fixes.
+
+QTextBrowser Fixed type=detail popup.
+
+*QTextCodec Use the defacto KOI8 standard if no charset specified for
+ru_ locale.
+
+QValueList AIX, aCC fixes.
+
+msg2qm More robust.
+
+
+
+Windows-specific fixes
+----------------------
+
+QApplication Fix Key_Enter (was always Key_Return). Fix numeric
+accelerators.
+
+QFontDatabase Fix italic fonts in Window font dialog.
+
+*QMime Use CRLF with text clip/dnd on Windows.
+
+QPainter Avoid failure when painting pixmap xformed into nothing.
+Improved drawing of scaled fonts on win95/98.
+
+*QPixmap Fix mask on QPixmap::convertToImage().
+
+QPrinter Fix setup() on Win95/98.
+
+QToolTip Use system settings for tool tips on Windows.
+
+*QWidget Fix QWidget::scroll(rect) for non-topleft rectangles.
+
+
+X11-specific fixes
+------------------
+
+DnD Fix Escape during DnD.
+
+*QApplication Generate MouseMove event on XCrossingEvent.  Support more
+XIM servers (eg. VJE Delta).  Use 11pt font as default rather than 12pt
+on larger than 95DPI displays.
+
+*QFont Correct DPI for fontsets (as for regular fonts).  Prefer unscaled
+(ie. perfect-match bitmaps) over scaled fonts.
+
+*QPaintDevice Round DPI.
+
+QWidget QWidget::showMaximized() works on X11 now. Fixed ReparentNotify
+handling.
+
+Xt extension Fixes.
+
diff --git a/dist/changes-2.00 b/dist/changes-2.00
new file mode 100644
index 0000000..1dcfea7
--- /dev/null
+++ b/dist/changes-2.00
@@ -0,0 +1,151 @@
+Qt 2.0 introduces a wide range of major new features as well as
+substantial improvements over the 1.x series.  The documentation has
+been significally extended and improved.
+
+This file will only give an overview of the main changes since version
+1.44.  A complete list would simply be too large to be useful.  For
+more detail see the online documentation which is included in this
+distribution, and also available on http://doc.trolltech.com/
+
+The Qt version 2.x series is not binary compatible with the 1.x
+series.  This means programs compiled with Qt version 1.x must be
+recompiled to work with Qt 2.0.
+
+Qt 2.0 is mostly, but not completely, source compatible with Qt 1.x.
+See the document "Porting from Qt 1.x to Qt 2.0" in the Online
+Reference Documentation for information on how to port an existing Qt
+1.x-based program to Qt 2.0.  Note in particular the automatic porting
+script included - it does a lot of the work for you.
+
+As for 1.x, the API and functionality of Qt is completely portable
+between Microsoft Windows and X11.  And between Windows 95, 98 and NT:
+Unlike most toolkits, Qt lets a single executable work on all three.
+
+****************************************************************************
+* 			   New major features				   *
+****************************************************************************
+
+
+* Support for international software development:
+    QTranslator and the QObject::tr() function
+    QTextCodec (and subclasses)
+    QString is now a 16-bit Unicode string with good support for
+	legacy 8-bit interoperation. (The old 8-bit string class
+	from Qt 1.x has been renamed to QCString.)
+    QChar - a Unicode character
+
+* Rich Text
+    QTextView - formatted text and images
+    QTextBrowser - navigate formatted text and images
+    QStyleSheet - define your own XML formatting tags
+    QSimpleRichText - display rich text anywhere
+
+* Convenient and powerful new collection classes:
+    QMap<Key,Type> - QDict with arbitrary keys
+    QValueList<Type> - QList of types other than pointers
+    QStringList - QValueList<QString> with helper functions
+
+* Dialogs
+    QColorDialog - user picks a color
+    QFontDialog - user picks a font
+    QWizard - framework for leading users through steps
+
+* Layout
+    QGrid/QHBox/QVBox - grid and boxes of widgets automatically assembled
+    QHGroupBox/QVGroupBox - easy framed groups of widgets
+    QSizePolicy - a widget's abilities to change size in different ways
+
+* Custom layouts
+    New, much simpler and more powerful API for creating custom layouts
+
+* PNG Support
+    PNG support is now included in the core library
+
+* Support for generalized configurable GUI styles:
+    QStyle and subclasses
+
+* Session management
+    QSessionManager - saving state when the system shuts down
+
+* Extended coordinate system
+    QPoint, QPointArray, QSize and QRect now have 32-bit coordinates
+
+* Cleaner namespace
+    Global functions, enums and macros now either start with a 'q' or
+    have been moved into the new namespace class "Qt"
+
+****************************************************************************
+* 			     List of removed classes			   *
+****************************************************************************
+
+* QGManager
+    Use the new custom layout API.
+
+* QPointVal, QPointData
+    Use QPoint.
+
+* QUrlDrag
+    Changed to QUriDrag
+
+* QWindow
+    Use QWidget
+
+****************************************************************************
+* 			     List of new classes			   *
+****************************************************************************
+
+* QCDEStyle
+* QChar
+* QColorDialog
+* QCommonStyle
+* QConstString
+* QCString
+* QDragEnterEvent
+* QDragLeaveEvent
+* QDropSite
+* QFontDialog
+* QGLayoutIterator
+* QGrid
+* QHBox
+* QHButtonGroup
+* QHGroupBox
+* QHideEvent
+* QLayoutItem
+* QLayoutIterator
+* QMimeSource
+* QMimeSourceFactory
+* QMotifStyle
+* QPlatinumStyle
+* QSessionManager
+* QShowEvent
+* QSimpleRichText
+* QSizeGrip
+* QSizePolicy
+* QSortedList
+* QSpacerItem
+* QStringList
+* QStyle
+* QStyleSheet
+* QStyleSheetItem
+* Qt
+* QTab
+* QTabWidget
+* QTextBrowser
+* QTextCodec
+* QTextDecoder
+* QTextEncoder
+* QTextIStream
+* QTextOStream
+* QTextView
+* QTranslator
+* QUriDrag
+* QVBox
+* QVButtonGroup
+* QVGroupBox
+* QWheelEvent
+* QWidgetItem
+* QWindowsStyle
+* QWizard
+
+For details, see e.g http://doc.trolltech.com/qcdestyle.html (or any
+other class name, lowercased).
diff --git a/dist/changes-2.00beta1 b/dist/changes-2.00beta1
new file mode 100644
index 0000000..5dccbad
--- /dev/null
+++ b/dist/changes-2.00beta1
@@ -0,0 +1,61 @@
+
+The Qt version 2.x series is not binary compatible with the 1.x
+series. This means programs compiled with Qt version 1.x must be
+recompiled to work with Qt 2.0.
+
+Qt 2.0 is mostly, but not completely, source compatible with Qt 1.x.
+See the document "Porting from Qt 1.x to Qt 2.0" in the Online
+Reference Documentation for information on how to port an existing
+Qt 1.x-based program to Qt 2.0.
+
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+
+* Support for generalized configrable styles:
+
+    QStyle and subclasses
+
+* Support for international software development:
+
+    QTranslator and the QObject::tr() function
+    QTextCodec (and subclasses)
+    QString - a Unicode string
+    QChar - a Unicode character
+
+* Convenient and powerful new collection classes:
+    QMap<Key,Type> - QDict with arbitrary keys
+    QValueList<Type> - QList of types other than pointers
+    QStringList - QValueList<QString> with helper functions
+
+* Dialogs
+    QColorDialog - user picks a color
+    QFontDialog - user picks a font
+    QWizard - framework for leading users through steps
+
+* Layout
+    QGrid/QHBox/QVBox - grid and boxes of widgets automatically assembled
+    QHGroupBox/QVGroupBox - easy framed groups of widgets
+
+* PNG Support
+    PNG support is always compiled into Qt
+
+* Rich Text
+    QTextView - formatted text and images
+    QTextBrowser - navigate formatted text and images
+    QStyleSheet - define your own XML formatting tags
+    QSimpleRichText - display rixh text anywhere
+
+* Session management
+    QSessionManager - safe state when system shuts down
+
+
+****************************************************************************
+* 	              Major changes in existing classes			   *
+****************************************************************************
+
+QString is now 16-bit Unicode. 
+
+QPoint, QPointArray, QSize and QRect now have 32-bit coordinates.
+\ No newline at end of file
diff --git a/dist/changes-2.00beta2 b/dist/changes-2.00beta2
new file mode 100644
index 0000000..943c368
--- /dev/null
+++ b/dist/changes-2.00beta2
@@ -0,0 +1,85 @@
+Qt 2.0 Beta2 is not binary compatible with Beta1, this means that any
+programs linked with Beta1 must be recompiled.
+
+The most important fixes since Beta 1:
+
+configure
+	Fixed the libzlib typo.
+	Added -lflags argument.
+
+Platforms
+	Fixes for Borland C++, Solaris and AIX
+
+QFileDialog
+	Several user interface improvements
+
+QPrinter
+	Plain text printing works again.
+	Multiple page printing fixed.
+
+QWidget
+	New widget flag WStyle_Dialog
+
+
+Major changes since 1.4x:
+
+The Qt version 2.x series is not binary compatible with the 1.x
+series. This means programs compiled with Qt version 1.x must be
+recompiled to work with Qt 2.0.
+
+Qt 2.0 is mostly, but not completely, source compatible with Qt 1.x.
+See the document "Porting from Qt 1.x to Qt 2.0" in the Online
+Reference Documentation for information on how to port an existing
+Qt 1.x-based program to Qt 2.0.
+
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+
+* Support for generalized configrable styles:
+
+    QStyle and subclasses
+
+* Support for international software development:
+
+    QTranslator and the QObject::tr() function
+    QTextCodec (and subclasses)
+    QString - a Unicode string
+    QChar - a Unicode character
+
+* Convenient and powerful new collection classes:
+    QMap<Key,Type> - QDict with arbitrary keys
+    QValueList<Type> - QList of types other than pointers
+    QStringList - QValueList<QString> with helper functions
+
+* Dialogs
+    QColorDialog - user picks a color
+    QFontDialog - user picks a font
+    QWizard - framework for leading users through steps
+
+* Layout
+    QGrid/QHBox/QVBox - grid and boxes of widgets automatically assembled
+    QHGroupBox/QVGroupBox - easy framed groups of widgets
+
+* PNG Support
+    PNG support is always compiled into Qt
+
+* Rich Text
+    QTextView - formatted text and images
+    QTextBrowser - navigate formatted text and images
+    QStyleSheet - define your own XML formatting tags
+    QSimpleRichText - display rixh text anywhere
+
+* Session management
+    QSessionManager - safe state when system shuts down
+
+
+****************************************************************************
+* 	              Major changes in existing classes			   *
+****************************************************************************
+
+QString is now 16-bit Unicode. 
+
+QPoint, QPointArray, QSize and QRect now have 32-bit coordinates.
+\ No newline at end of file
diff --git a/dist/changes-2.00beta3 b/dist/changes-2.00beta3
new file mode 100644
index 0000000..08f222a
--- /dev/null
+++ b/dist/changes-2.00beta3
@@ -0,0 +1,35 @@
+Qt 2.0 Beta3 is not binary compatible with Beta2, this means that any
+programs linked with Beta2 must be recompiled.
+
+The most important fixes since Beta 2:
+
+platforms
+	64-bits, FreeBSD and gcc 2.7 fixes
+
+QLayoutIterator/QGLayoutIterator
+	The custom layout API has been changed: void removeCurrent()
+	has been replaced by QLayoutItem* takeCurrent().
+
+QLabel
+	The functions setMargin() and margin() have been renamed to
+	setIndent() and indent, to avoid collision with QFrame::setMargin().
+
+QAccel
+	Non-latin1 accelerators are now supported.
+
+QTranslator/findtr/msg2qm/mergetr
+	All reported bugs fixed and improvements made.
+
+Rich Text
+	Many improvements and fixes such as supressed warnings in the 
+	QBrowser example. Support for logical font sizes.
+
+QApplication
+	lastWindowClosed() now works with virtual desktops. Desktop settings
+	on Windows improved.
+
+QScrollView / QMultiLineEdit
+	Speedups with a new widget flag: WNorthWestGravity.
+
+QPopupMenu / QMenuBar
+	Speedups, less flicker.
diff --git a/dist/changes-2.1.0 b/dist/changes-2.1.0
new file mode 100644
index 0000000..a0794cf
--- /dev/null
+++ b/dist/changes-2.1.0
@@ -0,0 +1,314 @@
+Qt 2.1 introduces new features as well as many improvements over the
+2.0.x series. This file will only give an overview of the main changes
+since version 2.0.2.  A complete list would simply be too large to be
+useful.  For more detail see the online documentation which is included
+in this distribution, and also available on
+http://doc.trolltech.com/
+
+The Qt version 2.1 series is binary compatible with the 2.0.x
+series - applications compiled for 2.0 will continue to run with 2.1.
+
+As with previous Qt releases, the API and functionality of Qt is
+completely portable between Microsoft Windows and X11.  It is also portable
+between Windows 95, 98 and NT; unlike most toolkits, Qt lets a single
+executable work on all three.
+
+****************************************************************************
+*			    Overview					   *
+****************************************************************************
+
+As usual, large sections of the documentation have been revised and
+lots of new documentation has been added.
+
+Much work went into existing classes, based on all the feedback we got
+from our users. A warm thank you to you all at this point, we honestly
+hope to satisfy most of your wishes with the new release.
+
+Among the things that got a lot of polishing is the new geometry
+management system that was introduced with the 2.x series. Some
+classes, such as QBoxLayout, have been rewritten and many size hints
+and size policies were optimized. As usual with newly introduced
+systems, the occasional bug has been fixed as well. As a result,
+layout in Qt-2.1 is not only nicer but also faster.
+
+Big parts of the file dialog have been rewritten. It is now
+synchronized in terms of features with the common Windows dialog,
+including fancy drag'n'drop and in-place renaming. You can customize
+both parts of the dialog, the front-end with info and preview widgets,
+the back-end with different network protocols (see the QFileDialog and
+QNetworkProtocol documentation for details).
+
+Especially interesting for dynamic Qt applications is the newly
+introduced property system. Many interesting things, from scripting up
+to graphical user interface builders, become easier. The technology
+requires a new macro Q_PROPERTY and a new revision of Qt's meta object
+compiler (moc). See the Qt documentation for details.
+
+Due to strong customer demand, we added a cross-platform way to easily
+implement multi-document interfaces (known as 'MDI'). The widget is
+called QWorkspace and makes this task trivial.
+
+On X11, text dropping from Motif drag'n'drop applications has been
+added, to make your Qt applications inter-operable with those Motif
+applications that survived Y2K.
+
+The rich text system, first introduced in Qt-2.0, has been
+revised. Apart from great speed improvements, it now supports HTML
+tables as well as floating images.
+
+QMultiLineEdit, the text input field in Qt, got the missing word wrap
+functionality. It's probably the last big extension we will add to
+that widget. In Qt 3.0, it will be replaced by a fancier, faster and
+more powerful QTextEdit widget that also deals with different colors
+and fonts in a way similar to the existing QTextView.
+
+Qt follows the respective GUI style guides even more closely. This
+includes honoring desktop settings, and keyboard shortcuts such as
+Ctrl-Z/Y for undo/redo in line edit and multi-line edit
+controls. Dialog handling for both modal and non-modal dialogs has
+been improved to follow the platform conventions precisely.
+
+With QIconView, we added a powerful new visualization widget similar
+to QListView and QListBox. It contains optinally labelled pixmap items
+that the user can select, drag around, rename, delete and more.
+
+Compared to the previous release, we have managed to reduce overall
+memory consumption while improving execution speed and features.
+
+Below is a list of the major new features in existing classes as well
+as short descriptions of all new classes and the changes in some of
+the extensions shipped with Qt.
+
+
+****************************************************************************
+* 		New major features in existing classes			   *
+****************************************************************************
+
+QApplication	- new function wakeUpGuiThread() to simplify using threads
+		  with Qt.
+
+QArray		- added sorting and binary search.
+
+QColor		- custom color support added.  qRgb(r,g,b) helper function
+		  now sets an opaque alpha value instead of a transparent
+		  one.
+
+QComboBox	- support for text items with icons.
+
+QFileDialog	- many new features including fancy drag'n'drop
+		  and in-place renaming.
+		  Methods like setInfoPreviewWidget()and
+		  setContentsPreviewWidget() make it easy to customize
+		  the dialog extensively. With QUrlOperator and the
+		  QNetworkProtocol abstraction, the dialog can operate
+		  transparently by various different network protocols,
+		  such as HTTP and FTP (see the Network Extension).
+
+QFocusEvent	- carries a reason() for the event. Possible reasons are
+		  Mouse, Tab, ActiveWindow, ShortCut and other. The
+		  addition makes line edit controls behave properly.
+
+QHeader		- added optional visual sort indicator. Revisited API that 
+		  operates on sections only (solves the 'logical' vs. 'actual' 
+		  index confusion). A reworked 'table' example shows how
+		  to use QHeader in combination with a scrollview to create
+		  a simple spreadsheet.
+
+QListBox	- many signals and functions added for convenience and
+		  greater flexibility.
+
+QListView	- various selections modes similar to QListBox, many
+		  new functions and signals added for convenience and
+		  greater flexibility.
+
+QMainWindow	- implemented draggable and hidable toolbars. A menubar
+		  can be made draggable by simply putting it in a toolbar.
+
+QMetaObject	- Parts of the API made public. The meta object allows
+		  applications to access information about an object's
+		  properties as well as its signals and slots.
+
+QMultiLineEdit	- added different word wrap modes: WidgetWidth,
+		  FixedPixelWidth and FixedColumnWidth.
+
+QObject		- property access functions property() and setProperty().
+
+QPen		- added adjustable cap and join styles.
+
+QPopupMenu	- added support for tear-off menus, custom items
+		  and widget items.
+		  A new function setItemParameter() makes it possible
+		  to distinguish between several menu items connected to
+		  one single slot.
+
+QPrinter        - Now allows printing to the default printer without doing
+                  setup() first.
+
+QProgressDialog	- auto-reset and auto-close modes.
+
+QPushButton	- added a menu button mode with setPopup().
+
+QScrollView	- support for auto-scrolling on drag move events (drag
+		  auto scroll mode).
+
+QSignal		- optional additional integer parameter for the emitted
+		  signal.
+
+QSimpleRichText - added adjustSize() function that implements a clever
+		  size hint. Vertical break support for printing. inText()
+		  hit test.
+
+QSpinBox	- different button symbols, currently UpDownArrows and
+		  PlusMinus.
+
+QSplitter	- supports three resize modes now, Stretch, KeepSize
+		  and FollowSizeHint.
+
+QString		- new functions setUnicode(), setUnicodeCodes(), setLatin1(),
+		  startsWith() and endsWith()
+
+QStringList	- new functions fromStrList(), split(), join() and grep().
+
+QStyle		- some extensions for menu button indicators, default
+		  button indicators, variable scrollbar extends and toolbar
+		  handles.
+
+QStyleSheet	- a couple of tags added to the default sheet, such as
+		  U, NOBR, HEAD, DL, DT, DD and table support (TABLE, TR,
+		  TD, TH). Many attributes added to existing tags.
+
+QTextView	- basic table support. Contents is selectable, selections
+		  can be pasted/dragged into other widgets.
+
+QToolBar	- stretchable depending on the orientation (setHorizontalStretchable()
+		  and setVerticalStretchable(). Added orientationChanged() signal.
+
+QToolButton	- added optional delayed menu with setPopup() and
+		  setPopupDelay(). Auto-raise behaviour adjustable.
+
+QWidget		- new widget flag WStyle_ContextHelp that adds a
+		  context-help button to the window titlebar. The
+		  button triggers "What's This?"-help. The flag works
+		  with MS-Windows and future versions of X11 desktops
+		  such as KDE-2.0.
+
+		- New function showFullScreen().
+
+		- Enabling and disabling with setEnabled() propagates to
+		  children.
+
+		- Changed isVisible(). It now returns whether a widget
+		  is mapped up to the toplevel widget (the previous
+		  implementation only returned isVisibleTo(parentWidget()).
+
+		- New property 'backgroundOrigin' that lets a widget draw 
+		  its background relatively to its parent widget's coordinate
+		  system. This makes pseudo-transparency possible, without
+		  the overhead of a real widget mask.
+
+
+****************************************************************************
+*				New clases				   *
+****************************************************************************
+
+QCustomMenuItem	- an abstract base class for custom menu items in
+		  popup menus.
+
+QFontDataBase	- provides information about the available fonts. Not really
+		  a new class (it was used internally for the QFontDialog),
+		  but for the first time public API.
+
+QGuardedPtr	- a template class that provides guarded pointers to
+		  QObjects.
+
+QIconView	- a sophisticated new widget similar to QListView and
+		  QListBox.  An iconview contains optinally labelled pixmap
+		  items that the user can select, drag around, rename, delete
+		  and more. The widget is highly optimized for speed and
+		  large amounts of icons.
+
+QInputDialog	- a convenience dialog to get some simple input values from
+		  the user.
+
+QMetaProperty	- stores meta data about properties. Part of the meta
+		  object system.
+
+QNetworkProtocol- base class for network protocols, provides
+		  a common API for network protocols.
+
+QUrl/
+QUrlOperator	- provides an easy way to work with URLs.
+
+QVariant	- a tagged union for the most common Qt data types.
+
+QValueStack	- a value-based stack container.
+
+QWorkspace	- provides a workspace that can contain decorated
+		  windows as opposed to frameless child widgets.
+		  QWorkspace makes it easy to implement a multi-document
+		  interface (MDI).
+
+QBig5Codec	- provides support for the Big5 Chinese encoding.
+
+
+****************************************************************************
+*		Changes which may affect runtime behaviour		   *
+****************************************************************************
+
+QDataStream / QPicture
+ To accomodate for improved functionality, the stream serialization format
+ of QString and QPen has changed in Qt 2.1. The format version
+ number has been increased to 3. Compatibility has been kept, so
+ applications built with this version of Qt are automatically able to read
+ QDataStream and QPicture data generated by earlier Qt 2.x versions. But if
+ your application needs to generate data that must be readable by
+ applications that are compiled with earlier versions of Qt, you must use
+ QDataStream::setVersion() (if the data contains QString or QPen objects).
+ See the documentation of this function for further discussion.
+
+QPainter::drawPolygon()
+ An outline is no longer drawn in the brush color if NoPen is specified.
+ This matches the behaviour on Windows and ensures that the area
+ painted in this case is the same pixels defined by a QRegion made
+ from the polygon.  To get the old behaviour, you can call
+ painter.setPen(painter.brush()) prior to painting, which will also
+ work on Windows.
+
+QPushButton::sizeHint()
+ The size hint of auto-default push buttons has been slightly
+ increased in order to reserve space for a default button indicator
+ frame. This is necessary for a proper Motif or Platinum emulation. If
+ this change destroys your geometry management, a auto-default button
+ is probably not what you wanted anyway. Simply call
+ setAutoDefault(FALSE) on these push buttons to get the old behaviour.
+
+QWidget
+ Font and palette propagation has changed totally (from "almost
+ brain-dead" to working).  In practice, the only changes we've seen are
+ to the better.
+
+QColor
+ qRgb(r,g,b) now sets a default opaque alpha value of 0xff instead of
+ a transparent 0x00 alpha value formerly.  Use qRgb(r,g,b,a) if you do
+ need a transparent alpha value.
+
+QPalette
+ It turned out that the old normal/active/disabled set of color groups
+ didn't work very well, except in the simplest hello-world examples,
+ that it couldn't be fixed without nasty hacks, and that during five
+ years nobody had discovered the bugs.  So, we've dropped our broken
+ attempt at Tcl/Tk L&F compatibility, and added support for Windows
+ 2000 and Macintosh L&F compatibility instead.  The Macintosh and
+ Windows 2000 looks differentiate between the window with focus and
+ other windows.  Qt calls the color groups QPalette::active() and
+ QPalette::inactive() respectively.
+
+QGridLayout/QBoxLayout 
+ setMargin() now also works on child layouts. As a result of this
+ change, the geometry() of a layout now includes margin(). This may
+ effect programs that use QLayout::geometry().
+
+QToolButton
+ The now adjustable auto-raise behaviour defaults to TRUE only when
+ a button is used inside a QToolBar. That's usually what you want. If not,
+ call setAutoRaise(FALSE).
diff --git a/dist/changes-2.1.1 b/dist/changes-2.1.1
new file mode 100644
index 0000000..bb653fe
--- /dev/null
+++ b/dist/changes-2.1.1
@@ -0,0 +1,71 @@
+
+Qt 2.1.1 is a bugfix release. It keeps both forward and backward
+compatibility (source and binary) with Qt 2.1.
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+- Many documentation improvements
+
+- Various compilation problems relating to particular versions of xlC,
+MipsPRO, Solaris, Japanese Windows, old X11 libraries, and gcc 2.7.2
+fixed
+
+- 64bit HP build targets added
+
+- Qt OpenGL Extension updated; see details in qt/extensions/opengl/CHANGES
+
+- As usual, many minor bugfixes, too small to be mentioned here.
+
+
+****************************************************************************
+*			    Specific					   *
+****************************************************************************
+
+QToolbar:	fix of layout-saving when moving out of dock
+
+QAccel:		Support for non-alphanumeric keys
+
+QPrinter:	Better tolerance for PS interpreter peculiarities
+
+QPainter:	drawText() with rasterOp on Windows
+
+QIconView:	Drawing fixes
+
+QDate:		Ensure invalid status when created with invalid values
+
+Motif Dnd:	Fix possible crash
+
+QWorkSpace:	Proper minimize/maximize activation
+
+QListBox:	Optimization: better performance for lists with thousands of
+		elements. Selection problem fixed.
+		
+QFont:		Fontset matching fix for X11
+
+QMultiLineEdit:	Wordwrap/selection workaround
+
+QTabBar:	Refresh layout after style change. Optimization.
+
+QTimer:		Zero-timers on Windows speedup
+
+QFileDialog:	Correct caption on Windows
+
+QComboBox:	Accept only left button. Do proper font propagation.
+
+QMenuBar:	Accept only left button
+
+QDialog:	Modal dialogs after QApplication::exec() returns
+
+QWidget:	Optimization: fewer server round-trips
+
+QCheckBox:	Fixed mask drawing
+
+QSpinBox:	Accept '-' key, for negative values
+
+Dnd:		Allow disabling on X11
+	
+QFontDatabase:	Use QApplication's charset as default,
+		and fixed garbage on Win2000
diff --git a/dist/changes-2.2.0 b/dist/changes-2.2.0
new file mode 100644
index 0000000..d5444a8
--- /dev/null
+++ b/dist/changes-2.2.0
@@ -0,0 +1,223 @@
+
+Qt 2.2 introduces new features as well as many improvements over the
+2.1.x series. This file will only give an overview of the main changes
+since version 2.1.  A complete list would simply be too large to be
+useful.  For more detail see the online documentation which is
+included in this distribution, and also available on
+http://doc.trolltech.com/
+
+The Qt version 2.2 series is binary compatible with the 2.1.x and
+2.0.x series - applications compiled for 2.0 or 2.1 will continue to
+run with 2.2.
+
+As with previous Qt releases, the API and functionality of Qt is
+completely portable between Microsoft Windows and X11.  It is also
+portable between Windows 95, 98, NT and 2000.
+
+****************************************************************************
+*			    Overview					   *
+****************************************************************************
+
+The greatest new feature in the 2.2 release is the Qt Designer, a
+visual GUI design tool. It makes it possible to cut down on
+development time even further through WYSIWYG dialog design. The
+designer makes use of improved runtime flexibility and a revised
+property system. Please see $QTDIR/doc/html/designer.html for a
+feature overview.
+
+Qt 2.2 integrates now fully on MS-Windows 2000.  This includes fade
+and scroll effects for popup windows and title bar gradients for MDI
+document windows in the MDI module. As with all Qt features, we
+provide the same visual effects on Unix/X11.
+
+Two new classes QAction and QActionGroup make it much easier to
+create sophisticated main windows for today's applications. A QAction
+abstracts a user interface action that can appear both in menus and
+tool bars.  An action group makes it easier to deal with groups of
+actions. It allows to add, remove or activate its children with a
+single call and provides "one of many" semantics for toggle
+actions. Changing an action's properties, for example using
+setEnabled(),setOn() or setText(), immediately shows up in all
+representations.
+
+Few people consider the original OSF Motif style the most elegant or
+flashy GUI style. Therefore several attempts have been made to come up
+with a slightly improved Motif-ish look and feel. One of them is the
+thinner CDE style, that was supported by Qt since version 2.0.  In the
+2.2 release, we now added support for SGI's very own Motif version on
+IRIX workstations.  With its more elegant bevelling of 3D elements and
+mouse-under highlight effects, it is quite appealing. For Linux users,
+we added a Motif plus style, that resembles the bevelling used by the
+GIMP toolkit (GTK+). Optionally, this style also does hovering
+highlight on buttons.
+
+Last but not least we added support for multi-threaded
+applications. The classes involved are QThread to start threads,
+QMutex to serialize them and QCondition to signal the occurrence of
+events between threads ("condition variables").
+
+Another major change was done regarding distribution. In order to
+address the steady growth of functionality in the Qt library, we
+split the source code into distinct modules that can be compiled
+in (or left out) separately. This also makes it possible for us to
+keep the cost of entry into the commercial Qt world as low as possible.
+
+The modules available in Qt 2.2 are:
+
+- Tools: platform-independent Non-GUI API for I/O, encodings, containers,
+    strings, time & date, and regular expressions.
+
+- Kernel: platform-independent GUI API, a complete window-system API.
+
+- Widgets: portable GUI controls.
+
+- Dialogs: ready-made common dialogs for selection of colors, files,
+    printers, fonts, and basic types, plus a wizard framework, message
+    boxes and progress indicator.
+
+- OpenGL 3D Graphics: integration of OpenGL with Qt, making it very
+    easy to use OpenGL rendering in a Qt application.
+
+- Network: advanced socket and server-socket handling plus
+    asynchronous DNS lookup.
+
+- Canvas: a highly optimized 2D graphic area.
+
+- Table:  a flexible and editable table widget
+
+- IconView: a powerful visualization widget similar to QListView and
+    QListBox. It contains optionally labelled pixmap items that the user
+    can select, drag around, rename, delete and more.
+
+- XML: a well-formed XML parser with SAX interface plus an
+    implementation of the DOM Level1
+
+- Workspace: a workspace window that can contain decorated document
+    windows for Multi Document Interfaces (MDI).
+
+
+Network, Canvas, Table and XML are entirely new modules.
+
+Below is a list of the major new features in existing classes as well
+as short descriptions of all new classes.
+
+
+****************************************************************************
+* 		New major features in existing classes			   *
+****************************************************************************
+
+QApplication: 	- "global strut", an adjustable minimum size for interactable
+		  control elements like the entries in a listbox, useful for
+		  touch-screens. Popup window effects ( setEffectEnabled() )
+		  and more threading support ( guiThreadTaken(), lock(),
+		  unlock(), locked() ).
+
+QCheckBox: 	- "tristate" is now a property.
+
+QClipboard: 	- text() supports subtypes.
+
+QComboBox: 	- "editable" is now a property that is changeable at runtime
+
+QDialog: 	- support for extensible dialogs ("More...") with
+		  setExtension() and setOrientation(). Optional size grip.
+
+QFont: 		- new functions styleStrategy() and  setStyleHint()
+
+QIconSet: 	- new constructor that takes both a small and a large pixmap
+
+QKeyEvent: 	- numeric keypad keys now set a Keypad flag
+
+QLabel: 	- support for scaled pixmap contents, "pixmap" as property
+
+QLayout:	- improved flexibility with setEnabled(), access to the
+		  laid out menu bar with menuBar().
+
+QListView: 	- "showSortIndicator" as property. New function
+		  QListViewItem::moveItem() to simplify drag and drop.
+
+QMovie: 	- new functions pushSpace(), pushData(), frameImage()
+
+QMultiLineEdit: - new functions pasteSubType() and copyAvailable()
+
+QObject: 	- new function normalizeSignalSlot(), tr() now supports a comment.
+
+QPicture: 	- streaming to and from QDataStream
+
+QPopupMenu: 	- new signal aboutToHide()
+
+QRegExp: 	- new functions setPattern() and find()
+
+QRegion: 	- new function setRects()
+
+QScrollView: 	- new property "staticBackground" to define a pixmap
+		  background that does not scroll with the contents.
+
+QStatusBar: 	- "sizeGripEnabled" as property
+
+QStyle: 	- themable menu bars with drawMenuBarItem(). New functions
+		  buttonMargin(), toolBarHandleExtent(), sliderThickness()
+
+QTabWidget: 	- new functions currentPageIndex(), setCurrentPage(), new
+		  signal currentChanged(). Similar extensions to QTabBar
+		  and QTabDialog
+
+QTranslator:	- new algorithmen for faster lookup. No more risk of
+		"hash collisions" when many translators are loaded.
+
+QVariant: 	- new subtype QSizePolicy. Necessary for QWidget's
+		   new sizePolicy property.
+
+QWidget: 	- new properties "sizePolicy", "ownPalette", "ownFont",
+		  "ownCursor" and "hidden". The size policy is now adjustable
+		  at runtime with setSizePolicy().  Added convenience slot
+		  setDisabled(). Fast geometry mapping functions mapTo() and
+		  mapFrom(). On X11, support for a new background mode
+		  X11ParentRelative.
+
+QWizard: 	- runtime changable titles with setTitle(), new signal
+		  selected()
+
+QWorkspace:	- support for more widget flags like WType_Tool. Titlebar
+		  blending effects on MS-Windows 98/2000.
+
+
+****************************************************************************
+*				New classes				   *
+****************************************************************************
+
+QAction 	- Abstracts a user interface action that can appear both in
+		  menus and tool bars. Changing an action's properties, for
+		  example using setEnabled(),setOn() or setText(),
+		  immediately shows up in all representations.
+
+QActionGroup 	- Combines actions to a group. An action group makes it easier
+		  to deal with groups of actions. It allows to add, remove or
+		  activate its children with a single call and provides
+		  "one of many" semantics for toggle actions.
+
+QDial		- A rounded rangecontrol (like a speedometer or
+		  potentiometer). Both API- and UI-wise the dial is very
+		  similar to a QSlider.
+
+QDom 		- [XML Module] DOM Level 1 Tree
+
+QMotifPlusStyle	- This class implements a Motif-ish look and feel with more
+		  sophisticated bevelling as used by the GIMP toolkit (GTK+)
+		  for Unix/X11.
+
+QMutex:		- Provides access serialization between threads.
+
+QSemaphore:	- A robust integer semaphore.  Another way of thread
+		  serialization.
+
+QThread 	- Baseclass for platform-independent threads.
+
+QWaitCondition 	- Provides signalling of the occurrence of events between
+		  threads ("condition variables")
+
+QCanvas 	- [Canvas Module] a highly optimized 2D graphic area.
+
+QTable 		- [Table Module] a flexible and editable table widget
+
+QXML 		- [XML Module] XML parser with SAX interface
+
diff --git a/dist/changes-2.2.1 b/dist/changes-2.2.1
new file mode 100644
index 0000000..1df0851
--- /dev/null
+++ b/dist/changes-2.2.1
@@ -0,0 +1,160 @@
+
+Qt 2.2.1 is a maintainance release. It keeps backward binary compatibility
+with Qt 2.1 and both forward and backward source compatibility with Qt 2.2.x.
+
+Qt 2.2.0 had a binary compatibility problem with the following:
+
+   bool QRect::contains( const QRect &r, bool proper=FALSE ) const
+
+Qt 2.2.1 corrects this. Programs compiled with 2.1.x now continue
+running with 2.2.1. Programs compiled with versions other than 2.2.0
+may not run with 2.2.0, so upgrading to 2.2.1 is additionally important.
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+- Various compilation problems on particular platforms fixed
+
+- Many improvments in QThread. More platforms supported
+  (e.g. HPUX 11.x), uses native threads on Solaris rather than
+  compatibility posix threads
+
+- A few newly discovered memory leaks and free memory reads fixed
+
+- As usual, many minor bugfixes, too small to be mentioned here.
+
+
+****************************************************************************
+*			   Designer					   *
+****************************************************************************
+
+- in KDE mode: don't show all KDE widgets in the toolbars, since we do
+  not have icons for them (yet). They are accessible through the menu
+  structure, though.
+
+- Introduced concept of a global /etc/designerrc and a templatePath
+  for the sake of Linux Standard Base (LSB) and the way Linux
+  ditributors like to package the Qt Free Edition.
+
+- Support for tab names in a QTabWidget, and page names in a QWizard.
+
+- Support for button IDs in a button group, makes it possible to utilize
+  one single slot for all buttons in a group.
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+QClipboard: 	X11 only: fixed occasional crashes, possibly corrupted
+		list of provided types and hangups of several seconds under
+		certain circumstances.
+
+QFileDialog:	Fixed update when renaming a file to an existing file
+		Unix only: Reset error status after attempting to read an
+		empty file
+		Fixed magical resetting of the "Open" label
+		Fixed duplicate entries in the history combobox
+
+QFont:		Fixes for Hewbrew, Arabic and Thai encodings
+		Added support for Ukrainian encodings
+		X11 only: loading fonts for a locale other than the
+		current now possible (allows displaying japanese characters
+		in a latin1 application without relying on the existence of
+		a unicode font)
+
+QHeader:	removing labels fixed, important for QTable and QListView
+
+QIconView:	drawing problem with missleading font metrices and
+		bounding rectangles fixed
+
+QInputDialog,
+QMessageBox:	use the main widget's or parent's icon if available
+
+QLayout:	synchronize the behaviour of sublayouts and subwidgets with
+		layouts.
+
+QLineEdit: 	Update cursor position if QValidator::fixup() truncates the
+		string
+
+QMainWindow:	Fixed calculated minimum size. Sometimes, the minimum width
+		of the central widget was disregarded.
+
+QMenuBar:	Sizing fixed for frameless menubars in toolbars in
+		Motif-based styles
+
+QMotifPlusStyle: correct drawing of triangular tabs
+
+QMovie:		keep frameImage() during EndOfMovie signal
+
+QDom:		add comments when reading a xml file into the dom
+
+QPrinter:	MS-Windows only: Fixed invalidation when setup dialog was
+		cancelled
+
+QSgiStyle:	Small drawing problem with QTabBar fixed.
+		Fixed drawing of special prefix in menu items
+
+QSizePolicy:	setHeightForWidth() was broken, works now
+
+QTextCodec:	significant speedups for latin1 conversion
+
+QTextStream:	small speed improvements for readLine()
+		Added codec for ukrainian (koi8-u) encoding
+
+QWheelEvent:	Support for the MSH_MOUSEWHEEL extension on MS-Windows 95
+
+QWidget:	X11 only: Fixed possible mouse lock-ups when re-entering
+		the event loop on mouse events for widgets of type
+		WType_Popup.
+		X11 only: set input context when setting the active
+		window
+		X11 only: when dialogs were closed, the main window looked
+		like it	lost focus with some window managers. This has been
+		fixed now.
+
+QWidgetStack:	potential flicker issue fixed
+
+QWorkspace: 	normalize minimized children when they get focus
+		removed occasional flashing (e.g. when maximizing child
+		windows)
+		Look and feel adjustments to emulate MS-Windows even
+		closer
+		Documented that the active window can be 0 if there is no
+		active window
+		Slightly modifed the button decorations to be more general
+		and less KDE2 specific
+
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+QLayout:
+
+We synchronized the behaviour of sublayouts and subwidgets with
+layouts. This shows great effect in the designer, were you usually
+operate on container subwidgets in the design phase, but get a
+complete layout in the preview mode or the generated code. For
+example, the influence of a spacer item on a sublayout's size policy
+has been reduced. The modifications may slightly affect the layout of
+some dialogs.
+
+
+****************************************************************************
+*		    Qt/Embedded-specific changes		           *
+****************************************************************************
+
+- Rotated displays & fonts
+- QCOP, a simple interprocess messaging system
+- Threading support
+- Auto-detected mouse
+- VGA16 support
+- Improved thick lines
+- Optimize some double-painting
+- Allow setting of custom 8bpp colors: QApplication::qwsSetCustomColors()
+- Fix masked widget drawing and clicking
+- Fix mouse grabbing for popups
+
+
diff --git a/dist/changes-2.2.2 b/dist/changes-2.2.2
new file mode 100644
index 0000000..5f271fe
--- /dev/null
+++ b/dist/changes-2.2.2
@@ -0,0 +1,154 @@
+
+Qt 2.2.2 is a bugfix release. It keeps both forward and backward
+compatibility (source and binary) with Qt 2.2.1
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+OpenGL:		More Problems with the auto-detection of OpenGL
+		libraries have been fixed.
+
+
+****************************************************************************
+*			   Designer					   *
+****************************************************************************
+
+uic:		Added workaround for the QListView::Manual vs.
+		QScrollView::Manual enumeration clash.	
+		Fixed backslashes inside strings.
+		Obeys user defined layout names.
+
+RC2UI:		Converts Microsoft Dialog Resources (.rc) to
+		Qt Designer Dialog Userinterface Description Files (.ui).
+		You find it in $QTDIR/tools/designer/integration/rc2ui.
+		See the README file there.
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+QAction:	Fixed possible crash in removeFrom().
+
+QApplication:	X11 only: Add possibility to input text in more than
+		one encoding.
+
+QCanvas:	Deletes items at canvas destruction time. Without a
+		canvas, items are not deletable anyway as they need to
+		access their canvas during destruction.
+		Some performance optimizations.
+
+QCanvasItem:	More accurate rectangle collision detection.
+
+QClipboard:	X11 only: 64bit cleanness when transferring data
+		with format==32 using dnd/clipboard.
+
+QColorDialog:	MS-Windows only: Tries harder to use a nice icon.
+
+QDialog:	Keypard-Enter triggers default button.
+
+QFile:		Unix only: Safe access to files in the proc filesystem.
+
+QFileDialog:	Fixed reentrancy problem when used with qFtp.
+		MS-Windows only: Tries harder to use a nice icon.
+
+QFontCache:	Fixed possible crash in the rare case that the font
+		cache runs over.
+
+QGLWidget:	MS-Windows only: Fix for GL context switching.
+
+QIconView:	Fixed possible crash.
+
+QImage:		Increased number of colors when writing XPM files from
+		64^2 to 64^4.
+		Fixed 16-bit pixel().
+
+QImageIO:	MS-Windows only: exported qInitJpegIO function.
+		Fixed crash with libpng 1.0.8.
+		Fixed huge memory leak with PNG files.
+
+QLCDNumber:	Sensible precision when displaying doubles.
+
+QLineEdit:	Accepts text drops other than text/plain.
+		Fixed psosible crash when deleting a line edit while its
+		context menu is visible.
+
+QListView:	Less flicker. Improved performance on insertItem().
+
+QMainWindow:	Deletes its layout first on destruction time to avoid
+		possible crashes with subclasses.
+
+QMotifPlusStyle:Tuned drawing of tabs.
+
+QPainter:	Fixed rounded rectangle drawing with rotation and
+		viewport transformation turned on.
+		Ignores '\r' in drawText.
+
+QPopupMenu:	Ensure to emit the aboutToShow() signal only once
+		for submenus.
+
+QPrinter:	Unix only: Fixed output for when printing some but not all pages
+		of multi-page output.
+		Unix only: Fixed an infinite loop in the image compression
+		algorithm for some images.
+		Unix only: Added MIBs for 8859-13, -14 and -15.
+		MS-Windows only: Fixed system print dialog for Win9x.
+
+QPrintDialog:	MS-Windows only: Tries harder to use a nice icon.
+
+QProgressBar:	Fixed drawing problem with really large progress ranges.
+
+QPushButton:	Implemented "flat" property as advertised.
+
+QPrinter:	MS-Windows only: Keep the current printer name.
+
+QRichText:	Fixed line breaking for asian scripts. Support for
+		chinese punctuation.
+		Obeys <font color="..."> tags inside links.
+
+QString:	Allows 'G' in sprintf.
+
+QTextCodec:	Recognizes "he" and "he_IL" as 8859-8 locales.
+		Added latin4 locales.
+		Improved Thai support.
+		X11 only: fixed crashes when LANG=ko.
+		Improved conversion performance.
+
+QWidget:	X11 only: fixed a crash in case XmbTextListToTextProperty
+		fails for a certain locale.
+		Visiblity fix when reparenting a widget to 0.
+		X11 only: Improved transient placement for embedded
+		windows.
+		X11 only: Maintains XDND state when reparented.
+		X11 only: No more crashes in setActiveWindow() with
+		or without XIM support.
+		X11 only: small ICCCM compatibility issue with subsequent
+		hide and show fixed.
+
+QWorkspace:	Tab-focus remains inside a document window.
+		Fixed problem with menubars inside document windows.
+		Obeys initial child geometry.
+		Uses the children's size hint when cascading.
+
+QXmlInputSource:Fix for stream devices that do not support
+		direct access.
+
+****************************************************************************
+*			   Third party					   *
+****************************************************************************
+
+None
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+None
+
+****************************************************************************
+*		    Qt/Embedded-specific changes		           *
+****************************************************************************
+
+ - Drawing speed-ups, especially rectangles, alpha blitting, horizontal lines.
+ - More control of qconfig.h
diff --git a/dist/changes-3.0.0 b/dist/changes-3.0.0
new file mode 100644
index 0000000..1f6ad5b
--- /dev/null
+++ b/dist/changes-3.0.0
@@ -0,0 +1,720 @@
+Qt 3.0 adds a wide range of major new features as well as substantial
+improvements over the Qt 2.x series. Some internals have undergone
+major redesign and new classes and methods have been added.
+
+The Qt version 3.x series is not binary compatible with the 2.x
+series.  This means programs compiled with Qt version 2.x must be
+recompiled to work with Qt 3.0.
+
+In addition to the traditional Qt platforms Linux, Unix and the
+various flavours of MS-Windows.  Qt 3.0 for the first time introduces a
+native port to MacOS X. Like all Qt versions, Qt/Mac is source
+compatible with the other editions and follows closely the platform's
+native look and feel guidelines.
+
+We have tried to keep the API of Qt 3.0 as compatible as possible with
+the Qt 2.x series. For most applications, only minor changes will be
+needed to compile and run them successfully using Qt 3.0.
+
+One of the major new features that has been added in the 3.0 release
+is a module allowing you to easily work with databases. The API is
+platform independent and database neutral. This module is seamlessly
+integrated into Qt Designer, greatly simplifying the process of
+building database applications and using data aware widgets.
+
+Other major new features include a plugin architecture to extend Qt's
+functionality, for styles, text encodings, image formats and database
+drivers. The Unicode support of Qt 2.x has been greatly enhanced, it
+now includes full support for scripts written from right to left
+(e.g. Arabic and Hebrew) and also provides improved support for Asian
+languages.
+
+Many new classes have been added to the Qt Library. Amongst them are
+classes that provide a docking architecture (QDockArea/QDockWindow), a
+powerful rich text editor (QTextEdit), a class to store and access
+application settings (QSettings) and a class to create and communicate
+with processes (QProcess).
+
+Apart from the changes in the library itself a lot has been done to
+make the development of Qt applications with Qt 3.0 even easier than
+before. Two new applications have been added: Qt Linguist is a tool to
+help you translate your application into different languages; Qt
+Assistant is an easy to use help browser for the Qt documentation that
+supports bookmarks and can search by keyword.
+
+Another change concerns the Qt build system, which has been reworked
+to make it a lot easier to port Qt to new platforms. You can use this
+platform independent build system - called qmake - for your own
+applications.
+
+And last but not least we hope you will enjoy the revisited and widely
+extended documentation.
+
+
+Qt/Embedded
+----------
+
+Qt/Embedded 3.0 provides the same features as Qt 3.0, but currently
+lacks some of the memory optimizations and fine-tuning capabilities of
+Qt/Embedded 2.3.x. We will add these in the upcoming maintainance
+releases.
+
+If you develop a new product based on Qt/Embedded, we recommend
+switching to 3.0 because of the greatly improved functionality.
+However, if you are planning a release within the next two months and
+require memory optimizations not available with Qt/Embedded 3.0, we
+suggest using Qt/Embedded 2.3.x.
+
+
+The Qt Library
+========================================
+
+A large number of new features has been added to Qt 3.0. The following
+list gives an overview of the most important new and changed aspects
+of the Qt library.
+
+
+Database support
+----------------
+
+One of the major new features in Qt 3.0 is the SQL module that
+provides cross-platform access to SQL databases, making database
+application programming with Qt seamless and portable. The API, built
+with standard SQL, is database-neutral and software development is
+independent of the underlying database.
+
+A collection of tightly focused C++ classes are provided to give the
+programmer direct access to SQL databases. Developers can send raw SQL
+to the database server or have the Qt SQL classes generate SQL queries
+automatically.  Drivers for Oracle, PostgreSQL, MySQL and ODBC are
+available and writing new drivers is straightforward.
+
+Tying the results of SQL queries to GUI components is fully supported
+by Qt's SQL widgets. These classes include a tabular data widget
+(for spreadsheet-like data presentation with in-place editing), a
+form-based data browser (which provides data navigation and edit
+functions) and a form-based data viewer (which provides read-only
+forms). This framework can be extended by using custom field editors,
+allowing for example, a data table to use custom widgets for in-place
+editing. The SQL module fully supports Qt's signals/slots mechanism,
+making it easy for developers to include their own data validation and
+auditing code.
+
+Qt Designer fully supports Qt's SQL module. All SQL widgets can be
+laid out within Qt Designer, and relationships can be established
+between controls visually. Many interactions can be defined purely in
+terms of Qt's signals/slots mechanism directly in Qt Designer.
+
+
+Explicit linking and plugins
+-------------------------
+
+The QLibrary class provides a platform independent wrapper for runtime
+loading of shared libraries.
+
+Specialized classes that make it possible to extend Qt's functionality
+with plugins: QStylePlugin for user interface styles, QTextCodecPlugin
+for text encodings, QImageFormatPlugin for image formats and
+QSqlDriverPlugin for database drivers.
+
+It is possible to remove unused components from the Qt library, and
+easy to extend any application with 3rd party styles, database drivers
+or text codecs.
+
+Qt Designer supports custom widgets in plugins, and will use the
+widgets both when designing and previewing forms (QWidgetPlugin).
+
+
+Rich text engine and editor
+---------------------------
+
+The rich text engine originally introduced in Qt 2.0 has been further
+optimized and extended to support editing. It allows editing formatted
+text with different fonts, colors, paragraph styles, tables and
+images. The editor supports different word wrap modes, command-based
+undo/redo, multiple selections, drag and drop, and many other
+features.  The engine is highly optimized for proccesing and displaying
+large documents quickly and efficiently.
+
+
+Unicode
+-------
+
+Apart from the rich text engine, another new feature of Qt 3.0 that
+relates to text handling is the greatly improved Unicode support. Qt
+3.0 includes an implementation of the bidirectional algorithm (BiDi)
+as defined in the Unicode standard and a shaping engine for Arabic,
+which gives full native language support to Arabic and Hebrew speaking
+people. At the same time the support for Asian languages has been
+greatly enhanced.
+
+The support is almost transparent for the developer using Qt to
+develop their applications. This means that developers who developed
+applications using Qt 2.x will automatically gain the full support for
+these languages when switching to Qt 3.0. Developers can rely on their
+application to work for people using writing systems different from
+Latin1, without having to worry about the complexities involved with
+these scripts, as Qt takes care of this automatically.
+
+
+Docked and Floating Windows
+---------------------------
+
+Qt 3.0 introduces the concept of dock windows and dock areas. Dock
+windows are widgets, that can be attached to, and detached from, dock
+areas. The most common kind of dock window is a tool bar. Any number of
+dock windows may be placed in a dock area. A main window can have dock
+areas, for example, QMainWindow provides four dock areas (top, left,
+bottom, right) by default. The user can freely move dock windows and
+place them at a convenient place in a dock area, or drag them out of
+the application and have them float freely as top level windows in
+their own right. Dock windows can also be minimized or hidden.
+
+For developers, dock windows behave just like ordinary widgets. QToolbar
+for example is now a specialized subclass of a dock window.  The API
+of QMainWindow and QToolBar is source compatible with Qt 2.x, so
+existing code which uses these classes will continue to work.
+
+
+Regular Expressions
+-------------------
+
+Qt has always provided regular expression support, but that support
+was pretty much limited to what was required in common GUI control
+elements such as file dialogs. Qt 3.0 introduces a new regular
+expression engine that supports most of Perl's regex features and is
+Unicode based. The most useful additions are support for parentheses
+(capturing and non-capturing) and backreferences.
+
+
+Storing application settings
+----------------------------
+
+Most programs will need to store some settings between runs, for
+example, user selected fonts, colors and other preferences, or a list
+of recently used files.  The new QSettings class provides a platform
+independent way to achieve this goal. The API makes it easy to store
+and retrieve most of the basic data types used in Qt (such as basic
+C++ types, strings, lists, colors, etc). The class uses the registry
+on the Windows platform and traditional resource files on Unix.
+
+
+Creating and controlling other processes
+----------------------------------------
+
+QProcess is a class that allows you to start other programs from
+within a Qt application in a platform independent manner. It gives you
+full control over the started program.  For example you can redirect
+the input and output of console applications.
+
+
+Accessibility
+---------------
+
+Accessibility means making software usable and accessible to a wide
+range of users, including those with disabilities. In Qt 3.0, most
+widgets provide accessibility information for assistive tools that can
+be used by a wide range of disabled users. Qt standard widgets like
+buttons or range controls are fully supported. Support for complex
+widgets, like e.g. QListView, is in development. Existing applications
+that make use of standard widgets will become accessible just by using
+Qt 3.0.
+
+Qt uses the Active Accessibility infrastructure on Windows, and needs
+the MSAA SDK, which is part of most platform SDKs. With improving
+standardization of accessibility on other platforms, Qt will support
+assistive technologies on other systems too.
+
+
+XML Improvements
+----------------
+
+The XML framework introduced in Qt 2.2 has been vastly improved. Qt
+2.2 already supported level 1 of the Document Object Model (DOM), a
+W3C standard for accessing and modifying XML documents.  Qt 3.0 has
+added support for DOM Level 2 and XML namespaces.
+
+The XML parser has been extended to allow incremental parsing of XML
+documents. This allows you to start parsing the document directly
+after the first parts of the data have arrived, and to continue
+whenever new data is available.  This is especially useful if the XML
+document is read from a slow source, e.g. over the network, as it
+allows the application to start working on the data at a very early
+stage.
+
+
+SVG support
+-----------
+
+SVG is a W3C standard for "Scalable Vector Graphics". Qt 3.0's SVG
+support means that QPicture can optionally generate and import static
+SVG documents. All the SVG features that have an equivalent in
+QPainter are supported.
+
+
+Multihead support
+-----------------
+
+Many professional applications, such as DTP and CAD software, are able
+to display data on two or more monitors. In Qt 3.0 the QDesktopWidget
+class provides the application with runtime information about the
+number and geometry of the desktops on the different monitors and such
+allows applications to efficiently use a multi-monitor setup.
+
+The virtual desktop of Windows 98 and 2000 is supported, as well as
+the traditional multi-screen and the newer Xinerama multihead setups
+on X11.
+
+
+X11 specific enhancements
+-------------------------
+
+Qt 3.0 now complies with the NET WM Specification, recently adopted
+by KDE 2.0.  This allows easy integration and proper execution with
+desktop environments that support the NET WM specification.
+
+The font handling on X11 has undergone major changes.  QFont no longer
+has a one-to-one relation with window system fonts.  QFont is now a
+logical font that can load multiple window system fonts to simplify
+Unicode text display.  This completely removes the burden of
+changing/setting fonts for a specific locale/language from the
+programmer.  For end-users, any font can be used in any locale.  For
+example, a user in Norway will be able to see Korean text without
+having to set their locale to Korean.
+
+Qt 3.0 also supports the new render extension recently added to
+XFree86. This adds support for anti-aliased text and pixmaps with
+alpha channel (semi transparency) on the systems that support the
+rendering extension (at the moment XFree 4.0.3 and later).
+
+
+Printing
+--------
+
+Printing support has been enhanced on all platforms. The QPrinter
+class now supports setting a virtual resolution for the painting
+process. This makes WYSIWYG printing trivial, and also allows you to
+take full advantage of the high resolution of a printer when painting
+on it.
+
+The postscript driver built into Qt and used on Unix has been greatly
+enhanced. It supports the embedding of true/open type and type1 fonts
+into the document, and can correctly handle and display Unicode.
+Support for fonts built into the printer has been enhanced and Qt now
+knows about the most common printer fonts used for Asian languages.
+
+
+Networking
+-----------
+
+A new class QHttp provides a simple interface for HTTP downloads and
+uploads.
+
+
+Compatibility with the Standard Template Library (STL)
+------------------------------------------------------
+
+Support for the C++ Standard Template Library has been added to the Qt
+Template Library (QTL).  The QTL classes now contain appropriate copy
+constructors and typedefs so that they can be freely mixed with other
+STL containers and algorithms.  In addition, new member functions have
+been added to QTL template classes which correspond to STL-style
+naming conventions (e.g., push_back()).
+
+
+Qt Designer
+========================================
+
+Qt Designer was a pure dialog editor in Qt 2.2 but has now been
+extended to provide the full functionality of a GUI design tool.
+
+This includes the ability to lay out main windows with menus and
+toolbars. Actions can be edited within Qt Designer and then plugged
+into toolbars and menu bars via drag and drop. Splitters can now be
+used in a way similar to layouts to group widgets horizontally or
+vertically.
+
+In Qt 2.2, many of the dialogs created by Qt Designer had to be
+subclassed to implement functionality beyond the predefined signal and
+slot connections. Whilst the subclassing approach is still fully
+supported, Qt Designer now offers an alternative: a plugin for editing
+code. The editor offers features such as syntax highlighting,
+completion, parentheses matching and incremental search.
+
+The functionality of Qt Designer can now be extended via plugins.
+Using Qt Designer's interface or by implementing one of the provided
+interfaces in a plugin, a two way communication between plugin and Qt
+Designer can be established. This functionality is used to implement
+plugins for custom widgets, so that they can be used as real widgets
+inside the designer.
+
+Basic support for project management has been added. This allows you
+to read and edit *.pro files, add and remove files to/from the project
+and do some global operations on the project. You can now open the
+project file and have one-click access to all the *.ui forms in the
+project.
+
+In addition to generating code via uic, Qt Designer now supports the
+dynamic creation of widgets directly from XML user interface
+description files (*.ui files) at runtime. This eliminates the need of
+recompiling your application when the GUI changes, and could be used
+to enable your customers to do their own customizations. Technically,
+the feature is provided by a new class, QWidgetFactory in the
+UI-library.
+
+
+Qt Linguist
+========================================
+
+Qt Linguist is a GUI utility to support translating the user-visible
+text in applications written with Qt. It comes with two command-line
+tools: lupdate and lrelease.
+
+Translation of a Qt application is a three-step process:
+
+  1) Run lupdate to extract user-visible text from the C++ source
+     code of the Qt application, resulting in a translation source file
+     (a *.ts file).
+  2) Provide translations for the source texts in the *.ts file using
+     Qt Linguist.
+  3) Run lrelease to obtain a light-weight message file (a *.qm file)
+     from the *.ts file, which provides very fast lookup for released
+     applications.
+
+Qt Linguist is a tool suitable for use by translators. Each
+user-visible (source) text is characterized by the text itself, a
+context (usually the name of the C++ class containing the text), and
+an optional comment to help the translator. The C++ class name will
+usually be the name of the relevant dialog, and the comment will often
+contain instructions that describe how to navigate to the relevant
+dialog.
+
+You can create phrase books for Qt Linguist to provide common
+translations to help ensure consistency and to speed up the
+translation process. Whenever a translator navigates to a new text to
+translate, Qt Linguist uses an intelligent algorithm to provide a list
+of possible translations: the list is composed of relevant text from
+any open phrase books and also from identical or similar text that has
+already been translated.
+
+Once a translation is complete it can be marked as "done"; such
+translations are included in the *.qm file. Text that has not been
+"done" is included in the *.qm file in its original form. Although Qt
+Linguist is a GUI application with dock windows and mouse control,
+toolbars, etc., it has a full set of keyboard shortcuts to make
+translation as fast and efficient as possible.
+
+When the Qt application that you're developing evolves (e.g. from
+version 1.0 to version 1.1), the utility lupdate merges the source
+texts from the new version with the previous translation source file,
+reusing existing translations. In some typical cases, lupdate may
+suggest translations. These translations are marked as unfinished, so
+you can easily find and check them.
+
+
+Qt Assistant
+========================================
+
+Due to the positive feedback we received about the help system built
+into Qt Designer, we decided to offer this part as a separate
+application called Qt Assistant. Qt Assistant can be used to browse
+the Qt class documentation as well as the manuals for Qt Designer and
+Qt Linguist. It offers index searching, a contents overview, bookmarks
+history and incremental search. Qt Assistant is used by both Qt
+Designer and Qt Linguist for browsing their help documentation.
+
+
+qmake
+========================================
+
+qmake is a cross-platform make utility that makes it possible to build
+the Qt library and Qt-based applications on various target platforms
+from one single project description. It is the C++ successor of
+'tmake' which required Perl.
+
+qmake offers additional functionallity that is difficult to reproduce
+in tmake. Trolltech uses qmake in its build system for Qt and related
+products and we have released it as free software.
+
+
+
+Detailed changes
+=============
+
+Qt 3.0 went through 6 beta releases. These are the detailed changes
+since Beta 6 only. For other changes, please see the changes notes
+of the respective beta releases.
+
+
+Qt 3.0 final is not binary compatible with Beta6; any programs linked
+against Beta6 must be recompiled.
+
+Below you will find a description of general changes in the Qt
+Library, Qt Designer and Qt Assistant.  Followed by a detailed list of
+changes in the API.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QApplication
+	make sure we process deferred deletes before leaving the event
+	loop. This fixes some ocassions of memory leaks on exit.
+	win32: some improvements for modality and dockwindow handling
+	x11 only: read non-gui QSettings when running without GUI.
+	
+
+- QCheckListItem
+	Make the checkboxes respect the AlignCenter flag. Also make
+	the boxes look better in case they are not placed in the first
+	column.
+
+- QComboBox
+	if we have a currentItem and then we set the combobox to be
+	editable then set the text in the lineedit to be of the
+	current item.
+
+- QCommonStyle
+	QToolButton: spacing between a toolbutton's icon and its label.
+	QProgressBar: text color fixed.
+
+- QCursor
+	added the What's This? cursor to the collection.
+
+- QDataTable
+	fixed broken context menus.
+
+- QDate
+	fixed addMonth() overflow.
+
+- QDesktopWidget
+	win32 only: works now also for cases where the card handles
+	multiple monitors and GetSystemMetrics returns a single screen
+	only.
+
+- QDomAttr
+	fixed a memory leak in setNodeValue()
+
+- QDomNodeMap
+	added count() as a Qt-style alias for length()
+
+- QDragObject
+	default to the middle of the pixmap as a hot spot, this looks
+	nicer.
+
+- QFileDialog (internal dialog)
+	make viewMode() return the correct value even after the dialog
+	is finished. Fixed getOpenFileName and getSaveFileName for
+	non-existant directories. Make sure that when it's in
+	directory mode that the filters reflect this, and change the
+	label from file name to directory.
+	win32 only: Improved modality when using the native file
+	dialog.
+
+- QFont
+	x11 only: speed up fontloading with even more clever
+	caching. Make sure we can match scaled bitmap fonts by
+	default. Do not load a backup font for a script that is not
+	default. Make sure the pixel size is correct, even for fonts
+	that are unavailable. Try even harder to find a fontname that
+	is not understood. Some RENDER performance optimizations.
+
+- QFontDialog
+	make sure the content is set up correctly when initializing
+	the dialog.
+
+- QGLWidget
+	IRIX only: fixed reparent/resize bug, QGLContext::setContext()
+	is incredibly sensitive on different X servers.
+
+- QHeader
+	fixed missing updates on height resp. width changes like the
+	occur when changing the application font.
+
+- QIconView
+	fixed updates of non-auto-arranged views.
+
+- QImage
+	no gamma correction by default.
+	x11 only: some alignment issue with the alpha masked fixed.
+
+- QIODevice
+	fixed return value of QIODevice::readLine() for sequential
+	access.
+
+- QKeyEvent
+	win32 only: generate Direction_R/L events for bidirectional
+	input.
+
+- QLabel
+	handle setPixmap( *pixmap() ) gracefully. Apply the WordBreak
+	alignment flag to both plaintext and richtext. Improved alignment of
+	richtext labels. Removed some sizepolicy magic, QLabel now
+	works fine with Preferred/Preferred in all modes.
+
+- QLineEdit
+	fixed a crash when doing undo and a validator is set. Emit
+	textChanged() also if the text changed because of undo or redo.
+
+- QListBox
+	fixed RMB context-menu offset.
+
+- QListView
+	do not start renaming an item is CTRL or SHIFT is
+	pressed. Start renaming on mouse release, not mouse press, so
+	click + click + move on the same item does not start a rename
+	operation.
+
+- QMainWindow
+	show dock-menu also when clicking on the menubar.
+
+- QPainter
+	win32 only: improved printing performance through printer font
+	caching.
+	boundingRect(): ignore 0-width in the constrain rectangle.
+
+- QPicture
+	added overload for load()  that takes a QIODevice.
+
+- QPrintDialog (internal dialog)
+	fixed enabling of the first page and last page labels.
+
+- QPrinter
+	win32 only: make setColorMode() work, some unicode fixes. Make
+	collate the default.  Enable the collate checkbox without
+	losing the page selection if you want to print multiple
+	pages. Make the collateCopies property work that it knows
+	checks/unchecks the collate checkbox in the printing
+	dialog. Make settings also work when the print dialog is not
+	shown at all.
+
+- QProcess
+	added a new communication mode that duplicates stderr to
+	stdout (i.e. the equivalent of the shell's 2>&1).
+
+- QPSPrinter (unix)
+	fixed collate.
+	
+- QRangeControl
+	simplified code.
+
+- QRichText
+	Propagate WhiteSpaceMode to subitems with
+	WhiteSpaceModeNormal. Hide DisplayModeNone
+	items without additional newline. Fixed links inside non-left
+	aligned tables. Fixed some bidi layout problems. Fixed last
+	line layout in right-aligned paragraphs. For plain text,
+	always use the palette's text color.
+
+- QScrollView
+	safer destruction.
+
+- QSettings
+	win32 only: fixed a dead lock situation when writing
+	to LOCAL_MACHINE, but reading from CURRENT_USER.
+
+- QSGIStyle
+	fixed drawing of checkable menu items.
+
+- QSimpleRichText
+	use the specified default font.
+
+- QSlider
+	optimized drawing in the new style engine.
+
+- QString
+	QString::replace() with a regular expression requires a
+	QRegExp object, passing a plain string will cause a compile
+	error.
+
+- QStyleSheet
+	additional parameter 'whitespacemode' for
+	QStyleSheet::convertFromPlainText(). Support for superscript
+	('sup') and subscript ( 'sub' ).
+
+- QTabBar
+	react properly on runtime font changes, less flicker.
+
+- QTable
+	take the pixmap of a header section into account when
+	adjusting the size.
+
+- QTabWidget
+	use the embedded tabbar as focus proxy.
+
+- QThread
+	win32 only: possible crash with the thread dictionary fixed.
+
+- QValidator
+	In Q{Int,Double}Validator, consider '-' as Invalid rather than
+	Intermediate if bottom() >= 0.
+	
+- QWidget
+	made showFullScreen() multihead aware.
+	win32 only: Better size and position restoring when switching
+	between fullscreen, maximized and minimized.
+	x11 only: improvements to XIM, overthespot works correctly
+	now.
+
+- QWorkspace
+	smarter placement of the minimize button when there is no
+	maximize button. Make titlebars of tool windows a bit smaller.
+	Improved styleability. Do not maximize a widget that has a
+	maximum size that is smaller than the workspace.
+
+
+
+****************************************************************************
+*			      Other					   *
+****************************************************************************
+
+- moc
+	fixed generation of uncompilable code in conjunction with
+	Q_ENUMS and signal/slots.
+
+- unicode
+	allow keyboard switching of paragraph directionality.
+
+- installation
+	install $QTDIR/doc/html/ instead of $QTDIR/doc/
+	install Qt Designer templates as well.
+
+- improved build on
+	HP-UX with cc.
+	Solaris 8 with gcc 3.0.1.
+	AIX with xlC and aCC.
+
+- inputmethods
+	x11 only: do not reset the input context on focus changes.
+
+- uic
+	smaller improvements, handle additional form signals.
+
+- Qt Designer
+	make it possible to add new signals to a form without
+	subclassing. Minor fixes.
+
+- Qt Assistant
+	fixed Shift-LMB selection bug. Fixed new window and window
+	restoration on restart.
+
+- Qt Linguist
+	change fourth parameter of QApplication::translate() from bool
+	to enum type. This affects MOC (new revision) and lupdate (new
+	syntax to parse). Change Qt Linguist's XML file format (.ts)
+	to be consistent with QApplication:<defaultcodec> (rather than
+	<codec>) to match QApp::defaultCodec(); encoding="UTF-8"
+	(rather than utf8="true") to match QApp::translate(). Fixed
+	window decoration on restart. Use 'finished', 'unfinished' and
+	'unresolved' instead of the (!), (?) symbols on printouts.
+
+- QMsDev
+	merge "Add UIC" and "New Dialog". Better user interface and
+	general cleanup. Wwrite (and merge) qmake pro file with active
+	project. Load qmake pro files into Visual Studio.
+
+
diff --git a/dist/changes-3.0.0-beta1 b/dist/changes-3.0.0-beta1
new file mode 100644
index 0000000..2c73e77
--- /dev/null
+++ b/dist/changes-3.0.0-beta1
@@ -0,0 +1,1239 @@
+Qt 3.0 adds a lot of new features and improvements over the Qt 2.x
+series. Some internals have undergone major redesign and new classes
+and methods have been added.
+
+We have tried to keep the API of Qt 3.0 as compatible as possible with
+the Qt 2.x series. For most applications only minor changes will be
+needed to compile and run them successfully using Qt 3.0.
+
+One of the major new features that has been added in the 3.0 release
+is a module allowing you to easily work with databases. The API is
+platform independent and database neutral. This module is seamlessly
+integrated into Qt Designer, greatly simplifying the process of
+building database applications and using data aware widgets.
+
+Other major new features include a component architecture allowing you
+to build cross platform components, 'plugins' with Qt. You can use
+your own and third party plugins your own applications. The Unicode
+support of Qt 2.x has been greatly enhanced, it now includes full
+support for scripts written from right to left (e.g. Arabic and
+Hebrew) and also provides improved support for Asian languages.
+
+Many new classes have been added to the Qt Library. Amongst them are
+classes that provide a docking architecture (QDockArea/QDockWindow), a
+powerful rich text editor (QTextEdit), a class to store and access
+application settings (QSettings) and a class to create and communicate
+with processes (QProcess).
+
+Apart from the changes in the library itself a lot has been done to
+make the development of Qt applications with Qt 3.0 even easier than
+before. Two new applications have been added: Qt Linguist is a tool to
+help you translate your application into different languages; Qt
+Assistant is an easy to use help browser for the Qt documentation that
+supports bookmarks and can search by keyword.
+
+Another change concerns the Qt build system, which has been reworked
+to make it a lot easier to port Qt to new platforms. You can use this
+platform independent build system for your own applications.
+
+
+The Qt Library
+========================================
+
+A large number of new features has been added to Qt 3.0. The following
+list gives an overview of the most important new and changed aspects
+of the Qt library. A full list of every new method follows the
+overview.
+
+
+Database support
+----------------
+
+One of the major new features in Qt 3.0 is the SQL module that
+provides cross-platform access to SQL databases, making database
+application programming with Qt seamless and portable. The API, built
+with standard SQL, is database-neutral and software development is
+independent of the underlying database.
+
+A collection of tightly focused C++ classes are provided to give the
+programmer direct access to SQL databases. Developers can send raw SQL
+to the database server or have the Qt SQL classes generate SQL queries
+automatically.  Drivers for Oracle, PostgreSQL, MySQL and ODBC are
+available and writing new drivers is straightforward.
+
+Tying the results of SQL queries to GUI components is fully supported
+by Qt's SQL widgets. These classes include a tabular data widget
+(for spreadsheet-like data presentation with in-place editing), a
+form-based data browser (which provides data navigation and edit
+functions) and a form-based data viewer (which provides read-only
+forms). This framework can be extended by using custom field editors,
+allowing for example, a data table to use custom widgets for in-place
+editing. The SQL module fully supports Qt's signal/slots mechanism,
+making it easy for developers to include their own data validation and
+auditing code.
+
+Qt Designer fully supports Qt's SQL module. All SQL widgets can be
+laid out within Qt Designer, and relationships can be established
+between controls visually. Many interactions can be defined purely in
+terms of Qt's signals/slots mechanism directly in Qt Designer.
+
+
+Component model - plugins
+-------------------------
+
+The QLibrary class provides a platform independent wrapper for runtime
+loading of shared libraries. Access to the shared libraries uses a
+COM-like interface. QPluginManager makes it trivial to implement
+plugin support in applications. The Qt library is able to load
+additional styles, database drivers and text codecs from plugins which
+implement the relevant interfaces, e.g. QStyleFactoryInterface,
+QSqlDriverInterface or QTextCodecInterface. It is possible to remove
+unused components from the Qt library, and easy to extend any
+application with 3rd party styles, database drivers or text codecs.
+
+Qt Designer supports custom widgets in plugins, and will use the
+widgets both when designing and previewing forms.
+
+QComponentFactory makes it easy to register any kind of component in a
+global database (e.g. the Windows Registry) and to use any registered
+component.
+
+
+Rich text engine and editor
+---------------------------
+
+The rich text engine originally introduced in Qt 2.0 has been further
+optimized and extended to support editing. It allows editing formatted
+text with different fonts, colors, paragraph styles, tables and
+images. The editor supports different word wrap modes, command-based
+undo/redo, multiple selections, drag and drop, and many other
+features.  The engine is highly optimized for proccesing and displaying
+large documents quickly and efficiently.
+
+
+Unicode
+-------
+
+Apart from the rich text engine, another new feature of Qt 3.0 that
+relates to text handling is the greatly improved Unicode support. Qt
+3.0 includes an implementation of the bidirectional algorithm (BiDi)
+as defined in the Unicode standard and a shaping engine for Arabic,
+which gives full native language support to Arabic and Hebrew speaking
+people. At the same time the support for Asian languages has been
+greatly enhanced.
+
+The support is almost transparent for the developer using Qt to
+develop their applications. This means that developers who developed
+applications using Qt 2.x will automatically gain the full support for
+these languages when switching to Qt 3.0. Developers can rely on their
+application to work for people using writing systems different from
+Latin1, without having to worry about the complexities involved with
+these scripts, as Qt takes care of this automatically.
+
+
+Docked and Floating Windows
+---------------------------
+
+Qt 3.0 introduces the concept of Dock Windows and Dock Areas. Dock
+windows are widgets, that can be attached to, and detached from, dock
+areas. The commonest kind of dock window is a tool bar. Any number of
+dock windows may be placed in a dock area. A main window can have dock
+areas, for example, QMainWindow provides four dock areas (top, left,
+bottom, right) by default. The user can freely move dock windows and
+place them at a convenient place in a dock area, or drag them out of
+the application and have them float freely as top level windows in
+their own right. Dock windows can also be minimized or hidden.
+
+For developers, dock windows behave just like ordinary widgets. QToolbar
+for example is now a specialized subclass of a dock window.  The API
+of QMainWindow and QToolBar is source compatible with Qt 2.x, so
+existing code which uses these classes will continue to work.
+
+
+Regular Expressions
+-------------------
+
+Qt has always provided regular expression support, but that support
+was pretty much limited to what was required in common GUI control
+elements such as file dialogs. Qt 3.0 introduces a new regular
+expression engine that supports most of Perl's regex features and is
+Unicode based. The most useful additions are support for parentheses
+(capturing and non-capturing) and backreferences.
+
+
+Storing application settings
+----------------------------
+
+Most programs will need to store some settings between runs, for
+example, user selected fonts, colors and other preferences, or a list
+of recently used files.  The new QSettings class provides a platform
+independent way to achieve this goal. The API makes it easy to store
+and retrieve most of the basic data types used in Qt (such as basic
+C++ types, strings, lists, colors, etc). The class uses the registry
+on the Windows platform and traditional resource files on Unix.
+
+
+Creating and controlling other processes
+----------------------------------------
+
+QProcess is a class that allows you to start other programs from
+within a Qt application in a platform independent manner. It gives you
+full control over the started program, for example you can redirect
+the input and output of console applications.
+
+
+Accessibility (not part of the beta1 release)
+---------------------------------------------
+
+Accessibility means making software usable and accessible to a wide
+range of users, including those with disabilities. In Qt 3.0, most
+widgets provide accessibility information for assistive tools that can
+be used by a wide range of disabled users. Qt standard widgets like
+buttons or range controls are fully supported. Support for complex
+widgets, like e.g. QListView, is in development. Existing applications
+that make use of standard widgets will become accessible just by using
+Qt 3.0.
+
+Qt uses the Active Accessibility infrastructure on Windows, and needs
+the MSAA SDK, which is part of most platform SDKs. With improving
+standardization of accessibility on other platforms, Qt will support
+assistive technologies on other systems, too.
+
+The accessibility API in Qt is not yet stable, which is why we decided
+not to make it a part of the beta1 release.
+
+
+XML Improvements
+----------------
+
+The XML framework introduced in Qt 2.2 has been vastly improved. Qt
+2.2 already supported level 1 of the Document Object Model (DOM), a
+W3C standard for accessing and modifying XML documents.  Qt 3.0 has
+added support for DOM Level 2 and XML namespaces.
+
+The XML parser has been extended to allow incremental parsing of XML
+documents. This allows you to start parsing the document directly
+after the first parts of the data have arrived, and to continue
+whenever new data is available.  This is especially useful if the XML
+document is read from a slow source, e.g. over the network, as it
+allows the application to start working on the data at a very early
+stage.
+
+
+SVG support
+-----------
+
+SVG is a W3C standard for "Scalable Vector Graphics". Qt 3.0's SVG
+support means that QPicture can optionally generate and import static
+SVG documents. All the SVG features that have an equivalent in
+QPainter are supported.
+
+
+Multihead support
+-----------------
+
+Many professional applications, such as DTP and CAD software, are able
+to display data on two or more monitors. In Qt 3.0 the QDesktopWidget
+class provides the application with runtime information about the
+number and geometry of the desktops on the different monitors and such
+allows applications to efficiently use a multi-monitor setup.
+
+The virtual desktop of Windows 98 and 2000 is supported, as well as
+the traditional multi-screen and the newer Xinerama multihead setups
+on X11.
+
+
+X11 specific enhancements
+-------------------------
+
+Qt 3.0 now complies with the NET WM Specification, recently adopted
+by KDE 2.0.  This allows easy integration and proper execution with
+desktop environments that support the NET WM specification.
+
+The font handling on X11 has undergone major changes.  QFont no longer
+has a one-to-one relation with window system fonts.  QFont is now a
+logical font that can load multiple window system fonts to simplify
+Unicode text display.  This completely removes the burden of
+changing/setting fonts for a specific locale/language from the
+programmer.  For end-users, any font can be used in any locale.  For
+example, a user in Norway will be able to see Korean text without
+having to set their locale to Korean.
+
+Qt 3.0 also supports the new render extension recently added to
+XFree86. This adds support for anti aliased text and pixmaps with
+alpha channel (semi transparency) on the systems that support the
+rendering extension (at the moment XFree 4.0.3 and later).
+
+
+Printing
+--------
+
+Printing support has been enhanced on all platforms. The QPrinter
+class now supports setting a virtual resolution for the painting
+process. This makes WYSIWYG printing trivial, and also allows you to
+take full advantage of the high resolution of a printer when painting
+on it.
+
+The postscript driver built into Qt and used on Unix has been greatly
+enhanced. It supports the embedding of true/open type and type1 fonts
+into the document, and can correctly handle and display Unicode.
+Support for fonts built into the printer has been enhanced and Qt now
+knows about the most common printer fonts used for Asian languages.
+
+
+QHttp
+-----
+
+This class provides a simple interface for HTTP downloads and uploads.
+
+
+Compatibility with the Standard Template Library (STL)
+------------------------------------------------------
+
+Support for the C++ Standard Template Library has been added to the Qt
+Template Library (QTL).  The QTL classes now contain appropriate copy
+constructors and typedefs so that they can be freely mixed with other
+STL containers and algorithms.  In addition, new member functions have
+been added to QTL template classes which correspond to STL-style
+naming conventions (e.g., push_back()).
+
+
+Qt Designer
+========================================
+
+Qt Designer was a pure dialog editor in Qt 2.2 but has now been
+extended to provide the full functionality of a GUI design tool.
+
+This includes the ability to lay out main windows with menus and
+toolbars. Actions can be edited within Qt Designer and then plugged
+into toolbars and menu bars via drag and drop. Splitters can now be
+used in a way similar to layouts to group widgets horizontally or
+vertically.
+
+In Qt 2.2, many of the dialogs created by Qt Designer had to be
+subclassed to implement functionality beyond the predefined signal and
+slot connections. Whilst the subclassing approach is still fully supported,
+Qt Designer now offers an alternative: a plugin for editing 
+slots. The editor offers features such as syntax highlighting,
+completion, parentheses matching and incremental search.
+
+The functionality of Qt Designer can now be extended via plugins.
+Using Qt Designer's interface or by implementing one of the provided
+interfaces in a plugin, a two way communication between plugin and Qt
+Designer can be established. This functionality is used to implement
+plugins for custom widgets, so that they can be used as real widgets
+inside the designer.
+
+Basic support for project management has been added. This allows you
+to read and edit *.pro files, add and remove files to/from the project
+and do some global operations on the project. You can now open the
+project file and have one-click access to all the *.ui forms in the
+project.
+
+In addition to generating code via uic, Qt Designer now supports the
+dynamic creation of widgets directly from XML user interface
+description files (*.ui files) at runtime. This eliminates the need of
+recompiling your application when the GUI changes, and could be used
+to enable your customers to do their own customizations. Technically,
+the feature is provided by a new class, QWidgetFactory in the
+QResource library.
+
+
+Qt Linguist
+========================================
+
+Qt Linguist is a GUI utility to support translating the user-visible
+text in applications written with Qt. It comes with two command-line
+tools: lupdate and lrelease.
+
+Translation of a Qt application is a three-step process:
+
+  1) Run lupdate to extract user-visible text from the C++ source
+     code of the Qt application, resulting in a translation source file
+     (a *.ts file).
+  2) Provide translations for the source texts in the *.ts file using
+     Qt Linguist.
+  3) Run lrelease to obtain a light-weight message file (a *.qm file)
+     from the *.ts file, which provides very fast lookup for released
+     applications.
+
+Qt Linguist is a tool suitable for use by translators. Each
+user-visible (source) text is characterized by the text itself, a
+context (usually the name of the C++ class containing the text), and
+an optional comment to help the translator. The C++ class name will
+usually be the name of the relevant dialog, and the comment will often
+contain instructions that describe how to navigate to the relevant
+dialog.
+
+You can create phrase books for Qt Linguist to provide common
+translations to help ensure consistency and to speed up the
+translation process. Whenever a translator navigates to a new text to
+translate, Qt Linguist uses an intelligent algorithm to provide a list
+of possible translations: the list is composed of relevant text from
+any open phrase books and also from identical or similar text that has
+already been translated.
+
+Once a translation is complete it can be marked as "done"; such
+translations are included in the *.qm file. Text that has not been
+"done" is included in the *.qm file in its original form. Although Qt
+Linguist is a GUI application with dock windows and mouse control,
+toolbars, etc., it has a full set of keyboard shortcuts to make
+translation as fast and efficient as possible.
+
+When the Qt application that you're developing evolves (e.g. from
+version 1.0 to version 1.1), the utility lupdate merges the source
+texts from the new version with the previous translation source file,
+reusing existing translations. In some typical cases, lupdate may
+suggest translations. These translations are marked as unfinished, so
+you can easily find and check them.
+
+
+Qt Assistant
+========================================
+
+Due to the positive feedback we received about the help system built
+into Qt Designer, we decided to offer this part as a separate
+application called Qt Assistant. Qt Assistant can be used to browse
+the Qt class documentation as well as the manuals for Qt Designer and
+Qt Linguist. It offers index searching, a contents overview, bookmarks
+history and incremental search. Qt Assistant is used by both Qt
+Designer and Qt Linguist for browsing their help documentation.
+
+
+QMake
+========================================
+
+To ease portability we now provide the qmake utility to replace tmake.
+QMake is a C++ version of tmake which offers additional functionallity
+that is difficult to reproduce in tmake. Trolltech uses qmake in its
+build system for Qt and related products and we have released it as
+free software.
+
+
+Qt Functions
+========================================
+
+QAction
+-------
+
+All new functions:
+	void addedTo( QWidget *actionWidget, QWidget *container );
+	void addedTo( int index, QPopupMenu *menu );
+
+QActionGroup
+------------
+
+New mode "uses drop down", where members are shown in a separate
+subwidget such as a combobox or a submenu (enable with
+setUsesDropDown(TRUE) )
+
+All new functions:
+	void add(QAction*);
+	void addSeparator();
+	void addedTo( QWidget *actionWidget, QWidget *container, QAction *a );
+	void addedTo( int index, QPopupMenu *menu, QAction *a );
+	void setUsesDropDown( bool enable );
+	bool usesDropDown() const;
+
+
+QApplication
+------------
+
+Added the setStyle(const QString&) overload that takes the name of the
+style as its argument. This loads a style plugin via a QStyleFactory.
+
+desktop() now returns a QDesktopWidget that provides access to
+multi-head information. Prior to 3.0, it returned a normal QWidget.
+
+New functions to define the library search path for plugins
+(setLibraryPaths, ...).
+
+New functions to define reverse layout for bidirectional languages
+(setReverseLayout, ...).
+
+All new functions:
+	bool hasPendingEvents()
+
+	void setLibraryPaths(const QStringList &);
+	QStringList libraryPaths();
+	void addLibraryPath(const QString &);
+	void removeLibraryPath(const QString &);
+
+	void setReverseLayout( bool b );
+	bool reverseLayout();
+	int horizontalAlignment( int align );
+
+
+
+QClipboard
+----------
+
+On systems that support it, for example X11, QClipboard now
+differentiates between the primary selection and the data in the clipboard.
+
+All new functions:
+	bool supportsSelection() const;
+	bool ownsClipboard() const;
+	void setSelectionMode(bool enable);
+	bool selectionModeEnabled() const;
+New signals:
+	void selectionChanged()
+	
+
+
+QCursor
+-------
+
+Now inherits Qt namespace. Enum values like ArrowCursor,
+UpArrowCursor, CrossCursor etc. are now part of that namespace.
+
+
+QDataStream
+-----------
+
+Added missing operators for Q_LONG and Q_ULONG
+
+
+QDateTime / QDate / QTime
+-------------------------
+
+More sophisticated toString() function that takes a DateFormat, where
+DateFormat can be either TextDate (the default), ISODate (ISO 8601) or
+LocalDate (locale dependent).
+
+All new functions:
+	QDate addMonths( int months ) const;
+	QDate addYears( int years ) const;
+	QDate fromString( const QString& s, Qt::DateFormat f = Qt::TextDate );
+	static QString shortMonthName( int month );
+	static QString longMonthName( int month );
+	static QString shortDayName( int weekday );
+	static QString longDayName( int weekday );
+	static void setShortMonthNames( const QStringList& names );
+	static void setLongMonthNames( const QStringList& names );
+	static void setShortDayNames( const QStringList& names );
+	static void setLongDayNames( const QStringList& names );
+
+QDialog
+-------
+
+Merged with QSemiModal. Calling show() on a modal dialog will return
+immediately, not enter a local event loop. Showing a modal dialog in
+its own event loop is achieved using exec().
+
+exec() is now a public slot.
+
+Usability: For widgets supporting What's This help, QDialog
+automatically offers a context menu containing a "What's This?" entry.
+
+
+QEvent
+------
+
+Mouse events are now propagated up to the toplevel widget if no widget
+accepts them and no event filter filters them out. In previous Qt
+versions, only key events were propagated.
+
+All events carry a flag 'spontaneous' to determine whether the even
+came from the outside or was generated by code within the
+applications. Previously, only show and hide events had this flag.
+
+Enter/Leave event generation has been fixed. Previously, a widget
+received a leave event when the mouse pointer entered one of its
+children. This was both unnatural and contradictive to the
+documentation.
+
+QWheelevent now carries an orientation to differentiate between
+horizontal and vertical wheels.
+
+QFocusEvent: new reason 'Backtab' (previously only 'Tab' was
+available). This makes it possible to discover from what direction on
+the tab-focus chain the widget was entered.
+
+New events: QContextMenuEvent, QIMEvent
+
+
+QFile
+-----
+
+Ported from int to Q_LONG to prepare for large file sizes on 64 bit
+systems.
+
+Filter handling made more flexible.
+
+
+QFileDialog
+-----------
+
+All new Functions:
+	void setSelectedFilter( const QString& );
+	void setSelectedFilter( int );
+New signals:
+	void filesSelected( const QStringList& );
+	void filterSelected( const QString& );
+
+If you try to specify an invalid file when using getOpenFileName(s), an error message
+will appear and the file will not be accepted.  In 2.x, this function behaved differently
+because users were using getOpenFileName(s) as a Save File Dialog; you should use
+getSaveFileName() when you require a Save File Dialog.	
+
+
+QCanvas Module
+--------------
+
+	New classes:
+		QCanvasSpline - a multi-bezier spline
+
+	QCanvasItemList
+		void update();
+
+	QCanvas:
+		QRect rect() const;
+		void setUnchanged( const QRect& area );
+		void drawArea(const QRect&, QPainter* p, bool double_buffer);
+		void drawViewArea( QCanvasView* view, QPainter* p, const QRect& r, bool dbuf );
+		QRect changeBounds(const QRect& inarea);
+
+	QCanvasView:
+		const QWMatrix &worldMatrix() const;
+		const QWMatrix &inverseWorldMatrix() const;
+		void setWorldMatrix( const QWMatrix & );
+	QCanvasSprite:
+		int leftEdge() const;
+		int topEdge() const;
+		int rightEdge() const;
+		int bottomEdge() const;
+		int leftEdge(int nx) const;
+		int topEdge(int ny) const;
+		int rightEdge(int nx) const;
+		int bottomEdge(int ny) const;
+
+QCanvasSprite can now be set to animate its frames without the need to
+subclass.
+
+
+QFont, QFontDatabase, QFontInfo, QFontMetrics
+---------------------------------------------
+
+The QFont::CharSet enum has been removed and replaced with the
+QFont::Script enum. With this change, a QFont is not associated with a
+specific character set. Instead, QFont uses Unicode Scripts for
+loading fonts.  On platforms where most fonts do not use the Unicode
+encoding (currently only X11), multiple locale and character-set
+dependent fonts can be loaded for the individual Unicode Scripts.
+
+Another new feature of QFont is a much more flexible substitution
+mechanism. Each family can have a list of appropriate substitutes. The
+font substitution feature allows you to specify a list of substitute
+fonts. Substitute fonts are used when a font cannot be loaded, or if
+the specified font doesn't have a particular character (X11 only).
+
+For example (on X11), you select the font Lucida, which doesn't have
+Korean characters. For Korean text, you want to use the Mincho font
+family. By adding Mincho to the list, any Korean characters not found
+in Lucida will be used from Mincho. Because the font substitutions are
+lists, you can also select multiple families, such as Song Ti (for use
+with Chinese text).
+
+QFontInfo and QFontMetrics had small API changes related to the
+disappearance of QFont::CharSet.  In terms of functionality, the
+behavior of these classes is unchanged.
+
+QFontDatabase had several API cleanups related to the disappearance of
+QFont::CharSet.  Most QFontDatabase member functions take one less
+argument, yet compatibility functions still exist to keep old source
+code working.
+
+Family and style names returned from QFontDatabase are now processed
+and formatted in a way that is suitable for display to users.  Family
+and foundry names are capitalized and foundry names are enclosed in
+square brackets after the family name.  For example, the Helvetica
+font family might have 3 different foundries: Adobe, Cronyx and
+Phaisarn. In 2.x, QFontDatabase listed them like this:
+
+	adobe-helvetica
+	cronyx-helvetica
+	phaisarn-helvetica
+
+Starting with 3.0, QFontDatabase lists them like this:
+
+	Helvetica [Adobe]
+	Helvetica [Cronyx]
+	Helvetica [Phaisarn]
+
+
+QFrame
+------
+
+Two new frame shapes for more sophisticated style features:
+MenuBarPanel and ToolBarPanel.
+
+
+QGrid
+-----
+
+The member type
+
+    enum Direction { Horizontal, Vertical };
+
+has been eliminated, as it is redundant: use Qt::Orientation instead.
+Old code referring to QGrid::Horizontal or QGrid::Vertical will still
+work, as QGrid counts Qt among its ancestors.
+
+
+QGroupBox
+---------
+
+More functionality of the built-in layout is exposed:
+
+	int insideMargin() const;
+	int insideSpacing() const;
+	void setInsideMargin( int m );
+	void setInsideSpacing( int s );
+
+
+QHeader
+-------
+
+New property: bool stretching
+
+New functions:
+	bool isStretchEnabled( int section );
+	void setStretchEnabled( bool b, int section );
+	
+
+QIconSet
+--------
+
+In addition to the mode - which can be either Normal, Disabled or
+Active - QIconSet now supports different pixmaps for a state, i.e. On
+or Off. The functions pixmap() and setPixmap() have been extended
+accordingly.
+
+The default constructor no longer initializes the iconset to
+contain a null pixmap. QIconSet::isNull() returns TRUE for un-
+initialized iconsets, and pixmap() still returns a null pixmap for
+pixmaps that couldn't be generated.
+
+
+QIconView
+---------
+
+Extended findItem() to support ComparisonFlags. Support for
+soft-hyphens when doing word wrap.
+
+New signal:
+	contextMenuRequested( QIconViewItem*, const QPoint& pos);
+
+
+QIconViewItem
+-------------
+
+Added support for explicit rtti.
+
+New function:
+	int rtti() const;
+
+
+
+QListBox
+--------
+
+Extended findItem() to support ComparisonFlags.
+
+New signal:
+	void contextMenu( QListBoxItem *, const QPoint & );
+
+
+QListBoxItem
+------------
+
+Added support for explicit rtti.
+
+New function:
+	int rtti() const;
+
+
+
+QListView
+---------
+
+It was never really hard to implement drag and drop with QListView,
+but since many applications demand this functionality today, we
+decided to add it to the listview itself.
+
+In addition, in-place editing and per-item tooltips have been added.
+Extended findItem() to support ComparisonFlags
+
+New properties:
+	bool showToolTips
+	ResizeMode resizeMode
+
+New signals:
+	contextMenuRequested( QIconViewItem*, const QPoint& pos);
+	void dropped( QDropEvent *e );
+	void itemRenamed( QListViewItem *item, int col, const QString & );
+	void itemRenamed( QListViewItem *item, int col  );
+
+New functions:
+	void setResizeMode( ResizeMode m );
+	ResizeMode resizeMode() const;
+	QDragObject *dragObject();
+	void startDrag();
+	void startRename();
+
+
+QListViewItem
+-------------
+
+Added support for explicit rtti.
+
+New functions:
+	void setDragEnabled( bool allow );
+	void setDropEnabled( bool allow );
+	bool dragEnabled() const;
+	bool dropEnabled() const;
+	bool acceptDrop( const QMimeSource *mime ) const;
+	void setVisible( bool b );
+	bool isVisible() const;
+	void setRenameEnabled( int col, bool b );
+	bool renameEnabled( int col ) const;
+	void startRename( int col );
+	void setEnabled( bool b );
+	bool isEnabled() const;
+	int rtti() const;
+
+	void dropped( QDropEvent *e );
+	void dragEntered();
+	void dragLeft();
+	void okRename( int col );
+	void cancelRename( int col );
+
+
+QLabel
+------
+
+In addition to text, rich text, pixmaps and movies, QLabel can now
+display QPicture vector graphics.
+
+New functions:
+
+	QPicture *picture() const;
+	void setPicture( const QPicture & );
+
+
+QLineEdit
+---------
+
+New property: bool dragEnabled
+
+New signal:
+	contextMenuRequested( QIconViewItem*, const QPoint& pos);
+
+New functions:
+	void cursorForward( bool mark, int steps = 1 );
+	void cursorBackward( bool mark, int steps = 1 );
+	void cursorWordForward( bool mark );
+	void cursorWordBackward( bool mark );
+	bool dragEnabled();
+	void setDragEnabled( bool b );
+
+
+QMainWindow
+-----------
+
+Added a dock window architecture. Previous versions of QMainWindow
+could only deal with toolbars, now they handle generalized dock
+windows. QToolBar inherits QDockWindow.
+
+
+New property:
+	bool dockWindowsMovable;
+
+New signals:
+	void dockWindowPositionChanged( QDockWindow * );
+
+New functions:
+	void setDockEnabled( Dock dock, bool enable );
+	bool isDockEnabled( Dock dock ) const;
+	bool isDockEnabled( QDockArea *area ) const;
+	void setDockEnabled( QDockWindow *tb, Dock dock, bool enable );
+	bool isDockEnabled( QDockWindow *tb, Dock dock ) const;
+	bool isDockEnabled( QDockWindow *tb, QDockArea *area ) const;
+
+	void addDockWindow( QDockWindow *, Dock = Top, bool newLine = FALSE );
+	void addDockWindow( QDockWindow *, const QString &label, Dock = Top, bool newLine = FALSE );
+	void moveDockWindow( QDockWindow *, Dock = Top );
+	void moveDockWindow( QDockWindow *, Dock, bool nl, int index, int extraOffset = -1 );
+	void removeDockWindow( QDockWindow * );
+
+	QDockArea *dockingArea( const QPoint &p );
+	QDockArea *leftDock() const;
+	QDockArea *rightDock() const;
+	QDockArea *topDock() const;
+	QDockArea *bottomDock() const;
+	
+	bool isCustomizable() const;
+	bool appropriate( QDockWindow *dw ) const;
+	QPopupMenu *createDockWindowMenu( DockWindows dockWindows = AllDockWindows ) const;
+
+	bool showDockMenu( const QPoint &globalPos );
+
+
+QMetaObject
+-----------
+
+###TODO
+
+
+QMimeSourceFactory
+------------------
+
+New static functions:
+	QMimeSourceFactory* takeDefaultFactory();
+	static void addFactory( QMimeSourceFactory *f );
+
+
+QNetworkProtocol
+----------------
+
+Spelling fix in Error::ErrListChildren enum.
+
+
+QRegExp
+-------
+
+QRegExp now has a more complete regular expression engine similar to
+Perl's, with full Unicode and backreference support.
+
+New functions:
+	bool minimal() const;
+	void setMinimal( bool minimal );
+	bool exactMatch( const QString& str );
+	bool exactMatch( const QString& str ) const;
+	int search( const QString& str, int start = 0 );
+	int search( const QString& str, int start = 0 ) const;
+	int searchRev( const QString& str, int start = -1 );
+	int searchRev( const QString& str, int start = -1 ) const;
+	int matchedLength();
+	QStringList capturedTexts();
+	QString cap( int nth = 0 );
+	int pos( int nth = 0 );
+
+
+QSessionManager
+---------------
+
+Renamed the misnamed setProperty() overloads to setManagerProperty()
+to resolve the conflict with the now virtual QObject::setProperty().
+
+
+QString
+-------
+
+New functions:
+	bool endsWith( const QString & );
+	int similarityWith( const QString & );
+
+### TODO
+
+QStyle
+------
+
+### TODO
+
+QTabBar
+-------
+
+The extended QTabWidget support in Qt Designer made two more
+functions handy to have:
+	QTab * tabAt( int ) const;
+	int indexOf( int ) const;
+
+
+
+QToolBar
+--------
+
+Inherits QDockWindow now, previously only QWidget.
+
+
+QToolButton
+-----------
+
+New property:
+	QIconSet iconSet
+
+New functions:
+	QIconSet iconSet() const;
+	virtual void setIconSet( const QIconSet & );
+
+QWidget
+-------
+
+New functions:
+
+    const QColor & eraseColor() const;
+    virtual void setEraseColor( const QColor & );
+    const QPixmap * erasePixmap() const;
+    virtual void setErasePixmap( const QPixmap & );
+
+
+
+QWizard
+-------
+
+New property: QString titleFont
+
+New functions:
+	QFont titleFont() const;
+	void setTitleFont( const QFont & );
+	int indexOf( QWidget* ) const;
+
+
+QWMatrix
+--------
+
+New function:
+	bool isIdentity() const;
+	
+
+QGL Module
+----------
+
+QGLWidget
+New functions:
+	QGLFormat requestedFormat() const;
+	QImage grabFrameBuffer( bool withAlpha = FALSE );
+
+
+QWorkspace Module
+-----------------
+
+A new property scrollBarsEnabled makes it possible to add on-demand
+scrollbars to the workspace. We define this property in Qt Designer to
+make designing forms larger than the available space on the desktop
+more comfortable.
+
+New property:
+	bool scrollBarsEnabled
+
+
+QXML Module
+-----------
+Many new functions have been added:
+	QDomImplementation
+		QDomDocumentType createDocumentType( const QString& qName, const QString& publicId, const QString& systemId );
+		QDomDocument createDocument( const QString& nsURI, const QString& qName, const QDomDocumentType& doctype );
+	QDomNode
+		QDomNode insertBefore( const QDomNode& newChild, const QDomNode& refChild );
+		QDomNode insertAfter( const QDomNode& newChild, const QDomNode& refChild );
+		QDomNode replaceChild( const QDomNode& newChild, const QDomNode& oldChild );
+		QDomNode removeChild( const QDomNode& oldChild );
+		QDomNode appendChild( const QDomNode& newChild );
+		bool hasChildNodes() const;
+		QDomNode cloneNode( bool deep = TRUE ) const;
+		void normalize();
+		bool isSupported( const QString& feature, const QString& version ) const;
+		QString namespaceURI() const;
+		QString localName() const;
+		bool hasAttributes() const;
+	QDomDocument
+		bool setContent( const QCString& text, bool namespaceProcessing=FALSE );
+		bool setContent( const QByteArray& text, bool namespaceProcessing=FALSE );
+		bool setContent( const QString& text, bool namespaceProcessing=FALSE );
+		bool setContent( QIODevice* dev, bool namespaceProcessing=FALSE );
+	QDomNamedNodeMap
+		QDomNode namedItemNS( const QString& nsURI, const QString& localName ) const;
+		QDomNode setNamedItemNS( const QDomNode& newNode );
+		QDomNode removeNamedItemNS( const QString& nsURI, const QString& localName );
+
+	QDomElement
+		QString attributeNS( const QString nsURI, const QString& localName, const QString& defValue ) const;
+		void setAttributeNS( const QString nsURI, const QString& qName, const QString& value );
+		void setAttributeNS( const QString nsURI, const QString& qName, int value );
+		void setAttributeNS( const QString nsURI, const QString& qName, uint value );
+		void setAttributeNS( const QString nsURI, const QString& qName, double value );
+		void removeAttributeNS( const QString& nsURI, const QString& localName );
+		QDomAttr attributeNodeNS( const QString& nsURI, const QString& localName );
+		QDomAttr setAttributeNodeNS( const QDomAttr& newAttr );
+		QDomNodeList elementsByTagNameNS( const QString& nsURI, const QString& localName ) const;
+		bool hasAttributeNS( const QString& nsURI, const QString& localName ) const;
+
+	
+	QXmlAttributes
+		void clear();
+		void append( const QString &qName, const QString &uri, const QString &localPart, const QString &value );
+
+	QXmlInputSource:
+		void setData( const QByteArray& dat );
+		void fetchData();
+		QString data();
+		QChar next();
+		void reset();
+		QString fromRawData( const QByteArray &data, bool beginning = FALSE );
+
+	QXmlSimpleReader:
+		bool parse( const QXmlInputSource& input, bool incremental );
+		bool parseContinue();
+
+	QXmlEntityResolver:
+		bool startEntity( const QString& name );
+		bool endEntity( const QString& name );
+
+	
+
+New classes
+-----------
+
+QAquaStyle (only on MacOS X)
+QCleanupHandler
+QComponentFactory
+QComponentFactoryInterface
+QComponentServerInterface
+QContextMenuEvent
+QDesktopWidget
+QDockArea
+QDockWindow
+QErrorMessage
+QFeatureListInterface
+QHttp [network]
+QInterfaceListInterface
+QInterfacePtr
+QIMEvent
+QLibrary
+QLibraryInterface
+QStyleFactory
+QStyleInterface
+QTextCodecInterface
+QUnknownInterface
+QUuid
+QRegExpValidator
+QTextEdit
+
+
+Renamed Classes
+---------------
+
+QArray has been renamed QMemArray
+QCollection has been renamed QPtrCollection
+QList has been renamed QPtrList
+QListIterator has been renamed QPtrListIterator
+QQueue has been renamed QPtrQueue
+QStack has been renamed QPtrStack
+QVector has been renamed QPtrVector
+
+The include file names have changed accordingly (e.g., <qmemarray.h>).
+
+
+New Modules
+-----------
+
+SQL
+	QDataBrowser
+	QDataTable
+	QDataView
+	QDateTimeEdit
+	QEditFactory
+
+
+Obsolete classes
+----------------
+
+	QSemiModal, use QDialog instead.
+	QMultiLineEdit, use QTextEdit instead.
+	QTableView, use QScrollView or QTable instead.
+	QAsyncIO, QDataSink, QDataSource, QDataPump and QIODeviceSource
+
+
+Obsolete functions
+------------------
+	QActionGroup::insert( QAction * ),  use QActionGroup::add( QAction* ) instead.
+	QApplication::setWinStyleHighlightColor( const QColor &c ), use setPalette() instead
+	QApplication::winStyleHighlightColor(), use palette() instead
+	QDir::encodedEntryList( int filterSpec, int sortSpec ), use QDir::entryList() instead
+	QDir::encodedEntryList( const QString &nameFilter, int filterSpec, int sortSpec ), use QDir::entryList() instead
+	QMainWindow::addToolBar( QDockWindow *, Dock = Top, bool newLine = FALSE );
+	QMainWindow::addToolBar( QDockWindow *, const QString &label,  Dock = Top, bool newLine = FALSE );
+	QMainWindow::moveToolBar( QDockWindow *, Dock = Top );
+	QMainWindow::moveToolBar( QDockWindow *, Dock, bool nl, int index, int extraOffset = -1 );
+	QMainWindow::removeToolBar( QDockWindow * );
+	QMainWindow::toolBarsMovable() const;
+	QMainWindow::toolBars( Dock dock ) const;
+	QMainWindow::lineUpToolBars( bool keepNewLines = FALSE );
+	QRegExp::match( const QString& str, int index = 0, int *len = 0,
+			bool indexIsStart = TRUE );
+	QToolButton::setOnIconSet( const QIconSet & )
+	QToolButton::setOffIconSet( const QIconSet & )
+	QToolButton::onIconSet() const
+	QToolButton::offIconSet() const
+	QToolButton::setIconSet( const QIconSet & set, bool on )
+	QToolButton::iconSet( bool on ) const
+	QXmlInputSource::QXmlInputSource( QFile& file ), use QXmlInputSource( QIODevice *dev ) instead.
+	QXmlInputSource::QXmlInputSource( QTextStream& stream ), use QXmlInputSource( QIODevice *dev ) instead.
+
+Removed functions:
+	QWidget::setFontPropagation
+	QWidget::setPalettePropagation
+	QMenuBar::setActItem
+	QMenuBar::setWindowsAltMode
+	QCheckListItem::paintBranches
+	QString::visual
+	QString::basicDirection
+	QRegExp::find( const QString& str, int index ) const; - has been renamed QRegExp::search()
+	QFont::charSet() const, not needed anymore
+	QFont::setCharSet( QFont::CharSet ), not needed anymore
+	QPushButton::upButton(), not relevant anymore
+	QPushButton::downButton(), not relevant anymore
+	QSpinBox::upButton(), not relevant anymore
+	QSpinBox::downButton(), not relevant anymore
+
+
+Removed preprocessor directives
+-------------------------------
+
+	qcstring.h no longer contains the following defines:
+
+		#define strlen qstrlen
+		#define strcpy qstrcpy
+		#define strcmp qstrcmp
+		#define strncmp qstrncmp
+		#define stricmp	qstricmp
+		#define strnicmp qstrnicmp
+
+	These directives were meant to automagically replace calls to the
+	above listed standard C functions with the equivalent Qt wrappers.
+	The latter pre-check the input parameters for null pointers as those
+	might cause crashes on some platforms.
+
+	Although convenient, this trick turned out to sometimes conflict with
+	third-party code, or, simply be nullified by standard system and
+	library headers depending on version and include order.
+
+	The name of some debugging macro variables has been changed.
+
+		DEBUG becomes QT_DEBUG
+		NO_DEBUG becomes QT_NO_DEBUG
+		NO_CHECK becomes QT_NO_CHECK
+		CHECK_STATE becomes QT_CHECK_STATE
+		CHECK_RANGE becomes QT_CHECK_RANGE
+		CHECK_NULL becomes QT_CHECK_NULL
+		CHECK_MATH becomes QT_CHECK_MATH
+
+	The name of some other debugging macro functions has also been changed
+	but source compatibility should not be affected if the macro variable
+	QT_CLEAN_NAMESPACE is not defined:
+
+		ASSERT becomes Q_ASSERT
+		CHECK_PTR becomes Q_CHECK_PTR
+
+	For the record these undocumented macro variables that are not part of
+	the API have been changed:
+
+		_OS_*_ becomes Q_OS_*
+		_WS_*_ becomes Q_WS_*
+		_CC_*_ becomes Q_CC_*
+
+
+[Qt 3.0]
+
diff --git a/dist/changes-3.0.0-beta2 b/dist/changes-3.0.0-beta2
new file mode 100644
index 0000000..0d55b12
--- /dev/null
+++ b/dist/changes-3.0.0-beta2
@@ -0,0 +1,363 @@
+Qt 3.0 Beta2 is not binary compatible with Beta1, this means that any
+programs linked with Beta1 must be recompiled.
+
+Below you'll find a description of general changes in the Qt Library
+and Qt Designer followed by a detailed list of changes in the
+programming API.
+
+
+The Qt Library
+========================================
+
+Wacom Tablet Support
+--------------------
+
+Support for Wacom brand tablets has been introduced on Irix and
+Windows.  These devices generate a QTabletEvent that can be handled by
+QWidget::tabletEvent(). The QTabletEvent holds information about
+pressure, X and Y tilt, and which device is being used (e.g. stylus or
+eraser).  Note: at present, there are known issues with the Windows
+version.
+
+Documentation
+-------------
+
+Overall enhancements including fixed typos and the addition of several
+images and code examples.
+
+QStyle (and derived classes)
+----------------------------
+
+The style API has been completely rewritten in Qt 3.0. The main reason
+for doing this was because it was getting inconsistent, hard to
+maintain and extend. Most of the old 2.x functions have been replaced
+by a small set of more general functions. The new API is:
+
+ - much more consistent
+ - less work have to be done to create custom styles
+ - easier to extend and maintain binary compatibility
+
+The old API relied upon a host of virtual functions that were
+re-implemented in the different styles. These functions were used to
+draw parts of, or entire widgets. The new API uses a small set of more
+general functions. Enumerated values are passed as parameters to these
+functions to specify which parts of a control or widget is to be drawn
+(e.g drawPrimitive( PE_ArrowUp, ...)).
+
+To create custom styles with the new API, simply subclass from the
+preferred base style and re-implement the function that draws the part
+of the widget you want to change. If you for example want to change
+the look of the arrows that are used in QWindowsStyle, subclass from
+it and re-implement the drawPrimitive() function. Your drawPrimitive()
+function may look something like this:
+
+void QMyStyle::drawPrimitive( PrimitiveElement pe, ... )
+{
+        switch( pe ) {
+        case PE_ArrowUp:
+                // draw up arrow
+                break;
+        case PE_ArrowDown:
+                // draw down arrow
+                break;
+        default:
+                // let the base class handle the rest of the drawing
+                QWindowsStyle::drawPrimitive( ... );
+                break;
+        }
+}
+
+For more information about the new style API, please read the QStyle
+documentation.
+
+
+Qt Designer
+========================================
+
+ - Improved indentation algorithm for the code editor.
+ - Allow multiple code editors to be open. This makes copy and paste
+   much easier.
+
+
+Qt Functions
+========================================
+
+QCanvas
+-------
+
+ - QCanvas does not react on windowActivationChange() anymore.
+ - 64 bit cleanup.
+
+QChar
+-----
+
+ - The Unicode character is stored host ordered now. Main advantage is
+   that you can directly cast a QChar array to an array of unsigned shorts.
+
+QCom
+----
+
+ - Introduced QS_OK, QS_FALSE, QE_NOINTERFACE, QE_INVALIDARG and
+   QE_NOIMPL as possible QRESULT return values.
+
+QDate, QTime and QDateTime
+--------------------------
+
+ - New function for outputting free form strings and new DateFormat
+   enum Qt::LocalDate.
+
+New functions:
+	QString	toString( const QString& format );
+
+QDir
+----
+
+ - entryInfoList() returns 0 for non-existing directories on Windows
+   as the documentation claims and the Unix version already does.
+ - On Windows, QDir tries a more failsafe way to determine the home
+   directory.
+
+QDom
+----
+
+ - QDomNode::hasChildNodes() now works as documented.
+ - QDomDocument::toString() includes now namespaces in its output.
+ - QDomDocument::QDomDocument() constructor now allows adding children
+   to the document.
+
+QFileDialog
+-----------
+
+ - Various fixes in file type filter and handling of file names and
+ directories.
+
+QEvent
+------
+
+ - New event type DeferredDelete. See QObject changes below.
+
+QGL
+---
+
+ - Fix for Irix in respect of installing colormaps.
+ - Swapped arguments of QGLColormap::setEntries() in order to be able
+   to use a meaningful default argument.
+
+New class:
+	QGLColormap - class for manipulating colormaps in GL index mode.
+
+QGridView
+---------
+
+A new class that provides an abstract base for fixed-size grids.
+
+QIconSet
+--------
+
+New function:
+	void clearGenerated();
+
+QImage
+------
+
+ - Handlers for image formats can be dynamically loaded as a plug-in by
+ using the QImageFormatInterface.
+
+QLabel
+------
+
+ - setIndent() behaves like documented.
+
+QLineEdit
+---------
+
+New function:
+	int characterAt( int xpos, QChar *chr ) const;
+
+QLibrary
+--------
+
+Enabled plug-in loading with static Qt library (Windows).
+
+QMovie
+------
+
+ - Does pixmap caching now. Reduces load e.g. on the X Server in the
+ case of animated gifs.
+
+QObject
+-------
+
+ - Added a deferredDelete() function that will cause the object to
+ delete itself once the event loop is entered again.
+
+ - A second type of destroyed signal - one that passes a pointer to
+ the destroyed object as a parameter - will be emitted in QObject's
+ destructor.
+
+New signal:
+	void destroyed( QObject* obj );
+
+New slot:
+	void deferredDelete();
+
+QPainter
+--------
+
+ - So far clipping had always been done in the device coordinate
+   system. The newly introduced ClipMode allows clipping regions to be
+   set via setClipRect() and setClipRegion() in painter coordinates.
+
+New enum:
+	enum ClipMode { ClipDevice, ClipPainter };
+
+Extended functions:
+	QRegion clipRegion( ClipMode = ClipDevice ) const;
+	void setClipRect( const QRect &, ClipMode = ClipDevice )
+	void setClipRect( int x, int y, int w, int h, ClipMode = ClipDevice );
+	void setClipRegion( const QRegion &, ClipMode = ClipDevice );
+
+QPrintDialog
+------------
+
+ - Allow overriding the default print dialog. This way it's possible
+   to better cope with the variety of existing print systems (API not
+   finalized, yet).
+ - The dialog reads current QPrinter on every invocation now.
+
+New functions:
+	static void setGlobalPrintDialog( QPrintDialog * );
+	virtual bool setupPrinters ( QListView *printers );
+
+QPrinter
+--------
+
+ - X11 version only: Introduced Qt settings switch 'embedFonts' that
+   allows disabling font embedding to reduce size of PostScript output.
+
+QProcess
+--------
+
+ - Added function to retrieve the pid (Unix) or PROCESS_INFORMATION
+   (Windows) from a running process.
+ - Extra parameter for environment settings in start() and launch()
+   functions.
+
+New/extended functions:
+	PID processIdentifier();
+	virtual bool start( QStringList *env=0 );
+	virtual bool launch( const QString& buf, QStringList *env=0  );
+	virtual bool launch( const QByteArray& buf, QStringList *env=0  );
+
+New signal:
+	void launchFinished();
+
+QServerSocket
+-------------
+
+ - Set the SO_REUSEADDR option so that the server can be restarted.
+
+QSocket
+-------
+
+ - Make deletion of QSocket instances safe if it is in response to a
+   signal emitted by the object itself.
+
+SocketDevice
+------------
+
+ - Optional boolean parameter to be able to distinguish between
+   timeout and connection closed by peer when waitForMore() returns.
+
+Extended functions:
+	int waitForMore( int msecs, bool *timeout=0 ) const;
+
+QStyleSheet
+-----------
+
+ - Added helper function that escapes HTML meta-characters.
+
+New function:
+	QString escape( const QString& plain);
+
+QSql
+----
+
+ - The source of the SQL driver plug-ins have been moved to
+   $QTDIR/plugins/src/sqldrivers/.
+ - The postgres driver checks the version number of the server. So there is
+   no need for different drivers: QPSQL6 no longer exists -- use QPSQL7
+   instead.
+ - Postgres driver supports now 3 PostgreSQL back ends: 6.x, 7.0.x and 7.1.x
+ - Better handling of errors coming from the database.
+ - SQL driver for Microsoft SQL Server and Sybase Adaptive Server (TDS).
+ - Added caching for forward-only cursors.
+ - Avoid crashes on the unloading of SQL plugins that occurred on some
+   platforms.
+ - QSqlResults can be forward only to improve performance
+   (QSqlResult::setForwardOnly()).
+ - QSqlDatabase passes the port number to the SQL driver.
+
+QTable
+------
+
+ - No longer calls processEvents() in columnWidthChanged() and
+   rowHeightChanged() in order to avoid any side effects.
+ - Ensure that mousePressEvent doesn't emit contextMenuRequested(),
+   unless it is called from the contextMenu event handler.
+ - For more useful subclassing the new functions listed below have
+   been added.
+
+New functions:
+	bool isEditing() const;
+	EditMode editMode() const;
+	int currEditRow() const;
+	int currEditCol() const;
+
+QTextCodec
+----------
+
+ - Fixes for characters in the 0x80..0xff range.
+
+QTextEdit
+---------
+
+ - The rich text engine has seen many internal improvements and
+   additions to the QTextEdit class.
+
+New functions:
+	virtual void scrollToBottom();
+	virtual void removeSelection( int selNum = 0 );
+	virtual bool getParagraphFormat(...);
+	virtual void insertParagraph( const QString &text, int para );
+	virtual void removeParagraph( int para );
+	virtual void insertAt( const QString &text, int para, int index );
+	QRect paragraphRect( int para ) const;
+	int paragraphAt( const QPoint &pos ) const;
+	int charAt( const QPoint &pos, int *para ) const;
+	
+QUrlOperator
+------------
+
+ - More precise error messages.
+
+QWidget
+-------
+
+ - Added a read-only property containing the widget's background brush.
+
+New function:
+	virtual const QBrush& backgroundBrush() const;
+
+QWMatrix
+--------
+
+ - New functions for mapping of geometric elements via matrix
+   multiplication semantics.
+
+New functions:
+	QRect mapRect( const QRect & );
+	QPoint operator * (const QPoint & ) const;
+	QRegion operator * (const QRect & ) const;
+	QRegion operator * (const QRegion & ) const;
+	QPointArray operator *  ( const QPointArray &a ) const;
diff --git a/dist/changes-3.0.0-beta3 b/dist/changes-3.0.0-beta3
new file mode 100644
index 0000000..cc49e6e
--- /dev/null
+++ b/dist/changes-3.0.0-beta3
@@ -0,0 +1,278 @@
+Qt 3.0 Beta3 is not binary compatible with Beta2, this means that any
+programs linked with Beta2 must be recompiled.
+
+Below you'll find a description of general changes in the Qt Library
+and Qt Designer followed by a detailed list of changes in the
+programming API.
+
+
+The Qt Library
+========================================
+
+Documentation
+-------------
+
+Overall enhancements include fixed typos, corrected grammar and
+spelling, and the addition of several images and code examples. Most
+classes now have useful detailed descriptions. Documentation accuracy
+and usability has been generally improved.
+
+Styles
+------
+
+In Qt 3.0.0 Beta2, only the Windows and Motif styles were implemented with
+the new style API. Now the missing styles (MotifPlus, Platinum, SGI and
+CDE) are included.
+
+MNG
+---
+
+Updated the libmng that is shipped with Qt to version 1.0.2.
+
+Wacom Tablet Support
+--------------------
+
+Fixes for Windows to solve the problem of creating a context for every
+widget and the problem of opening the dialog and losing the ability to use
+the tablet afterwards.
+
+
+Qt Designer
+========================================
+
+ - Added the ability to sort the property editor either by category
+   (default and old behaviour) or alphabetically.
+
+ - Added the option "-nofwd" to uic which supresses the generation of
+   forward declarations for custom classes in the generated output.
+
+-  The way how custom slots and editing these slots directly in the Qt
+   Designer is handled has been changed. Originally the code for these
+   slots was saved into the .ui XML file together with the user
+   interface description and the uic did put this code into the
+   generated source files.
+   Now, if code of custom slots is edited directly in the Qt Designer,
+   additionally to the <filename>.ui of a form, a <filename>.ui.h file
+   is created. The code is written into this source file now instead
+   of the .ui file.
+   This way the code of custom slots can be also easily edited outside
+   the Qt Designer without subclassing, and it is possible to edit it
+   both, in the Qt Designer and outside the Qt Designer without
+   conflicts, as this is a plain text C++ file.
+   Uic now automatically includes this source file into the generated
+   sources (if it exists) and, in this case, does not create empty
+   stubs for the custom slots in the generated sources anymore. So
+   this code file has not to be added to the project Makefile. If the
+   source file does not exist, uic falls back to the old behavior and
+   creates the empty stubs in the generated source.
+   If a user does not want to subclass to implement the custom slots,
+   but also does not want to edit the code of the custom slots in the
+   Qt Designer, it is possible to always create the <formname>.ui.h
+   for a form (even if it was not edited in the Qt Designer) and edit
+   that file in a seperate editor. This feature can be configured in
+   the project settings dialog.
+   This way, the old approach of subclassing keeps working (and all
+   old .ui files keep working without any change). Also, for users of
+   the previous Qt 3.0 Beta versions, Qt Designer can still read the
+   .ui files which contain code. So also .ui files created with Qt 3.0
+   Beta versions of the Qt Designer keep working without any change.
+   Details about the possible concepts which can be used to add code
+   to a form created by the Qt Designer (subclassing and uic +
+   <filename>.ui.h) and related information about project management
+   can be found in the chapter about new features in Qt Designer 3.0
+   in the Qt Designer manual.
+
+
+Qt Functions
+========================================
+
+QApplication
+------------
+
+ - flush() no longer calls sendPostedEvents(), as this might be unsafe
+   under certain circumstances.
+
+QDataTable
+----------
+
+ - Now uses the new row selection mode of QTable.
+
+QDomDocument
+------------
+
+ - Fixed the toString() function to work properly with namespaces.
+ - In Qt 3.0.0 Beta2, there was a workaround for Microsoft's XML parser,
+   so that the toString() function did not output a doctype that consists
+   only of the name. This workaround is semantically wrong; it was
+   reverted.
+
+QDateEdit
+---------
+
+ - Fixed wrong default size policy and missing size hint.
+ - Improved focus and tab handling.
+
+QEffects
+--------
+
+ - Tooltips and popup menus scroll and fade again
+
+QTable
+------
+
+ - Fixed right mouse button handling.
+ - Implemented row selection modes. This implied adding the new enum values
+   SingleRow and MultiRow to the enum SelectionMode.
+ - Doubleclick clears selections completely now.
+ - Allow different focus styles, namely FollowStyle (draw it as the style
+   tells you) and SpreadSheet (draw it as it is done in common spreadsheet
+   programs).
+
+New functions:
+	virtual void setFocusStyle( FocusStyle fs );
+	FocusStyle focusStyle() const;
+	virtual QRect cellRect( int row, int col ) const;
+
+QTimeEdit
+---------
+
+ - Fixed wrong default size policy and missing size hint.
+ - Improved focus and tab handling.
+
+QTextEdit
+---------
+
+ - QTextCursor is an internal class, so the signal
+   cursorPositionChanged(QTextCursor*) is only of limited use. Added a
+   more useful signal in addition.
+
+ - Overrides accelerators for all shortcuts used to edit text.
+
+New signal:
+	void cursorPositionChanged( int para, int pos );
+
+QLineEdit
+---------
+
+ - Overrides accelerators for all shortcuts used to edit text.
+
+QLibrary
+--------
+
+ - Static overload for resolve as a convenience function.
+
+New function:
+	static void *resolve( const QString &filename, const char * );
+
+QListView
+---------
+
+ - A bug that was introduced in Qt 3.0.0 beta 2 made listviews with
+   lots of items very slow. This problem has been fixed.
+
+QProcess
+--------
+
+ - exitStatus() did not work for negative values on Unix. This is fixed
+   now.
+ - Fixed problems on Unixware.
+
+QRichtext
+---------
+
+ - Fixed searching backwards.
+ - Fixed some BIDI text-rendering problems.
+
+QSound
+------
+
+ - Simplified the API to allow easier extension.
+
+New functions:
+	bool isAvailable();
+	int loops() const;
+	int loopsRemaining() const;
+	void setLoops(int);
+	QString fileName() const;
+	bool isFinished() const;
+
+New slot:
+	void stop();
+
+Removed function:
+	bool available();
+
+QSpinBox
+--------
+
+ - Spin box arrows were not updated correctly when the widget was
+   disabled/enabled. This problem is fixed now.
+ - Improved handling of the case when a spinbox accepts a value: now it
+   also accepts it if the spinbox loses focus or is hidden.
+
+QSqlCursor
+----------
+
+ - Add functions to set the generated flag. This is used to avoid the
+   generation of malformed SQL statements.
+
+New functions:
+	void setGenerated( const QString& name, bool generated );
+	void setGenerated( int i, bool generated );
+
+QSqlDriver
+----------
+
+ - Add new function hasFeature( QSqlDriver::DriverFeature ) const which
+   allows you to query whether the driver supports features like SQL
+   transactions or Binary Large Object fields. The functions
+   hasQuerySizeSupport(), canEditBinaryFields() and hasTransactionSupport()
+   are therefore obsolete and have been removed.
+
+New function:
+	bool hasFeature( QSqlDriver::DriverFeature ) const;
+
+Removed functions:
+	bool hasQuerySizeSupport() const;
+	bool canEditBinaryFields() const;
+	bool hasTransactionSupport() const;
+
+QSqlField
+---------
+
+ - The bool argument of setNull() was removed since it does not make sense
+   to set a field to non null.
+
+QTabWidget
+----------
+
+ - Use the functions below to add tool tips to the individual tabs in a
+   QTabWidget.
+
+New functions:
+	void removeTabToolTip( QWidget * w );
+	void setTabToolTip( QWidget * w, const QString & tip );
+	QString tabToolTip( QWidget * w ) const;
+
+QTabBar
+-------
+
+ - Use the functions below to add tool tips to the individual tabs in a
+   QTabBar.
+
+New functions:
+	void removeToolTip( int id );
+	void setToolTip( int id, const QString & tip );
+	QString toolTip( int id ) const;
+
+QTextStream
+-----------
+
+ - The global functions setw(), setfill() and setprecison() were deleted
+   since they conflict with the std classes. If you need the functionality,
+   use qSetW(), qSetFill() and qSetPrecision() instead.
+
+Removed functions:
+	QTSManip setw( int w )
+	QTSManip setfill( int f )
+	QTSManip setprecision( int p )
diff --git a/dist/changes-3.0.0-beta4 b/dist/changes-3.0.0-beta4
new file mode 100644
index 0000000..a3f44a5
--- /dev/null
+++ b/dist/changes-3.0.0-beta4
@@ -0,0 +1,688 @@
+Qt 3.0 Beta4 is not binary compatible with Beta3; any programs linked
+against Beta3 must be recompiled.
+
+Below you will find a description of general changes in the Qt
+Library and Qt Designer followed by a detailed list of changes in the
+API.
+
+
+The Qt Library
+========================================
+
+Documentation
+-------------
+
+The extensive revision of the documentation is almost complete.
+We have added new navigation options, including a shorter list
+of classes entitled Main Classes.
+
+Translations
+------------
+
+Qt now includes French and German translations of the Qt library, as
+well as a template for translating Qt. These files are found in the
+translations directory of Qt, in both .ts and .qm formats.
+
+Style Fixes
+-----------
+
+Qt 3.0.0 beta2 introduced a new QStyle API. This new API has changed
+between beta3 and beta4. These changes will affect both widget
+writers and style writers. The QStyle entry below explains what has
+changed.
+
+Beta4 also introduces some fixes for bugs introduced during the port
+to the new API in various widgets, notably QComboBox and QSlider.
+
+LiveConnect Plugin
+------------------
+
+A few bugs were fixed in the LiveConnect Plugin so that the grapher
+example works again on Windows.
+
+
+Qt Designer
+========================================
+
+ - General usability improvements and bug fixes, and improved file
+   and project handling.
+ - Updated designer manual to cover the .ui.h mechanism.
+ - New auto-indentation algorithm in the code editor.
+
+
+Qt Assistant
+========================================
+
+ - Added a Settings dialog and made more features customizable.
+ - Sessions are now saved and restored.
+ - A brief introduction to using Qt Assistant is now included.
+
+
+Qt Linguist
+========================================
+
+ - Phrase books are now provided in tools/linguist/phrasebooks.
+ - Added support for Qt Designer's .ui.h mechanism to lupdate.
+ - Support for a larger subset of .pro file syntax in lupdate and
+   lrelease.
+
+
+Qt Functions
+========================================
+
+QApplication
+------------
+
+ - Ignore drag-and-drop events for disabled widgets.
+ - Always send ChildRemoved events, even if no ChildInserted event
+   was sent.
+ - Mouse events for popup menus are now sent to event filters.
+
+QCanvasItem
+-----------
+
+ - The functions visible(), selected() and active() have been renamed
+   setVisible(), setSelected() and setActive().
+
+New functions:
+	bool isVisible() const;
+	bool isSelected() const;
+	bool isActive() const;
+
+Removed functions:
+	bool visible() const;
+	bool selected() const;
+	bool active() const;
+
+QCanvasText
+-----------
+
+ - Fixed alignment flags.
+
+QChar
+-----
+
+New function:
+	bool isSymbol() const;
+
+QCheckBox
+---------
+
+ - Fixed a bug in pixmap caching which could result in using the
+   wrong pixmap.
+
+QCheckListItem
+--------------
+
+ - After a mouse click, the list view ignores the following double
+   click as in Windows XP.
+
+QClipboard
+----------
+
+ - Made clipboard operations faster on X11.
+
+QColorDialog
+------------
+
+ - Never show scrollbars in the color array.
+
+QComboBox
+---------
+
+ - Comboboxes are now drawn correctly in all styles.
+ - Fixed bug with auto completion. There was undefined behavior with
+   non-editable comboboxes when changing focus.
+
+New function:
+	virtual void setCurrentText( const QString& );
+
+New property:
+	QString currentText
+
+QDataBrowser
+------------
+
+ - The setCursor() function is obsolete and will be removed for Qt 3
+   release due to the incompatibility with some compilers. Use
+   setSqlCursor() instead.
+
+QDataTable
+----------
+
+ - Dates and times in tables can now be displayed in different
+   display formats.
+ - The setCursor() function is obsolete and will be removed for Qt 3
+   release due to the incompatibility with some compilers. Use
+   setSqlCursor() instead.
+
+QDateEdit
+---------
+
+ - The default separator and the day-month-year order respect the
+   user's settings.
+ - Pressing the separator key now skips to the next section.
+ - Fixed a usability flaw related to some months being longer than
+   others.
+
+New functions:
+	QString separator() const;
+	virtual void setSeparator( const QString& s );
+
+QDateTime
+---------
+
+ - Always initialize the tm struct completely. This fixes a problem
+   on some versions of Unix.
+
+QDir
+----
+
+ - QDir::homeDirectory() now always returns an existing directory on
+   Windows.
+
+QDockWindows
+------------
+
+ - Fixed dockwindows created in non-dock areas.
+ - Fixed constructor if InDock and the parent is a QMainWindow.
+
+QDom...
+-------
+
+ - Fixes in the conversion of the DOM tree to a string.
+
+QDomNodeList
+------------
+
+ - Fixed a crash.
+
+QFileDialog
+-----------
+
+ - Select contents of the line edit at startup (if any) so that the
+   user can overwrite the provided file name right away.
+
+QFileInfo
+---------
+
+ - In adition to lastModified() and lastRead(), provide created().
+
+New function:
+	QDateTime created() const;
+
+QFont
+-----
+
+ - Provide more correct font metrics under X11.
+ - Worked around X11 limits on length of strings to draw and on
+   coordinate sizes.
+ - Fixed sone point vs. pixel size issues under X11.
+ - Added PreferAntialias and NoAntialias flags to StyleStrategy enum
+   type.
+
+QFtp
+----
+
+ - Fixed a QSocket bug that made QFtp crash if the connection was
+   refused.
+ - Fixed operationRename() and operationRemove().
+ - Set the right state when finished.
+
+QGIFFormat
+----------
+
+ - Support GIF files with broken logical screen size.
+
+QHeader
+-------
+
+ - Added support for '\n' in header labels.
+ - Improved placement of icon.
+
+QHttp
+-----
+
+ - If the status code of the reply is an error code, it is now also
+   reflected in the status of the network operation. The error
+   handling in general was improved.
+
+QImageIO
+--------
+
+ - Allow gamma correction to be set programmatically.
+
+New functions:
+	void setGamma( float gamma );
+	float gamma() const;
+
+QKeyEvent
+---------
+
+ - Worked around an X11 bug in isAutoRepeat().
+
+QKeySequence
+------------
+
+A new class that encapsulates a key sequence as used by accelerators.
+
+QLabel
+------
+
+ - Made the WordBreak alignment property work with rich text labels
+   in addition to plain text labels.
+
+QLayout
+-------
+
+ - Fixed crashes with deleting widgets managed by the layout.
+ - Fixed problems with reparenting widgets managed by the layout.
+ - Respect maximumHeight() of items in heightForWidth().
+
+QLibrary
+--------
+
+ - Plugins now return the version number, threading model and debug
+   vs. release mode of the Qt library used in ucm_initialize(). If
+   there is any kind of incompatibility, cancel the loading.
+
+QLineEdit
+---------
+
+ - Update the "edited" flag and the accessibility data better than
+   before.
+ - Fixed setMaxLength().
+ - Fixed context menu problem on Windows.
+
+New functions:
+	bool isUndoAvailable() const;
+	bool isRedoAvailable() const;
+
+QListViewItem
+-------------
+
+ - Fixed setVisible(TRUE) which triggered an update too soon.
+
+QMenuBar
+--------
+
+ - Cancel alt-activation of menubar on mouse press/release.
+ - On wheel events, all popup menus are now closed instead of hidden.
+   Hiding popup menus confused QMenuBar.
+
+QObject
+-------
+
+ - Have QObject dispatch events to customEvents().
+
+QPainter
+--------
+
+ - Renamed the enum type ClipMode to CoordinateMode. The enum values
+   ClipDevice and ClipPainter are now called CoordDevice and
+   CoordPainter.
+ - Fixed escaping of ampersand character, so "&&", "&&&", etc., now
+   work as they did in Qt 2.x.
+
+New functions:
+	void drawPixmap( const QRect& r, const QPixmap& pm );
+	void drawImage( const QRect& r, const QImage& img );
+
+QPicture
+--------
+
+ - Respect the size of a loaded SVG document.
+ - Solved a replay-transformed-picture problem.
+ - Fixed format version number.
+
+QPluginManager
+--------------
+
+ - Fixed crash when loading a plugin fails.
+
+QPopupMenu
+----------
+
+ - Custom menu items that are separators now see their size hint
+   respected.
+ - Fixed crash when drawing an empty popup menu.
+
+QPrinter
+--------
+
+ - Better printing in different resolutions under both Windows and
+   X11.
+ - Support for collation under Windows and X11.
+ - Correct bounding rectangles for texts in all printer modes.
+ - Fixed pixmap printing on Windows.
+ - Fixed PostScript font names for fonts with foundries.
+ - Support for PostScript printing of scaled images.
+
+New functions:
+	bool collateCopiesEnabled() const;
+	void setCollateCopiesEnabled( bool enable ) const;
+	bool collateCopies() const;
+	void setCollateCopies( bool on );
+	int winPageSize() const; /* Windows only */
+
+QProcess
+--------
+
+ - The function hangUp() was renamed to tryTerminate() to make the
+   purpose more clear. Furthermore, under Unix, the signal that is
+   sent was changed from SIGHUP to SIGTERM.
+ - The function kill() and the function tryTerminate() (formerly
+   hangUp()) were made slots.
+
+New slots:
+	void tryTerminate();
+	void kill();
+
+Removed functions:
+	void hangUp();
+	void kill();
+
+QProgressBar
+------------
+
+ - Draw the progress bar correctly with respect to the properties
+   "percentageVisible", "indicatorFollowsStyle" and
+   "centerIndicator".
+
+QPtrVector
+----------
+
+ - Support null items without triggering an assert.
+
+QPushButton
+-----------
+
+ - Fixed the sizeHint() of buttons with an icon.
+
+QRegExp
+-------
+
+ - Fixed a subtle bug in regular expressions mixing anchors and
+   alternation.
+
+QRegion
+-------
+
+ - Don't crash when creating a QRegion from an empty point array.
+
+QRichText
+---------
+
+ - Improved alignment support, including nested alignments.
+ - Improved table margin support.
+ - Improved page break algorithm.
+ - Do not eat '\n' in preformatted items.
+ - Do not draw the internal trailing space at the end of a paragraph.
+ - Fixed link underlining in table cells and other subdocuments.
+ - Use larger vertical margin between paragraphs.
+ - Display paragraph spacing even when printing.
+ - Support vertical table cell alignment.
+ - Fix for floating items and table cell size calculation.
+ - Improved allignment handling.
+ - Offset fixes for tabs.
+ - Better <div> support.
+ - Fixed <br> tag.
+ - Fix for the <center> tag and centering tables.
+ - Fixed &nbsp; and <nobr>.
+ - Fixed off-by-one bug in gotoWordLeft() and gotoWordRight().
+ - Better positioning of super- and subscripts.
+ - Faster printing of large tables by using a clipping rectangle.
+ - Improved high-resolution printing.
+ - Correct sizes for images when printing.
+ - Fixed list painting when printing.
+ - Use right background for printing.
+
+QScrollBar
+----------
+
+ - Made setValue() a slot.
+
+New slot:
+	void setValue( int );
+
+Removed function:
+	void setValue( int );
+
+QSettings
+---------
+
+ - Added support for QStringLists without requiring a distinct
+   separator.
+ - Added support for null strings, empty lists and null strings in
+   lists.
+ - Fixed bug with values ending with a backslash.
+ - On Unix, don't overwrite files if the user doesn't have permission.
+
+QSimpleRichText
+---------------
+
+ - Implemented vertical breaks and floating elememts.
+ - Fixed bug with borders and clipping in printing.
+ - Fixed bug in adjustSize() cache.
+
+QSizePolicy
+-----------
+
+ - Stretch factors were added to QSizePolicy.
+ - Added a new size policy: Ignored.
+
+New functions:
+	uint horStretch() const;
+	uint verStretch() const;
+	void setHorStretch( uchar sf );
+	void setVerStretch( uchar sf );
+
+QSpinBox
+--------
+
+New slot:
+	virtual void selectAll();
+
+QSqlDatabase
+------------
+
+ - QSqlDatabase now provides access to meta-data. Meta-data is stored
+   in two new classes, QSqlFieldInfo and QSqlRecordInfo. See the
+   class documentation for details.
+
+New Functions:
+	QSqlRecordInfo recordInfo ( const QString & tablename ) const
+	QSqlRecordInfo recordInfo ( const QSqlQuery & query ) const
+
+
+QSqlFieldInfo
+-------------
+
+A new class that stores meta data associated with a SQL field.
+
+QSqlRecordInfo
+--------------
+
+A new class that is keeping a set of QSqlFieldInfo objects.
+
+QStatusBar
+----------
+
+ - Don't cut off the bottom line of the border of the status bar.
+ - Respect maximumHeight() of items in the status bar.
+
+QString
+-------
+
+ - QString now provides section(), a function that parses simple
+   fields.
+ - The function similarityWith() has been removed from the API. If
+   you need it, write to qt-bugs@trolltech.com.
+
+New functions:
+	QString section( QChar sep, int start, int end,
+			 int flags = SectionDefault ) const;
+	QString section( char sep, int start, int end = 0xffffffff,
+			 int flags = SectionDefault ) const;
+	QString section( const char *substr, int start, int end = 0xffffffff,
+			 int flags = SectionDefault ) const;
+	QString section( QString substr, int start, int end = 0xffffffff,
+			 int flags = SectionDefault ) const;
+	QString section( const QRegExp &regxp, int start, int end = 0xffffffff,
+			 int flags = SectionDefault ) const;
+	
+Removed function:
+	int similarityWith( const QString& target ) const;
+
+QStyle
+------
+
+ - Changed "void **" technique to QStyleOption technique. This
+   affects the interface of most of the QStyle member functions.
+   Please read the QStyle class documentation for details.
+
+QStyleOption
+------------
+
+A new class that encapsulates extra data sent to the style API.
+
+QTabBar
+-------
+
+ - The accelerators are now working correctly after changing a tab.
+
+QTable
+------
+
+ - Fixed crash related to popup menu and cell edition.
+ - Fixed not-drawing hidden cells.
+
+QTextCodec
+----------
+
+ - Added MIME names for codecs.
+ - Improved locale detection.
+ - Fixed the ISO 8859-6.8x (Arabic) font encoding.
+
+New function:
+	const char *mimeName() const;
+
+QTextStream
+-----------
+
+ - Fixed bug with stateful QTextEncoders.
+
+QTextEdit
+---------
+
+ - Respect disabling updates.
+ - Fixed link underlining in table cells and other subdocuments.
+ - Draw cursor on focus in.
+ - Emit cursorPositionChanged() where it previously was missing.
+ - Fixed sync().
+
+New functions:
+	bool isUndoAvailable() const;
+	bool isRedoAvailable() const;
+	bool isUndoRedoEnabled() const;
+	virtual void setUndoRedoEnabled( bool enabled ) const;
+
+New property:
+	bool undoRedoEnabled
+
+QThread
+-------
+
+ - Fixed QThread::sleep() on Unix.
+
+QTime
+-----
+
+ - fromString() with format Qt::ISODate now recognizes milliseconds
+   if they are specified.
+ - Make elapsed() a const function.
+
+QTimeEdit
+---------
+
+ - The default time separator respects the user's settings.
+ - Pressing the separator key now skips to the next section.
+
+New functions:
+	QString separator() const;
+	virtual void setSeparator( const QString& s );
+
+QTooltip
+--------
+
+ - Hide active tooltips when the user switches to another application.
+ - Fixed tooltips with Windows effects enabled.
+
+QUrl
+----
+
+ - Fixed password encoding.
+
+New function:
+	bool hasPort() const;
+
+QValidator
+----------
+
+ - Let QValidator, QIntValidator, QDoubleValidator and
+   QRegExpValidator have QObject parents rather than only QWidget
+   parents.
+
+QVariant
+--------
+
+ - Added QBitArray support.
+ - The QDateTime type now supports asDate() and asTime().
+ - The QByteArray type now supports toString().
+
+New functions:
+	QVariant( const QBitArray& );
+	const QBitArray toBitArray() const;
+	QBitArray& asBitArray();
+
+QWhatsThis
+----------
+
+ - Added support for hyperlinks in "What's This?" help windows.
+
+QWidget
+-------
+
+ - Fixed crashes related to LayoutHint events.
+
+QWizard
+-------
+
+ - Made removePage() behave as documented.
+ - Fixed back() so that it skips irrelevant pages like next().
+
+QWorkspace
+----------
+
+ - Make sure that the widget state is set before the first titlebar
+   painting is triggered.
+ - Use the right pixmap for titlebar.
+ - Respects widget flags better for titlebars in QCommonStyle.
+ - Fixed move and resize in the system menu bar of workspace
+   children.
+
+QXml
+----
+
+ - Made the "prefix" xmlns map to the namespace name
+   http://www.w3.org/2000/xmlns/.
+ - Fixed default namespaces.
+
+QXmlAttributes
+--------------
+
+ - Added count() as equivalent to length() to be consistent with Qt
+   conventions.
+
+New function:
+	int count() const;
diff --git a/dist/changes-3.0.0-beta5 b/dist/changes-3.0.0-beta5
new file mode 100644
index 0000000..174a1b3
--- /dev/null
+++ b/dist/changes-3.0.0-beta5
@@ -0,0 +1,316 @@
+Qt 3.0 beta 5 is not binary compatible with beta 4; any programs
+linked against beta 4 must be recompiled.
+
+Below you will find a description of general changes in the Qt
+Library and Qt Designer followed by a detailed list of changes in the
+API.
+
+
+The Qt Library
+========================================
+
+Documentation
+-------------
+
+The extensive revision of Qt classes' documentation is complete. The
+front page of the Qt documentation (index.html) has been redesigned
+to provide better access to other documentation than class
+documentation.
+
+OpenGL Module
+-------------
+
+Qt beta 5 provides some fixes which will make rendering GL widgets to
+pixmaps work on a wider range of X servers.
+
+QDateTimeEdit
+-------------
+
+The QDateTimeEdit, QDateEdit and QTimeEdit widgets have been moved
+from the SQL module to the Qt core widget set. All users of Qt can
+now use these widgets.
+
+
+Qt Designer
+========================================
+
+ - Some bugs related to the .ui.h feature were fixed.
+
+ - The generation of code related to QSqlCursor has been fixed.
+
+ - When removing a slot implementation from the Qt Designer
+   interface, do not accidentally remove a preceding comment.
+
+ - Improved the C++ code indenter in the editor for some C++
+   constructs, including try-catch blocks.
+
+
+Qt Linguist
+========================================
+
+ - Fixed problem with loading phrase books containing non-ASCII
+   characters.
+
+
+Qt Classes
+========================================
+
+QApplication
+------------
+
+ - Fixed a clipboard bug related to drag-and-drop on X11.
+
+QColorDialog
+------------
+
+ - Fixed repaint problem.
+
+QComboBox
+---------
+
+ - Never inserts empty strings in the list.
+ - Use the drop-down listbox's size hint in the combobox if the
+   listbox has been set manually.
+
+QComponentInterface
+-------------------
+
+ - This class has been renamed QComponentInformationInterface.
+
+QComponentServerInterface
+-------------------------
+
+ - This class has been renamed QComponentRegistrationInterface.
+
+QDataBrowser
+------------
+
+ - The setCursor() function is obsolete and has been removed due to
+   problems with some compilers. Use setSqlCursor() instead.
+
+QDataTable
+----------
+
+ - Fixed a rare crash when the database is deleted while its popup is
+   still open.
+ - Made setColumnWidth() a public slot like in the base class.
+ - The setCursor() function is obsolete and has been removed due to
+   problems with some compilers. Use setSqlCursor() instead.
+
+QDateTimeEdit
+-------------
+
+ - Fixed the minimumSizeHint() for better behavior in a layout.
+
+QDom
+----
+
+ - Added a sanity check.
+
+QFileDialog
+-----------
+
+ - Fixed a crash in MotifPlus style.
+ - Use the existing file-icon provider rather than the default
+   Windows one if one is set.
+
+QFont
+-----
+
+ - Fixed background color for more than 8 bits per channel.
+ - Added the font's pixel size to the value returned by key().
+
+QFtp
+----
+
+ - Correcty sets the default password to "anonymous".
+
+QGL
+---
+
+ - Added robustness on X11 for invalid pixmap parameters.
+
+QImage
+------
+
+ - Fixed loading of BGR BMP files.
+ - Changed the signature of the constructor to accept "const char *
+   const *" objects without a cast.
+
+QLatin1Codec
+------------
+
+ - Provide the missing mimeName().
+
+QLibrary
+--------
+
+ - Construct Unix-specific filenames correctly.
+
+QLineEdit
+---------
+
+ - Fixed offset for right-aligned text.
+
+QListView
+---------
+
+ - Fixed a bug with in-place renaming.
+
+QMime
+-----
+
+ - Fixed infinite loop when searching for a mime-source.
+
+QMutex
+------
+
+ - Unlock the Qt library mutex when enter_loop() is called the first
+   time, rather than when exec() is called. A programmer might call
+   QDialog::exec() and never QApplication::exec(), and then she will
+   wait for the mutex.
+
+QPixmap
+-------
+
+ - Do transformations correctly on big-endian systems.
+
+QPrinter
+--------
+
+ - Respect the PRINTER environment variable on X11, as stated in the
+   documentation.
+ - Work around a display-context bug on Windows 95 and 98.
+
+QProcess
+--------
+
+New functions:
+	void clearArguments();
+	int communication() const;
+	void setCommunication( int c );
+
+QProgressBar
+------------
+
+ - Fixed bug in repainting when a background pixmap is set.
+
+QPtrList
+--------
+
+ - Reverted a semantics change introduced in beta 4 when deleting the
+   current item.
+
+QRegExp
+-------
+
+ - Fixed matchedLength() when used with exactMatch(). This bug
+   affected QRegExpValidator.
+
+QRichText
+---------
+
+ - Added support for "color" attribute in <hr> tag.
+ - Fixed selectedText().
+
+QSqlCursor
+----------
+
+ - Don't generate calculated fields.
+
+QStatusBar
+----------
+
+ - Made addWidget() and removeWidget() virtual.
+
+QSpinBox
+--------
+
+ - Fixed the minimumSizeHint() for better behavior in a layout.
+
+QStyle
+------
+
+ - Allow separator custom menu items to use a different size than
+   specified by the style.
+
+Qt
+--
+
+ - Renamed Qt::Top, Qt::Bottom, Qt::Left, Qt::Right to Qt::DockTop,
+   Qt::DockBottom, Qt::DockLeft, Qt::DockRight.
+
+QTable
+------
+
+ - Fixed currentChanged() and valueChanged() emits.
+
+QTextEdit
+---------
+
+ - Moved eventFilter() from the public slots section to the public
+   section of the class definition.
+ - Reformat after changing tab-stop size.
+ - Implemented undo for clear().
+
+New function:
+	void zoomTo( int size );
+
+QTextIStream
+------------
+
+ - Fixed QTextIStream with a QString.
+
+QToolBar
+--------
+
+ - Fall back to text property in extension popup if no pixmap label
+   has been set.
+ - Made mainWindow() const.
+
+QToolButton
+-----------
+
+ - Fixed the minimumSizeHint() for better behavior in a layout.
+
+QToolTip
+--------
+
+ - Fixed the transparent tooltip effect a la Windows 2000.
+
+QUrl
+----
+
+ - Fixed the return value of QUrl::dirPath() on Windows.
+ - Set ref to nothing when merging URLs.
+
+QUrlOperator
+------------
+
+ - Added a default parameter for single copy to specify the "to" file
+   name and not just the file path.
+
+New function:
+	QPtrList<QNetworkOperation> copy( const�QString& from,
+		const�QString& to,�bool�move,�bool�toPath�);
+
+QValueList
+----------
+
+ - Added a return value to remove(), as stated in the documentation.
+
+QWidget
+-------
+
+ - Fixed a bug in QPainter on X11 that caused a crash when paint
+   events were dispatched from other paint events.
+ - Fixed showMaximized() and deferred map handling.
+ - When specifying WDestructiveClose as a widget flag,
+ QWidget::close() does not immediately delete the widget anymore, but
+ calles QObject::deferredDelete()
+
+
+QWorkspace
+----------
+
+ - Fixed cascade().
diff --git a/dist/changes-3.0.0-beta6 b/dist/changes-3.0.0-beta6
new file mode 100644
index 0000000..dbed175
--- /dev/null
+++ b/dist/changes-3.0.0-beta6
@@ -0,0 +1,272 @@
+Qt 3.0 Beta6 is not binary compatible with Beta5; any programs linked
+against Beta5 must be recompiled.
+
+Below you will find a description of general changes in the Qt
+Library, Qt Designer and Qt Assistant.  Followed by a detailed list of
+changes in the API.
+
+
+The Qt Library
+========================================
+
+QCom postponed
+--------------
+
+Previous Qt 3.0 betas introduced a module called QCom that provides a
+COM-like component system. The feedback we received on this module
+during the 3.0 beta phase has been mixed. Many users think this module
+lacks the intuitiveness and compactness that they have learned to
+expect from a Qt API. Therefore, we have made the difficult decision
+to withdraw the QCom API from the Qt 3.0 release. We will continue to
+develop this API until it is evolved enough for our customers, and
+will include the improved version in a later release.
+
+We apologize for any inconvenience the QCom API change has
+caused. This decision was made as part of our ongoing efforts to
+maintain the soundness and quality of Qt.
+
+Please note that the new plugin functionality in 3.0 will still be
+provided. This includes using custom widgets in Qt Designer, as well
+as runtime addition of styles, codecs, SQL drivers, and image format
+handlers. This functionality is now available through a substantially
+simplified API.
+
+Also also note that it will still be convenient to add custom plugin
+capabilities to Qt 3.0 applications, since the new QLibrary class will
+still be available. This class takes care of the low-level,
+platform-dependent issues regarding loading of DLLs and obtaining
+pointers to the functions exported by the DLLs.
+
+
+Qt Designer
+========================================
+
+ - Improvements to the Designer reference manual.
+
+ - Improved the C++ code indenter in the editor for numbers and
+   handling of parenthesis.
+
+
+Qt Assistant
+========================================
+
+ - Added a context menu with common commands.
+
+ - Allow multiple windows to be opened and added the common shortcut
+    that Shift+Click on a link opens the link in a new window.
+
+
+Qt Functions
+========================================
+
+QAccel
+------
+
+ - Try harder to ensure that accelerators continue to work when a top
+   level widget is reparented into another window.
+
+QColor
+-----
+
+ - X11 only: better heuristic to decide if you use black or white when a
+   color could not be allocated.
+ - win32 only: improve color allocation on 8bit displays, e.g. when
+   using a terminal server.
+
+QComboBox
+---------
+
+ - Added a new function to be able to set a custom line edit.
+
+New function:
+	virtual void setLineEdit( QLineEdit *edit );
+
+QCString
+--------
+
+ - Implemented a dummy out-of-line destructor for QCString to help the
+   compiler to optimize the number of conflicts as the location of a vtable
+   is now known.
+
+QCursor
+-------
+
+ - win32 only: Added a constructor that takes a platform specific handle.
+
+New function:
+	QCursor( HCURSOR ); (win32 only)
+
+QDateTime and QDateTimeEdit
+---------------------------
+
+ - win32 only: better handling of localization settings.
+
+QDockWindow
+-----------
+
+ - Remeber last size of an undocked window, so when it is docked and
+   undocked again, use this size again.
+
+QDom
+----
+
+ - Fixed an infinite loop in QDomDocument::toString().
+
+QFileDialog
+-----------
+
+ - Improved handling of "~" to make it work as a directory.
+
+QFileInfo
+---------
+
+ - win32 only: permissions respects the read-only attribute now.
+
+QIconView
+---------
+
+ - Added a function to find out whether an item in a view is currently
+   being renamed.
+ - Fixed a crash.
+
+New function:
+	bool isRenaming() const;
+
+QInputDialog
+------------
+
+ - Improved the handling of double input formats.
+
+QListView
+---------
+
+ - Added a function to find out whether an item in a view is currently
+   being renamed.
+ - Fixed a possible infinite loop.
+ - Improved spacing handling for columns that can show a sort indicator.
+
+New function:
+	bool isRenaming() const;
+
+QMainWindow
+-----------
+
+ - Make menuAboutToShow() protected to allow customized dock menus.
+ - Fixed spacing problem for menu bars.
+
+QMap
+----
+
+ - Fixed infinite looping in count( const Key& k ).
+
+QObject
+-------
+
+ - The slot deferredDelete() was renamed to deleteLater() to be more
+   intuitive. Code that used deferredDelete() has to be adjusted for the
+   new name.
+
+New function:
+	void deleteLater();
+
+QPainter
+--------
+
+ - Fixed bounding rectangle when printing richtext.
+ - Restore brush origin in QPainter::restore().
+
+QPixmap
+-------
+
+ - X11 with render extension only: better support for alpha blending:
+    - QPixmap::xForm() keeps now the alpha channel information
+    - alpha channel information is kept when copying QPixamps
+    - alpha blending works with QMovie
+    - tiling pixmaps with alpha channel works now
+
+QPrinter
+--------
+
+ - Unix only: fixed dashed line drawing when using high resolution
+   printing.
+ - Better printing detection on Irix.
+
+QRadioButton
+------------
+
+ - Fixed focus problem for radio buttons in a button group.
+
+QSqlCursor
+----------
+
+ - Fixed primeInsert() to work if the primary key of the edit buffer has
+   changed.
+ - Changing primary index keys now also works if the cursor's position
+   moved in the meantime.
+
+QStyle
+------
+
+ - Added a base value (CC_CustomBase) for custom defined primitives,
+   controls, etc. -- this allows custom widgets to use the new style
+   engine.
+ - Fixed spacing problem for custom menu items.
+ - Improved the look of the Motif plus and the SGI style.
+
+QTable
+------
+
+ - Fixed a crash when drag source is the current table editor widget.
+ - Fixed a bug that prevented having different colors in different cells.
+
+QTabletEvent
+------------
+
+ - Improved Watcom tablet support to allow multiple devices to be used.
+
+QTextEdit
+---------
+
+ - Better handling for font sizes in the font tag.
+ - Parse the qt tag again.
+ - Fixed text() for read-only documents.
+ - Improved right mouse button menu handling.
+ - New function to pass the position to the createPopupMenu() function for
+   improved flexibility.
+
+New function:
+	virtual QPopupMenu *createPopupMenu( const QPoint& pos );
+
+QThread
+-------
+
+ - Unix only: Make sure that the seconds and nano-seconds in the sleep
+   functions are within the limits.
+
+QUrlInfo
+--------
+
+ - Added the concept of invalid QUrlInfo objects. This is useful in
+   conjunction with QUrlOperator::info().
+
+New function:
+	bool isValid() const;
+
+QWizard
+-------
+
+ - Set the previous pages nextEnabled to TRUE if we add a page to the end
+   of a wizard.
+
+QWMatrix
+--------
+
+ - mapRect() returns always a valid QRect now.
+
+QWorkspace
+----------
+
+ - Update the titlebar when toggling shaded/non-shaded.
+ - Update the titlebar to be deactivated when the application's activation
+   status changes.
+ - Improve placement of document windows.
diff --git a/dist/changes-3.0.1 b/dist/changes-3.0.1
new file mode 100644
index 0000000..26fb022
--- /dev/null
+++ b/dist/changes-3.0.1
@@ -0,0 +1,540 @@
+Qt 3.0.1 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.0.0
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+- Style Engine fixes
+	Qt 3.0 introduced a new and more flexibile style engine. This
+	release should fix most of the small visual flaws that the new
+	styles introduced. It also greatly improves appearance in
+	right-to-left mode.
+
+- MS-Windows XP
+	This is the first release to fully support Windows XP,
+	including the new themable GUI styles.
+	The Windows XP style can only be built as a plugin, which requires
+	Qt to be configured as a shared library. To build the plugin
+	you must install a Microsoft Platform SDK for October 2001
+	or later. Your INCLUDE and LIB environment variables must
+	point to the respective directories in the SDK installation.
+
+- Reverse (right-to-left) layouts
+	Many classes have improved support for right-to-left layouts.
+
+- Compile fixes 
+	Solaris 7 Intel, g++ version 2.8.1.
+
+- Documentation updates
+	Some new and improved diagrams and minor textual revisions.
+
+- Mac only: Drag'n'drop
+	Mac only: QDropEvents can decode HFS flavors.
+
+- X11 only: Multi-head (multi-screen) improvements
+	Support for different TrueColor depths on each head (screen).
+	Drag'n'drop support across multiple screens. Tooltips always
+	stay on the correct screen. Improved OpenGL support on
+	multiple screens. Qt 3.1 will support different color depths
+	on every screen (e.g. one TrueColor screen, one 8-bit
+	PseudoColor and one 8-bit GreyScale).
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAction
+	Fixed a memory leak in conjunction with action accelerators.
+	Turn toggle actions off when toggling is turned off with
+	setToggleAction(FALSE);
+
+- QApplication
+	Shared double buffers are cleaned up on destruction. 
+	Creating and using multiple QApplications in the same process
+	is supported.
+	- Solaris only: Default to the Interface System font (which is
+	  the default for the CDE)
+	- Win32 only: When WM_QUERYENDSESSION is received, _flushall
+	  is called to ensure that all open streams and buffers are
+	  flushed to disk (or to OS's buffers). 
+	  Better support for more input methods (e.g. Chinese). 
+	  Enter events are not propagated to modally blocked widgets. 
+	  Key_BackTab events are generated rather than Shift+Key_Tab.
+	  Floating toolbars are blocked when the application is modal. 
+	  Move and Resize are disabled in the system menu for
+	  maximized toplevel windows
+	- WinXP only: WM_THEMECHANGED messages are handled; widgets
+	  are repolished with the appropriate style.
+	- X11 only: Removed misleading warning message for main
+	  widgets on heads (screens) other than the default head.
+	  Input context: Solved a memory leak in Xlib, and saved a
+	  server round trip when updating the microfocushint. 
+	  Worked around some broken XmbLookupString implementations
+	  that do not report buffer overflows correctly. 
+	  Key events are never given to a widget after clearFocus()
+	  has been called for that widget; this is the same behavior
+	  as Windows.
+
+- QAquaStyle (MacOS X only)
+	More optimizations and several minor visual bugs fixed.
+
+- QCanvas
+	Erase any exposed empty space when shrinking the canvas.
+
+- QCanvasPixmapArray
+	Initialize the framecount to 0.
+
+- QCanvasView
+	Optimize background pixmaps: potentially they were drawn
+	twice, first untranslated then translated.
+
+- QClipboard (X11 only)
+	The race conditions that cause KDE to lock-up occasionally
+	should now be fixed.
+
+- QComboBox
+	Fixed behavior with non-selectable items. Fixed a crash when
+	calling setCurrentItem(-1). Fixed autoscrolling when dragging
+	the mouse directly after opening the dropdown.
+
+- QColor
+	Make invalid named colors return a non-valid QColor (as
+	documented).
+
+- QColorDialog (Win32 only)
+	Use WStyle_DialogBorder, since resizing this dialog does not
+	make much sense.
+
+- QCommonStyle
+	Respect QApplication::globalStrut() in scroll bars. Support
+	reverse layout in QTitleBar.
+
+- QCursor
+	Safer cleanup of cursor shapes (avoids possible free'd memory
+	read)
+	- Win32 only: fixed application override cursor with mouse
+	  grabbing.
+
+- QDate
+	Fixed some possible overflows.
+	- Win32 only: Improve locale support for short day and month
+	  names etc. Initialize milliseconds correctly.
+
+- QDateTimeEdit
+	Display AM/PM if set by locale. Improved sizeHint().
+
+- QDockAarea
+	More reliable sizeHint(). Better support for reverse layouts.
+
+- QDockWindow
+	Emit the placeChange() signal more reliably. Avoid floating
+	docks popping up everywhere before they have been positioned
+	and laid out.
+
+- QDesktopWidget
+	- X11 only: When using normal dualhead (not Xinerama), make
+	  sure we report the correct screen number.
+	- Win32 only: refresh on WM_DISPLAYCHANGE.
+
+- QFrame
+	New panel styles LineEditPanel and TabWidgetPanel. This was
+	required by the new for Windows XP support.
+
+- QFileDialog
+	Show unicode filenames to the user rather than encoded ASCII
+	(e.g. previously latin1 characters were shown as "%XX"
+	escapes).
+	Fixed multiple-selection of FTP files. 
+	Emit signal fileHighlighted in existingfile mode.
+	- Mac only: Fixed existingFolder(). Fixed window position so
+	  that it will never fall outside the screen.
+	- Win32 only: since files, directories and drives are not case
+	  sensitive, we don't add an extra entry in the paths box if
+	  the path already exists but with different case.
+
+- QFileInfo (Unix only) 
+	Make sure that symlinks pointing to invalid/non-existing
+	targets are reported as symlinks.
+
+- QFont
+	Ensure a rounded-off value is returned from pointSize().
+	- x11 only: improved line width calculation. Fixed off by one
+	  error in interpreting Xft font extents. Allow the use of
+	  both Xft and non Xft fonts in the same application. Make
+	  sure fonts are antialiased by default when using
+	  xftfreetype.
+
+- QFontDialog
+	Prevent re-laying out when the size of the preview label
+	changes.
+
+- QFtp
+	In parseDir(), do not compare English month names to
+	shortMonthName(), since the latter is localized.
+
+- QGList
+	Make self-assignments work.
+
+- QGLWidget
+	Fixed ARGB to RGBA conversion on BigEndian systems.
+	- Win32 only: fixed colormap for 8-bit RGBA GL mode.
+	- X11 only: multiple heads with different color depths fixes.
+
+- QHebrewCodec
+	Assume the bidi algorithm is a reversible operation for the
+	visual 8859-8 codec. This is not true for very complex strings
+	but should hold in most cases.
+
+- QIconSet
+	Fixed detach() to really detach the internal pixmaps. In case
+	no image formats are installed, show black pixmaps rather than
+	ASSERT.
+
+- QImage
+	Allow 16-bit DIBs. Allow > 32767 level PNMs. 
+	Fixed smoothscale() for the following bug: whenever 
+	(new_width / original_width * 4096) is not an integer the last
+	column of the scaled image is black.
+
+- QImageIO
+	Fixed plugin loading in cases where the image format is
+	explicitly defined.
+
+- QInputDialog
+	Disable the OK button when input is not Acceptable.
+	(See QValidator.)
+
+- QLabel
+	When showing rich text with tables (via QSimpleRichtext),
+	avoid drawing the table background.
+
+- QLayout
+	In reverse layout mode: fix off by one error when laying out
+	right to left or bottom to top.
+
+- QLineEdit
+	Fixed offset calculation for horizontal scrolling. Invoke
+	validator when the user presses Backspace or
+	Delete. Compression of the undo/redo stack fixed. Security: do
+	not reveal the position of spaces with Ctrl+RightArrow or
+	Ctrl+LeftArrow in password mode.
+
+- QListBox
+	Append items at the proper position even after sorting the
+	content. Made QWidget::setBackgroundMode() work correctly.
+
+- QListBoxPixmap
+	Use the function pixmap() when drawing the pixmap, so users
+	can reimplement QListBoxPixmap::pixmap().
+
+- QListView
+	Fix misalignment of checkbox click zone. Make the selected and
+	focus rectangles cover the entire column for QCheckListItems
+	if the listview root is not decorated. Make
+	QWidget::setBackgroundMode() on the viewport work correctly.
+	Comply with user interface guidelines: clear the selection
+	when a click is in an empty area unless the Ctrl key is down.
+	Fixed possible crash when starting a rename with a double
+	click. Smarter ensureItemVisible(). Draw listview background
+	in paintEmptyArea() with the current style. Ensure the
+	listview always has a current item.
+
+- QMainWindow
+	Better laying out of dockareas when they are all empty.
+	Otherwise an empty QMainWindow looks unappealing in a
+	workspace. Maintain the toplevel layout's resize mode.
+
+- QMessageBox
+	Avoid double deletion if the parent is destroyed while the
+	messagebox is open. Support y/n/c shortcuts without needing
+	the Alt key modifier.
+
+- QMovie
+	Allow pause() and restart() with MNG.
+
+- QMultiLineEdit
+	Remove internal trailing space when returning a textline with
+	textLine(int) and querying lineLength(int).
+
+- QPainter
+	The boundingRect() should now work properly for the
+	combination richtext, right-aligned and an empty initial rect.
+	Handle DontClip-flag in the painter's complex drawText()
+	function. Reset the cached composition matrix (and inverse)
+	when reinitialising a painter.
+
+- QPicture
+	Fixed the loading of binaries from older Qt versions.
+
+- QPixmap
+	grabWidget(): when the widget sets WRepaintNoErase it might
+	erase itself with the non-redirected QWidget::erase(); restore
+	those areas.
+	- X11 only: (with XRENDER extension) when copying a pixmap,
+	  bitBlt the entire data into the new pixmap instead of using
+	  alpha composition.
+
+- QPopupMenu
+	Fixed strange side effects with the menu effects. Support
+	minimumSize() for popups. Fixed a navigation issue where
+	Key_Right under certain circumstances was not propagated to
+	the menu bar. Speedups when disabling/enabling menu items
+	before showing them.
+	- X11 only: Fixed mouse and keyboard grabbing side effects
+	  with popup menu effects enabled.
+
+- QPrintDialog (built-in dialog)
+	Use the text in the lineedit for the file dialog.
+
+- QPrinter
+	Fixed crash when printing with incomplete combined unicode
+	fonts.
+	- Win32 only: fixed a very rare and mysterious crash.
+
+
+- QPSPrinter
+	Make sure the fontPath is read correctly by the postscript
+	driver, and the qtconfig program. Small memory leaks closed.
+	Better support for Asian printing. Limit line length of
+	Postscript DSC comments to 255 chars (as per the postscript
+	specification).
+
+-  QRichText
+	Fixed handling of &nbsp. Support both <qt title="..."> and
+	<title>. Avoid painting \n at the end of lines (these
+	sometimes appeared as an empty unicode box). Fixed find() in
+	"whole words only" mode. Fixed unicode auto alignment. Made
+	cursor movement in BiDi paragraphs compliant with MS-Windows.
+	Fixed paragraph right and center alignments when using <br>
+	tags. Fixed superscript/subscript confusion.
+
+- QScrollBar
+	Allow scrolling with modifier keys pressed.
+
+- QScrollView
+	Made autoscrolling work with drag and drop. Never generate
+	paintevents that are outside the visible area.
+
+- QSettings
+	- Unix only: search paths are valid for individual objects,
+	  NOT every object (windows behavior). When reading files,
+	  don't replace the old groups with contents of the new
+	  groups; merge them instead. Properly escape backslashes and
+	  newlines.
+	- win32 only: improved error handling. Fixed subKeyList() and
+	  entryList() for empty paths.
+
+- QSimpleRichText
+	Correctly transform clipping rectangle.
+
+- QSizeGrip
+	Reverted sizeHint() to the old size to avoid making the
+	statusbar a tiny bit too big. Support right-to-left layout.
+
+
+- QSgiStyle
+	Made the combobox arrow look nicer. Fixed disabled combobox
+	drawing.
+
+- QSlider
+	Fixed click handling for reverse layouts.
+
+- QSpinBox
+	Usability fix: when changing a value with the up/down arrow
+	keys or with the arrow buttons, select the new value.
+
+- QSplitter
+	Use the actual QSplitter pointer as documented (and not a
+	QSplitterHandle pointer) as the parameter to the
+	QStyle::sizeForContents() call. Fixed reverse layouts when
+	splitter movement is constrained.
+
+- QSqlRecord
+	Fixed double increment of the iterator in certain
+	circumstances.
+
+- QString
+	Fixed QString::setLatin1() when the length parameter is 0.
+	- Unix only: Use strcoll() in QString::localeAwareSorting().
+	- Mac only: clarify that local8Bit() is always utf8().
+
+- QStyle
+	New frame styles for tab widgets, window frames and line edit
+	controls. This was required by the new support for Windows XP.
+	Added SH_ScrollBar_StopMouseOverSlider style hint so that one can
+	turn on (or off) the ability to stop pageup/pagedown when the
+	slider hits the mouse (this is needed for Aqua on MacOS X).
+
+- QSvgDevice
+	Many fixes for saving and restoring attributes that are not
+	part of QPainter. Processing of 'tspan' elements. Now uses
+	double instead of int for internal 'path' arithmetic for
+	better scaling results. Supports QPicture's coordinate
+	transformations.
+
+- QTabBar
+	Fixed the focus rectangles and spacing with icons and label
+	texts.
+
+- QTable
+	Improved layout in right-to-left mode. Fixed adjustRow() when
+	using header items with icon sets. Do not let hidden
+	columns/rows re-appear when adjusting. Update header correctly
+	when changing a table's dimensions. Correctly reset the
+	updatesEnabled flag in sortColumn(). Fixed modifying the
+	contents of a combobox or checkbox table item while it is the
+	current cell.
+
+- QTableItem
+	Make sure an item cannot span over a table's maximum number of
+	rows and columns.
+
+- QTabWidget
+	Constrain the sizehint to avoid having oversized dialogs.
+
+- QTextCode
+	Rename iso8859-6-I to to 8859-6. The old name is still
+	supported for backwards compatibility.
+	- Win32: implemented locale().
+	- Mac: implemented locale().
+
+- QTextDrag (Win32 only)
+	Performance improvements in encodedData().
+
+- QTextEdit
+	Fixed HTML output. New property tabStopWidth. Fixed append()
+	and made it smarter: it only scrolls to the end if the view
+	was scrolled to the end before. Proper reformatting when
+	switching word wrap policies. Do not blink the cursor when the
+	textedit is disabled. Make isModified() return the new value
+	in slots connected to the modificationChanged() signal.
+	- X11 only: middle mouse selection pasting sets the cursor
+	  position.
+
+- QTextStream
+	Faster string output in latin1 mode.
+
+- QThread
+	- Unix only: initialize threads in non-GUI mode as well.
+	- Win32 only: fixed the initial value of QThread::running().
+
+- QToolButton
+	Fixed unwanted occurences of delayed popup menus.
+
+- QUrlOperator
+	Fixed the cache, so that QUrlInfo::name() is set correctly for
+	renamed files. This bug also affected QFileDialog. More
+	careful check whether a file is writable before renaming or
+	deleting it.
+
+- QValueVector
+	Make operator==() const. Fixed some sharing issues.
+
+- QVariant
+	Fixed a few memory leaks when casting complex values to simple
+	types. Faster operator==().
+
+- QWaitCondition (Win32 only)
+	Fixed wakeAll().
+
+- QWhatsThis
+	Make QWidget::customWhatsThis() work with menu accelerators.
+	Avoid infinite loops with menu effects.
+
+- QWidget
+	Fix default focus so that setTabOrder( X, Y ); setTabOrder( Y,
+	Z ); gives focus to X, not Y or Z. Closing a modal dialog with
+	a double click on a widget could result in a mouse release
+	event being delivered to the widget underneath; this has been
+	fixed.
+	Set/Reset WState_HasMouse on DragEnter/DragLeave.
+	- Win32 only: obey WPaintUnclipped. Make reparent() with 0,0
+	  positions do the requested positioning.
+	- X11 only: when reparenting widgets to/from toplevel, make
+	  sure the XdndAware property is set. Make input methods work
+	  with servers other than kinput2. More fixes for 4Dwm's
+	  incompliance with ICCCM 4.1.5 regarding geometry handling.
+	  When hiding toplevel windows, we call XFlush() to avoid
+	  having popup menus hanging around grabbing the mouse and
+	  keyboard while the application is busy. Obey the 'erase'
+	  value in repaint(const QRegion& reg, bool erase).
+
+- QWindowsStyle
+	Various visual fixes, including fixes for right-to-left
+	mode. Most significantly the light source now comes from the
+	top left also in reverse layout the same as modern versions of
+	Windows.
+
+- QWorkspace
+	Support document windows without title bars. Scroll to top
+	left corner when cascading/tiling a scrolled workspace. Define
+	a proper baseSize() for workspace children. Fix some side
+	effects with the workspace's maximize controls on Windows
+	style. Don't raise windows over scrollbars. Clients can now
+	call adjustSize() on the workspace when their sizeHint()
+	changes. When showing two scrollbars, maintain a solid corner.
+	Obey a document window's maximum size when tiling.
+
+****************************************************************************
+*			   Extensions					   *
+****************************************************************************
+
+NO CHANGES
+
+****************************************************************************
+*			      Other					   *
+****************************************************************************
+
+- qtconfig (X11 only)
+	It is now possible to turn Xft on and off, as well as turning
+	antialiasing-by-default on and off. This is necessary since
+	Xft doesn't work on dual head.
+
+- moc
+	Q_PROPERTY: Support QMap<QString, QVariant> and
+	QValueList<QVariant> as "QMap" and "QValueList". Support
+	parameters of nested template types, for example
+	QValueVector<QValueVector<double> >, as well as
+	Foo<const int>.
+
+- uic
+	Fix uic-generated code for QWizard with both "font" and
+	"titleFont" properties set. Put local includes after global
+	includes in generated files.
+
+- lupdate
+	Allow translation of menubar items generated with Qt Designer
+	(e.g. "&File", "&Edit", etc.).
+
+- libMNG
+	Updated to version 1.0.3.
+
+- libPNG
+	Updated to version 1.0.12.
+
+- Translations
+	Added Hebrew translations for Qt and the demo application.
+
+- Qt Designer
+	Support 'Ignored' size policy. Support properties of type
+	'double'. Fixed saving of custom widgets in toolbars. Various
+	smaller usability improvements.
+
+- Qt Assistant
+	When users starts Qt Assistant themselves, always make a new
+	instance. Only use the unique-instance feature when invoking
+	from Qt Designer.
+
+- QMsDev
+	Invoke Qt Linguist when opening a .ts file in Visual Studio.
+
+
+
+****************************************************************************
+*		    Qt/Embedded-specific changes		           *
+****************************************************************************
+
+NO CHANGES
diff --git a/dist/changes-3.0.2 b/dist/changes-3.0.2
new file mode 100644
index 0000000..211c8ef
--- /dev/null
+++ b/dist/changes-3.0.2
@@ -0,0 +1,325 @@
+Qt 3.0.2 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.0.1
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+- Improved building of Qt on SCO OpenServer 5.0.5, Sun WorkShop 4.2, MIPSpro
+7.2 and VC++.NET
+
+- Added support for NIS to the build system
+
+- BiDi on X11: direction key events for right-to-left are configurable
+in QSettings via qt/useRtlExtensions. In 3.0.1 they were always turned
+on.
+
+- basic table support with XFree86
+
+- unicode on X11: fix keysymbols 0x1000000-0x100ffff
+
+- moc: Generate correct code for N::B which inherits M::B. Don't warn
+on throw() specifications.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAbstractLayout
+	Fixed heightToWidth handling.
+
+- QApplication
+	X11 only: Stop compressing keys when a non printable key is
+	pressed. Fixed handling backtab (shift+tab) on HPUX. Better support
+	for currency symbol keys like the Euro key. Also fixed a crash when
+	tablet support is set up, but without a device attached.
+	Mac only: Adjust the desktop widget size when the display size
+	changes.
+
+- QAquaStyle
+	Better highlight color detection for the inactive case.
+
+- QCanvas
+	Let QCanvasPolygon::areaPoints() return a detached QPointArray
+	for safeness.
+
+- QColorDialog
+	Save and restore the custom colors via QSettings between Qt
+	applications.
+
+- QComboBox
+	Layout the popup listbox correctly before showing it. 
+
+- QContextMenuEvent
+	X11 only: Both the mouse press event and the context menu
+	are always sent now.
+
+- QClipboard
+	Mac only: Fixed pasting text from non-Qt applications to Qt
+	applications.
+
+- QDataTable	
+	Faster key event handling. Fixed crash when cancelling cell
+	editing. Fixed autoEdit mode.
+
+- QDesktopWidget
+	X11 only: Fixed screenNumber() in Xinerama mode.
+
+- QDateEdit
+	Gray out background if the widget is disabled. Fixed small
+	static memory leak on exit.
+
+- QDialog
+	On show(), send a tab-focus event to the focus widget, so that
+	e.g. in lineedits, all the text is selected when becoming visible.
+	Windows only: Position dialogs on the same screen as the mouse if
+	there is no parent widget that can be used.
+
+- QDockWindow
+	Use correct minimum size, taking frame into account. Less
+	flicker on (de)activation. undock() doesn't undock the window
+	if the TornOff dockarea is disabled.
+
+- QDragObject
+	Fixed crash when a drag object is created without parent.
+	
+- QFileDialog
+	Fixed an endless loop.
+	Windows only: In getExistingDirectory(), use QFileDialog and not
+	the Windows system one when the dirOnly flag is FALSE
+	Mac only: Fixed filtering when using the native Mac filedialog.
+
+- QFileInfo
+	Windows only: Fixed isWriteable() to check Windows permissions as
+	well.
+
+- QFont
+	Windows only: Fixed boundingBox() when called in a widget
+	constructor. Internal fixes for invalid HDCs. More
+	accurate exactMatch(). Fixed GDI resource leak.
+	X11 only: Fixed calculating the point size of default font, so
+	the default font on systems with only bitmap fonts doesn't look
+	ugly. Support for Ukranian fonts.
+
+- QFontDataBase
+	Win9x only: Fixed problem with multiple entries.
+
+- QGLWidget
+	X11 only: Fixed pixmap rendering with TrueColor visuals
+	on X servers with a default PseudoColor visual (introduced in
+	3.0.1). Fixed context sharing (introduced in 3.0.1).
+
+- QGroupBox
+	More predictable focus handling.
+
+- QHttp
+	Enable downloading from non-default websites.
+
+- QIconView
+	Initialise internal variable.
+
+- QImage
+	Fixed xForm() for bigendian bitmaps. Accept dots in XM
+	#define.
+
+- QImageIO
+	Correctly limit quality parameter when writing PNG and JPEG
+	files.
+
+- QLabel
+	Smarter minimumSizeHint() for word-break labels.
+
+- QLayout
+	Fixed possible crash when deleting/adding layout items. More
+	robust on runtime layout changes.
+
+- QLibrary
+	Windows only: Use an internal cache and refcount to avoid loading
+	the same library multiple times into the memory on Windows NT.
+
+- QLineEdit
+	Ctrl-V now calls the virtual paste() rather than duplicating
+	its functionality. Override accelerators for keypad keys.
+
+- QListBox
+	Center pixmaps in listbox items properly. Fixed isSelected().
+
+- QListView
+	Fix focus rects for QCheckList items that have a Controller as
+	a parent. Also, fix drawing of selected checklist boxes so
+	that the focus rect doesn't overlap it. Keep checklist items
+	working after the user swapped columns. Fixed drawing check
+	marks and the vertical branch lines for listview items with
+	multiple lines of text. Optimized the clear() function.
+	Improved the sorting for the case that entries have the same key.
+
+- QMenuBar
+	Fixed painting problems on content changes.
+	mostly X11: when the focus widget is unfocused, the menubar
+	should stop waiting for an alt release. On X11, when you use
+	an alt-key shortcut to switch desktops back and forth, then
+	you will get the menubar in altmode when you return to that
+	desktop
+	Mac only: Fixed keyboard modifiers.
+
+- QMovie
+	Animated gifs with a frame delay of 0 work nicer. Initialize
+	internal cache variable.
+
+- QMutex
+	Made tryLock() work on recursive mutexes.
+
+- QPainter
+	Return translated coordinates in pos(). Fixed translation in
+	calls to clipRegion(CoordPainter).
+
+- QPopupMenu
+	More fixes for the animate and fade effects. Fixed opening of
+	menus that was impossible under certain circumstances. Fixed
+	painting problems on content changes.
+
+- QPixmap
+	Make grabWidget() work with internally double-buffered widgets
+	X11 and Mac: Fixed a memory leak.
+
+- QPrinter
+	Win32 only: Resolution fix.
+
+- QRichText
+	Fixed crash bug when clearing a document. Fixed various layout
+	bugs, esp. with HTML tables. Fixed a memory leak. Fixed a
+	crash when placing a cursor on a hidden paragraph. Arabic and
+	Hebrew fixes. Make moving the cursor to the next word not
+	stumble upon multiple whitespaces.
+
+- QScrollBar
+	Make sure middle clicking a scrollbar doesn't allow the slider
+	to move outside the groove.
+
+- QSettings
+	In readEntry(), report 'ok' in all cases.  Make sure the
+	default value is returned correctly for bool entries that
+	do not exist in the settings files. Both readNumEntry()
+	and readDoubleEntry() report a false ok parameter if the
+	conversion fails
+	win32 only: Fixed default values
+
+- QSgiStyle
+	Minor visual improvements.
+
+- QSlider
+	Make setting a new size policy in Designer work.
+
+- QSound
+	Stop sound playing when distroying a QSound object.
+	Windows only: QSound::stop() really stops the sound now.
+
+- QSqlCursor
+	Fixed setMode().
+
+- QSqlDriver
+	Escape '\' characters in strings. Fix the QOCI8 driver so that
+	it compiles with the Oracle9i client libs. Major speedup fix 
+	for the QMYSQL3 driver.
+
+- QSqlRecord
+	Fixed crash when accessing values of non-existing fields.
+
+- QString
+	mid() works safely now for len > length() && len !=
+	0xffffffff. Some speed optimizations. Replace non-latin1
+	characters with '?' in unicodeToAscii().
+
+- QStyle
+	Added a style hint for a blinking text cursor when text is
+	selected.
+
+- QStyleFactory
+	Windows only: Don't load style plugins for static Qt builds.
+
+- QTable
+	Use correct style flags for QCheckTableItem drawing. The
+	internal event filter no longer consumes FocusIn/FocusOut,
+	meaning those events are accessible for subclasses now. Fixed
+	redraw problem with dynamically resized cells. Always return
+	the right text for items (fixed a caching problem). Fixed
+	emitting valueChanged(). Fixed a redraw problem with multispan
+	cells.
+
+- QTextCode
+	Support for @euro locales.
+
+- QTextEdit
+	The internal event filter no longer consumes FocusIn/FocusOut,
+	meaning these events accessible for subclasses now. Override
+	accelerators for keypad keys. Reduced memory consumption for
+	contents with many paragraphs. Emit selectionChanged() when
+	the selected text has been removed. Emitting the linkClicked()
+	signal may result in the cursor hovering over a new, valid link
+	- check this and set the appropriate cursor shape. Overwrite
+	mode fixed. Always emit currentAlignmentChanged() when the
+	paragraph alignment changed. Ignore key events which are not
+	handled. Fixed right-alignment in BiDi mode. Key_Direction_L/R
+	will now affect the whole document for non-richtext content.
+	X11 only: Fixed copy on mouse release. Lower impact of an
+	XFree memory leak.
+	Mac only: Always draw selections extended to the full width of the
+	view.
+
+- QTextStream
+	Speed optimization for QTextStream::write().
+
+- QToolBar:
+	Hint about explicit show() call for child widgets to ensure
+	future operability.
+
+- QToolTip
+	Fixed wordbreaking when using both rich text and plain text
+	tooltips. Fixed placement of tooltips for multi-head and Xinerama
+	systems.
+
+- QVariant
+	In toDateTime(), allow conversion from QDate.
+
+- QWhatsThis
+	X11 only: Fixed positioning on dualhead setups.
+	Windows XP only: Improved drawing.
+
+- QWidget
+	X11 only: fixed a show() problem that occurred
+	after few reparents from and to toplevel.
+	Mac only: Fixed showNormal().
+
+- QWindowsStyle
+	Minor visual improvements (popupmenu checkitems, listview
+	branches).
+
+- QWorkspace
+	Obey minimumSizeHint() of document widgets. Do not emit
+	windowActivated() for the already active document window.
+
+- QUrlOperator
+	Relaxed checks for directories.
+
+
+****************************************************************************
+*			   Extensions					   *
+****************************************************************************
+
+****************************************************************************
+*			      Other					   *
+****************************************************************************
+
+
+****************************************************************************
+*		    Qt/Embedded-specific changes		           *
+****************************************************************************
+
+****************************************************************************
+*		    Qt/Mac-specific changes		           	   *
+****************************************************************************
+
+Optimizations and fixes in QPainter and QFont fixed creation and
+raising of top level widgets fixed hovering over titlebar problems.
diff --git a/dist/changes-3.0.4 b/dist/changes-3.0.4
new file mode 100644
index 0000000..e7089a7
--- /dev/null
+++ b/dist/changes-3.0.4
@@ -0,0 +1,214 @@
+Qt 3.0.4 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.0.3
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+- Qt 3.0.4 builds on VC++.NET.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QApplication
+	Send wheel events for blocked widgets to the focus widget instead.
+	Windows only: Fixed problems with Korean input methods. Reset
+	the mouse state even when we ignore the next button release.
+
+- QColor:
+	Fixed marking colors created with an invalid color string as
+	invalid.
+
+- QComboBox:
+	QComboBox's listbox now takes the combobox's palette.
+
+- QDataTable:
+	Fixed the scrollbar behaviour when browsing result sets from
+	clients that do not return a query size. Make the table
+	adopt the filter and sort settings from the cursor when
+	setSqlCursor() is called.
+	
+- QDateTimeEdit:
+	Update the date/time edit even if the new date/time is
+	invalid.
+
+- QDialog:
+	Respect the minimum and maximum size of the extension grow
+	width/height in showExtension( TRUE ). Don't delete the object
+	immediately for WDestructiveClose, instead use deleteLater()
+	to allow queued events to be processed.
+
+- QDir:
+	Fixed crash when calling entryList() for non-existing
+	directories.
+
+- QDnD:
+	Mac only: Prevent crash when dropping onto a transparent part
+	of a widget.
+
+- QDockWindow:
+	Accelerators of the mainwindow now continue to work if a floating
+	dockwindow becomes active.
+
+- QFileDialog:
+	Windows only: Fixed displaying shared Windows directories
+	(e.g. \\Machine\Folder). Worked around a problem which made
+	QFileDialog hang.
+
+- QFontDataBase:
+	Enumerate all fonts correctly on Windows; also made it faster.
+
+- QGridLayout:
+	Do not crash when a widget inserted with addMultiCellWidget()
+	is deleted.
+
+- QHeader:
+	Fixed setOffset() for vertical headers.
+
+- QIconView:
+	Fixed when clicking and dragging from the edge of an icon, so
+	that the icon will drag immediately rather than when the mouse
+	next passes over it.
+
+- QKeyEvent:
+	Correctly deliver a KeyRelease event with isAutoRepeat
+	set to FALSE after releasing an auto-repeated key.
+
+- QLabel:
+	Fixed so that the label uses paletteForegroundColor() and not
+	the the colorgroup's 'text' color, when displaying richtext.
+
+- QListBox:
+	Performance improvements.
+
+- QListView:
+	When typing in a listview to search for an item, don't select
+	items in Extended selection mode. Speed improvements for
+	selectAll() or (un)selecting a large number of items (e.g by
+	pressing Shift+End) in big listviews (starting from 150.000
+	items).
+
+- QOCIDriver:
+	Allow access to tables not owned by the current user. Use
+	Oracle synonyms for table names. Tables can also be specified
+	as 'OWNER.TABLE'.
+
+- QPainter:
+	Don't delete the tabarray set in setTabArray() in the first
+	drawText() call.
+
+- QPopupMenu:
+	Fixed re-use of menus.
+
+- QPrintDialog:
+	Layout group boxes properly. Fixed function cast in NIS code
+	so that it works on all compiler-platform pairs. Allow NIS on
+	any Unix, not just Solaris.
+
+- QPrinter:
+	Windows only: Implemented printing of rotated pixmaps and
+	images.
+
+- QProcess:
+	Unix and Mac only: Make sure that the processExited() signal
+	is emitted only once for each process. This also fixes a crash
+	that occurred on very rare occasions.
+
+- QProgressBar:
+	Fixed crash bug when totalSteps() was 1. Fixed some painting
+	bugs.
+
+- QPSPrinter:
+	Improvements in printing Japanese. Big speed improvements.
+
+- QRichText:
+	Improved speed of loading plain text and rich text
+	documents. Fixed some internal links which didn't work
+	correctly. Fixed minimumWidth and usedWidth calculations for
+	table layouts of nested tables. Fixed <br> tags within list
+	items. Fixed some memory leaks and cleanup on exit. Now works
+	with fonts that specify sizes in pixels.
+
+- QScrollBar:
+	Release the control, when the scrollbar got hidden while a
+	control was pressed.
+
+- QSimpleRichText:
+	Make sure the painter's properties don't get changed in
+	setWidth().
+
+- QSpinBox:
+	Don't fire the autorepeat timer before valueChanged() is
+	completed, if the up or down button is pressed.
+
+- QSqlDriver:
+	Export DB driver classes under Windows if compiled into the
+	lib.
+
+- QSqlQuery:
+	Reset the last error before a new query is executed.
+
+- QTable:
+	If a row or column is hidden, setRowHeight() and
+	setColumnWidth() no longer cause an immediate resize; instead
+	they store the value for later use, i.e. for when the row or
+	column is shown. Fixed a problem which reset table header
+	sections after inserRows()/insertColumns() calls. showRow()
+	and showColumn() now do nothing if a row/column is already
+	visible. Windows only: Fixed the problem that combobox table
+	items never got smaller than a certain size.
+
+- QTextEdit:
+	Cleaner modified() and setModified() handling (doesn't rely on
+	internal signals anymore, so it is now safe to call
+	setModified() from a slot connected to textChanged()). Fixed
+	selecting text if a margin was set using setMargins(). Fixed
+	crash when calling removeSelectedText() with a selNum larger
+	than 0. Only auto-create a bullet list when typing - or * at
+	the beginning of a line if textFormat() is RichText, not
+	AutoFormat.
+
+- QTitleBar:
+	Don't paint all titlebars in a QWorkspace activated when a
+	dockwindow is the active window.
+
+- QToolBar:
+	Don't show the extension button when the extension menu would
+	not contain any items.
+
+- QUrlOperator
+	Fixed a crash.
+
+- QWaitCondition:
+	Fixed a problem with wait() using invalid timeout values.
+
+- QWorkspace:
+	Also show scrollbars (if enabled), when moving a document
+	window out of the workspace to the left at the top. Never show
+	scrollbars if a document window is maximized.
+
+
+
+****************************************************************************
+*			   Extensions					   *
+****************************************************************************
+
+****************************************************************************
+*			      Other					   *
+****************************************************************************
+
+Qt Config:
+	X11 only: The default X input methods are now configurable
+	through qtconfig.
+
+****************************************************************************
+*		    Qt/Embedded-specific changes		           *
+****************************************************************************
+
+****************************************************************************
+*		    Qt/Mac-specific changes		           	   *
+****************************************************************************
+
diff --git a/dist/changes-3.0.7 b/dist/changes-3.0.7
new file mode 100644
index 0000000..ec084d6
--- /dev/null
+++ b/dist/changes-3.0.7
@@ -0,0 +1,375 @@
+Qt 3.0.7 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.0.6.
+
+****************************************************************************
+*                              General                                     *
+****************************************************************************
+
+Smaller documentation fixes. Some build issues fixed. Upgraded libpng
+to 1.0.15.
+
+****************************************************************************
+*                              Library                                     *
+****************************************************************************
+
+- QAction
+	Avoid emitting activated() twice for actions in a
+	toolbar. Possibility to remove an iconset from an action by
+	specifying a null iconset.
+
+- QApplication
+	Fixed a font sharing problem with setFont(). Fixed window
+	close with modality. Don't overwrite an explicitely set font
+	with the default font when using the static methods before
+	calling the constructor. When the programmer/user explicitly
+	sets the style (either with QApplication::setStyle or -style
+	command line option), do not reset the style on settings
+	changes.
+	Windows only: Serialize calls to OutputDebugString, as this
+	API is not reentrant. Emit aboutToQuit() when the user logs
+	off. Send a focusOut event to the focus widget when the user
+	tries to switch applications via Alt+Tab.
+	Windows95/98/Me: Fixed enter/leave handling. Among others this
+	makes tooltips work more reliable.
+	X11 only: Spit out warning then the user passes an invalid
+	Display* argument. Fixed figuring out the depth of the visual
+	in case a private colormap is supplied. Some startup
+	performance improvements with QSettings. Mark the internal
+	wakeUpGuiThread() pipe with FD_CLOEXEC. Call XFilterEvent
+	before the public X11 event filters to avoid applications
+	filtering out events that are necessary for input methods to
+	operate.
+
+- QBuffer
+	Make IO_Truncate not detach the explicitely shared byte array.
+
+- QButton
+	In setPixmap(), avoid relayouting if the new pixmap doesn't
+	change the size.
+
+- QCanvasEllipse
+	Windows only: Workaround a Windows limitation that doesn't
+	support 2x2 ellipse rendering without a pen. Don't try to
+	double buffer invalid areas.
+
+- QClipboard
+	Flush the clipboard contents when the application object is
+	destroyed.
+	X11 only: another race condition fixed. Handle paste
+	operations with empty data.
+
+- QComboBox
+	Accept enter/return key press events on the line edit. Fixed
+	vertical alignment of text when a global strut is set. Clip
+	drawing of large items. Fixed problem with items not being
+	highlighted the first time the popup is shown.
+
+- QCommonStyle
+	Fixed SR_CheckBoxFocusRect for empty checkboxes (now inside
+	the indicator)
+
+- QComplexText
+	Added correct positioning specs for all of thai and lao. Some
+	reordering fixes.
+
+- QCustomEvent
+	Removed bogus warning on illegal type ids.
+
+- QDataTable
+	Don't display a single empty row if result set is empty and
+	QuerySize cannot be determined. Don't resize the table after a
+	refresh() if the size is already known.
+	In closeEvent(), accept the event only when isHidden()
+
+- QDateTime
+	Fixed addYears() for days missing in certain years.
+
+- QDns
+	Slightly more reliable now, fixed a memory leak.
+
+- QDockArea
+	Fixed resizing of a QDockWindow is no longer affected by
+	another closed QDockWindow in the same QDockArea.
+
+- QDom
+	Fixed memory consumption when QDomElement::setAttribute() is
+	called multiple times to change the value of an
+	attribute. Fixed a memory leak in QDomDocument::importNode().
+
+- QDragManager
+	X11 only: Fixed a dangling pointer case when the current
+	widget was deleted. Raise cursor decoration.
+	Windows only: Made dropping of URLs work on Japanese Windows98
+
+- QEffects
+	More robust through deferred deletion. Some code improvements. 
+	X11 only: disable effects on displays with <16bpp (rather then
+	falling back to the scrolling).
+
+- QFileDialog
+	Fixed problems with '#' in path. Fixed creation on
+	non-existing directories. Make previewMode() check if
+	the preview widgets are visible. Enable renaming in
+	ExistingFiles mode. Fix drag'n'drop for the first click into
+	the listbox. Don't auto-complete when saving a file. Enabled
+	drag'n'drop of files for all modes.
+
+- QFont
+	Windows only: Fixed boundingRect(QChar) for non true type
+	fonts. Fixed some positioning issues with Thai diacritics.
+	Win95 only: Make symbol fonts work.
+	X11 only: Fixed some issues with diacritics in non unicode
+	encoded fonts.
+
+- QFontDialog
+	Fixed getFont() in case no default font is specified.
+
+- QFrame
+	Fixed erasing the margin region for flicker-optimized
+	subclasses (e.g. QLineEdit). Turn on focus and mouse-over
+	style flags for frame painting.
+
+- QHeader
+	Some speed improvements for the sake of QTable and
+	QListView. Fix redrawing problems when moving header sections.
+
+- QIconView
+	Fixed contentsContextMenuEvent(). Only call
+	QIconViewItem::dragLeft() when the cursor has left the
+	bounding rect and only call QIconViewItem::dragEnter() when
+	the cursor has entered the bounding rect. Some performance
+	improvements.
+
+- QInputContext
+	X11 only: Improved XFontSet cache (also for cases where the X
+	server does not know the locale).
+
+- QKeyEvent
+	Windows only: Fixed internal ascii to keycode conversion for
+	codes > 0x80.
+
+- QLineEdit
+	Fixed doubleclick selection to only use spaces as word
+	seperators. Don't validate twice in a row if fixup() did
+	nothing. Fixed support for background pixmaps. Improved undo
+	mechanism. Respect maxLength() in setText().
+
+- QListBox
+	Fixed null-pointer crash in extended selection mode.
+
+- QListView
+	Improved auto scrolling. Restrict drop events to items that
+	have drop enabled and accept the event. Added more
+	null-pointer checks to prevent crashes when reimplementing
+	insertItem. Try harder to draw the focus rectangle with an
+	appropriate contrast.  Do not resize a stretachable column in
+	widthChanged(). Fixed selecting when auto scrolling.
+
+- QLocalFs
+	The network protocol for local file systems sets sets the
+	right permissions for the QUrlInfo objects if you do a
+	QUrlOperator::listChildren().
+
+- QMainWindow
+	Fixed orientation handler calls.
+
+- QMenuBar
+	Fixed resizing when it was emptied. Caused some strange
+	problems in QMainWindow widgets. Allow stealing of focus in
+	alt-mode. Activate alt-mode only with the plain Alt key, not
+	AltGr.
+
+- QMimeSourceFactory
+	Windows only: If a path starts with \\ then it's an absolute
+	path pointing to a network drive
+
+- QMovie
+	For animated GIFs, use a minimum delay of 10ms. This is
+	compatible with both IE and Mozilla and avoids huge loads on
+	application and X-Server.
+
+-QPainter
+	Fixed pos() in combination with transformations save/restore
+	pairs. Fixed a bug in the BiDi algorithm.
+	X11 only: some problems when drawing rotated text on Solaris
+	fix (due to floating point arithmetrics). Fixed a matrix
+	related crash on Tru64.
+	Windows only: Draw end pixel in lineTo only for 0-width
+	pens. Avoid painting with invalid transformations.
+
+- QPaintDeviceMetrics
+	Windows only: Fixed numColors() for 32 bit displays.
+
+- QPixmap
+	Windodws only: Fixed array bounds read error in win32
+	function in convertFromImage.
+
+- QPopupMenu
+	Avoid flickering when showing a just created menu
+	immediately. If there is a custom QWhatsThis installed for the
+	whole menu but no whatsThis set for the item, use the custom
+	QWhatsThis to get the help text.
+	MacOS only: improved scrollable popups
+
+- QPrintDialog
+	Unix only: Continue parsing the nsswitch.conf file using
+	additional services when /etc/printers.conf is not found.
+	Windows only: Handle lack of default printers more
+	gracefully. Fix reentrancy issues when reading printer dialog
+	settings.
+
+- QPrinter
+	Unix only: Fixes for 64 bit safety.
+	Windows only: fixed a possible double-freeing of memory of a
+	hdc passed to the Windows Common Dialog.
+
+- QProcess
+	Windows only: Less command quoting for clients that use
+	GetCommandLine() directly. Make tryTerminate() robust in case
+	the process does not run. Make it possible to start batch
+	files with spaces in the filename. Make it safe to call
+	qApp->processEvents() in a slot connected to
+	QProcess::readyReadStdout().
+
+- QPSPrinter
+	Fixed codec for korean postscript fonts (ksc5601.1987-0, not
+	the listbox. Don't auto-complete when saving a fileeucKR).
+
+- QRichText
+	Fixed a case-sensitive compare for alignment. Fixed a free'd
+	memory access problem with floating items on destruction.
+
+- QScrollView
+	If a contents mouse event is accepted, don't propagate as
+	a normal mouse event.
+
+- QSemaphore
+	Fixed race condition in operator -=.
+	Unix only: a bit more robust.
+
+- QSettings
+	Unix only: Fixed requesting subkeylists for single
+	subkeys. Don't read in QSettings stuff in non-gui mode if
+	desktop-settings-aware is set to false.
+
+- QSlider
+	Emit sliderMoved() after the slider was moved.
+
+- QSocket
+	If the read retruns 0, safely assume assume that the peer
+	closed the connection. Fixed readyRead sometimes not being
+	emitted.
+
+- QSpinBox
+	Fixed setValue so it will ignore input but yet
+	not interpreted text
+
+- QSqlDatabase
+	Fixed a crash on manual deletion of the QApplication object.
+
+- QSqlDriver
+	Various fixes and improvements for Oracle, Postgres, MySQL
+
+- QSqlForm
+	Fixed crash in clearValues() on empty fields.
+
+- QString
+	Fixed setNum(n,base) with n == LONG_MIN and n != 10. Make
+	toLong() and toULong() 64bit clean (problems on Tru64).
+
+- QStyle
+	Make more use of Style_HasFocus. Enforce a usable size for
+	subcontrols for small scrollbars. Improve titlebar drawing
+	(e.g. no gradient on 95/NT). Allow drawing of list view
+	expand controls without branches .
+	In Windows style: increase default PM_MaximumDragDistance
+	value.
+	Windows only: fixed PM_ScrollBarExtent
+
+- QStyleSheet
+	More accurate mightBeRichText() heuristic. Fixed setMargin()
+	to only set left/right/top/bottom as documented, not the
+	firstline margin.
+
+- QSvgDevice
+	Fixed curve command mixup. Some bounding rect fixes. Fixed
+	output coordinates for drawArc, drawPie and drawChord. Proper
+	x-axis-rotation and other angle fixes for arcs, pies and
+	chords. Respect text alignments. No background for Bezier
+	the listbox. Don't auto-complete when saving a filecurves.
+
+- QTabBar
+	Move focus to the current tab if the tab with focus is being
+	removed.
+
+- QTable
+	Fixed contentsContextMenuEvent(). Fixed
+	adjustRow()/adjustColumn() for multi line sections. Support
+	for QApplicaton::globalStrut(). Speed improvements for
+	setNumRows(). Improved sizeHint() to include the left/top
+	header. Fix for mouse release handling. Update geometry of
+	cell widgets when changing rowHeight/colWidth. Fixed
+	QTableItem::sizeHint() for items with wordwrap. Catch
+	hideColumn() on tables with too few columns. Fixed an endless
+	recursion when swapping header sections.
+
+- QTableItem
+	Fixed multiple calls to setSpan().
+
+- QTextCodec:
+	Initialize locale before loading textcodec plugins. Fixed a
+	bug in the unicode -> jisx0208 conversion table.
+
+- QTextEdit	
+	Reset cursor on undos that leave us with an empty
+	textedit. Quote quotes when exporting rich text. Fixed
+	possible crash when appending empty paragraphs like
+	"<p>". Some drawing problems fixed. Made removeParagraph() and
+	friends work in read-only mode. Fixed cursor blinking with
+	setEnabled() / setDisabled(). When exporting HTML, quote the
+	src attribute of img tags tags that contains spaces. Made 
+	setFormat() much faster in case undo/redo is disabled. Fixed
+	double deletion crash when clearing a document with floating
+	custom items.
+
+- QToolButton
+	In sizeHint() don't reserve space for icons if button has
+	only a textlabel. Made popups more robust (e.g. if the slot
+	connected to the popup menu results in the destruction of the
+	toolbutton)
+
+- QVariant
+	Fixed canCast() for Bool -> String conversion. Fixed
+	operator== for maps.
+
+- QWaitCondition
+	Windows only: Fixed multiple waits()
+
+- QWheelEvent
+	X11 only: Support for two-wheel mice. This relies on the
+	X-Server option "ZAxisMapping" "4 5 6 7"
+	On Windows, we have not found a reliable way to distringuish
+	the two wheels. Some drivers use larger deltas, something that
+	breaks with other drivers.
+
+- QWidget
+	Make focusWidget() return the focus widget even if it has no
+	focus policy. In setEnabled(FALSE) always clear the focus.
+	Made grabWidget() more robust. Fixed isEnabledTo().
+	X11 only: set WM_WINDOW_ROLE instead of WINDOW_ROLE.
+	Windows only: fixed widget-origin pixmap backgrounds.
+
+- QWidgetStack
+	More fixes to reduce flicker.
+
+- QWorkspace
+	Traditional activeWindow() fixes. Make maximizing a window while
+	the workspace is invisible work. If the already active window
+	is clicked on, transfer focus to the child. Restore focus to
+	old subcontrol when changing the active MDI window. Make sure
+	a MDI window is not resized below a child widget's minimum
+	size. Do not allow resizing windows when we have an active
+	popup window.
+
+- QXmlSimpleReader
+	Fixed a memory leak for incremental parsing.
diff --git a/dist/changes-3.1.0 b/dist/changes-3.1.0
new file mode 100644
index 0000000..f080946
--- /dev/null
+++ b/dist/changes-3.1.0
@@ -0,0 +1,334 @@
+Qt 3.1 introduces many significant new features and many improvements
+over the 3.0.x series. This file provides an overview of the main
+changes since version 3.0.x. For further details see the online
+documentation which is included in this distribution, and also
+available at http://doc.trolltech.com/.
+
+The Qt version 3.1 series is binary compatible with the 3.0.x series:
+applications compiled for 3.0 will continue to run with 3.1.
+
+
+****************************************************************************
+*                                 General                                  *
+****************************************************************************
+
+Qt Script for Applications
+--------------------------
+Qt 3.1 is the first Qt release that can be used with Qt Script for
+Applications (QSA). QSA provides a scripting engine, an IDE for
+creating and editing scripts and script forms, and bindings to the Qt
+API. Script-enabling a Qt application is not difficult and the IDE
+makes it easy for resellers and end-users to write their own scripts.
+QSA is due for release after Qt 3.1.
+
+
+Qt Designer
+-----------
+Qt Designer, the visual GUI builder, has undergone several usability
+improvements. A new dialog for creating and editing signals and slots
+connections has been created: it is much easier to use and much faster
+for setting up multiple connections. The widgets are now presented in
+an easy-to-use toolbox rather than in toolbars (although you can still
+have the toolbars if you want). The property editor now handles common
+properties in multiple widgets simultaneously. By popular demand,
+WYSIWYG support for QWidgetStack has been added. Rich text is now
+supported with a rich text editor. And the code editor can be used for
+ordinary member functions as well as for slots.
+
+
+Qt Assistant
+------------
+Qt Assistant, the Qt documentation browser, can now be used with
+custom documentation sets. This new functionality combined with the
+new QAssistantClient class means that you can use Qt Assistant as a
+help browser for your own applications. Qt Assistant has also been
+enhanced by the addition of a fast full text search engine.
+
+
+Motif
+-----
+The general industry-wide move away from Motif is leaving more and
+more companies in need of a migration solution. But converting large
+legacy applications in one step is often impractical. To minimize
+risks and to manage the workload companies often want to port code on
+a module by module basis. Qt 3.1 includeds a completely new Motif
+module that supports hybrid applications in which Qt code and Motif
+code coexist. (This obsoletes the earlier rudimentary Qt Xt/Motif
+extension.)
+
+
+ActiveX
+-------
+With the release of Qt 3.1, customers who use Qt for Microsoft Windows
+development can now use Qt with ActiveX. The new ActiveQt module
+provides a simple API for COM and ActiveX. The module can be used to
+create applications which host ActiveX controls, and also to create
+applications that serve ActiveX controls (e.g. Internet Explorer
+plugins).
+
+
+Qt/Mac
+------
+The introduction of Qt/Mac, a Mac OS X port of Qt, with Qt 3.0 has
+proved a great success. This port has undergone many improvements in
+Qt 3.1, especially with respect to Appearance Manager, anti-aliased
+text and user settings. The Qt OpenGL support is greatly improved, and
+uses the hardware-accelerated drivers.
+
+
+Qt/Embedded
+-----------
+Graphics, mouse and keyboard drivers can now be compiled as plugins.
+
+
+Qt library
+----------
+In addition to the new additions and enhancements referred to above,
+as with all major Qt releases, Qt 3.1 includes hundreds of
+improvements in the existing class library. Here is a brief summary of
+the most significant changes:
+
+- QTextEdit has a new text format: LogText. This is a performance and
+  memory optimized format especially designed for the fast display of
+  large amounts of text. The format supports basic highlighting,
+  including bold and colored text.
+
+- The new QSyntaxHighlighter class makes it both easy and efficient to
+  add syntax highlighting capabilities to a QTextEdit.
+
+- QHttp and QFtp in earlier Qt's were implementations of the
+  QNetworkProtocol. Both have been extended to stand in their own
+  right. If you missed some flexibility in the network protocol
+  abstractions of earlier Qt's, the new QHttp and QFtp classes should
+  provide the solution.
+
+- QAccel, used to handle keyboard shortcuts, now gracefully copes with
+  shortcut clashes. If a clash occurs, a new signal,
+  activatedAmbiguously(), is emitted. Classes that use QAccel, like
+  QButton's subclasses and QPopupMenu, make use of this new
+  functionality. Futhermore QAccel can now handle multi-key sequences,
+  for example, Ctrl+X,Ctrl+F.
+
+- QClipboard has been extended to simplify data exchange between
+  programs.
+
+- Thread support: almost all methods in the tools classes have been
+  made reentrant. QApplication::postEvent() and a few other methods
+  are now thread-safe if Qt is compiled as a multi-threaded library.
+  (The documentation now states if a class or function is thread-safe
+  or reentrant.)
+
+- A QMutexLocker class has been added to simplify the locking and
+  unlocking of mutexes.
+
+- Input methods: A selectionLength() function has been added to
+  QIMEvent. Japanese compositions are now handled correctly. Support
+  for AIMM based input methods (those working on non-Asian versions of
+  Win95/98/Me) has been added.
+
+- Large File support: Qt's internals have been modified to support
+  Large Files (> 2GB). QFileDialog will now correctly display and
+  select large files.
+
+- SQL module: Support for prepared query execution and value binding
+  has been added. Among other benefits, this makes it possible to
+  write large BLOBs (> 2 KB) to Oracle databases, and to write Unicode
+  strings to SQL Server databases.
+
+- Support for XIM on Solaris.
+
+Build process
+-------------
+The build process has been improved:
+
+- The configure script does not need QTDIR to be set anymore.
+
+- Improved support for building Qt on MSVC.NET.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAccel:
+	Corrected illegal accelerator state when using multiple
+	keysequences. (Resulted in no accelerator being triggered when
+	there's a partial match). Only triggers on enabled
+	accelerators and their enabled items. Eats all keys in a
+	keysequence, not just the first and last.
+
+- QCString:
+	Speed-optimized replace().
+
+- QDataStream:
+	Applies to printable data streams only: If the version number
+	of the device is less than 4, use the same streaming format
+	that was used in Qt 2.3 and earlier.
+
+- QDataTable:
+	Respect read-only columns. Make it possible to swap columns.
+
+- QDockWindow:
+	Added a standard widget constructor (taking a QWidget *parent,
+	const char *name and WFlags). Improved docking behavior.
+
+- QFileDialog:
+	Windows only: make Qt's filedialog work properly with network
+	paths.
+
+- QFontMetrics:
+	Windows only: Fixed QFontMetrics::boundingRect( QChar c ) to
+	work for non-TrueType fonts.
+
+- QHeader:
+	Optimized the sectionSizeHint() calculation, which in turn 
+	speeds up all QHeader size/label calculations.
+
+- QIconFactory:
+	Avoid infinite loops when recursively calling
+	QPixmap::pixmap().
+
+- QIconView:
+	Fixed navigation and selection with arrow keys. Some speedups
+	when repainting.
+
+- QKeySequence:
+	Treat Unicode characters in string defined sequences
+	correctly. So, now letters like �, � and � should work as
+	accelerators, even through translation files.
+
+- QLayout:
+	alignmentRect() respects the layout's maximum size.
+
+- QLineEdit:
+	Added a lostFocus() signal. Double-clicking only uses spaces
+	as word bounderies for the selection now, not dots, commas,
+	etc. Support double-click+mousemove selection.
+
+- QListBox:
+	Fixed the item which is passed into the contextMenuRequested()
+	signal (this was sometimes wrong). Don't select items that are
+	not selectable.
+
+- QListView:
+	Shift selection in Extended mode now follows Windows
+	Shift-selection standard. Erase empty area when drawing
+	listviews without columns. Only drops on drop-enabled items
+	that accept drops.
+
+- QListViewItem:
+	Optimized size claculation for multi-line items.
+
+- QMainWindow:
+	Base the minimumSizeHint() on the sizeHint()s of the left hand
+	dock area (instead of the minimumSize()).
+
+- QMenuBar:
+	Fixed broken Alt release detection. Fixed flickering. Fixed
+	empty menubars resizing properly.
+
+- QObject:
+	Fixed return value of disconnect(). Fixed disconnect()ing
+	SIGNALs from SIGNALs and disconnect()ing multiple SLOTs with
+	the same name from a SIGNAL.
+
+- QProcess:
+	Unix only: Don't eat the file descriptors if a lot of
+	processes (with short runtimes) are started immediately after
+	each other.
+
+- QPSQLDriver:
+	Make the driver compile with the standard PostgreSQL source
+	distribution under Windows. Better handling of network,
+	datetime and geometrical datatypes.
+
+- QRegion:
+	Fixed setRects() to calculate the bounding rectangle
+	correctly.
+
+- QScrollView:
+	Doesn't reposition the view when the user is scrolling the
+	view.
+
+- QSpinBox:
+	Fixed setValue() so that any not-yet-interpreted input is
+	ignored when setting a new value.
+
+- QString:
+	Support QTextCodec::codecForCStrings(). Support
+	std::string<==>QString conversion when STL support is on.
+
+- QSyntaxHighlighter:
+	Added function rehighlight(). Improved internals to be more
+	efficient (less calls to highlightParagraph() necessary).
+
+- QTable:
+	Fixed Tab/BackTab handling to always work. Fixed
+	setColumnLabels() and setRowLabels().
+
+- QTableItem (and subclasses):
+	Now supports global struts. (See QApplication::globalStrut().)
+
+- QTDSDriver:
+	Added support for binary datatypes.
+
+- QTextCodec:
+	Added QTextCodec::codecForCStrings and QTextCodec::codecForTr.
+
+- QTextEdit:
+	Fixed a painting error which resulted in areas of the textedit
+	not being erased correctly. Make sure repainting is done after
+	changing the underline-links setting. Renamed 'allowTabs'
+	property to 'tabChangesFocus' (inverted value). Added a new
+	property 'autoFormatting'. When exporting HTML also quote
+	quotes. Fixed a background erasing bug which messed up the
+	view.
+
+- QUrl:
+	Recognize Windows drive letters not only in the form of "c:/"
+	but also in the form "c:" (without the '/').
+
+- QWidget:
+	Fixed some visibility issues.
+
+****************************************************************************
+*			   Qt Designer					   *
+****************************************************************************
+
+- Now displays the classname of "gray box" custom widgets in the gray
+  box on the form.
+
+- Accept tildes (~) in the project settings.
+
+- A new command line tool conv2ui (in qt/tools/designer/tools) has
+  been added, to convert dialog description files from different file
+  formats to .ui files without the need to invoke Qt Designer. This
+  tool uses the same plugins as Qt Designer for loading other dialog
+  description files.
+
+- An import filter for .kdevdlg files has been added.
+
+- Actions in the action editor are now sortable.
+
+- Improved usability of more dialogs (in-place renaming, drag'n'drop,
+  etc.)
+
+- Preserve creation order of forward declarations, variables, etc.
+
+- Save comments for actions.
+
+- uic: Fixed generating code for QStringList properties.
+
+****************************************************************************
+*			   Qt Assistant					   *
+****************************************************************************
+
+- Fixed some accelerator conflicts.
+
+****************************************************************************
+*			   Qt Linguist					   *
+****************************************************************************
+
+- Handle trailing backslash in strings correctly in lupdate.
+
+******************************** END ***************************************
diff --git a/dist/changes-3.1.0-b1 b/dist/changes-3.1.0-b1
new file mode 100644
index 0000000..527992f
--- /dev/null
+++ b/dist/changes-3.1.0-b1
@@ -0,0 +1,692 @@
+Qt 3.1 introduces many significant new features and many improvements
+over the 3.0.x series. This file provides an overview of the main
+changes since version 3.0.5. For further details see the online
+documentation which is included in this distribution, and also
+available at http://doc.trolltech.com/.
+
+The Qt version 3.1 series is binary compatible with the 3.0.x series:
+applications compiled for 3.0 will continue to run with 3.1.
+
+
+****************************************************************************
+*                                 General                                  *
+****************************************************************************
+
+Qt Script for Applications
+--------------------------
+Qt 3.1 is the first Qt release that can be used with Qt Script for
+Applications (QSA). QSA provides a scripting engine, an IDE for
+creating and editing scripts and script forms, and bindings to the Qt
+API. Script-enabling a Qt application is not difficult and the IDE
+makes it easy for resellers and end-users to write their own scripts.
+QSA is due for release after Qt 3.1.
+
+
+Qt Designer
+-----------
+Qt Designer, the visual GUI builder, has undergone several usability
+improvements. A new dialog for creating and editing signals and slots
+connections has been created: it is much easier to use and much faster
+for setting up multiple connections. The widgets are now presented in
+an easy-to-use toolbox rather than in toolbars (although you can still
+have the toolbars if you want). The property editor now handles common
+properties in multiple widgets simultaneously. By popular demand,
+WYSIWYG support for QWidgetStack has been added. Rich text is now
+supported with a rich text editor. And the code editor can be used for
+ordinary member functions as well as for slots.
+
+
+Qt Assistant
+------------
+Qt Assistant, the Qt documentation browser, can now be used with
+custom documentation sets. This new functionality combined with the
+new QAssistantClient class means that you can use Qt Assistant as a
+help browser for your own applications. Qt Assistant has also been
+enhanced by the addition of a fast full text search engine.
+
+
+Motif
+-----
+The general industry-wide move away from Motif is leaving more and
+more companies in need of a migration solution. But converting large
+legacy applications in one step is often impractical. To minimize
+risks and to manage the workload companies often want to port code on
+a module by module basis. Qt 3.1 includeds a completely new Motif
+module that supports hybrid applications in which Qt code and Motif
+code coexist. (This obsoletes the earlier rudimentary Qt Xt/Motif
+extension.)
+
+
+ActiveX
+-------
+With the release of Qt 3.1, customers who use Qt for Microsoft Windows
+development can now use Qt with ActiveX. The new ActiveQt module
+provides a simple API for COM and ActiveX. The module can be used to
+create applications which host ActiveX controls, and also to create
+applications that serve ActiveX controls (e.g. Internet Explorer
+plugins).
+
+
+Qt/Mac
+------
+The introduction of Qt/Mac, a Mac OS X port of Qt, with Qt 3.0 has
+proved a great success. This port has undergone many improvements in
+Qt 3.1, especially with respect to Appearance Manager, anti-aliased
+text and user settings. The Qt OpenGL support is greatly improved, and
+uses the hardware-accelerated drivers.
+
+
+Qt/Embedded
+-----------
+Graphics, mouse and keyboard drivers can now be compiled as plugins.
+
+
+Qt library
+----------
+In addition to the new additions and enhancements referred to above,
+as with all major Qt releases, Qt 3.1 includes hundreds of
+improvements in the existing class library. Here is a brief summary of
+the most significant changes:
+
+- QTextEdit has a new text format: LogText. This is a performance and
+  memory optimized format especially designed for the fast display of
+  large amounts of text. The format supports basic highlighting,
+  including bold and colored text.
+
+- The new QSyntaxHighlighter class makes it both easy and efficient to
+  add syntax highlighting capabilities to a QTextEdit.
+
+- QHttp and QFtp in earlier Qt's were implementations of the
+  QNetworkProtocol. Both have been extended to stand in their own
+  right. If you missed some flexibility in the network protocol
+  abstractions of earlier Qt's, the new QHttp and QFtp classes should
+  provide the solution.
+
+- QAccel, used to handle keyboard shortcuts, now gracefully copes with
+  shortcut clashes. If a clash occurs, a new signal,
+  activatedAmbiguously(), is emitted. Classes that use QAccel, like
+  QButton and QPopupMenu, make use of this new functionality.
+  Futhermore QAccel can now handle multi-key sequences, for example,
+  Ctrl+X,Ctrl+F.
+
+- QClipboard has been extended to simplify data exchange between
+  programs.
+
+- Thread support: almost all methods in the tools classes have been
+  made reentrant. QApplication::postEvent() and a few other methods
+  are now thread-safe if Qt is compiled as a multi-threaded library.
+  (The documentation now states if a class or function is thread-safe
+  or reentrant.)
+
+- A QMutexLocker class has been added to simplify the locking and
+  unlocking of mutexes.
+
+- Input methods: A selectionLength() function has been added to
+  QIMEvent. Japanese compositions are now handled correctly. Support
+  for AIMM based input methods (those working on non-Asian versions of
+  Win95/98/Me) has been added.
+
+- Large File support: Qt's internals have been modified to support
+  Large Files (> 2GB). QFileDialog will now correctly display and
+  select Large Files.
+
+- SQL module: Support for prepared query execution and value binding
+  has been added. Among other benefits, this makes it possible to
+  write large BLOBs (> 2 KB) to Oracle databases, and to write Unicode
+  strings to SQL Server databases.
+
+
+Build process
+-------------
+The build process has been improved:
+
+- The configure script does not need QTDIR to be set anymore.
+
+
+****************************************************************************
+*                                 Library                                  *
+****************************************************************************
+
+New classes
+==================
+
+- QBackInsertIterator
+- QEventLoop
+- QIconFactory
+- QMutexLocker
+- QSyntaxHighlighter
+
+
+QAction
+------------------
+New functions:
+	void setVisible( bool )
+	bool isVisible() const
+
+
+QCanvas
+------------------
+New functions:
+	void invalidate()
+	bool isValid() const
+
+
+QColorDialog
+------------------
+New functions:
+	static void setStandardColor( int, QRgb )
+
+
+QAccel
+------------------
+New signals:
+	void activatedAmbiguously( int id )
+
+
+QApplication
+------------------
+The event loop has been moved to the QEventLoop class, making it
+easier to integrate other toolkits with Qt.
+
+New functions:
+	QEventLoop *eventLoop() const
+	void setEventLoop( QEventLoop * )
+	QString sessionKey() const
+
+
+QClipboard
+------------------
+New functions:
+	void clear( Mode mode )
+	bool supportsSelection() const
+	bool ownsSelection() const
+	bool ownsClipboard() const
+	QString text( Mode mode )  const
+	QString text( QCString& subtype, Mode mode ) const
+	void setText( const QString &, Mode mode )
+	QMimeSource *data( Mode mode ) const
+	void setData( QMimeSource*, Mode mode )
+	QImage image( Mode mode ) const
+	QPixmap pixmap( Mode mode ) const
+	void setImage( const QImage &, Mode mode )
+	void setPixmap( const QPixmap &, Mode mode )
+
+
+QDesktopWidget
+------------------
+New functions:
+	const QRect& screenGeometry( QWidget *widget ) const
+	const QRect& screenGeometry( const QPoint &point ) const
+	const QRect& availableGeometry( int screen ) const
+	const QRect& availableGeometry( QWidget *widget ) const
+	const QRect& availableGeometry( const QPoint &point ) const
+
+
+QFileDialog
+------------------
+Large Files (> 2GB) are now correctly displayed and selected.
+
+
+QFileInfo
+------------------
+QFileInfo now supports Large Files (> 2GB) internally. To maintain
+binary compatibility the QFileInfo API cannot be adapted before Qt 4
+and will truncate file sizes and offsets to 4 GB.
+
+New functions:
+	bool isHidden() const
+
+
+QFile
+------------------
+QFile now supports Large Files (> 2GB) internally. To maintain binary
+compatibility the QFile API cannot be adapted before Qt 4 and will
+truncate file sizes and offsets to 4 GB.
+
+
+QDir
+------------------
+QDir now supports Large Files (> 2GB).
+
+
+QImEvent
+------------------
+New functions:
+	in selectionLength() const
+
+
+QIconSet
+------------------
+New functions:
+	void installIconFactory( QIconFactory *factory )
+
+
+QImage
+------------------
+New functions:
+	static QImage fromMimeSource( const QString& abs_name )
+
+
+QMetaObject
+------------------
+New functions:
+	QStrList enumeratorNames( bool super ) const
+	int numEnumerators( bool super ) const
+	static bool hasMetaObject( const char *class_name )
+
+
+QMenuData
+------------------
+New functions:
+	bool isItemVisible( int id ) const
+	void setItemVisible( int id, bool visible )
+Both functions are inherited by QMenuBar and QPopupMenu
+
+
+QPaintDevice
+------------------
+New functions (x11 only):
+	static Qt::HANDLE x11AppRootWindow()
+	static int x11AppDepth( int screen )
+	static int x11AppCells( int screen )
+	static Qt::HANDLE x11AppRootWindow( int screen )
+	static Qt::HANDLE x11AppColormap( int screen )
+	static void *x11AppVisual( int screen )
+	static bool x11AppDefaultColormap( int screen )
+	static bool x11AppDefaultVisual( int screen )
+	static int x11AppDpiX( int )
+	static int x11AppDpiY( int )
+	static void x11SetAppDpiX( int, int )
+	static void x11SetAppDpiY( int, int )
+
+
+QPicture
+------------------
+New functions:
+	void setBoundingRect( const QRect &r )
+
+
+QPixmap
+------------------
+New functions:
+	bool hasAlpha() const
+	static QPixmap fromMimeSource( const QString& abs_name )
+
+
+QPrinter
+------------------
+New functions:
+	void setMargins( uint top, uint left, uint bottom, uint right )
+	void margins( uint *top, uint *left, uint *bottom, uint *right ) const
+
+Improvements:
+	Handle masked images and pixmaps correctly. Add code to handle
+	asymmetrical printer margins correctly.
+
+
+QSessionManager
+------------------
+New functions:
+	QString sessionKey() const
+
+
+QStyleOption
+------------------
+New functions:
+	QStyleOption( QCheckListItem* i )
+	QCheckListItem* checkListItem() const
+
+New enums values:
+	PE_CheckListController, PE_CheckListIndicator,
+	    PE_CheckListExclusiveIndicator, PE_PanelGroupBox
+	CE_MenuBarEmptyArea
+	CE_DockWindowEmptyArea
+	PM_CheckListButtonSize
+	CT_TabBarTab, CT_Slider, CT_Header, CT_LineEdit
+	SH_GroupBox_TextLabelVerticalAlignment
+
+
+QThread
+------------------
+New functions:
+	void terminate()
+
+
+QTranslator
+------------------
+New functions:
+	bool load( const uchar *data, int len )
+
+
+QVariant
+------------------
+New functions:
+	QVariant( const QPen& )
+	const QPen toPen() const
+	QPen& asPen()
+	bool isNull() const
+
+New enum values:
+	KeySequence, Pen
+
+
+QWidget
+------------------
+All top-level widgets will now try to find an appropriate application
+icon when they're not given one, trying in this order
+ 1. Parent widget's icon
+ 2. Top-level widget's icon
+ 3. Application main widget's icon
+
+New functions:
+	bool isFullScreen() const
+	void setSizePolicy( QSizePolicy::SizeType hor, QSizePolicy::SizeType ver, bool hfw = FALSE )
+
+New enum values:
+	AncestorOrigin
+
+
+QWMatrix
+------------------
+Two different transformation modes for painter transformations are now
+available. See the QWMatrix documentation for details.
+
+New functions:
+	QPointArray mapToPolygon( const QRect &r ) const
+	double det() const
+	static void setTransformationMode( QWMatrix::TransformationMode m )
+	static TransformationMode transformationMode()
+
+New enums:
+	TransformationMode { Points, Areas }
+
+
+QFtp
+------------------
+While still remaining a subclass of QNetworkProtocol, QFtp can be now
+used directly for more advanced FTP operations. The QFtp documentation
+provides details of the extensions to the API.
+
+
+QHttp
+------------------
+While still remaining a subclass of QNetworkProtocol, QHttp can be now
+used directly for more advanced HTTP operations. The QHttp
+documentation provides details of the extensions to the API.
+ 
+Related new classes:
+	QHttpHeader
+	QHttpResponseHeader
+	QHttpRequestHeader
+
+
+QSqlDriver
+------------------
+New enum values:
+	Unicode, PreparedQueries, OracleBindingStyle, ODBCBindingStyle
+	
+
+QSqlQuery
+------------------
+New functions:
+	bool isForwardOnly() const
+	void setForwardOnly( bool forward )
+	bool exec()
+	bool prepare( const QString& query )
+	void bindValue( const QString& placeholder, const QVariant& val )
+	void bindValue( int pos, const QVariant& val )
+	void addBindValue( const QVariant& val )
+
+
+QTableSelection
+------------------
+New functions:
+	QTableSelection( int start_row, int start_col, int end_row, int end_col )
+
+
+QTable
+------------------
+New properties:
+	int numSelections
+
+New functions:
+	void selectCells( int start_row, int start_col, int end_row, int end_col )
+	void selectRow( int row )
+	void selectColumn( int col )
+	void updateHeaderStates()
+	void setRowLabels( const QStringList &labels )
+	void setColumnLabels( const QStringList &labels )
+
+
+QCString
+------------------
+New functions:
+    	QCString &replace( char c, const char *after )
+    	QCString &replace( const char *, const char * )
+    	QCString &replace( char, char )
+
+New global functions:
+	QByteArray qCompress( const uchar* data, int nbytes )
+	QByteArray qUncompress( const uchar* data, int nbytes )
+	QByteArray qCompress( const QByteArray& data )
+	QByteArray qUncompress( const QByteArray& data )
+Improvements:
+	Speed optimisations in lots of the old search and replace
+	functions.
+
+
+QDate
+------------------
+New functions:
+	int weekNumber( int *yearNum = 0 ) const
+	static QDate currentDate( Qt::DateTimeSpec )
+
+
+QTime
+------------------
+New functions:
+	static QTime currentTime( Qt::DateTimeSpec )
+
+
+QDateTime
+------------------
+New functions:
+	static QDateTime currentDateTime( Qt::DateTimeSpec )
+
+
+QPtrList
+------------------
+New functions:
+	bool replace( uint i, const type *d )
+
+
+QRegExp
+------------------
+New functions:
+	QString errorString()
+	static QString escape( const QString& str )
+	int numCaptures() const
+
+
+QSettings
+------------------
+New functions:
+	QSettings( Format format )
+	void setPath( const QString &domain, const QString &product, Scope = User )
+	void beginGroup( const QString &group )
+	void endGroup()
+	void resetGroup()
+	QString group() const
+
+New enums:
+	Format { Native = 0, Ini }
+	Scope { User, Global }
+
+
+QChar
+------------------
+Updated Unicode tables to Unicode-3.2
+
+
+QString
+------------------
+New functions:
+	QString &append( const QByteArray & )
+	QString &append( const char * )
+	QString &prepend( const QByteArray & )
+	QString &prepend( const char * )
+	QString &remove( QChar c )
+	QString &remove( char c )
+	QString &remove( const QString & )
+	QString &remove( const QRegExp & )
+	QString &remove( const char * )
+	QString &replace( uint index, uint len, QChar )
+	QString &replace( uint index, uint len, char c )
+	QString &replace( QChar c, const QString & )
+	QString &replace( char c, const QString & after )
+	QString &replace( const QString &, const QString & )
+	QString &replace( QChar, QChar )
+	QString &operator+=( const QByteArray &str )
+	QString &operator+=( const char *str )
+	static QString fromUcs2( const unsigned short *ucs2 )
+	const unsigned short *ucs2() const
+
+Improvements:
+	find(), findRev() and contains() use either a fast hashing
+	algorithm (for short strings) or an optimized Boyer-Moore
+	implementation for long strings. Lots of smaller performance
+	optimisations.
+
+
+QTextStream
+------------------
+New functions:
+	QTextCodec *codec()
+
+
+QTimeEdit
+------------------
+New properties:
+	Display display
+
+New functions:
+	uint display() const
+	void setDisplay( uint )
+
+New enums:
+	Display { Hours, Minutes, Seconds, AMPM }
+
+
+QFrame
+------------------
+New enum values:
+	GroupBoxPanel
+
+
+QGroupBox
+------------------
+New properties:
+	bool flat
+
+New functions:
+	bool isFlat() const
+	void setFlat( bool b )
+
+
+QListBox
+------------------
+New functions:
+	QListBoxItem* selectedItem() const
+
+
+QListView
+------------------
+New functions:
+	int sortColumn() const
+
+
+QSlider
+------------------
+New functions:
+	void addLine() ( as slot)
+	void subtractLine() (as slot)
+
+
+QTextBrowser
+------------------
+New functions:
+	void sourceChanged( const QString& )
+	void anchorClicked( const QString&, const QString& )
+
+
+QTextEdit
+------------------
+QTextEdit offers another TextFormat (LogText), which is optimized
+(speed and memory) for displaying large read-only texts normally used
+for logging.
+
+New properties:
+	bool allowTabs
+
+New functions:
+	QString anchorAt( const QPoint& pos, AnchorAttribute a )
+	void setAllowTabs( bool b )
+	bool allowTabs() const
+	void insert( const QString &text, uint insertionFlags = CheckNewLines | RemoveSelected )
+
+New signals:
+	void clicked( int parag, int index )
+	void doubleClicked( int parag, int index )
+
+New enums:
+	TextInsertionFlags { RedoIndentation, CheckNewLines, RemoveSelected }
+
+New enum values:
+	AtWordOrDocumentBoundary
+
+
+QToolButton
+------------------
+New properties:
+	TextPosition textPosition
+
+New functions:
+	TextPosition textPosition() const
+	void setTextPosition( TextPosition pos )
+
+New enums:
+	TextPosition { Right, Under }
+
+
+QTooltip
+------------------
+New functions:
+	static void setWakeUpDelay( int )
+
+
+QWhatsThis
+------------------
+New functions:
+	static void setFont( const QFont &font )
+
+
+QDomDocument
+------------------
+New functions:
+	QString toString( int ) const
+	QCString toCString( int ) const
+
+
+QFont on X11 
+------------------ 
+Improvements:
+	Safe handling of huge font sizes. Added support for the new
+	Xft2 font library on XFree-4.x.
+
+
+QRegion on X11 
+------------------ 
+Improvements:
+	Removed the 16 bit size limitation
+
+****************************************************************************
diff --git a/dist/changes-3.1.0-b2 b/dist/changes-3.1.0-b2
new file mode 100644
index 0000000..f5c8c14
--- /dev/null
+++ b/dist/changes-3.1.0-b2
@@ -0,0 +1,220 @@
+Qt 3.1 introduces many significant new features and many improvements
+over the 3.0.x series. For an overview of the main changes between
+3.0.x and 3.1, look at the changes-3.1.0-b1 file. This file describes
+the changes between Qt 3.1 beta1 and Qt 3.1 beta2.
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+The binary incompatibilities that were introduced in Qt 3.1 beta1
+have been fixed.
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAction
+	Don't update when nothing has changed.
+
+- QActionGroup
+	Syncronize comboboxes correctly for groups with
+	separators. Set the initial currentItem of comboboxes to the
+	action that is on when adding the group. Emit activated signal
+	for non-toggle actions selected from a combobox. Apply the
+	state of the action group for new widgets.
+
+- QApplication
+	Correctly set the accept() flag on accel events. Obsoleted
+	processOneEvent(), we have a better way for integrating
+	eventloops now. (See QEventLoop's documentation.)
+	Windows only: reserve more space for very long application
+	filenames.
+
+- QCheckTableItem
+	Use the colorgroup passed in for the background color and not
+	the viewport's.
+
+- QColor
+	Windows only: Fix palette allocation and ManyColor mode on
+	Windows.
+
+- QComboBox
+	Emit activated() signals from the wheel event handler.
+
+- QComboTableItem
+	Make sure stringlist is updated even if setStringList() is
+	called while an editor exists.
+
+- QDataTable
+	Windows only: If edit confirmation was switched on and
+	the user cancelled an update by clicking in a different field,
+	the current row was needlessly changed.
+
+- QDateTimeEdit/QTimeEdit
+	Now supports wraparound for time editing.
+	
+- QDesktopWidget
+	Windows only: Allow explicit creation of QDesktopWidgets.
+
+- QDns
+	Fix a crash when a QDns object is deleted in a slot connected
+	to its resultsReady() signal.
+
+- QDockWindow
+	Windows only: Don't pass window activation around
+	unnecessarily when the activation is ignored anyway. Also
+	fixed repaint errors while dragging dock windows. Remove
+	floating windows from the mainwindow's internal lists when
+	deleting.
+
+- QEventLoop
+	Renamed processNextEvent(flags,bool) to processEvents(flags)
+	and introduced new ProcessEvents flag, WaitForMore. Remove
+	processOneEvent since it is redundant.
+
+- QFileDialog
+	Windows only: Disable NTFS permission lookup during filedialog
+	population. This can take a long time, and the information is
+	not really required.
+
+- QGLContext
+	Added a workaround to get overlays to work on ATi FireGL
+	cards.
+
+- QGLWidget
+	Added support for rendering text into a GL context with the
+	renderText() calls.
+
+- QHeader
+	Draw the sort arrow at the right position with multi-line
+	header labels. Scale the correct sections when the header
+	sections are reordered. Respect orientation() in sizeHint().
+
+- qHeapSort()
+	Fixed to only require operator<, instead of a mix of
+	operator<, <=, and >.
+
+- QIconView
+	Optimize updates on focus/window activation changes.
+
+- QLibrary
+	Windows only: only append ".dll" extension if no extension has
+	been provided.
+
+- QListBox
+	Don't call ensureCurrentVisible() in resizeEvent() unless the
+	current item was visible when you started resizing.
+
+- QListView
+	Don't draw the cell if the cell wouldn't be visible due to
+	having a width or height of 0. Don't call cancelRename() when
+	the rename was OK'd. When showing a tooltip make sure it's
+	only for that column and not for the whole item.
+
+- QMacStyle
+	Many improvements to follow the native style more closely.
+
+- QMainWindow
+	Close all floating dockwindows of the mainwindow in the close
+	event.
+
+- QMenuData
+	Make removeItem(int id) work on trees like the other functions
+	that take IDs as arguments.
+
+- QObject
+	Make sender() a safer function to use:
+	- it cannot be dangling anymore (points to 0 if the sender was
+	  deleted or disconnected)
+	- it maintains its value after other signals have been emitted
+	Fixed compatibility problem in connect(). Remove quadratic
+	behaviour in insertChild()
+
+- QPicture
+	Proper streaming for null pictures.
+
+- QPixmap
+	X11 only: allow grabWindow() to work on a screen other than
+	the default screen.
+
+- QPopupMenu
+	Draw submenu items disabled if the submenu is disabled. Fix
+	null-pointer dereferencing for dynamically changing menus.
+
+- QProcess
+	Windows only: make the tryTerminate() function work for
+	windows applications (it still does not work for
+	consoleapplications, though).
+
+- QSocket
+	Don't crash if the readBlock() returned 0.
+
+- QSplitter
+	addWidget() now reparents the widget if necessary.
+
+- QTable
+	Set the table of the item to the table in insertItem(), so
+	takeItem()/insertItem() can be used to move items between
+	tables.
+
+- QWidget
+	Clear WDestructiveClose before calling deleteLater() on
+	widgets. Event processing during destruction might otherwise
+	have another close event come along, which would issue another
+	deleteLater() call. Added a new function toggleShowHide(bool show).
+	Simplified visible() handling and added a convenience property
+	"shown" and a write function for "hidden". Save WFlags in
+	showFullScreen() and restore them so flags are remembered
+	correctly.
+
+- QWindowsStyle
+	Make the Windowsstyle obey the system's scrollbar widths.
+
+- qUncompress()
+	Don't hang forever if the expected size passed in is 0. Return
+	an empty bytearray if something went wrong instead of garbage
+	data.
+
+
+
+
+****************************************************************************
+*			   Qt Designer					   *
+****************************************************************************
+
+- Improved the look of the Toolbox
+
+- Many small usibility improvements in the special editors for widgets
+  (drag'n'drop, in-place renaming, etc.).
+
+- New icon look.
+
+- Accept class names with "::" and generate correct namespace code in
+  uic.
+
+- Reduced startup time.
+
+- Fixed a crash when loading .ui files using QWidgetFactory.
+
+- Cleaned up some old dialogs and removed obsolete settings.
+
+- Improved the .dlg import plugin.
+
+- Button text properties can be edited in a multi-line editor now,
+  since all buttons support multi-line labels.
+
+****************************************************************************
+*			   Qt Assistant					   *
+****************************************************************************
+
+- Added commandline option -removeContentFile.
+
+- New icon look.
+
+****************************************************************************
+*			   Qt Linguist					   *
+****************************************************************************
+
+- New icon look.
diff --git a/dist/changes-3.1.1 b/dist/changes-3.1.1
new file mode 100644
index 0000000..41a5742
--- /dev/null
+++ b/dist/changes-3.1.1
@@ -0,0 +1,212 @@
+Qt 3.1.1 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.1.0
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+- The build issues with the Professional Edition have been solved.
+
+- The build problems reported on Solaris and HP-UX have been addressed.
+
+- Detection of Xft2 support has been added.
+
+- The installer and reconfigure tools on Windows have been fixed.
+
+- Look'n'Feel improvements have been made in the Qt/Mac version.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAccel
+	Fixed for single key accelerators. Made Shift modifier work
+	for all key combinations, unless an accelerator with Shift is
+	defined.
+
+- QAction
+	Remove iconset when a null-iconset is being set.
+
+- QApplication
+	Don't overwrite explicitly set font with the default font when
+	using the static methods before calling the constructor.
+	X11 only: Support custom color maps on 8-bit visuals.
+
+- QCheckBox
+	Draw focus indicator into indicator if the text label is empty.
+
+- QClipboard
+	X11 only: Null-terminate encoded strings.
+
+- QComboBox
+	Made sure the current item is selected in the list. Call
+	focusIn/OutEvent handlers when the lineedit changes focus.
+
+- QDataTable
+	Update the current cell when selecting rows.
+
+- QDialog
+	Don't find a place for dialogs that have been explicitly
+	moved.
+
+- QDir
+	Improved filtered lookup.
+
+- QDockWindow
+	Emit visibilityChanged signal only if visibility relative to
+	the dock area has changed.
+
+- QEventLoop
+	Implement this API on Windows and Mac.
+
+- QFileDialog
+	Fix visibility of preview widgets. Renaming files now also
+	works in ExistingFiles mode.
+
+- QFont
+	X11 only: Fixed width calculation for undefined characters.
+
+- QFrame
+	Erase the margin region for flicker-optimized subclasses.
+
+- QFtp
+	Don't try to connect multiple times to the server.
+
+- QHttp
+	Fix special case for "Content-Length: 0" transfers.
+
+- IME   (Input Methods)
+	Windows only: Accept the input when the widget loses focus.
+
+- QLibrary
+	Mac only: Implement path searching to look in standard loader places
+	for plugins.
+
+- QLineEdit
+	Draw background pixmap with the correct offset. Fixed
+	undo/redo.
+	Mac only: Support for native navigation and selection with keyboard.
+
+- QListBox
+	Fixed null-pointer crash in QFileDialog.
+
+- QListView
+	Fixed null-pointer crash when reimplementing insertItem.
+
+- QMenuBar
+	Improved focus handling.
+
+- QMime
+	Support URLs on Japanese Win98.
+	Windows only: Support URLs on network drives.
+
+- QOCIDriver
+	Improved handling for datatype mismatches
+
+- QODBCDriver
+	Don't report Unicode support on Win9x/Me. Support
+	high-precision values. Support fetchLast in forward-only
+	databases
+
+- QPainter
+	Make endpixel rendering consistent on all platforms. Draw
+	focus rectangles with better contrast. Fixed text rendering
+	with wordbreak.
+
+- QPixmap
+	Mac only: Support alpha channels when converting from a
+	QImage.
+
+- QPopupMenu
+	Fixed offset errors and keyboard navigation for invisible
+	items. Allow overlapping of menus with desktop elements (e.g.
+	taskbar). Avoid flicker for context menus.
+
+- QPrinterDialog
+	Unix only: Try harder to find all printers.
+
+- QProcess
+	Windows only : Start batch files with spaces in filename.
+
+- QScrollView
+	Don't propagate accepted contents mouse events.
+
+- QSettings
+	X11 only: Don't read Qt specific settings if application is
+	not desktop-settings-aware.
+	Windows only: Handle null-terminations correctly on
+	Win95/98/Me. Fixed a resource leak.
+
+- QSqlCursor
+	Improved performance for multiple inserts
+
+- QString
+	Pass base parameter to recursive calls in setNum().
+
+- QStyle
+	Make better use of the style flags.
+
+- QTabBar
+	Fixed focus handling for dynamically created tab widgets.
+
+- QTable
+	Make sizeHint implementation depend on header
+	visibility. Update the geometry of cell widgets in
+	setRowHeight() and setColumnWidth().
+
+- QTableItem
+	Fixed sizeHint() for items with wordwrap and items with
+	newlines in the text.
+
+- QTextCodecFactory
+	Load plugins correctly.
+
+- QTextEdit
+	Fixed rendering of selections in inactive windows. Return the
+	string with format tags in LogText mode. Non-breaking
+	whitespaces (0xA0) are no longer converted to spaces in text().
+
+- QWheelEvent
+	X11 only: Support second mouse wheel (since there is no
+	documented API for this on Windows).
+
+- QWidget
+	Fix showHidden(). Propagate palettes and fonts correctly to
+	children. Don't block modeless children of modal dialogs.
+
+- QWorkspace
+	Don't return invalid pointers to closed MDI clients.
+
+
+****************************************************************************
+*		   		Tools					   *
+****************************************************************************
+
+- moc and uic
+	Delete output files before aborting.
+
+- uic
+	Don't print debug messages from generated code. Fixed column
+	and row labeling. Don't generate code for database specific
+	properties.
+
+- Qt Designer
+	Fixed reported crashes.
+  
+- Qt Assistant
+	Flush stdout to make sure that clients get the correct port
+	number.
+
+
+****************************************************************************
+*			       Extensions				   *
+****************************************************************************
+
+- ActiveQt
+	Fixed null-pointer crashes for QVariant parameters. Try harder
+	to convert types. Fixed Qt control placement and property
+	handling in Visual Basic. Improved workaround for Word
+	type library problems. Integrated hosted controls in tab focus
+	chain. Support property overloading in Qt controls.
diff --git a/dist/changes-3.1.2 b/dist/changes-3.1.2
new file mode 100644
index 0000000..79e0136
--- /dev/null
+++ b/dist/changes-3.1.2
@@ -0,0 +1,631 @@
+
+Qt 3.1.2 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.1.1
+
+
+****************************************************************************
+*                               General                                    *
+****************************************************************************
+
+Some build fixes on different platforms. Many small documentation
+fixes.
+
+XFree86 only: Tablet support now also looks for devices called "pen",
+not just "stylus" and "eraser".
+
+Animations: Less CPU-consuming roll effects.
+X11 only: Disable effects on displays with <16bpp (rather than
+falling back to the scrolling).
+
+
+****************************************************************************
+*                               Library                                    *
+****************************************************************************
+
+- QAccel
+	Allow localization of status bar messages. Try harder to
+	distinguish between an accelerator and the identical
+	accelerator with Shift in case on of them is currently
+	disabled.
+
+- QAccessible
+	Send accessibility notification for selection changes in
+	menubars and popup menus. Send accessibility
+	notifications for QListBox currentItem/selection changes.
+
+- QActionGroup
+	Implement visibility for drop-down actiongroups.
+
+- QApplication
+	Return focus to the widget that had it before a popup opened
+	even if the focus is passed on during the show event handling.
+	When the programmer/user explicitly sets the style (either
+	with QApplication::setStyle or the -style command line
+	option), do not reset the style on settings changes. Creating
+	a second QApplication reads the settings again.
+	Windows only: Emit aboutToQuit() when the user logs off. Send
+	a focusOut event to the focus widget when the user tries to
+	switch applications using Alt+Tab. Fixed setting of
+	desktop-wide fade and scroll effects.
+	Windows95/98/Me: Fixed enter/leave handling. Among other
+	benefits this makes tooltips work more reliably.
+	X11 only: Various fixes for input methods, e.g. Korean
+	'ami'. Some startup performance improvements with
+	QSettings. Mark the internal wakeUpGuiThread() pipe with
+	FD_CLOEXEC. Call XFilterEvent before the public X11 event
+	filters to avoid applications filtering out events that are
+	necessary for input methods to operate. Removed old en_US
+	locale workaround for Solaris. Close all open popups when 
+	clicking on a screen different from the popup's screen. Do not
+	force 256 colors on 8-bit display (used to be a workaround for
+	a vnc bug).
+	Mac only: Popupmenus that are dismissed by clicking outside of their
+	bounds will no longer send the event to the widget clicked on (to avoid
+	selection changing when canceling a context menu). QContextMenuEvents
+	will be sent in the same style as Windows/X11 to make the platforms
+	more consistent, additionally mapping of Ctrl+Click to RightButton has
+	been added to allow easy context menu handling. Added warnings when a
+	Qt application is run outside of an application bundle (in GUI mode)
+	this will prevent accidental starving from events. Correct state when a
+	modal dialog is shown (to disable the menubar) is used now, and is
+	emulated to feel like Carbon applications. Fixed bug so that
+	QApplication::processEvents() can be called before
+	QApplication::exec(). Window activation will not change when a popup
+	menu is displayed. Toolbar toggle button will only toggle the top dock
+	in a QMainWindow. European text composition is supported now to take
+	advantage of TextInput modules available on Mac OS X. Window activation
+	has been improved to allow interleaving windows of different classes
+	correctly (to decrease differences between X11/Windows and Mac).
+
+- QBuffer
+	IO_Truncate no longer detaches the explicitly shared byte array.
+
+- QButton
+	In setPixmap(), avoid laying out again if the new pixmap does
+	not change the size. Use QSharedDoubleBuffer only if it is
+	enabled (this avoids repainting errors).
+
+- QButtonGroup
+	Improve hit testing for cursor navigation.
+
+- QCanvas
+	Do not try to double buffer invalid areas.
+
+- QCanvasEllipse
+	Windows only: Workaround a Windows limitation that does not
+	support 2x2 ellipse rendering without a pen. Do not try to
+	double buffer invalid areas.
+
+- QColorDialog
+	Allow the setting of all 48 standard colors.
+
+- QComboBox
+	Close any popup menus or listboxes when disabling the combobox.
+	Fix text alignment when large pixmaps were inserted into the
+	combobox.
+
+- QComplexText
+	Added correct positioning specs for all of Thai and Lao. Some
+	reordering fixes.
+
+- QCursor
+	Mac only: Correct interpretation of mask/data of a QCursor so that the
+	mask will can be used as documented.
+
+- QDate
+	Fixed addYears() for days missing in certain years.
+
+- QDateTimeEdit
+	Compute an improved layout for the QDateEdit and QTimeEdit
+	components of the QDateTimeEdit (based on the size hints). Set
+	the size policy of the QDateTimeEdit to (Minimum, Fixed).
+	In time edit: If the display is AM/PM, do not accept 13-24 as
+	valid input for the hours. Go to the min/max value when
+	stepping down/up goes out of the valid range.
+
+- QDesktopWidget
+	Mac only: Fixes to availableGeometry().
+
+- QDialog
+	Fixed a visibility issue with setExtension().
+	X11 only: Modal dialogs that have no parent set their
+	WM_TRANSIENT_FOR hint to the main application widget (not
+	root). Do not raise the active modal widget if another one
+	gets focus. This used to be an incorrect workaround for a
+	now-obsolete problem where CDE would not keep modal dialogs
+	above their parents. 
+	Do not reposition laid out dialogs that restore their geometry
+	in a polish() reimplementation.
+
+- QDict
+	Handle zero sized hash tables.
+
+- QDns
+	Slightly more reliable now, fixed a memory leak.
+
+- QDockArea
+	Fixed resizing of a QDockWindow is no longer affected by
+	another closed QDockWindow in the same QDockArea. If a QDockWindow
+	has changed its sizeHint layout items use now the new size.
+
+- QDockWindow
+	When undocking a window, use the last undocked size if we have
+	one.
+	X11 only: Make sure the moving frame is drawn on the correct screen.
+	Windows only: Fixed some focus issues.
+
+- QDom
+	Create entity references for unknown entities.
+
+- QDragManager
+	X11 only: Raise cursor decoration. Improved Motif drop support
+	to support non-textual data.
+	Windows only: Do not send any drag events if we don't have a receiver.
+	Windows 2000 only: Ignore illegal requests for error-clipboard
+	format when dropping files onto Explorer.
+
+- QEventLoop
+	Window only: Fixed mutex lock problem. Fixed processEvents()
+	with ExcludeUserInput. Fixed QSocketNotifiers not being
+	removed when the notifier gets deleted and the event
+	loop is blocking.
+	Unix only: Fixed a 64 bit problem.
+	Mac only: Fixed hasPendingEvents() for non-gui apps.
+
+- QFileDialog
+	Fix drag'n'drop for the first click into the listbox. Do not
+	auto-complete when saving a file. Enabled drag'n'drop of files
+	for all modes. In Directory* mode, do not set the filter to a
+	non-existent directory if one is specified.
+	Windows only: Fixed icon lookup.
+	Win 98/Me only: Make sure getExistingDirectory() doesn't
+	modify the current directory.
+	Mac only: Encoding fixes.
+
+- QFont
+	Win95 only: Make symbol fonts work.
+	X11 only: Don't change the Xft enabled/disabled setting
+	at runtime. Avoid some X server roundtrips when loading fonts.
+
+- QFontDialog
+	Fixed getFont() in case no default font is specified.
+
+- QFrame
+	Turn on focus and mouse-over style flags for frame painting.
+
+- QFtp
+	If the server does not expect a password (i.e. if you are
+	already logged in after you sent the username), do not send
+	the password since this might lead to errors.
+
+- QGLWidget
+	X11 only: Xft fonts won't work with glXUseXFont() - so do not
+	try to use them.
+	Win32 only: Fixed text rendering to pixmap issues.
+	Mac only: Improved responsiveness when resizing opengl widgets.
+	Mac only: Optimized swapping between accelerated and
+	non-accelerated case.
+	Mac 10.2 only: Improved performance in the case of overlapping
+	opengl widgets.
+
+- QHBoxLayout
+	Handle direction changes in user code.
+
+- QHeader
+	Improved sizeHint() takes the arrows of sorted columns
+	into account. Fix redrawing problems when moving header
+	sections. Ignore grip-margin in mouse handling for
+	non-resizable sections.
+
+- QHttp
+	Fixed a memory leak. (With thanks to valgrind's developer for
+	this useful tool). Improved head() implementation to actually
+	use HEAD requests. Accepts responses from web servers that
+	return \n instead of \r\n as line separators. Fixed a rare
+	infinite loop issue.
+
+- QIconView:
+	Clip item drawing to current container to fix drawing of
+	pixmaps with alpha channels.
+
+- QImageIO
+	jpegio: Fixed potential buffer overrun.
+	gif: Fixed a crash for invalid gif files.
+
+- QInputContext
+	X11 only: Try harder to provide the input method with an
+	appropriate - and available - fontset.
+
+- QInputDialog
+	Fixed size hint when using height-for-width rich text.
+
+- QKeySequence
+	Fixed operator==() for some special cases.
+
+- QLabel
+	When the the label is disabled, use identical color roles for both
+	rich text and plain text.
+
+- QLibrary
+	Mac only: Return failure response when a library cannot be opened
+	due to missing symbols.
+
+- QLineEdit
+	Do not truncate the text when we validateAndSet a text which
+	is longer than maxLength, but disallow the input. Respect
+	maxLength() in setText(). Make displayText() and selectedText()
+	not strip non-breaking spaces anymore. Fixed memory leak when
+	adding and deleting line edits. Undo now clears the current
+	selection. Undo/redo now works when overwriting the selection.
+	Fixed memory leak on constructing/destructing line edits. Give
+	line edit ownership of the popup menu returned by the default
+	createPopupMenu() implementation.
+
+- QListView 
+	Fixed background brush origin when using double buffering. Do
+	not resize a stretchable column in widthChanged(). Fixed
+	selecting when auto-scrolling. Initialize multi-selection
+	anchor. Accept drops outside items when acceptDrops() is true.
+	Use anchor correctly in Extended selection mode (also for
+	mouseMove). Make right clicking on a selected item not change
+	the selection. The AlignHCenter flag of a QCheckListItem now
+	behaves like for normal QListViewItems. Speed up opening and
+	closing of invisible items. Fixed a memory leak in removeColumn()
+	Single selection mode: If the selected item is taken out of the 
+	listview, unselect it and emit selectionChanged(). Fixed
+	deselecting in multi-selection modes. Right release outside an
+	item in a listview no longer clears the selection if
+	ControlButton is set.
+
+- QListViewItem
+	Invalidate column sorting in moveToJustAfter().
+
+- QLocalFs
+	The network protocol for local file systems sets sets the
+	right permissions for the QUrlInfo objects if you do a
+	QUrlOperator::listChildren().
+
+- QMainWindow
+	Fixed orientation handler calls.
+
+- QMap
+	Fixed conversion from std::map.
+
+- QMenuBar
+	Mac only: Fix for destruction of menu bars.
+	Mac only: Use process name instead of argv.
+
+- QObject
+	Always emit the destroyed() signal, even when signals are
+	blocked.
+
+- QPaintDevice
+	Mac only: Fixed raster op. for bitBlt.
+
+- QPainter
+	X11 only: Fix for rotated rectangles. Fixed drawPolygon() with
+	winding being false.
+	Mac only: drawText() fixes.
+	Mac only: Fix for drawPie().
+
+- QPicture
+	Warn about and catch save operations on still active devices.
+
+- QPixmap
+	Made grabWidget() more robust. 
+	X11 only: Fixed a bug in grabWindow(), fixes in 
+	convertFromImage() for MonoOnly.
+
+- QPointArray
+	The makeArc() function is now inclusive in respect of the start and
+	end points.
+
+- QPopupMenu
+	If there is a custom QWhatsThis installed for the whole menu
+	but no whatsThis set for the item, use the custom QWhatsThis
+	to get the help text. Improved size for multi-column popups.
+	Mac only: Improved scrollable popups
+	Mac only: Fix handling of popupmenu dismissing mouse presses.
+
+- QPrintDialog
+	Fix reentrancy issues when reading printer dialog settings.
+	Windows only: Handle lack of default printers more
+	gracefully.
+
+- QPrinter
+	Windows only: Fix reentrancy issues and make sure that all
+	handles are updated correctly. Improved bottom and right
+	margin calculation. Fixed some problems with image printing.
+	Mac only: Support for high resolution printing. Support 1-bit
+	masking for pixmaps.
+
+- QProcess
+	If the process's file descriptor is closed for stdout or
+	stderr, but the line in the buffer does not end with a \n or
+	\r\n, it is still possible to read this data using readLine().
+	Windows only: Make it safe to call qApp->processEvents() in a
+	slot connected to QProcess::readyReadStdout(). Fixed start()
+	with no arguments. Use a non-blocking file descriptor for
+	writes to stdin. Avoid leaking of handles.
+
+- QPSPrinter
+	Fixed codec for Korean PostScript fonts (ksc5601.1987-0, not
+	the listbox. Do not auto-complete when saving a
+	fileeucKR). Fixed memory leak.
+
+- QRichText
+	Improved Asian line breaking: Avoid breaking before
+	punctuation and closing braces and after opening braces. Fixed
+	a freed memory access problem with floating items on
+	destruction. When copying rich application/x-qrichtext, include
+	format information for the initial characters until the first
+	complete span. Make text="color" attributes in qt and body
+	tags work again.
+
+- QScrollView
+	Restored the Qt 3 default sizeHint() that depends on the
+	scroll view's content, restricted within a 'sane' range (this
+	has no impact on most child classes, which already reimplement
+	sizeHint()).
+
+- QSemaphore
+	Fixed race condition in operator-=().
+	Unix only: A bit more robust.
+
+- QSettings
+	Implement scoping for file-based settings (Unix and
+	Ini-modes). Support storing and reading null strings. Other
+	fixes.
+	X11 only: Fixed rehash issues when using multiple screens.
+	Windows and Mac: Completed Ini mode.
+
+- QSocket
+	If the read retruns 0, safely assume that the peer closed the
+	connection. Fixed readyRead sometimes not being
+	emitted. Fixed a select bug when the other end terminates
+	the connection. Some 64 bit fixes.
+
+- QSound
+	Mac only: Implemented stop().
+
+- QSplitter
+	Make sizes() return 0 for collapsed widgets.
+
+- QSqlDriver
+	All drivers: Fixed crashes when accessing out of bound
+	fields. Clear the openError() flag when opening a connection
+	successfully.
+	MySQL only: Make use of mysql_use_result() in forward-only mode.
+	TDS only: Return NULL QVariants for NULL fields.
+	ODBC only: Do not require the SERVER keyword to be in a
+	connection string. Fix Unicode issues with MS Access. Allow 
+	MS Access people to create a connection string without 
+	creating a DSN entry first.
+
+- QSqlQuery
+	Real values in queries containing placeholders were in some
+	cases incorrectly replaced in emulated prepared queries.
+	Added support for forward only queries in MySQL.
+
+- QStatusBar
+	Make sure QStatusBar updates the minimum height when a child
+	widget triggers a relayout (e.g. from size/font/etc. changes).
+
+- QString
+	Safer QString->std::string conversion (handles null-string
+	case). Fixed 64-bit issue in toLong() and toULong(). Make
+	prepend(), append() and operator+=() work with a QByteArray
+	argument that is not 0-terminated. Since this
+	fix is done in inline functions, you must recompile your
+	application to benefit from it. Make QString(const
+	QByteArray&) respect the array's size where a codec for
+	C strings is defined. Performance improvements for lower() 
+	and upper(). Fix toDouble() when string contains trailing
+	whitespace.
+
+- QSvgDevice
+	No background for Bezier curves. Fixed omission of font-family
+	attribute in SVG generator. Fixed bounding rect mapping.
+
+- QStyle (and subclasses)
+	Usable size for subcontrols for small scrollbars. Fixed MDI
+	document window titlebar clipping.
+	XP style: Support non-default group boxes. Corrected tab
+	widget border drawing. More compliant dock window
+	appearance. Fixed translations for QCheckTableItem and
+	QComboTableItem.
+	Windows style: Use the highlighted text color role for arrows
+	in menus. Allow drawing of list view expand controls without
+	branches.
+	SGI style: Use correct background brush on pushbuttons with
+	popdown arrows.
+	Mac style (Mac only): Comboboxes will now be smaller (and closer to
+	Aqua Style suggested sizes). Expansion widgets (in a listview) will
+	now draw in the correct background color to allow non-white listviews.
+
+- QSpinBox
+	Stop spinning when users press a button other than the
+	left one. Support Key_Enter in addition to Key_Return as the
+	documentation always stated.
+
+- QTabBar
+	Let arrow buttons react correctly on style changes.
+
+- QTabDialog
+	Fix reverse layout for right to left languages.
+
+- QTable
+	Catch hideColumn() on tables with too few columns. Fixed an
+	endless recursion when swapping header sections. Fixed SingleRow
+	selection when using the vertical header. Emit the
+	sizeChange() signal when resizing a table header section with
+	a double click. Fixed set*MovingEnabled() when the selection
+	mode is NoSelection. Fix selection drawing for focusStyle ==
+	FollowFocus. Fixed a memory leak.
+
+- QTableItem
+	Use virtual text() method for calculations instead of accessing the
+	data member directly. Do not crash when destroying a table item that
+	is not in a table.
+
+- QTextCodec:
+	Fixed a bug in the Unicode -> jisx0208 conversion table.
+
+- QTextEdit
+	Made setFormat() much faster when undo/redo is
+	disabled. Fixed double deletion crash when clearing a document
+	with floating custom items. AccelOverride events with Shift
+	pressed now work the same as for a normal key press.
+	LogText mode: Allow spaces in the font color tag. Fixed
+	background redraw issue. Stop scrollbar from disappearing
+	due to laying out the document incorrectly.
+
+- QThread
+	Unix only: Do not rely on PTHREAD_MUTEX_INITIALIZER and
+	PTHREAD_COND_INITIALIZER. Fixed timeout calculation in
+	sleep().
+
+- QTimeEdit
+	Typing in input for the first time now overwrites the existing
+	value.
+
+- QToolButton
+	Fixed width calculation for multiline text.
+
+- QTooltip
+	Try hard to avoid tooltips for widgets in inactive
+	windows. Use screen geometry rather than available geometry
+	for positioning. Avoid the mouse cursor covering part of the
+	tooltip.
+
+- QTranslator
+	Notify main windows when installing an empty translator.
+
+- QUrlOperator
+	Make setNameFilter() work with FTP.
+
+- QValueVector
+	Fix operator==() to work as expected if the two vectors do not have
+	the same size.
+
+- QVariant
+	Fixed canCast() for Bool -> String and ByteArray -> String conversion. 
+	Fixed operator==() for maps. Fixed the asDouble() function to
+	detach first before a conversion is done. After streaming into
+	a QVariant isNull() now returns false.
+
+- QWaitCondition
+	Unix only: Make sure the mutex is destroyed after it is
+	unlocked.
+
+- QWhatsThis
+	Use screen geometry rather than available geometry
+	for positioning.
+
+- QWidget
+	In adjustSize(), process LayoutHint events for all widgets,
+	not only this widget. Fixed a visibility issue with
+	reparent(). Fixed recursive update of child widgets with
+	background origin not being WidgetOrigin. Fixed isEnabledTo().
+	Windows only: Fixed mapFromGlobal() / mapToGlobal() for
+	widgets that are not visible.
+	X11 only: Set the WM_CLIENT_LEADER and SM_CLIENT_ID properties
+	according to the ICCCM (section 5.1). We accomplish this by
+	creating a hidden toplevel window to act as the client leader,
+	and all toplevel widgets will use this window as the client
+	leader. Fixed calling show() on minimized windows. Fixes to
+	grabWindow() for platforms that support different color depths
+	on one display.
+	Windows only: Handle frameGeometry() changes when users change
+	the titlebar font.
+	Mac only: Reparent fixes so that visiblity of a toplevel window
+	will be retained as well as to avoid painting errors when reparented
+	onto a different window. Fixed painting errors when a widget is
+	interactively moved off screen. showNormal() will now toggle
+	correctly when a window is minimized, additionally toggling between
+	showMaximized()/showNormal() will operate as expected. Qt will now
+	try to prevent placing a window partially offscreen. This will not
+	over-ride explicit window positioning, but it will correct default
+	placement.
+
+- QWidgetStack
+	Make removeWidget() safe when there are several widgets
+	with the same id.
+
+- QWorkspace
+	If the active window is clicked on, transfer focus to
+	the child. Restore focus to old subcontrol when changing the
+	active MDI window. Make sure a MDI window is not resized below
+	a child widget's minimum size. Do not allow resizing windows
+	when we have an active popup window. Another fix to the
+	windowActivated() signal. Fixed resize handling for fixed-size
+	windows.
+
+- QXmlSimpleReader
+	Fixed a memory leak for incremental parsing.
+
+
+****************************************************************************
+*                                Tools                                     *
+****************************************************************************
+
+- Qt Designer
+	Some small usability improvements and crash fixes. Fixed
+	editing properties of multiple selected widgets for custom
+	widgets. Fixed some problems with pixmaps, when using a pixmap
+	function. Allow entering ':' in the class name in the
+	form settings dialog (for namespaces). Do not show deleted
+	toolbars in the object explorer. Fixed inserting widgets into
+	toolbars. Fixed displaying nested widget stacks in the object
+	explorer. Added an option to enable auto saving. Fixed some
+	issues with auto-indent in the C++ editor plugin. Fixed
+	problems with slots which have namespaces in their function
+	arguments. Do not save invalid pixmaps. whatsThis properties
+	can now be edited with the richtext editor.
+
+- Qt Assistant
+	Fixed crash when printing to file was cancelled. Fixed
+	mimesource settings when a link is opened in a new window.
+	Added missing translator. Fixed reloading pages when the
+	font was changed. Added accelerator for exiting Assistant.
+	Full text search now supports Unicode. Search accepts special
+	characters like '_'. Added option for disabling the first run
+	initialization. Now it is possible to open a link or new
+	window directly from the sidebar.
+
+- moc
+	Make 'moc -p foo bar/baz.h' generates #include "foo/baz.h"
+	instead of #include "foo/bar/baz.h". Also avoid redundant "./"
+	at the beginning. Accept identifiers trailing the function
+	signature to allows sneaking in compiler specific attributes
+	via a macro.
+
+- qmake
+	Qmake will no longer put the version number on plugins. These are
+	not a necessary part of the filename. A parser bug got into qmake
+	causing (right hand side) functions from being evaluated properly,
+	additionally the argument parser has been improved to allow functions
+	calling functions. Qmake now has support for ProjectBuilder 2.1, it
+	will no longer respect OBJECTS_DIR in ProjectBuilder (as this exposed
+	a bug in ProjectBuilder itself). It will automatically detect qt-mt
+	(when linking against Qt) so "CONFIG += thread" is not necessary,
+	however this will not turn on Q_THREAD_SUPPORT. A new test operator
+	has been added 'equals()' to allow testing for equality to a variable.
+	In 'project mode' qmake will now detect TRANSLATIONS files
+	automatically.
+
+- uic
+	Some small fixes in code generation.
+
+****************************************************************************
+*                              Extensions                                  *
+****************************************************************************
+
+- Netscape Plugin
+	The Netscape Plugin is supported again, now on both Netscape 4.x and
+	current versions based on the Mozilla code.
+
+- ActiveQt
+	Activate socket notifiers and process config requests even if
+	Qt does not own the event loop.
+
diff --git a/dist/changes-3.2.0 b/dist/changes-3.2.0
new file mode 100644
index 0000000..6d99213
--- /dev/null
+++ b/dist/changes-3.2.0
@@ -0,0 +1,327 @@
+
+Qt 3.2 introduces new features as well as many improvements over the
+3.1.x series. This file gives an overview of the main changes since
+version 3.1.2.  For more details, see the online documentation which
+is included in this distribution. The documentation is also available
+at http://doc.trolltech.com/
+
+The Qt version 3.2 series is binary compatible with the 3.1.x series.
+Applications compiled for 3.1 will continue to run with 3.2.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+Qt library
+----------
+
+New classes have been added to the Qt Library including a
+class to add splash screens to applications (QSplashScreen), a toolbox
+widget that provides a column of tabbed widgets (QToolBox), and a
+class to manage per-thread data storage (QThreadStorage).
+
+The SQL module received a fair bit of attention this time. The most
+notable improvements include a native IBM DB2 driver, complete support
+for stored procedures including the possibility to access
+out-parameters, and native support for 64 bit fields without having to
+convert to or from strings. We also added support for setting
+connection parameters. This way you can, for example, conveniently
+open an SSL connection to a MySQL or PostgreSQL database. If you need
+even more customization, e.g. for an Oracle database, you can set up
+the connection yourself and instantiate a Qt driver object on top of
+it. An extended SQL cursor class has been added that makes it more
+convenient to display result sets from general SQL queries
+(QSqlSelectCursor). QSqlDatabase::tables() is now capable to return
+tables, views and/or system tables. In addition, you can add custom
+database drivers without compiling them as plugins
+(see QSqlDatabase::registerSqlDriver()).
+
+QLineEdit, the one-line text editor, now supports validation input
+masks. The feature complements the previous QValidator concept and
+allows e.g. restriction of input to the IP address format (mask
+"990.990.990.990;_"), or to ISO date format (mask "0000-90-90;0").
+
+Qt's unicode code support has been extended. Most notably, full
+support for Indic scripts has been added, covering writing systems
+such as Devanagari, Tamil and Bengali. The group of right to left
+writing systems has been extended with support for Syriac. Both
+improvements are available on both Windows with Uniscribe installed,
+and on Unix/X11 when using XFT with OpenType fonts.
+
+All tool classes that support STL-like iterators with begin() and
+end(), contain two extra functions constBegin() and constEnd(). The
+const versions always return const iterators, and thus can be a little
+bit faster with Qt's implicitly shared containers.
+
+QPainter's complex drawText() function has been highly
+optimized. Despite its support for complex unicode scripts, it now
+performs better than its less unicode-capable counterpart in Qt 2.3.
+
+QPixmap now supports pixmaps with alpha channel (semi transparency) on
+all Windows versions except Windows 95 and Windows NT 4.0.
+
+The print dialog now supports "selection" as a print range as well as
+the possibility to enable/disable all different printer options
+individually.
+
+On Windows, the Qt installation includes a toolbar for Visual Studio.NET 
+that provides an integration of the Qt tools (ie. Qt Designer) with the 
+IDE.
+
+Many classes were improved; see the detailed overview that follows.
+
+Qt Motif Extension
+------------------
+
+Dialog handling has matured and has been extended since the
+extension's introduction in Qt 3.1.  The documentation and code
+examples have been improved, including a walkthrough that covers the
+complete migration of a real-world Motif example to Qt. The process
+contains four intermediate steps where the application utilizes both
+toolkits.
+
+ActiveQt Extension
+------------------
+
+Type handling has been extended on both the container and the server
+side. The new supported types are byte arrays and 64bit integers. The
+QAxServer module supports aggregation, as well as QObject subclasses as 
+return and parameter types of slots, and allows error reporting through 
+COM exceptions.
+The Designer integration has been extended to support property dialogs
+implemented by the control server.
+Controls developed with ActiveQt support aggregation, which makes it
+possible to use them in containers that require this form of containment to
+be supported. ActiveQt also supports masked controls in containers that
+support this for window'ed controls.
+
+Qt Designer
+-----------
+
+The popup menu editor has been rewritten. The new editor provides the
+the ability to add, edit and remove menus and menu items directly in
+the menubar and in the popup menu. Navigation and editing can be done
+using either the mouse or the keyboard.
+
+The property editor now allows editing of properties with or'd values
+(sets).
+
+Designer also supports the new QToolBox widget in a similar fashion to
+QTabWidget, etc.
+
+Qt Assistant
+------------
+
+Profiles have been introduced to allow applications to extend the use
+of Qt Assistant as a help system. Profiles describe the documentation
+to use so that only application specific documentation will be
+referenced in an end user installation. Profiles also allow some
+customization of the look in Qt Assistant. For detailed information,
+see the helpdemo example in $QTDIR/examples/helpdemo.
+
+Profiles replace the content files and categories system. The
+following command line options are removed since they no longer serve
+any purpose: addContentFile, removeContentFile, category, and
+disableFirstRun.
+
+Qt Assistant has multiple tabs for browsing, therefore enabling
+multiple pages to be browsed without opening a new window.
+
+It is possible to specify a default home page.
+
+It is possible to specify a PDF reader so that urls to PDF files can
+be opened from Qt Assistant.
+
+Compilers
+---------
+
+Note: Qt 3.2 is the last version to officially support IRIX MIPSpro
+o32 and Sun CC 5.0. A script, $QTDIR/bin/qt32castcompat, is provided
+for 3.2 which needs to be run for these compilers.
+
+Miscellaneous
+-------------
+
+Users of the 3.2.0 beta releases please note: The QWidgetContainerPlugin
+interfaces was removed from the final release due to some serious issues.
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAction / QActionGroup
+	Simplified constructors so that it is no longer necessary to
+	specify texts for buttons and menu items separately.
+	For action groups, we fixed the enable/disable behavior. If
+	an action inside an action group is explicitly disabled, it is
+	no longer implicitly enabled together with the group.
+	This is identical to enabling/disabling widgets and their
+	children.
+
+- QApplication
+	Added the aboutQt() slot for convenience.
+
+- QAssistantClient
+	Added the new function, setArguments(), that invokes Qt
+	Assistant in different modes.
+
+- QAxBase
+	Added the new function, asVariant(), that passes a COM
+	object through dynamicCall().
+
+- QAxBindable
+	Added the new function, reportError(), that sends error
+	information to the ActiveX client.
+
+- QColor
+	Added the new static function, colorNames(), that retrieves a
+	list of all color names known to Qt.
+
+- QDeepCopy
+	Now also supports QDir, QFileInfo, and QStringList.
+
+- QDom
+	Now has long and ulong support for setAttribute() and
+	setAttributeNS().
+
+- QFont
+	Added the new properties: stretch and overline. Added the new
+	function, resolve(), that copies unspecified attributes from
+	one font to another.
+
+- QFontDataBase
+	Added a new overload for families() that restricts the
+	returned list to fonts supporting a specific QFont::Script,
+	e.g. QFont::Greek, QFont::Devanagari or QFont::Arabic.
+
+- QFontInfo / QFontMetrics
+	Added new constructors that force the info and metrics objects
+	to use a given QFont::Script.
+
+- QGLWidget
+	Added a new constructor that takes a QGLContext
+	parameter. Makes the undocumented setContext() obsolete.
+
+- QHeader
+	Added getters for the sort indicator (sortIndicatorSection()
+	and sortIndicatorOrder() ).
+
+- QImage
+	Added a new overload for save() that writes to a given
+	QIODevice*.
+
+- QListView
+	Added tristate support to check list items
+	(QCheckListItem::setTristate()). Added the new function,
+	setSelectionAnchor(), to set the list view's selection anchor
+	explicitly.
+
+- QLineEdit
+	Added input masks: setInputMask(), inputMask(), and
+	hasAcceptableInput(). Added new function selectionStart()
+	which returns the index of the first selected character in the
+	line edit.
+
+- QMacStyle
+	Added customizable focus rectangle policy.
+
+- QMessageBox
+	Added the new static function, question(), that complements
+	the existing information(), warning() and fatal() functions.
+
+- QMotifDialog [Qt Motif Extension]
+	Now has two distinct modes of operation: 1) it allows a Motif
+	dialog to have a Qt parent, and 2) it allows a Qt dialog to have
+	a Motif parent.
+
+- QMYSQLDriver
+	Better support for MySQL/embedded.
+
+- QPixmapCache
+	Added the new function, remove(), to explicitly remove a
+	pixmap from the cache.
+
+- QPrinter
+	Added the new functions: setPrintRange(), printRange(),
+	setOptionEnabled(), and optionEnabled(). For Windows only,
+	added the new function, setWinPageSize(), that allows setting
+	DEVMODE.dmPaperSize directly.
+
+- QPtrList
+	Added STL-like iterators with begin(), end(), and erase().
+
+- QScrollBar
+	Maintains a user defined size policy when the direction
+	changes.
+
+- QSplashScreen [new]
+	This new widget class provides a splash screen to be shown
+	during application startup.
+
+- QSplitter
+	Added the new properties: opaqueResize, childrenCollapsible,
+	and handleWidth.
+
+- QSqlError
+	Added a couple of convenience functions: text(), which returns
+	the concatenated database and driver texts. showMessage(),
+	which will pop up a QMessageBox with the text that text()
+	returns.
+
+- QSqlQuery
+	Added overloads for the bindValue() call which makes it
+	possible to specifiy what role a bound value should have: In,
+	Out or InOut.
+
+- QSqlSelectCursor [new]
+	This new QSqlCursor subclass provides browsing of general SQL
+	SELECT statements.
+
+- QSqlDatabase
+	Added overloaded tables() call which can return tables, views
+	and/or system tables.
+
+- QPSQLDriver
+	Calling tables() with no arguments will only return table names,
+	instead of table and view names as in Qt 3.1.
+	The new tables() call in QSqlDatabase can be used to get
+	table and/or view names.
+
+- QString
+	Added 64 bit support. Added the new functions: multiArg(),
+	reserve(), capacity(), squeeze(). Added case insensitive
+	overloads for startsWith() and endsWidth().
+
+- QStringList
+	Added the new function gres().
+
+- QStyle
+	Added support for toolbox, header, MDI frame, table grid line
+	color, line edit password character, and message box question.
+
+- QSyntaxHighlighter
+	Added the new function, currentParagraph().
+
+- QTabWidget
+	Added support for custom widgets to be placed beside
+	the tab bar: setCornerWidget() and cornerWidget().
+
+- QTextEdit
+	In Log mode, added the new functions: setMaxLogLines() and
+	maxLogLines(). Implemented insertAt() for LogText mode.
+
+- QThreadStorage [new]
+	This new tool class provides per-thread data storage, also
+	referred to as thread local storage or TLS.
+
+- QToolBox [new]
+	This new widget class provides a column of tabbed widgets, one
+	above the other, with the current page displayed below the
+	current tab.
+
+- QVariant
+	Added support for LongLong and ULongLong.
+
+- QWidget
+	Added a new widget flag, WNoAutoErase, that combines the now
+	obsolete WResizeNoErase and WRepaintNoErase flags.
diff --git a/dist/changes-3.2.0-b1 b/dist/changes-3.2.0-b1
new file mode 100644
index 0000000..cdd3514
--- /dev/null
+++ b/dist/changes-3.2.0-b1
@@ -0,0 +1,296 @@
+
+Qt 3.2 introduces new features as well as many improvements over the
+3.1.x series. This file gives an overview of the main changes since
+version 3.1.2.  For more details, see the online documentation which
+is included in this distribution. The documentation is also available
+at http://doc.trolltech.com/
+
+The Qt version 3.2 series is binary compatible with the 3.1.x series.
+Applications compiled for 3.1 will continue to run with 3.2.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+
+Qt library
+----------
+
+New classes have been added to the Qt Library including a
+class to add splash screens to applications (QSplashScreen), a toolbox
+widget that provides a column of tabbed widgets (QToolBox), and a
+class to manage per-thread data storage (QThreadStorage).
+
+The SQL module received a fair bit of attention this time. The most
+notable improvements include a native IBM DB2 driver, complete support
+for stored procedures including the possibility to access
+out-parameters, and native support for 64 bit fields without having to
+convert to or from strings. We also added support for setting
+connection parameters. This way you can, for example, conveniently
+open an SSL connection to a MySQL or PostgreSQL database. If you need
+even more customization, e.g. for an Oracle database, you can set up
+the connection yourself and instantiate a Qt driver object on top of
+it. An extended SQL cursor class has been added that makes it more
+convenient to display result sets from general SQL queries
+(QSqlSelectCursor). In addition, you can add custom database drivers
+without compiling them as plugins (see
+QSqlDatabase::registerSqlDriver()).
+
+QLineEdit, the one-line text editor, now supports validation input
+masks. The feature complements the previous QValidator concept and
+allows e.g. restriction of input to the IP address format (mask
+"990.990.990.990;_"), or to ISO date format (mask "0000-90-90;0").
+
+Qt's unicode code support has been extended. Most notably, full
+support for Indic scripts has been added, covering writing systems
+such as Devanagari, Tamil and Bengali. The group of right to left
+writing systems has been extended with support for Syriac. Both
+improvements are available on both Windows with Uniscribe installed,
+and on Unix/X11 when using XFT with OpenType fonts.
+
+All tool classes that support STL-like iterators with begin() and
+end(), contain two extra functions constBegin() and constEnd(). The
+const versions always return const iterators, and thus can be a little
+bit faster with Qt's implicitly shared containers.
+
+QPainter's complex drawText() function has been highly
+optimized. Despite its support for complex unicode scripts, it now
+performs better than its less unicode-capable counterpart in Qt 2.3.
+
+QPixmap now supports pixmaps with alpha channel (semi transparency) on
+all Windows versions except Windows 95 and Windows NT.
+
+The print dialog now supports "selection" as a print range as well as
+the possibility to enable/disable all different printer options
+individually.
+
+Many classes were improved; see the detailed overview that follows.
+
+Qt Motif Extension
+------------------
+
+Dialog handling has matured and has been extended since the
+extension's introduction in Qt 3.1.  The documentation and code
+examples have been improved, including a walkthrough that covers the
+complete migration of a real-world Motif example to Qt. The process
+contains four intermediate steps where the application utilizes both
+toolkits.
+
+ActiveQt Extension
+------------------
+
+Type handling has been extended on both the container and the server
+side. The new supported types are byte arrays and 64bit integers. The
+QAxServer module supports QObject subclasses as return and parameter
+types of slots, and allows error reporting through COM exceptions.
+The Designer integration has been extended to support property dialogs
+implemented by the control server.
+
+Qt Designer
+-----------
+
+The popup menu editor has been rewritten. The new editor provides the
+the ability to add, edit and remove menus and menu items directly in
+the menubar and in the popup menu. Navigation and editing can be done
+using either the mouse or the keyboard.
+
+The new QWidgetContainerPlugin class provides support for complex
+custom container widgets in Designer, such as the custom tab widget,
+etc.
+
+The property editor now allows editing of properties with or'd values
+(sets).
+
+Designer also supports the new QToolBox widget in a similar fashion to
+QTabWidget, etc.
+
+Qt Assistant
+------------
+
+Profiles have been introduced to allow applications to extend the use
+of Qt Assistant as a help system. Profiles describe the documentation
+to use so that only application specific documentation will be
+referenced in an end user installation. Profiles also allow some
+customization of the look in Qt Assistant. For detailed information,
+see the helpdemo example in $QTDIR/examples/helpdemo.
+
+Profiles replace the content files and categories system. The
+following command line options are removed since they no longer serve
+any purpose: addContentFile, removeContentFile, category, and
+disableFirstRun.
+
+Qt Assistant has multiple tabs for browsing, therefore enabling
+multiple pages to be browsed without opening a new window.
+
+It is possible to specify a default home page.
+
+It is possible to specify a PDF reader so that urls to PDF files can
+be opened from Qt Assistant.
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAction / QActionGroup
+	Simplified constructors so that it is no longer necessary to
+	specify texts for buttons and menu items separately.
+	For action groups, we fixed the enable/disable behavior. If
+	an action inside an action group is explicitly disabled, it is
+	no longer implicitly enabled together with the group.
+	This is identical to enabling/disabling widgets and their
+	children.
+
+- QApplication
+	Added the aboutQt() slot for convenience.
+
+- QAssistantClient
+	Added the new function, setArguments(), that invokes Qt
+	Assistant in different modes.
+
+- QAxBase
+	Added the new function, asVariant(), that passes a COM
+	object through dynamicCall().
+
+- QAxBindable
+	Added the new function, reportError(), that sends error
+	information to the ActiveX client.
+
+- QColor
+	Added the new static function, colorNames(), that retrieves a
+	list of all color names known to Qt.
+
+- QDeepCopy
+	Now also supports QDir, QFileInfo, and QStringList.
+
+- QDom
+	Now has long and ulong support for setAttribute() and
+	setAttributeNS().
+
+- QFont
+	Added the new properties: stretch and overline. Added the new
+	function, resolve(), that copies unspecified attributes from
+	one font to another.
+
+- QFontDataBase
+	Added a new overload for families() that restricts the
+	returned list to fonts supporting a specific QFont::Script,
+	e.g. QFont::Greek, QFont::Devanagari or QFont::Arabic.
+
+- QFontInfo / QFontMetrics
+	Added new constructors that force the info and metrics objects
+	to use a given QFont::Script.
+
+- QGLWidget
+	Added a new constructor that takes a QGLContext
+	parameter. Makes the undocumented setContext() obsolete.
+
+- QHeader
+	Added getters for the sort indicator (sortIndicatorSection()
+	and sortIndicatorOrder() ).
+
+- QImage
+	Added a new overload for save() that writes to a given
+	QIODevice*.
+
+- QListView
+	Added tristate support to check list items
+	(QCheckListItem::setTristate()). Added the new function,
+	setSelectionAnchor(), to set the list view's selection anchor
+	explicitly.
+
+- QLineEdit
+	Added input masks: setInputMask(), inputMask(), and
+	hasAcceptableInput().
+
+- QMessageBox
+	Added the new static function, question(), that complements
+	the existing information(), warning() and fatal() functions.
+
+- QMotifDialog [Qt Motif Extension]
+	Now has two distinct modes of operation: 1) it allows a Motif
+	dialog to have a Qt parent, and 2) it allows a Qt dialog to have
+	a Motif parent.
+
+- QPixmapCache
+	Added the new function, remove(), to explicitly remove a
+	pixmap from the cache.
+
+- QPrinter
+	Added the new functions: setPrintRange(), printRange(),
+	setOptionEnabled(), and optionEnabled(). For Windows only,
+	added the new function, setWinPageSize(), that allows setting
+	DEVMODE.dmPaperSize directly.
+
+- QPtrList
+	Added STL-like iterators with begin(), end(), and erase().
+
+- QScrollBar
+	Maintains a user defined size policy when the direction
+	changes.
+
+- QSplashScreen [new]
+	This new widget class provides a splash screen to be shown
+	during application startup.
+
+- QSplitter
+	Added the new properties: opaqueResize, childrenCollapsible,
+	and handleWidth.
+
+- QSqlError
+	Added a couple of convenience functions: text(), which returns
+	the concatenated database and driver texts. showMessage(),
+	which will pop up a QMessageBox with the text that text()
+	returns.
+
+- QSqlQuery
+	Added overloads for the bindValue() call which makes it
+	possible to specifiy what role a bound value should have: In,
+	Out or InOut.
+
+- QSqlSelectCursor [new]
+	This new QSqlCursor subclass provides browsing of general SQL
+	SELECT statements.
+
+- QString
+	Added 64 bit support. Added the new functions: multiArg(),
+	reserve(), capacity(), squeeze(). Added case insensitive
+	overloads for startsWith() and endsWidth().
+
+- QStringList
+	Added the new function gres().
+
+- QStyle
+	Added support for toolbox, header, MDI frame, table grid line
+	color, line edit password character, and message box question.
+
+- QSyntaxHighlighter
+	Added the new function, currentParagraph().
+
+- QTabWidget
+	Added support for custom widgets to be placed beside
+	the tab bar: setCornerWidget() and cornerWidget().
+
+- QTextEdit
+	In Log mode, added the new functions: setMaxLogLines() and
+	maxLogLines().
+
+- QThreadStorage [new]
+	This new tool class provides per-thread data storage, also
+	referred to as thread local storage or TLS.
+
+- QToolBox [new]
+	This new widget class provides a column of tabbed widgets, one
+	above the other, with the current page displayed below the
+	current tab.
+
+- QVariant
+	Added support for LongLong and ULongLong.
+
+- QWidget
+	Added a new widget flag, WNoAutoErase, that combines the now
+	obsolete WResizeNoErase and WRepaintNoErase flags.
+
+- QWidgetContainerPlugin [new]
+	This new plugin class complements QWidgetPlugin for custom
+	container widgets, i.e. widgets that can host child
+	widgets.
diff --git a/dist/changes-3.2.0-b2 b/dist/changes-3.2.0-b2
new file mode 100644
index 0000000..98910a8
--- /dev/null
+++ b/dist/changes-3.2.0-b2
@@ -0,0 +1,121 @@
+
+Qt 3.2 introduces new features as well as many improvements over the
+3.1.x series. This file gives an overview of the main changes since
+version 3.1.2. For more details, see the online documentation which
+is included in this distribution. The documentation is also available
+at http://doc.trolltech.com/
+
+The Qt version 3.2 series is binary compatible with the 3.1.x series.
+Applications compiled for 3.1 will continue to run with 3.2.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+ActiveQt
+--------
+
+Controls developed with ActiveQt support aggregation, which makes it
+possible to use them in containers that require this form of containment to
+be supported. ActiveQt also supports masked controls in containers that
+support this for window'ed controls.
+
+Compilers
+---------
+
+Note: Qt 3.2 is the last version to officially support IRIX MIPSpro
+o32 and Sun CC 5.0. A script, $QTDIR/bin/qt32castcompat, is provided
+for 3.2 which needs to be run for these compilers.
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QApplication
+	Win32 only: Stop compressing mouse move events when a change
+	in the key state is detected. Allow multiple QApplication
+	objects be created sequentially by resetting the pointers to
+	static objects on destruction.
+
+- QClipboard
+	X11 only: Various fixes.
+
+- QDockWindow
+	Various layout fixes.
+
+- QFont related classes
+	Many fixes and improvements.
+
+- QGLWidget
+	X11 only: Various fixes to make pixmap rendering work better
+	with accelerated nVidia drivers.
+
+- QImage
+	Fixed writing of QImages.
+
+- QLayout
+	Fixed layout to take the menu bar's minimum width into
+	consideration and correctly propagate spacing() from parent to
+	child layouts.
+
+- QLineEdit
+ 	Replace all non-printable characters with spaces when
+ 	drawing. Added new function selectionStart() which returns
+	the index of the first selected character in the line edit.
+
+- QListBox
+	Improved item search based on keystrokes.
+
+- QListView
+	Don't move the inline item editor out of the visible area for
+	wide items. Ignore +/- indicator for columns other than the
+	first one. Fixed keyboard handling in Multi selection
+	mode. Improve drawing of extremely long item texts.
+
+- QListViewItem
+	Respects icons vertical alignment properly.
+
+- QMYSQLDriver
+	Better support for MySQL/embedded. Bind TEXT blob fields as
+	strings instead of byte arrays.
+
+- QPainter
+	Qt/Embedded only: Fixed printing issues.
+
+- QPrinter
+	Mac only: Fixed printing issues.
+
+- QSocketDevice
+	Windows only: Fixed setBlocking(TRUE) to work properly.
+
+- QString
+	Fixed toShort() and toUShort() to behave correctly when passed
+	a null pointer as 'ok' value.
+
+- QStyleFactory
+	Return the correct style name from the factory for the
+	WindowsXP style.
+
+- QTable
+	Replace old contents when editing. Take hidden rows into
+	account when activating cells. Clear the cell widget when
+	clearing a cell.
+
+- QTextBrowser
+	Fixed table headers to be bold.
+
+- QTextEdit
+	Implemented insertAt() for LogText mode. Fixed undoAvailable
+	and redoAvailable to be emitted correctly from the context
+	menu. Fixed tripleclick selection in QTextEdit.
+
+- QToolButton
+	Prevent nested openings of the tool button popups.
+
+- QWindowsXPStyle
+	Various paint bug fixes.
+
+- QWorkspace
+	Fixed workspace to keep the active window when
+	tiling. Improved icon handling for maximized and minimized
+	windows.
diff --git a/dist/changes-3.2.1 b/dist/changes-3.2.1
new file mode 100644
index 0000000..c5a2915
--- /dev/null
+++ b/dist/changes-3.2.1
@@ -0,0 +1,143 @@
+Qt 3.2.1 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.2.0
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+Compilers
+---------
+
+Small fixes to build with gcc-3.4.  Build fix for the DB2 Sql driver
+on Borland.  Work around a compiler bug in Sun Forte 6.  Fix a build
+issue for 64bit HP/UC.
+
+Qt Motif Extension
+------------------
+
+Document a known problem related to clipboard and selection handling
+between Qt and Motif components.  See the Qt Motif Extension
+documentation for a more detailed description of the problem.
+
+Qt Designer
+-----------
+Correctly remove connections to deleted actions from the meta
+database.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+General Fixes
+-------------
+
+- QApplication
+        Update arguments passed to the constructor correctly when
+        arguments have already been processed.
+- QDockWindow
+	Fix a regression against 3.1.2 with minimized dock windows.
+- QDom
+	Fix a bug in ownerDocument()
+- QFontDialog
+	Fix to small usability regressions from 3.1.2.
+- QLineEdit
+	Fix regression against 3.1.2: textChanged signal after 
+	setText("") should contain a non null string.
+- QMotifDialog [Qt Motif Extension]
+- QMotifWidget [Qt Motif Extension]
+	Fix incorrect usage of XtSetArg().  In certain cases, some
+	variables would be incorrectly modified, resulting in
+	out-of-bounds memory access and/or crashes.
+- QPainter/QFontMetrics
+	Fix some problems related to line breaking and size
+	calculation of multi line text layouts.
+- QSplitter
+	Fix a problem with setCollapsible.
+- QSqlCursor
+	Fix updates in tables without a primary key.
+- Sql
+	Fix crash in odbc and db2 drivers when using binary fields.
+- QTable
+	Fix possible crash in the QTable destructor.
+- QWidgetStack
+	Fix a slight behavioral change in the sizeHint between 3.1.2
+	and 3.2.
+- QApplication::reverseLayout
+	Fix some problems with dockwindows/toolbars in reverse layout
+	mode.
+- QListView
+	Fix emitting of dropped().	
+
+Platform Specific Issues
+------------------------
+
+Windows:
+
+- QFont
+	Fix possible memory corruption when printing.
+	Windows 98: Fix a problem with displaying of russian
+	text using the default font.
+- QPainter
+	Fix a regression printing text in high resolution mode.
+- QPrinter
+	Fix a problem in setPageSize().
+	Windows 95/98/Me: Fix a possible crash.
+- QWaitCondition and QThread
+	Fix two possible race conditions.
+- XP style
+	Fix resource leak.
+- QString
+	QString::sprintf() work around a memory leak in the Windows C
+	runtime.
+- Dnd
+	Fix problem with dragging URLs.
+	Reverted back accept(), ignore(), acceptAction() to 3.1.x behavior.
+- IME framework
+	Better positioning of the IME composition window.
+
+Mac:
+
+- QStyle:
+	Smaller fixes to the Mac Style.
+	Some fixes for Panther.
+- QFont
+	Fixes for arabic; speed improvements.
+	Make the NoAntialias flag work.
+
+X11:
+
+- QFont
+	Fix possible crash with broken open type fonts.
+- QWidget
+	Fix possible crash in setMicroFocusHint().
+- QPrinter
+	Fix possible crash when drawing text with opaque background.
+	Fix crash if printer tries to print to a nonexistant printer.
+- QRegion
+	Fix drawing problem when using some complex clip 
+	regions on the painter.
+- IME framework
+	Fix a possible performance problem and server side memory
+	leak.
+- DnD
+	Fix regression against 3.1.1 when dragging across multiple
+	screens.
+
+Embedded:
+
+- QApplication
+	Fix mouse event delivery bug with modal dialogs and touch
+	screens.
+- QRegion
+	An empty rectangle will now create an empty region, like on
+	the other platforms.
+- QPixmap
+	Preserve alpha channel in xform().
+- QFont
+	Make setPixelSize() work correctly.
+- QImage
+	Fix loading of BMP images.
+- Build system
+	Make the -no-zlib option work correctly.
diff --git a/dist/changes-3.2.2 b/dist/changes-3.2.2
new file mode 100644
index 0000000..e6d1424
--- /dev/null
+++ b/dist/changes-3.2.2
@@ -0,0 +1,155 @@
+Qt 3.2.2 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.2.1
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Compilers
+---------
+
+Make Qt work on Windows 9x compiled with Borland.
+
+Meta Object Compiler
+--------------------
+
+Generate safer code for signals with pointer-to-pointer arguments.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+
+- QButton
+        Make sure button pops up when mouse leaves the button.
+- QEffects
+        Don't crash when widget is destroyed during effect.
+- QFont
+        Load the correct font for characters that have the 'Unicode'
+        script assigned to them (e.g. the em-dash).
+        Fix exact match for raw mode fonts.
+        Fix conversion from unicode to gb2312 to make Chinese appear
+        correctly again when using xlfd fonts.
+- QLineEdit
+        Proper behavior when dragging text inside the same line edit.
+        Make sure the cursor is immediately displayed upon entering a
+        line edit.
+- QListView
+        Update the scroll bars correctly when double clicking on the
+        edge of the header.
+- QPainter
+        Fix case in text rendering, where overfull lines did not get
+        layouted correctly.
+        Fix the last known problems in Indic rendering.
+- QProcess
+        Make canReadLine...() work in a busy loop.
+- QPrinter
+        Set the default paper source properly.
+- QPSPrinter
+        Handle broken true type fonts better.
+        Handle true type fonts with spaces in the family name.
+- QRichText
+        Fix a crash when zooming.
+        Fix possible memory leak.
+- QScrollBar
+        Propagate context menu events that are not handled by the
+        scroll bar.
+
+- QString
+        Support non-'C' locales for string-to-double conversion.
+- QSql
+        Oracle crash fix in some really weird situations.
+- QTable
+        Handle icons correctly when swapping columns/rows.
+        Fix case where a dialog containing a table could hang when
+        opening.
+        Do not crash when QTableHeader::updateSelections() is called,
+        without a current selection.
+- QTextEdit
+        Fixed crash in setCurrentFont() when in LogText mode.
+        Fixed backward searches for the first character or word in a
+        document.
+- QTextEngine
+        Fix memory leaks.
+- QWidgetResizeHandler
+        Improve user interaction.
+- QXmlSimpleReader
+        Fix reading of events after a skippedEntity().
+
+Platform Specific Issues
+------------------------
+
+Windows:
+
+- QFontDatabase
+        Report fixedPitch attribute for fonts correctly.
+        Handle fonts with a hyphen in the name properly.
+- QGLContext
+        Thread safety fix for makeCurrent().
+- QPixmap
+        Detect alpha channel in pixmaps correctly.
+        Fix crash on Windows 9x using alpha blended pixmaps with
+        MemoryOptim.
+        Fix memory leak when detaching copies from pixmaps with
+        alpha channels.
+        Make sure that sizes are correct after xForm().
+        Fix drawing of a masked pixmap into a pixmap with an alpha
+        channel.
+- QPrinter
+        Fix printer output of the drawPixmap()/drawImage() functions
+        that take a rectangle as a parameter.
+        Block all application windows modally when the system printer
+        dialog is open.
+- QWidget
+        Speedup case where tablet support is enabled in library, but
+        no tablet device is present.
+- QWindowsXPStyle
+        Fix gradient background of QLabels within QTabWidgets.
+        Fix "password" character for systems without extended font
+        support.
+
+Mac:
+
+        Improved documentation of Mac-specific issues. A number of
+        general improvements, style fixes, optimizations and bugfixes
+        have been made for Qt/Mac in 3.2.2. Some of the most visible
+        are:
+
+- QSizeGrip
+        Handle hide/show better.
+- QSocket
+        More responsive handling of incoming data reads.
+- QWidget
+        Create widget even if widget flag combinations make no sense.
+        Widget clipping fixes for OpenGL.
+        Widget masking fixed.
+        Fix the problem of a window being set active in show() and
+        then losing its activation when returning from a second event
+        loop.
+
+X11:
+
+- Drag'n'drop
+        Stability improvements.
+- QApplication
+        Make sure that mouse events have proper coordinates when mouse
+        enters widget.
+- QFont
+        Make sure that screen and printer metrics are the same for
+        bitmapped fonts.
+        Avoid crashes with invalid fonts.
+- QPicture
+        Fix text drawing.
+
+Embedded:
+
+- QWSPcMouseHandler
+        Fix buffer overrun when reading from mouse device.
+        Also look for mouse in /dev/inputs/mice when autodetecting.
+
+- QPainter
+        Fix rotated text on 4, 8 and 16 bpp screens.
diff --git a/dist/changes-3.2.3 b/dist/changes-3.2.3
new file mode 100644
index 0000000..a88e930
--- /dev/null
+++ b/dist/changes-3.2.3
@@ -0,0 +1,150 @@
+Qt 3.2.3 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.2.2
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Compilers
+---------
+
+Work around Solaris, AIX, and HP-UX bug affecting
+QString::operator=(const QString &) when linking statically.
+
+Fix gcc 3.4 compile problems.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+
+- QJpegIO
+	Fix memory leak when writing JPEG files.
+
+- QLineEdit
+	Preserve null and empty strings correctly in setText().
+
+- QMessageBox
+	Preserve undocumented behavior in 3.1: expand tabs.
+
+- QMimeSourceFactory
+	Don't crash when a factory uses a pointer to a QMimeSource
+	which is owned by another factory.
+
+- QMovie
+	Respect the background color of a movie when loading
+	animations with transparent pixels.
+	Fix color mode if reading 1-bpp images or frames.
+
+- QPainter
+	Fill the complete bounding rect when rendering text with an
+	opaque painter.
+
+- QRichtext
+	Fix special case where <nobr>\nfoo had an extra space.
+	Fix line breaking for Latin text.
+
+- QTextEdit
+	Improve speed of syntax highlighting.
+
+- QToolBar
+	Do not grow in height when put inside a normal widget.
+
+- QWheelEvent
+	Wheel events are now only sent to the focus widget if the
+	widget under the mouse doesn't handle the event.
+
+- QWMatrix 
+	Fix operator *(QRegion) when the world matrix is (-1 0 0 1 0 0)
+	or similar.
+
+
+Platform-Specific Issues
+------------------------
+
+Windows:
+
+- QPrinter
+	Fix resource leak when printing on Windows 9x.
+	Fix crash for Win98 with HP OfficeJet Pro 1150C.
+
+- QTextBrowser
+	Fixed weight problem in setFont().
+
+- QUriDrag
+	Fix bugs with encoding and separators.
+
+Mac:
+
+Mac OS X 10.3 (Panther) changes:
+
+- QMacStyle
+	Draw push button text vertically-centered.
+
+- QSplashScreen
+	Make the splash screen centered.
+
+- QWidget
+	Tooltips are displayed in the correct place in Panther.
+	Applications that save and restore their geometry will not
+	"walk up" the screen.
+
+General Mac OS X changes:
+
+Fix crash on exit problem (e.g. with Qt Designer).
+
+- QApplication
+	Fix mouse release problem when Control is used to emulate
+	mouse button 2.
+
+- QDesktopWidget
+	Fix problem with popup windows and dual monitors.
+
+- QFont
+	Improve fixed pitch font handling.
+
+- QMenuBar
+	Fix crash with empty menus.
+	Make sure that when we show the application menu, the items we
+	merged in from the other popup menu's are properly
+	enabled/disabled.
+	Fix case where clicking menu bar would stop timers firing.
+
+X11:
+
+- QApplication
+	Avoid endless client message loops when replying to
+	_NET_WM_PING events.
+
+- QFont
+	Fix crash when using high latin characters with GNU unifont.
+	Fix scale factor for printing (rounding error).
+
+- QPainter
+	Fix an endless loop and a bug in the shape engine for Hangul
+	Jamo. (Affects only ancient Korean texts.)
+
+- QPrinter
+	Work around bugs in Xft that cause memory corruption in the
+	postscript printer when downloading certain fonts.
+
+- QSound
+	Fixed crash when deleting a QSound object while it was
+	playing.
+
+
+Embedded:
+
+Fixed bug when applications connect then disconnect immediately.
+Added experimental code to handle 1-bpp and 4-bpp displays for
+big-endian architectures (turned off by default).
+
+- QEventLoop
+	Make processEvents(ExcludeUserInput) work.
+
+- QPrinter
+	Fix font metrics when printing with QPrinter::HighResolution.
diff --git a/dist/changes-3.3.0 b/dist/changes-3.3.0
new file mode 100644
index 0000000..8523592
--- /dev/null
+++ b/dist/changes-3.3.0
@@ -0,0 +1,313 @@
+Qt 3.3 introduces many new features as well as many improvements over
+the 3.2.x series. For more details, see the online documentation which
+is included in this distribution. The documentation is also available
+at http://doc.trolltech.com/
+
+The Qt version 3.3 series is binary compatible with the 3.2.x series.
+Applications compiled for 3.2 will continue to run with 3.3.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+Qt library
+----------
+
+Qt 3.3 is .NET enabled. This release shows how to use classes
+developed with Qt in a .NET environment. It includes an analysis of
+the different interoperability infrastructures provided by the .NET
+framework. An example demonstrates how to use both a manual approach
+with Microsoft's managed extensions to the C++ language, and also
+automated solutions based on COM and the ActiveQt framework to reuse
+native Qt classes and widgets in .NET projects. To learn more about Qt
+and .NET read the "Using Qt objects in Microsoft .NET" walkthrough
+found in the ActiveQt framework documentation.
+
+Qt 3.3 now supports IPv6 in addition to IPv4. New functions have been
+added for IPv6 support to QSocketDevice, QHostAddress and QDNns.
+
+Qt now includes a new tool class called QLocale. This class converts
+between numbers and their string representations in various languages.
+QLocale supports the concept of a default locale which allows a locale
+to be set globally for the entire application.
+
+Support for new 64bit platforms and compilers has been added for Qt
+3.3.  Qt now supports Itanium on both Linux (Intel C++ compiler) and
+Windows (MSVC and Intel C++ Compiler). Qt 3.3 now also officially
+supports FreeBSD.
+
+Qt 3.3 also supports precompiled headers for Windows, Mac OS X and
+X11. To use precompiled headers when compiling your Qt application
+simply add PRECOMPILED_HEADER and then specify the header file to 
+precompile in your .pro file. To learn more about precompiled headers
+see the "Using Precompiled Headers" chapter in the qmake User Guide.
+
+Two new database drivers have been added to the SQL module, InterBase
+and SQLite. This makes it possible to write database applications that
+do not require a database server. SQLite is provided in the Qt 3.3
+distribution and can be enabled with either -qt-sql-sqlite or
+-plugin-sql-sqlite. The InterBase plugin also works with Firebird, the
+open source version of InterBase.
+
+QWidget has a new function setWindowState() which is used to make a
+widget maximized, minimized, etc. This allows individual settings for
+the minimized/maximized/fullscreen properties.
+
+Support for semi-transparent top-level widgets on Mac OS X and Windows
+2000/XP has also been added.
+
+A new example, qregexptester, has been added that makes it easy to
+test QRegExps on sample strings.
+
+Qt 3.3 includes in addition to this, numerous bug fixes and
+improvements. Special thanks goes to KDE for their reports and
+suggestions.
+
+
+Qt/Embedded
+-----------
+
+Added support for SNAP graphics drivers from SciTech Software. This
+gives access to accelerated drivers for more than 150 graphics
+chipsets.
+
+
+Qt/Mac
+------
+
+QAccessible support has been introduced (implemented in terms of Apple's
+Universal Access API).
+
+Added support for Xcode project files in qmake.
+
+Added Tablet support for Mac OS X.
+
+Numerous visual improvements.
+
+
+Qt/X11
+------
+
+Added support for Xft2 client side fonts on X servers without the
+RENDER extension.
+
+Added a new configure option (-dlopen-opengl) which will remove the
+OpenGL and Xmu library dependencies in the Qt library. The functions
+used by Qt in those libraries are resolved manually using dlopen()
+when this option is used.
+
+Improved support for the Extended Window Manager Hints.
+
+
+Qt/Windows
+----------
+
+Added support for Windows Server 2003 (Win64/Itanium).
+
+
+Qt Motif Extension
+------------------
+
+Clipboard operations now work between Qt and Motif widgets in the same
+application. Click-to-focus works with Motif widgets that are children
+of a QMotifWidget.
+
+
+ActiveQt Extension
+------------------
+
+Two new functions, QAxFactory::startServer() and
+QAxFactory::stopServer(), can be used to start and stop an
+out-of-process ActiveQt server at runtime. The new functions
+QAxFactory::serverDirPath() and QAxFactory::serverFilePath() return
+the location of the COM server binary. Server binaries no longer
+need to implement a main() entry point function. A default
+implementation is used for out-of-process servers. IClassFactory2
+is supported for the development of licensed components, and
+QAxFactory supports the creation of non-visual COM objects. Class
+specific information can be provided directly in the C++ class
+declaration using the Q_CLASSINFO macro to control how objects and
+controls are registered and exposed. New helper classes and macros
+are avialable to make it even easier to expose object classes (see the
+QAxServer documentation for details).
+
+COM objects developed with ActiveQt are now supported in a wider range
+of clients, including Microsoft Office applications and .NET. Examples
+that demonstrate how to use the Qt objects from the examples in .NET
+languages like C# are included. QStringList is supported as a type,
+and QRect, QSize and QPoint are now supported datatypes for control
+properties and as reference parameters. Saving the controls to a
+storage or stream now includes the version number of the QDataStream
+used for the serialization (note that this might break existing
+storages).
+
+The QAxContainer library is now static even for shared configurations
+of Qt. This simplifies deployment and allows using both QAxServer and
+QAxContainer in one project, i.e. an OLE automatable application that
+uses COM objects itself. The semantics of QAxBase::setControl() have
+been extended to allow creating of COM objects on remote machines via
+DCOM, to create controls requiring a license key and to connect to
+already running objects. The implementation of QAxBase::dynamicCall()
+has been improved to support passing of parameter values directly in
+the function string. Three new classes, QAxScript, QAxScriptManager
+and QAxScriptEngine, can be used to script COM objects from within Qt
+applications using Windows Script Host.
+
+SAFEARRAY(BSTR) parameters are supported as QStringList. Calling COM
+object methods with out-parameters of type short, char and float is 
+now supported (the parameters are of type int& and double& in the Qt 
+wrapper), and QVariants used for out-parameters don't have to be 
+initialized to the expected type. Calling QByteArray functions in 
+out-of-process controls no longer returns an error code. The control's 
+client side is set to zero when the container releases the control.
+
+
+Qt Designer
+-----------
+
+Qt Designer, Qt's visual GUI builder, has received some speed
+optimizations, along with minor improvements to the menu editor.
+
+
+Qt Assistant
+------------
+
+Qt Assistant now saves the states of the tab bars between runs. This
+enables users to start browsing where they ended their previous
+assistant session.
+
+Shortcuts for Find Next (F3) and Find Previous (Shift+F3) have been
+implemented.
+
+
+Compilers
+---------
+
+Qt 3.3 adds support for two new compilers. The Intel C++ compiler is
+supported on Windows, Linux and FreeBSD. GNU gcc is supported on
+Windows using MinGW.
+
+Qt 3.3 no longer officially supports the Sun WorkShop 5.0 compiler or the
+SGI MIPSpro o32 mode.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAction
+	Added a setDisabled() slot similar to QWidget::setDisabled.
+	Added an activate() slot which activates the action and
+	executes all connected slots.
+	QActions::menuText() escapes ampersand characters ('&') when
+	using the value of the text property.
+
+- QButtonGroup
+	Added QButtonGroup::selectedId property to allow mapping with
+	SQL property sets.
+
+- QCursor
+	Added new enum value Qt::BusyCursor.
+	X11 only: Added QCursor constructor taking a X11 cursor handle.
+
+- QDom
+	The QDom classes are now reentrant.
+
+- QEvent
+	Added new event type WindowStateChange, obsoleting ShowNormal,
+	ShowMinimized, ShowMaximized and ShowFullScreen.
+
+- QHeader
+	The sizeChange() signal is emitted when the section sizes are
+	adjusted by double clicking.
+
+- QHostAddress
+	Added new constructor for IPv6 and new functions
+	isIPv6Address() and toIPv6Address(). Obsoleted the functions
+	isIp4Addr() and ip4Addr(), replacing them with isIPv4Address()
+	and toIPv4Address().
+
+- QIconView
+	Improved keyboard search to behave like QListView.
+
+- QListView
+	Improved alignment for text in QListViewItems. Right aligned
+	text now has the ellipsis on the left.
+	Keyboard search now uses the sort column as the column to
+	start searching in.
+	Improved branch drawing.
+
+- QLocale [new]
+	This new tool class converts between numbers and their string
+	representations in various languages.
+
+- QMacStyle
+	Allow disabling of size constraints.
+
+- QMovie
+	Added JNG support.
+
+- QPixmap
+	Support full alpha-maps for paletted (8-bit) images.
+	Support 16-bit grayscale PNG images with transparency.
+
+- QPushButton
+	A push button with both an iconset and text left-aligns the
+	text.
+
+- QSocketDevice
+	Added setProtocol() and protocol() for IPv6 support.
+
+- QSound
+	Windows: Support loop related APIs.
+
+- QSplashScreen
+	Less intrusive stay-on-top policy.
+
+- QSql
+	Support for InterBase and SQLite.
+
+- QStatusBar
+	Draw messages with the foreground() color of the palette,
+	rather than with the text() color.
+
+- QString
+	Added support for %lc and %ls to sprintf(). %lc takes a
+	Unicode character of type ushort, %ls takes a zero-terminated
+	array of Unicode characters of type ushort (i.e. const
+	ushort*). Also added support for precision (e.g. "%.5s").
+	Changed arg() to support "%L1" for localized conversions.
+	Windows only: QString::local8Bit() now returns an empty
+	QCString when called on a null QString to unify behavior
+	with the other platforms.
+
+- QStyle
+	Add a new primitive element: PE_RubberBand.
+	Added PM_MenuBarItemSpacing and PM_ToolBarItemSpacing pixel metrics.
+
+- QTextDrag
+	decode() now autodetects the encoding of text/html content.
+
+- QTextEdit
+	Reduced memory consumption by 20 bytes per line.
+	Added a getter for the currently set QSyntaxHighlighter.
+
+- QTextBrowser
+	Qt now automatically detects the charset of HTML files set
+	with setSource().
+	
+- QVariant
+	Comparison between variants where one of the variants is a
+	numeric value will compare on the numeric value. Type casting
+	between different variants is more consistent.
+
+- QWidget
+	Added setWindowOpacity() and windowOpacity() to support
+	transparent top-level widgets on Windows and Mac.
+	Added windowState() and setWindowState() to allow individual
+	setting of the minimized/maximized/fullscreen properties.
+
+- QWindowsStyle
+	Qt supports toggling of the accelerator underlines using the
+	Alt-key on Windows 98, 2000 and later. On other platforms this
+	change has no effect.
diff --git a/dist/changes-3.3.0-b1 b/dist/changes-3.3.0-b1
new file mode 100644
index 0000000..8a7433b
--- /dev/null
+++ b/dist/changes-3.3.0-b1
@@ -0,0 +1,284 @@
+Qt 3.3 introduces many new features as well as many improvements over
+the 3.2.x series. For more details, see the online documentation which
+is included in this distribution. The documentation is also available
+at http://doc.trolltech.com/
+
+The Qt version 3.3 series is binary compatible with the 3.2.x series.
+Applications compiled for 3.2 will continue to run with 3.3.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+Qt library
+----------
+
+Qt 3.3 is .NET enabled. This release shows how to use classes
+developed with Qt in a .NET environment. It includes an analysis of
+the different interoperability infrastructures provided by the .NET
+framework. An example demonstrates how to use both a manual approach
+with Microsoft's managed extensions to the C++ language, and also
+automated solutions based on COM and the ActiveQt framework to reuse
+native Qt classes and widgets in .NET projects. To learn more about Qt
+and .NET read the "Using Qt objects in Microsoft .NET" walkthrough
+found in the ActiveQt framework documentation.
+
+Qt 3.3 now supports IPv6 in addition to IPv4. New functions have been
+added for IPv6 support to QSocketDevice, QHostAddress and QDNns.
+
+Qt now includes a new tool class called QLocale. This class converts
+between numbers and their string representations in various languages.
+QLocale supports the concept of a default locale which allows a locale
+to be set globally for the entire application.
+
+Support for new 64bit platforms and compilers has been added for Qt
+3.3.  Qt now supports Itanium on both Linux (Intel) and Windows
+(VC++). Qt 3.3 now also officially supports FreeBSD.
+
+Qt 3.3 also supports precompiled headers for both Windows and Mac OS
+X. To use precompiled headers when compiling your Qt application
+simply add PRECOMPH and then specify the header file to precompile in
+your .pro file. To learn more about precompiled headers see the
+"Using Precompiled Headers" chapter in the qmake User Guide.
+
+Two new database drivers have been added to the SQL module, InterBase
+and SQLite. This makes it possible to write database applications that
+do not require a database server. SQLite is provided in the Qt 3.3
+distribution and can be enabled with either -qt-sql-sqlite or
+-plugin-sql-sqlite. The InterBase plugin also works with Firebird, the
+open source version of InterBase.
+
+QWidget has a new function setWindowState() which is used to make a
+widget maximized, minimized, etc. This allows individual settings for
+the minimized/maximized/fullscreen properties.
+
+Support for semi-transparent top-level widgets on Mac OS X and Windows
+2000/XP has also been added.
+
+Qt 3.3 includes in addition to this, numerous bug fixes and
+improvements. Special thanks goes to KDE for their reports and
+suggestions.
+
+
+Qt/Embedded
+-----------
+
+Added support for SNAP graphics drivers from SciTech Software. This
+gives access to accelerated drivers for more than 150 graphics
+chipsets.
+
+
+Qt/Mac
+------
+
+Added support for Xcode project files in qmake.
+Added Tablet support for Mac OS X.
+Numerous visual improvements.
+
+
+Qt/X11
+------
+
+Added support for Xft2 client side fonts on X servers without the
+RENDER extension.
+
+Added a new configure option (-dlopen-opengl) which will remove the
+OpenGL and Xmu library dependencies in the Qt library. The functions
+used by Qt in those libraries are resolved manually using dlopen()
+when this option is used.
+
+Improved support for the Extended Window Manager Hints.
+
+
+Qt/Windows
+----------
+
+Added support for Windows Server 2003 (Win64/Itanium).
+
+
+Qt Motif Extension
+------------------
+
+Clipboard operations now work between Qt and Motif widgets in the same
+application. Click-to-focus works with Motif widgets that are children
+of a QMotifWidget.
+
+
+ActiveQt Extension
+------------------
+
+Two new functions, QAxFactory::startServer() and
+QAxFactory::stopServer(), can be used to start and stop an
+out-of-process ActiveQt server at runtime. The new functions
+QAxFactory::serverDirPath() and QAxFactory::serverFilePath() return
+the location of the COM server binary. Server binaries no longer
+need to implement a main() entry point function. A default
+implementation is used for out-of-process servers. IClassFactory2
+is supported for the development of licensed components, and
+QAxFactory supports the creation of non-visual COM objects. Class
+specific information can be provided directly in the C++ class
+declaration using the Q_CLASSINFO macro to control how objects and
+controls are registered and exposed. New helper classes and macros
+are avialable to make it even easier to expose object classes (see the
+QAxServer documentation for details).
+
+COM objects developed with ActiveQt are now supported in a wider range
+of clients, including Microsoft Office applications and .NET. Examples
+that demonstrate how to use the Qt objects from the examples in .NET
+languages like C# are included. QStringList is supported as a type,
+and QRect, QSize and QPoint are now supported datatypes for control
+properties and as reference parameters. Saving the controls to a
+storage or stream now includes the version number of the QDataStream
+used for the serialization (note that this might break existing
+storages).
+
+The QAxContainer library is now static even for shared configurations
+of Qt. This simplifies deployment and allows using both QAxServer and
+QAxContainer in one project, i.e. an OLE automatable application that
+uses COM objects itself. The semantics of QAxBase::setControl() have
+been extended to allow creating of COM objects on remote machines via
+DCOM, to create controls requiring a license key and to connect to
+already running objects. The implementation of QAxBase::dynamicCall()
+has been improved to support passing of parameter values directly in
+the function string. Three new classes, QAxScript, QAxScriptManager
+and QAxScriptEngine, can be used to script COM objects from within Qt
+applications using Windows Script Host.
+
+SAFEARRAY(BSTR) parameters are supported as QStringList. Calling COM
+object methods with out-parameters of type short is now supported (the
+parameters are of type int& in the Qt wrapper), and QVariants used for
+out-parameters don't have to be initialized to the expected type.
+Calling QByteArray functions in out-of-process controls no longer
+returns an error code. The control's client side is set to zero when
+the container releases the control.
+
+
+Qt Designer
+-----------
+
+Qt Designer, Qt's visual GUI builder, has received some speed
+optimizations, along with minor improvements to the menu editor.
+
+
+Qt Assistant
+------------
+
+Qt Assistant now saves the states of the tab bars between runs. This
+enables users to start browsing where they ended their previous
+assistant session.
+
+Shortcuts for Find Next (F3) and Find Previous (Shift+F3) have been
+implemented.
+
+
+Compilers
+---------
+
+Qt 3.3 adds support for two new compilers. The Intel C++ compiler is
+supported on Linux and FreeBSD. GNU gcc is supported on Windows using
+MinGW.
+
+Qt 3.3 no longer officially supports the Sun CC 5.0 compiler or the
+IRIX MIPSpro o32 mode.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAction
+	Added a setDisabled() slot similar to QWidget::setDisabled.
+	Added an activate() slot which activates the action and
+	executes all connected slots.
+	Added showStatusMessage() and whatsThisClicked() signals.
+
+- QButtonGroup
+	Added QButtonGroup::selectedId property to allow mapping with
+	SQL property sets.
+
+- QCursor
+	Added new enum value Qt::BusyCursor.
+
+- QDom
+	The QDom classes are now reentrant.
+
+- QEvent
+	Added new event type WindowStateChange, obsoleting ShowNormal,
+	ShowMinimized, ShowMaximized and ShowFullScreen.
+
+- QHeader
+	The sizeChange() signal is emitted when the section sizes are
+	adjusted by double clicking.
+
+- QHostAddress
+	Added new constructor for IPv6 and new functions
+	isIPv6Address() and toIPv6Address(). Obsoleted the functions
+	isIp4Addr() and ip4Addr(), replacing them with isIPv4Address()
+	and toIPv4Address().
+
+- QListView
+	Improved alignment for text in QListViewItems. Right aligned
+	text now has the ellipsis on the left.
+	Keyboard search now uses the sort column as the column to
+	start searching in.
+	Improved branch drawing.
+
+- QLocale [new]
+	This new tool class converts between numbers and their string
+	representations in various languages.
+
+- QMacStyle
+	Allow disabling of size constraints.
+
+- QMovie
+	Added JNG support.
+
+- QPixmap
+	Support full alpha-maps for paletted (8-bit) images.
+	Support 16-bit grayscale PNG images with transparency.
+
+- QSocketDevice
+	Added setProtocol() and protocol() for IPv6 support.
+
+- QSound
+	Windows: Support loop related APIs.
+
+- QSplashScreen
+	Less intrusive stay-on-top policy.
+
+- QSql
+	Support for InterBase and SQLite.
+
+- QStatusBar
+	Draw messages with the foreground() color of the palette,
+	rather than with the text() color.
+
+- QString
+	Added support for %lc and %ls to sprintf(). %lc takes a
+	Unicode character of type ushort, %ls takes a zero-terminated
+	array of Unicode characters of type ushort (i.e. const
+	ushort*). Also added support for precision (e.g. "%.5s").
+	Changed arg() to support "%L1" for localized conversions.
+
+- QStyle
+	Add a new primitive element: PE_RubberBand.
+
+- QTextEdit
+	Reduced memory consumption by 20 bytes per line.
+	Added a getter for the currently set QSyntaxHighlighter.
+
+- QVariant
+	Comparison between variants where one of the variants is a
+	numeric value will compare on the numeric value. Type casting
+	between different variants is more consistent.
+
+- QWidget
+	Added setWindowOpacity() and windowOpacity() to support
+	transparent top-level widgets on Windows and Mac.
+	Added windowState() and setWindowState() to allow individual
+	setting of the minimized/maximized/fullscreen properties.
+
+- QWindowsStyle
+	Qt supports toggling of the accelerator underlines using the
+	Alt-key on Windows 98, 2000 and later. On other platforms this
+	change has no effect.
diff --git a/dist/changes-3.3.1 b/dist/changes-3.3.1
new file mode 100644
index 0000000..55ea305
--- /dev/null
+++ b/dist/changes-3.3.1
@@ -0,0 +1,141 @@
+Qt 3.3.1 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.0
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Added support for animated cursors on Mac OS X.
+
+Compilers
+---------
+
+Fixed SQLite compilation on Solaris.
+
+Fixed problem with precompiled headers (PCH) and Platform SDK on
+Windows by removing winsock2.h dependency.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+
+Fixed drag and drop for modal dialogs.
+
+- QAction
+	Propagate visibility state correctly to actions added to an
+	invisible actiongroup.
+	
+- QHttp
+	Handle both upper and lower case in response headers.
+
+- QLineEdit
+	Fixed drawing problems that affected very long strings and
+	the handling of trailing spaces.
+
+- QObject
+	Fixed connectNotify() and disconnectNotify() for some special
+	cases.
+
+- QPixmap
+	Avoid calling detach() when setting a null mask on a pixmap.
+
+- QString
+	sprintf() again interprets strings, %s, as UTF-8 strings, not
+	as Latin1 strings.
+
+- QTabBar
+	Tabbars are now correctly left aligned again.
+
+- QTable
+	Fixed shift selections after editing.
+	
+- QTextEdit
+	Emits cursorPositionChanged() when cursor position changes
+	when find() has been called.
+	LogText mode: Changing fonts after appending text now
+	recalculates the scrollbars properly.
+	Optimized createPopupMenu().
+
+- QVariant
+	Added missing detach() calls in QVariant::as...() functions
+	(e.g. asInt()).
+
+- QWidget
+	setWindowState() fixed for WindowMaximized and
+	WindowFullScreen. showMaximized() and showFullScreen() now
+	work for laid out widgets that have not been explicitly
+	resized.
+	windowOpacity() correctly initialized.
+
+Platform-Specific Issues
+------------------------
+
+Windows:
+
+Fixed overflow error that sometimes affected the font engine.
+Fixed font drawing problems for some international versions of Win9x;
+also improved handling of spaces before Chinese characters.
+
+- QApplication
+	Fixed libraryPaths() to return the correct location of the
+	application executable, independently of whether it has been
+	called before the QApplication constructor or afterwards.
+
+- QFileInfo
+	Fixed readLink() for special cases.
+
+- QSound
+	Fixed isFinished() to work correctly.
+
+- QStyle
+	Fixed QWindowsXPStyle drawing flat toggle buttons.
+
+- QWidget
+	Turn off layered painting if window opacity is set back to
+	1.0; making widget redrawing fast again.
+
+Mac:
+
+Fixed crash on exit problem with Qt Designer.
+Fixed compilation of networking modules for Professional edition. 
+Fixed overflow error that sometimes occurred in the font engine.
+Fixed modal dialogs and contextMenuRequested() signals.
+
+- QMenuBar
+	Add separator after the "Abouts".
+	Fixed memory corruption.
+
+- QMessageBox
+	Improved handling of text and button size.
+
+- QPainter
+	Improved raster operations when using colors.
+	Improved polygon region handling and drawPolyLine().
+
+- QStyle
+	Fixed QAquaStyle to use setWindowOpacity().
+	Fixed QMacStyle drawing of flat toggle buttons.
+
+- QWidget
+	Fixed showFullScreen() to not hide the toolbar.
+
+X11:
+
+Fixed skipping of certain (bitmap) fonts for Xft2 when building up the
+font database.
+
+- QPrinter
+	Fixed regression with margins and Landscape.
+
+Embedded:
+
+- QPixmap
+	Fixed crash bug with transformed driver when using masked
+	pixmaps where width > height.
+	In xForm(), pre-fill the resulting pixmap with a transparent
+	color instead of white.
diff --git a/dist/changes-3.3.2 b/dist/changes-3.3.2
new file mode 100644
index 0000000..72213de
--- /dev/null
+++ b/dist/changes-3.3.2
@@ -0,0 +1,390 @@
+Qt 3.3.2 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.1 and Qt 3.3.0.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Compilers
+---------
+
+MinGW: It is now possible to build the WinXP style on MinGW.
+
+FreeBSD: Enable DragonFly to build Qt with its native compiler.
+
+Mac: Assistant builds with Professional edition when Fink is installed.
+
+AIX: Fixed compile problem with OpenType.
+
+Tru64: Correctly detects the Compaq C++ compiler.
+
+HP-UX 64: Fixed link failure for Designer.
+
+Intel: Fixed compile failure on icc version 8.0 p42+.
+
+Qt/Embedded: Compiles with gcc 3.4.0 (prerelease).
+
+Added macro QT_QLOCALE_USES_FCVT for systems with non-IEEE-compliant
+floating point implementations (notably some versions of ARM
+Linux). These systems are not autodetected; use
+"-DQT_QLOCALE_USES_FCVT" as a parameter to ./configure.
+
+Qt Designer
+-----------
+
+Allows saving of the column and label information for QDataTable, even
+when Qt is compiled without the SQL module.
+
+Fixed data corruption in .pro files with whitespace.
+
+Fixed crash on closing a new, modified, unsaved C++ file.
+
+Fixed crash with QicsTable.
+
+Fixed corrupted .ui files caused by '<' or '>' in the object name.
+
+Fixed freeze when opening a modal Wizard Dialog from file.
+
+Fixed crash when adding a new separator using drag and drop.
+
+Qt Assistant
+------------
+
+Fixed the Settings font combobox to not re-add font entries.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+
+- QAction
+	Fixed bug when adding invisible/disabled actions to
+	visible/enabled action groups.
+
+- QCanvas
+	Cleans up old animations in setCanvas().
+
+- QClipboard
+	Fixed potential double deletion in clean up.
+
+- QColorDialog
+	Fixed crash when running on very small screens (less than
+	480x350).
+
+- QDateEdit
+	Fixed bug that would accept invalid dates when losing focus.
+
+- QDialog
+	Made showMaximized() and showFullScreen() work for dialogs
+	again.
+
+- QDns
+	Improved handling of literal IP addresses for both IPv4 and
+	IPv6.
+	Improved handling of disappearing/reappearing name servers.
+
+- QFont
+	Fixed handling of Oblique fonts.
+
+- QImage
+	Fixed crash when loading MNG animations.
+
+- QLabel
+	Fixed bug with labels without buddies that have '&' in the
+	text.
+
+- QLineEdit
+	Handles input method events according to the specification,
+	fixing severe problems with Korean input on Windows. This
+	change could show up problems with buggy input methods.
+	Fixed disappearing cursor for right-aligned text and Xft1.
+
+- QListBox
+	Fixed bug in itemAt() when listbox has wide line/framestyle.
+
+- QListView
+	Fixed problem with editor sometimes having zero width.
+
+- QLocale
+	Fixed crash on FreeBSD/Alpha.
+
+- QPainter
+	Fixed QPicture transformation bug.
+
+
+- QPopupMenu
+	Fixed crash-on-exit bug when using floating menus.
+
+- QRegExp
+	Fixed bug with patterns of the form "^A|B".
+
+- QSocket
+	Fixed bug where connecting two QSockets simultaneously would
+	cause both to connect to the same address.
+	Fixed bug where ErrConnectionRefused would not be emitted in
+	rare cases.
+
+- QSql
+	Fixed data corruption in OCI driver.
+	Fixed data corruption with SQLite driver when using non-UTF-8
+	databases with special characters.
+	Updated to work with SQLite version 2.8.13.
+
+- QString
+	Made string-to-number conversions interpret strings according
+	to the current locale.
+	Fixed the format of the %p sprintf flag.
+	Perform sanity check on the length parameter to fromUtf8().
+	Fixed toDouble() to again return a value even when failing on
+	trailing whitespace.
+	Performance optimization for startsWith()/endsWith().
+
+- QTable
+	Fixed crash caused by calling addLabel() on a horizontal header
+	when there are no columns in the table.
+	Fixed crash that occurs when deleting a QTable while editing
+	a cell.
+	Made it possible to override the grid line color.
+	Fixed selectionChanged() to be emitted correctly when dealing
+	with selections of multiple items.
+
+- QTabWidget
+	Fixed setAutoMask().
+
+- QToolButton
+	Icon and label now move the same distance when pressed.
+
+- QTextEdit
+	Does not override Ctrl+Alt+key accelerators.
+	Performance optimization: do not call ensureCursorVisible() when
+	isUpdatesEnabled() is not true.
+	Fixed crash when using removeParagraph() to remove QTextTable
+	items.
+	Fixed data corruption when saving documents with overline or
+	strikeout.
+
+- QTextBrowser
+	Fixed Purify warning about array-bound reads.
+
+- QVariant
+	Fixed bug in detaching LongLong and ULongLong values.
+
+- QWidget
+	Made showMaximized()/showFullScreen()/showMinimized() work
+	correctly again.
+	Posts events from the windowing system as before.
+
+- QWizard
+	Does not show enabled Next button on the last page if the
+	Finish button was enabled on an earlier page.
+
+- QWorkspace
+	Scales down maximize icon correctly.
+	Fixed active window/focus bug.
+	Ensured that children added to invisible workspaces are
+	painted correctly.
+	Fixed flicker with tooltips for maximize, minimize and close
+	buttons.
+
+- QXml
+	Fixed bug causing data corruption when reading invalid XML
+	files.
+
+
+Platform-Specific Issues
+------------------------
+
+Windows:
+
+- QApplication
+	Does not handle GUI messages for non-GUI appliations.
+	Disabled MenuItem highlight color for XP in non-themed
+	Classical Style.
+
+- QContextMenuEvent
+	Made right mouse button send menu event also for popup widgets
+	such as the QListBox in QComboBox.
+
+- QDesktopWidget
+	Made qApp->desktop()->size() give the correct size after a
+	display resolution change.
+
+- QFont
+	Loading a Japanese font using the English name now works when
+	running in a Japanese locale.
+
+- QLineEdit
+	Fixed drawing problems that affected very long strings and the
+	handling of trailing spaces when using Uniscribe.
+
+- QPainter
+	Fixed possible crash in setBrush().
+	Draw bitmaps using painter's foreground color when painter is
+	using a complex transformation.
+	Fixed inter-letter spacings for scaled fonts.
+
+- QPrinter
+	Fixed crash when using buggy printer drivers.
+
+- QSound
+	Made setLoops(-1) work again (plays the sound in a loop).
+	Made setLoops(0) play no sound.
+	Made setLoops(1) set isFinished() correctly.
+	Fixed memory leak.
+	If a new sound is started then stop the existing one, and play
+	the new one.
+
+- QTextEngine
+	Performs auto-detection of Asian scripts even if Uniscribe is
+	not installed.
+
+- QWidget
+	Returns correct isMinimized/isMaximized state if an application
+	is started through a shortcut using "Minimized" or "Maximized".
+
+Mac:
+
+- QAccel
+	Solved the problem where we received two accel override events
+	for each keypress.
+
+- QApplication
+	Uses better technique for obtaining applicationFilePath().
+	Allows non-GUI applications to run without the GUI.
+	Stopped using EnableSecureEventInput() because of
+	Jaguar/Panther compatibility problems.
+	Updates the text highlight color when the system changes it.
+
+- QClipboard
+	Fixed posting to the clipboard and access rights.
+
+- QComboBox
+	Ensures that the item list stays within the screen size.
+
+- QCursor
+	Uses native splitter cursors when available.
+
+- QFontMetrics
+	Fixed fontmetrics for Asian fonts.
+
+- QLineEdit
+	Uses secure keyboard input in Password mode, so that keyboard
+	events cannot be intercepted.
+
+- QMacStyle
+	Fixed painting of radio buttons to be perfectly circular.
+
+- QMenuBar
+	Fixed bug when using pixmaps without an alpha channel.
+
+- QPainter
+	Improved raster operations.
+	Made custom bitmap brushes work.
+	Draws text using painter's foreground color.
+
+- QPrinter
+	Ensures that the printer name and page range are correct after
+	setup.
+	Always uses the native print dialog.
+	Implemented setPageSize() and pageSize() properly.
+	Made QPrinter work when no printer is installed.
+	Fixed font width bug in postscript when font embedding is
+	disabled.
+
+- QSettings
+	Returns correct value for global settings when scope is User.
+
+- QSlider
+	Fixed drawing of tickmarks when minimum value is non-zero.
+
+- QStyle
+	Does not change pixmap of QToolbutton if the button is not
+	auto-raised.
+
+- QWidget
+	Fixed bug where the toolbar is partially hidden when showing a
+	mainwindow in fullscreen mode.
+	Made WStyle_StaysOnTop work in the same way as on the other
+	platforms.
+	Fixed bug in maximizing windows with a maximum size.
+
+- QWorkspace
+	Fixed bug giving frozen child windows when maximizing and
+	restoring.
+
+X11:
+
+Fixed crash bug when using X Input Method Chinput.
+
+- Drag and Drop
+	Ignores accelerator events when dragging.
+
+- QClipboard
+	Fixed bug where data()->format() would return the wrong value.
+	Fixed potential crashes with regards to iterators.
+
+- QFont
+	Avoids badly scaled fonts, and prefers exact matches.
+	Made sure symbol fonts get loaded correctly.
+	Made it possible to load Latin fonts that do not contain the
+	Euro symbol.
+	Fixed glyph width bug observed with some Khmer fonts.
+	Fixed crash with misconfigured Xft.
+	Fixed problem with font selection for Xft2 when having Latin
+	text with non-Latin locale.
+	Respects custom dpi settings for Xft.
+	Does not use Xft if we have FreeType1 but no XRender.
+	Fixed memory leak in the font engine when drawing transformed
+	fonts.
+
+- QGL
+	Fixed crash when rendering text in GL widgets.
+
+- QLocale
+	Tru64: Fixed crash when INFINITY is compared to another double.
+	Tru64: Uses DBL_INFINITY for Compaq C++ compiler.
+
+- QMimeSource
+	Does not re-enter the event loop in provides().
+
+- QPainter
+	Fixed rendering of anti-aliased text on non-XRender enabled
+	displays.
+
+- QPrinter
+	Fixed setFromTo().
+	Fixed printing of Arabic text with XLFD fonts.
+
+- QTextEdit
+	Fixed bug with extremely long lines.
+
+- QThread
+	Fixed bug that made program require superuser privileges on
+	some Linux machines.
+
+- QWidget
+	Fixed showFullScreen() and showMaximized() for window managers
+	that do not support extended window manager hints (EWMH).
+
+Embedded:
+
+- QFontInfo
+	Made QFontInfo work properly on Qt/Embedded.
+
+- QGfxVNC
+	Fixed crash if VNC viewer is closed while Qt/E is painting.
+
+- QWidget
+	Uses correct focus handling if the focus widget is hidden or
+	deleted while a popup is open.
+
+Linux virtual console switching:
+	Fixed race condition in handling of virtual console switching
+	that could cause a deadlock in some cases.
+	Switch consoles on key press event.
+	Fixed QWSServer::hideCursor()/showCursor() display locking bug
+	which could block client processes.
diff --git a/dist/changes-3.3.3 b/dist/changes-3.3.3
new file mode 100644
index 0000000..8dde96a
--- /dev/null
+++ b/dist/changes-3.3.3
@@ -0,0 +1,442 @@
+Qt 3.3.3 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.2, Qt 3.3.1 and Qt 3.3.0.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Compilers
+---------
+Added support for GNU gcc on AIX 64-bit.
+
+Fixed the issue of some compilers that produced bad output when
+compiling qlocale.cpp with -O2.
+
+Fixed include path problem with MinGW.
+
+Meta Object Compiler (moc)
+--------------------------
+Allow classnames containing the substring 'const' in signal
+parameters.
+
+Qt Assistant
+------------
+Fixed crash when an empty file is part of the profile.
+
+Qt Designer
+-----------
+Fixed occasional crash when closing the form window.
+
+Fixed bug that removed '@' characters from .pro files.
+
+Fixed bug resulting in invalid code for radio buttons with strong
+focus.
+
+Fixed crash when custom widget plugins based on QComboBox were edited or
+previewed in certain styles.
+
+Fixed bug in loading enum properties (e.g. slider tickmarks).
+
+Handle comments of the form '# {' correctly.
+
+Handle '$${}' variable expansion correctly.
+
+Fixed missing actions in drop down action groups created with the menu
+editor.
+
+Made sure that the item labels for toolboxes can be translated.
+
+Added CTRL + Key_Q as a shortcut to quit.
+
+Do not add unnecessary blank lines in .pro files.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+- Drag and drop
+	Handle filenames with '#' characters properly.
+
+- QAccel
+	Fixed bug where Alt + non-ASCII letter would require an additional
+	Shift.
+
+- QButtonGroup
+	Don't navigate out of the button group with the arrow keys.
+
+- QComboBox
+	Don't close the combobox when holding space down while clicking.
+	(Fixes GUI lock-up on Windows.)
+
+- QDateTimeEdit
+	Propagate enabled state correctly when adding a QDateEdit/QTimeEdit
+	to a disabled parent.
+
+- QDataStream
+	Fixed bug involving the output of doubles/floats in printable mode.
+
+- QFileDialog
+	Fixed crash when calling setContentsPreview() twice.
+
+- QFontDatabase
+	Made Tibetan text work even without OpenType tables.
+	When using XLFD fonts, make sure that the size selected actually
+	supports the script.
+	Fixed bug that caused fixed-pitch XLFD fonts to be reported as
+	variable pitch.
+	Fixed some issues in the CJK compatibility area, where we did
+	not always pick the correct CJK font.
+	Made isSmoothlyScalable() work when a font only exists in bold.
+	Fixed bug where font metrics for Asian fonts were wrong in some
+	circumstances.
+	Fixed bug involving certain open source Arabic fonts.
+
+- QFontDialog
+	Resize OK/Cancel buttons properly with large font sizes.
+
+- QFtp
+	Allow connection to FTP servers that return lower-case month
+	names.
+
+- QImage
+	Included fix for buffer overflow in libPNG.
+	Fixed bug that made copy constructor not copy the entire image.
+	Allow XPM images with colors that have more than one word in the
+	name.
+	Fixed crash when trying to load a corrupt/invalid BMP image.
+	Fixed crash when trying to load a corrupt/invalid GIF image.
+	Fixed crash when trying to load a JPEG image that is too big.
+	Fixed bug that caused dotsPerMeter() to be ignored when saving
+        JPEG images.
+
+- QLineEdit
+	Fixed memory leak for line edits with masks.
+	Fixed bug where QLineEdit::text() would return a null QString when
+	an input mask was set on an empty line edit.
+	Don't scroll when the text is wider than the widget.
+
+- QListView
+	Don't select a non-visible item when Right arrow key is pressed.
+	Fixed crash in setOpen(QListViewItem*, bool).
+
+- QLocale 
+	Now supports string-to-int conversions with base up to 36.
+	Handle space as a separator for large numbers in toDouble().
+
+- QMovie
+	Fixed offset bug.
+
+- QPainter
+	Don't crash if setWorldMatrix() is called on a painter that is not
+	active.
+
+- QPicture
+	Fixed bounding rect calculation.
+
+- QPixmap
+	Fixed rounding errors in xForm().
+
+- QPopupMenu
+	Fixed updateSize().
+	Fixed a crash when clearing and inserting new items while the tear
+	off is visible.
+
+- QRichText
+	Clear the focusIndicator paragraph when clearing the text.
+	Fixed bug with <td valign="middle">.
+
+- QSemaphore
+	Fixed possible starvation in operator-=().
+
+- QSlider
+	Fixed mouse handling for vertical sliders in reverse mode.
+
+- QSocket
+	Preserve readBufferSize() when doing connectToHost().
+
+- QSql
+	Fixed crash in ODBC-Driver in connection with Informix SE.
+
+- QSqlCursor
+	Fixed bug in del(true)
+
+- QSqlQuery
+	Fixed thread reentrancy bug.
+
+- QString
+	Made toFloat() fail if the number is too large for a float.
+	Fixed crash in fromUtf8 when argument is not 0-terminated.
+	Don't end up in an endless loop when setLength() is called with a
+	ridiculously large value (> 2^31).
+
+- QSvgDevice
+	Fixed some clipping issues.
+
+- QTable
+	Fixed memory leak in key event handling.
+	Fixed bug where calling setNumRows() or setNumCols() would not
+	change the sizeHint().
+	Improved speed of deleting rows/columns in big tables.
+
+- QTextEdit
+	Hide the cursor again when a drag leaves the text edit.
+	Don't crash if the text edit is deleted while the popup menu is
+	active.
+	Fixed undo/redo bug in overwrite mode.
+	Fixed crash when entering text in overwrite mode when entire text is
+	selected, on a single line, and the cursor is at the start of the
+	text.
+
+- QTextEngine
+	Fixed a small bug in the bidi engine.
+	Fixed two small issues with Bengali rendering.
+	Fixed small issue with Khmer rendering.
+	Fixed an issue with ideographic space (U+0x3000).
+
+- QThread
+	Fixed bug on HP-UX when starting a thread with LowPriority.
+	Provide a safety mechanism when trying to use QThreadStorage from
+	non-QThread threads: spit out a warning and do nothing.
+
+- QToolBar
+	Create a disabled popup menu when a disabled combobox is added to
+	the extension menu.
+
+- QWidget
+	Fixed bug that would sometimes make showMaximized() fail.
+
+- QWidgetStack
+	Set background properly when the current page has a maximum size
+	that is less than the size of the QWidgetStack.
+
+- QWorkspace
+	Fixed problems involving widgets with size constraints.
+	Don't normalize minimized widgets when cascading and tiling.
+
+- QXml
+	Speed optimizations.
+
+Platform-Specific Issues
+------------------------
+Windows:
+
+- Drag and drop
+	Ignore drag and drop events for modally shadowed windows.
+
+- Build system
+	Fixed qmake problem with QMAKE_EXTRA_WIN_TARGETS.
+
+- QApplication
+	Fixed restoring of windows when minimized using something other than
+	the window menu.
+	When restoring a modally blocked application after using "Minimize
+	All Windows" from the task bar, activate the modal dialog rather
+	than the blocked window.
+	Support Unicode application directories in applicationFilePath()
+	independently of the current locale.
+	Fixed accelerators with Ctrl+@ and Ctrl+[ to Ctrl+_ instead.
+
+- QAxWidget 
+	Fixed bug that could lead to windows no longer responding to mouse
+	events.
+	Fixed bug that would eat a mouse release event in some cases.
+
+- QFileDialog
+	Don't let getOpenFileName() fail immediately, even if passed invalid
+	characters.
+	Fixed bug that gave spurious mouse move events to other widgets when
+	closing a file (or printer) dialog.
+
+- QFontDatabase
+	Select correct font when family is empty and style hint is set.
+	Fixed problem where Chinese fonts were a pixel smaller than with
+	older Qt versions.
+
+- QFtp
+	Improved performance by increasing buffer sizes.
+
+- QLocale
+	Obtain correct locale information on Win95, so that
+	QTextCodec::locale() works properly.
+
+- QPixmap
+	Fixed problems when alpha blending in 32bpp depth.
+
+- QPrinter
+	Fixed problems caused by printing without first calling setup() when
+	using certain printers.
+
+- QSettings
+	Fixed bug that would add unnecessary size to the registry on Win98
+	in some circumstances.
+
+- QSocket
+	Worked around Windows bug which caused bytesAvailable() to be 1,
+	even if no data was available.
+
+- QSound
+	Removed race condition.
+
+- QTextEngine
+	Draw CJK compatibility characters in the 0xffxx range correctly.
+	Fixed crash on invalid UTF-8 when using the newest Uniscribe library
+	on XP.
+
+- QWidget
+	Don't clear the maximized state when moving a maximized window.
+	Don't move the widget to a silly position when showMinimized() is
+	called on a visible widget.
+	Let the size grip respect the same size limits as the window
+	manager.
+	Fixed bug where a widget with an empty region as mask would still
+	have one visible pixel.
+
+- QWindowsStyle
+	Always underline accelerator cues on Windows 98.
+
+- QWindowsXPStyle
+	Draw up/down buttons of QDateTimeEdit disabled when the widget is
+	disabled.
+	Draw toggle-toolbuttons as toggled even if they are not in a
+	toolbar.
+
+Mac:
+
+- Drag and drop
+	Fixed bug that would disrupt drag and drop when toggling
+	full-screen status.
+	Ignore drag and drop events for modally shadowed windows.
+        Show the correct cursor when copying.
+
+- QApplication
+	Fixed bug that could cause crash when allocating and deleting
+	QApplication repeatedly.
+	Properly animate the toolbar button.
+
+- QAquaStyle
+	Made sure that OK and Cancel buttons are big enough when icons are
+	added.
+	Fixed bug that would show focus rectangles around hidden widgets in
+	a QScrollView.
+	Fixed drawing errors in QComboBox and QSpinBox when building on
+	Panther and deploying on Jaguar.
+	Fixed bug that caused artifacts on the focus widget when embedded
+	inside a widget with a background pixmap.
+
+- QComboBox
+	Fixed crash when calling setListBox() and later popping up the popup
+	list.
+	Fixed size hint problems.
+
+- QFileDialog
+	Made the filter functionality work in getSaveFileName().
+
+- QFontEngine
+	Fixed bug showing strikeout text.
+
+- QHeader
+	Fixed drawing errors when moving columns.
+
+- QListView
+	Don't draw the disclosure triangle for items that aren't visible.
+
+- QMenuBar
+        Disable the quit option when there is a modal dialog.
+
+- QPixmap
+	Made copyBlt() copy the alpha channel properly again.
+
+- QPrinter
+	Fixed page range bug.
+
+- QProgressBar
+	Show something for indeterminate progress bars.
+
+- QScrollView
+	Fixed colors for the scrollview frame.
+
+- QSettings
+	Fixed bug that caused settings files to end up in the wrong place.
+
+- QTableHeader
+	Fixed sizing bug.
+
+- QWidget
+	Don't disable children of WStyle_Tool widgets.
+        The window proxy icon is only set for document windows.
+
+X11:
+
+- QApplication
+	Made the '-inputstyle' command line option override the ~/.qt/qtrc
+	setting.
+	Fixed crash when using the QApplication( Display *,...) constructor
+	without any settings file in ~/.qt/.
+	Fixed bug when passing a Tk Visual* to the QApplication constructor.
+
+- QClipboard
+	Fixed race condition in clear().
+
+- QFontDatabase
+	Fixed bug that caused some special TTF fonts to display incorrectly.
+	Fixed bug where Qt would not find some non-scalable fonts.
+
+- QFontEngine
+	Fixed bug that caused incorrect metrics and drawing in some cases
+	when a painter scales down very large fonts for display.
+
+- QMotif
+	Fixed crash when passing X11 command line parameters.
+	Fixed GUI freeze when using the system close menu on a QMotifWidget
+	window with some window managers.
+
+- QPainter
+	Fixed memory leak when more than 256 GCs are allocated.
+
+- QPrinter
+	Allow multiple space-separated options in
+	setPrinterSelectionOption().
+	Fixed printing to A3 sized paper.
+	Fixed printing using certain PFB fonts (e.g. the ones generated from
+	TeX).
+
+- QWidget
+	Fixed restoration from fullscreen/maximize on non-EWMH supporting
+	window managers.
+	Do not clear the fullscreen/maximize state if the window manager
+	ignores a resize request from Qt.
+	Worked around bugs in window placement for the SGI 4Dwm window
+	manager.
+
+Embedded:
+
+Makeqpf tool
+	Use the same way of finding the font directory as the rest of Qt.
+
+- QVNCServer
+	It is now possible to have several different VNC servers active on
+	the same machine (and even in the same process).
+	Fixed bug connecting a little-endian client to a big-endian server.
+
+- QPainter
+	Fixed bug making thick vertical lines one pixel too wide.
+	Worked around compiler bug in gcc 3.3.1 and 3.3.3 (but apparently
+	not in 3.3.2), causing artifacts when drawing anti-aliased text on
+	16-bpp displays in release mode. 
+
+- QWidget
+	Avoid creating a paint event in setMask() if the new mask is the
+	same as the old.
+
+- QWSManager
+	Fixed crash when widget is deleted during a window system mouse
+	grab.
+	Only move window on left mouse press.
+
+- QWSServer
+	Avoid possible race condition in sendPropertyNotifyEvent()
+	when client quits.
diff --git a/dist/changes-3.3.5 b/dist/changes-3.3.5
new file mode 100644
index 0000000..8839f76
--- /dev/null
+++ b/dist/changes-3.3.5
@@ -0,0 +1,617 @@
+Qt 3.3.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.4, Qt 3.3.3, Qt 3.3.2,
+Qt 3.3.1 and Qt 3.3.0.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Platforms
+---------
+
+- Qt now supports Mac OS X 10.4 (Tiger)
+
+Compilers
+---------
+
+- Added support for VS 2005
+- Added support for GCC 4
+
+Windows Installer
+-----------------
+
+- The environment variables no longer contain invalid paths.
+- The user is warned if QTDIR is not set and the evaluation edition is
+  already installed, to avoid conflicts between the two packages.
+- A bug was fixed where a '\0' was appended to the end of a path.
+- Fixed the dependencies for image formats and styles.
+
+Qt Designer
+-----------
+
+- Fixed a problem with long string literals on certain Visual Studio
+  C++ compilers.
+- UIC now uses the include hints from the .ui file when generating
+  source files.
+- The "paste" action is now enabled and disabled correctly.
+- QWidgetFactory::supportsWidget() now returns true for QSplitter.
+- Parse files with more than one '.' in the file name correctly.
+- The project name is now displayed correctly also when the project is
+  created in a root directory.
+- Fixed a bug where Windows end-of-line terminators would be included
+  in string literals, which broke translation.
+- Several crashes were fixed related to cutting/copying/pasting menu
+  items.
+- Fixed some problems with designer generating corrupted pro files.
+- A crash was fixed for when designer loads a pro file with the same
+  file listed more than once.
+- The action editor is now closed when there is no main window form.
+- Stability fixes
+
+Qt Linguist
+-----------
+
+- lupdate now understands strings longer than 16384 characters.
+- Fixed escaping bugs for string that contain both ampersands and
+  double quotes.
+
+Qt Assistant
+------------
+
+- When printing, assistant now always uses the Active color group.
+- Fixed a rendering bug for paragraphs that start with a line break.
+- Support for setting the documentation root path, allowing
+  documentation files to be moved.
+- When opening a link in a new window, assistant will now properly
+  scroll to the correct anchor after the window has been shown.
+- Fixed full text search for documents not listed in the 'ref'
+  attribute of the <section> tag in the current .adp file.
+- The state of the forward/backward buttons now work properly when the
+  tabs are changed.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+
+Added security patches for zlib: CAN-2005-1849, CAN-2005-2096
+The FreeType library was upgraded from version 2.0.9 to 2.1.9
+
+- Build system
+        Improved build keys for gcc 4 compilers, so plugins no longer
+        need rebuilding after upgrading gcc to a new patch release.
+
+- QCanvas
+        Fixed wrong text scaling and cut-off text.
+        Fixed drawing with a brush when double buffering is enabled.
+
+- QCommonStyle
+        Fixed the appearance of QSlider after setBackgroundOrigin has
+        been called.
+        Fixed an overflow in calculating the handle position for
+        QScrollBar.
+
+- QCString
+        Fixed a crash in qUncompress() if the resulting QByteArray was
+        too large to fit in memory.
+        Fixed potential security problems by using vsnprintf() instead
+        of the less secure vsprintf().
+
+- QDataStream
+        Fixed a data corruption bug when using stream version Qt_3_1 and using
+        operator<<(qint64).
+
+- QDateTime
+        Fixed QDateTime::secsTo() when crossing daylight savings hours
+        boundaries.
+
+- QDockWindow
+        Undocked windows now remember their size also if the user
+        changes it.
+
+- QDom
+        The default constructor for QDocDocument now creates an empty
+        document that can be used to create elements.
+        A warning is now displayed when trying to construct or save an
+        invalid document.
+        Characters that are not allowed in XML are now escaped
+        properly when saving.
+
+- QFileDialog
+        Shortcuts now show the icons of what they point to.
+        Entry sorting is now locale-aware, as opposed to sorting based
+        on Unicode order.
+        You can now select files by pressing 'enter' when using
+        QFileDialog::getOpenFileNames().
+        Fixed a missing repaint in contents preview after selecting a
+        file, then a directory, then the same file again.
+        dirPath() no longer chops off the last directory in a path.
+
+- QGVector
+        Fixed a bug that caused a memory leak and data corruption if
+        resize() failed.
+
+- QHeader
+        The header text is now rendered correctly next to the icon in
+        reverse layout mode.
+
+- QImage
+        Fixed comparison of images with alpha data, but with the alpha
+        channel disabled.
+
+- QKeySequence
+        Key sequences that ended with a ',' now work properly.
+
+- QLineEdit
+        Fixed the behavior of the delete key on the keypad.
+        Fixed support for transparent line edits.
+        Fixed a crash when opening the context menu in a QTextEdit
+        subclass that returns 0 for createPopupMenu().
+
+- QListBox
+        Fixed a crash when removing the current item while selecting
+        items with a rubberband.
+
+- QListView
+        Fixed the behavior of the Home and End keys when QListView
+        contains disabled and hidden items.
+        Fixed a problem with the QListView::...Clicked() signals were
+        emitted also when the root decorated section was not in the
+        left-most column.
+        HTML control characters in QListView's tool tip text are now
+        escaped properly.
+        sortChildren() now also sorts children of items with no
+        siblings.
+        Fixed a missing redraw after removing columns.
+        contentsWidth() now returns the correct value after
+        setContentsWidth() has been called.
+        Fixed a crash after a sequence of deleting and selecting
+        items.
+        Fixed the size of headers with multi-line text.
+        Fixed a lock-up and possible crash caused by an internal state
+        restore on controllers with no children.
+        Fixed keyboard navigation when jumping to entries by pressing
+        the key for the first character in the text of an item.
+
+- QLocale
+        Fixed support for NaN, which failed on certain compilers.
+        Passing Q_LLONG to toString() now properly includes the group
+        symbols.
+        Fixed locale detection when locale environment variables are
+        not set.
+        Added workarounds for compiler optimization bugs when parsing
+        doubles.
+
+- QLocalFS
+        Fixed a crash when canceling a QUrlOperator transfer before
+        completion.
+
+- QMenuData
+        Fixed a crash when closing an MDI application while the menu
+        bar has Alt-focus.
+
+- QMessageBox
+        Message boxes now work correctly in right-to-left mode.
+
+- QPaintDevice
+        Fixed drawing errors when using bitBlt() on a printer.
+
+- QPainter
+        Fixed drawing of rectangles with a negative (or 0) width.
+
+- QPopupMenu
+        The height of new columns is now initialized properly when
+        menu items are shown in multiple columns.
+
+- QProcess
+        Close socket connections properly when a
+        process is created after creating the socket connection.
+
+- QPSPrinter
+        Generate PS font names correctly.
+
+- QPushButton
+        Fixed a crash caused by deleting the button while the popup
+        menu is shown.
+
+- QRichText
+        Tab stops are now adjusted correctly when printing in high
+        resolution mode.
+        Reduced the number of memory allocations when deleting large
+        blocks of text.
+        Fixed parsing of hexadecimal HTML entities
+        Fixed a bug where the font changed after calling setText()
+        repeatedly.
+
+- QScriptEngine
+        Fixed an issue with shaping of Hebrew text, which lead to
+        layout problems in QTextLayout.
+        Fixed rendering of Hebrew text with punctuation.
+        Fixed bugs in Gurmukhi shaping.
+
+- QScrollView
+        Fixed the size hint when scrollbars are set to be permanently
+        on.
+        Fixed a drawing error seen on certain graphics drivers when a
+        scroll view spans multiple screens.
+        Fixed a bug where wheel events' horizontal/vertical status
+        were not forwarded to viewportWheelEvent().
+        Fixed a crash when mouse wheel events were sent to a scroll
+        view with disabled scroll bars.
+
+- QSettings
+        Fixed a bug when comparing keys with common prefixes.
+
+- QSGIStyle
+        Fixed the size of QComboBox.
+
+- QSizeGrip
+        Fixed a bug that caused the window to move when resizing to
+        the minimum size using the size grip.
+
+- QSocketDevice
+        Improved error reporting when the connection is unexpectedly
+        closed.
+        Fixed a bug where the socket would be closed if 0 was passed
+        as maxlen to readBlock().
+
+- QString
+        Fixed a lock-up in QString::section().
+        Let replace() behave as documented when the index is larger
+        than the length of the string.
+
+- QTable
+        Fixed positioning of QComboTableItems that span several rows.
+
+- QTextCodec
+        Fixed occasional crash in fromUnicode().
+        Fixed Big5 support to comply with the standards.
+
+- QTextEdit
+        Fixed bug in undo/redo history when input methods are used.
+        Fixed a crash caused by inserting text with an input method
+        during a focus change.
+        Fixed the behavior of the delete key on the keypad.
+        Fixed setMaxLogLines() when there are already too many lines.
+        Fixed crash when clearing a QTextEdit when the IME is active.
+        Fixed crash when the text edit is deleted while dragging text.
+
+- QTextLayout
+        Fixed layout of lines that are too long and do not contain a
+        possible break point.
+
+- QTimeEdit
+        Fixed several issues with stepUp() and stepDown().
+
+- QToolButton
+        Fixed a crash when assigning a tooltip to a tool button which
+        does not have QMainWindow as an ancestor.
+
+- QToolTip
+        Fixed an occasional crash.
+
+- QTranslator
+        Fixed a bug when calling messages() before tr() when using
+        compressed .qm files.
+
+- QUrlOperator
+        Fixed a crash when accessing invalid paths on an FTP server
+        using QFileDialog.
+        Fixed a bug where the source would be removed if the source
+        and destination were the same.
+
+- QVariant
+        Fixed a memory leak in clear().
+
+- QWidget
+        Fixed excessive flicker when reparenting a widget that has
+        tool windows.
+
+- QWorkspace
+        Fixed flickering when switching between maximized windows.
+        Fixed a lock-up when modal dialogs were created with
+        QWorkspace as parent.
+        Fixed a bug where modeless dialogs with QWorkspace as parent
+        would be drawn with no title bar.
+
+- SQL, DB2 driver
+        Compile fixes.
+        Fixed a bug where QSqlCursor::insert() would fail to insert
+        two blob fields at the same time.
+
+- SQL, MySQL driver
+        Fixed a crash when using empty database names.
+
+- SQL, Oracle driver
+        Fixed truncation of numeric data types to 22 digits.
+        Fixed UTF-8 support by ensuring that there is enough space to
+        store the text.
+
+- SQL, ODBC driver
+        Fixed problems with sorting and comparing strings larger than
+        8192 characters.
+
+- SQl, PostgreSQL driver
+        Temporary tables are now only visible for the connection that
+        created them.
+
+- SQL, TDS driver
+        Fixed problems with compiling the plugin with later versions
+        of the TDS library.
+
+- SVG support
+        Fixed support for SVG viewbox.
+        Added basic support for stroke-dasharray.
+
+
+Platform-Specific Issues
+------------------------
+
+Windows:
+
+- ActiveQt
+        Unrelated types are no longer converted.
+        The control container is now only reset if the CLSID changes.
+        Fixed a bug where QAxObject::clear() did not reset the
+        metaobject when it was cached.
+        Fixed a memory leak.
+        Fixed a bug that caused flicker when navigating away from a
+        page embedding a control.
+        The VARIANT out-parameters in signals now map to "QVariant &"
+        and not "const QVariant &".
+        Signal parameters of type "bool" are marshalled to the bool
+        slot also when the control sends an integer parameter.
+
+- Drag & drop
+        Fixed a bug with sending single-color pixmaps.
+        Fixed a crash caused by reading a drag object after it has
+        been deleted (before the drop event).
+        Dragged pixmaps are now cleaned up before drawn to avoid
+        problems with broken alpha values and resetting masked pixels.
+
+- QApplication
+        Fixed a lockup caused by showing a dialog while resizing a
+        window.
+        QWidget::grabKeyboard() now also grabs the menu button.
+        Fixed a bug where mouse events were sent to the wrong widget
+        after calling QEventLoop::processEvents() with
+        ExcludeUserInput.
+        Windows Server 2003 can now also use the Windows XP style.
+        Fixed a memory leak in QEventLoop.
+
+- QColor
+        Fixed failed initialization of the Qt colors (e.g., Qt::red) when
+        using the MinGW compiler.
+ 
+- QFile
+        Fixed a bug where a read error was not handled properly.
+
+- QFileInfo
+        permission() now uses the correct file name on Windows 9x.
+
+- QFontDataBase
+        Added support for scalable fonts.
+
+- QFontEngine
+        Fixed a problem with symbol fonts.
+        Fixed support for user defined characters.
+
+- QLibrary
+        Fixed the directory separators.
+        Fixed some library loading errors.
+
+- QLocale
+        The locale() function now returns the correct ISO name instead
+        of a number.
+
+- QNPWidget (NPAPI)
+        Fixed a bug where the widget was not clipped properly by the
+        browser.
+
+- QPainter
+        Fixed a bug where QPainter failed to fill ellipses of size
+        2x2.
+        Fixed a potential lock-up after failed GDI allocations.
+
+- QPrinter
+        Rich text tables are now printed correctly when the table
+        spans pages.
+        Fixed text printing errors on page 2 and out caused by the
+        background mode being reset to OPAQUE.
+
+- QProcess
+        The directory separators for the current working directory are
+        now converted properly, so that a UNC path can be used on
+        Windows.
+
+- QTranslator
+        Fixed an issue with isReadable() on NTFS.
+
+- QWindowsXPStyle
+        XP style now works when compiled as a plugin.
+        Fixed menu bar placement.
+        Fixed a bug in setting the background color of QTabWidget.
+        Fixed the position of the size grip in large QSizeGrip
+        widgets.
+        QGroupBox now uses the correct colors.
+
+- QWorkspace
+        Fixed bug where hidden windows would be shown after restoring
+        from maximized mode.
+
+- qmake
+        The Makefile generator now only searches for the latest
+        version of the Qt library, as opposed to searching all
+        libraries.
+        Dependency checking for pre-compiled headers were fixed.
+        Fixed support for listing .pro files in SUBDIRS in subdir .pro
+        files.
+        Fixed support for multiple -L and -I entries in QMAKE_LIBS.
+
+Mac:
+
+- Build system
+        When using Xcode, the optimization level is set to 0 in debug
+        mode.
+        Added support for Xcode 2.1 and up.
+        Fixed copying of target files when DESTDIR is set.
+
+- Drag & drop
+        Fixed a crash when deleting the drag object before dropping.
+
+- QApplication
+        The default font is now only set if the user has not set one.
+        Fixed a problem where popup menus would not go away after
+        releasing the mouse button outside the popup.
+        Added support for dual axis mouse wheels.
+        Fixed a bug in tablet identification.
+        Added support for tablet erasers.
+        Fixed a deadlock in postEvent() when there was contention for
+        a wakeup.
+        Fixed a crash when switching displays at the same time as
+        QApplication is destroyed.
+        Stability fixes.
+
+- QColorDialog
+        Fixed modality support.
+
+- QFileDialog
+        Let the file dialog remember the previous directory.
+        Fixed keyboard navigation when jumping to entries using the
+        first letter of a file name.
+        Fixed a memory leak.
+
+- QFontDatabase
+        Fall back to the "Geneva" font, which is guaranteed to be
+        available, instead of "Helvetica".
+
+- QFontEngine
+        Fixed a memory leak.
+        Fixed rendering of glyphs that modify previous glyphs,
+        including Indic text.
+
+- QMacStyle
+        Title bars are now shown as deactivated when the window is
+        deactivated.
+        Fixed a bug where buttons in button groups inside a container
+        would look like they were pressed.
+        Fixed a crash caused by drawing onto a non-pixmap background.
+        Fixed the width of QComboBox.
+        Improved drawing of size grips.
+        Improved drawing of sliders, and made QSlider slightly wider
+        by default.
+
+- QMenuBar
+        Fixed a lockup caused by menu items ending with an '&'.
+        Menu items with disabled popups are now also disabled.
+
+- QMessageBox
+        The resize handle is now shown.
+
+- QPainter
+        Fixed double transformation of ellipses with a transformed
+        width or height of 1.
+
+- QPixmap
+        Fixed a crash when loading a cursor from an embedded image.
+        The color depth is now set properly when converting a QBitmap.
+
+- QPrinter
+        Fixed a crash when using bitBlt() to copy a QBitmap onto a
+        printer.
+
+- QProcess
+        Fixed support for launching bundles.
+
+- QPushButton
+        Icons are now drawn properly.
+
+- QTextBrowser
+        Fixed a bug where a text browser popup triggered by a
+        hyperlink would pop up again when the user clicks inside the
+        first popup.
+
+- QToolButton
+        Fixed a painting problem when the button was pressed.
+
+- QWidget
+        Menubar popups no longer steal focus from QTextEdit.
+        Fixed collapsing of windows with no title bar decorations.
+        Several window activation bugs have been fixed.
+        Fixed a bug where modal dialogs would be modal to its own
+        children.
+        Fixed tablet support for multiple screens.
+        Fixed a memory leak.
+
+X11:
+
+- Build system
+        Removed aliasing/redefinitions of the 'which' command to fix
+        failures in the configure script on certain Unix systems.
+        Added some missing flags for the yacc tool on 64-bit Linux.
+        The -fn application command line option, which selects the
+        default application font, works again.
+        Fixed copying of target files when DESTDIR is set.
+
+- Drag and drop
+        Fixed a crash in the dragging application when the drop target
+        crashes.
+        Fixed a bug in finding the widget under the cursor while
+        dragging.
+        Some problems were fixed with the internal timestamp in the
+        drop event.
+
+- OpenGL
+        Fixed colors when rendering using glColor() onto an 8 bit
+        pixmap.
+
+- QApplication
+        Support the F11 and F12 keys on Sun keyboards.
+
+- QCanvasView
+        Support multiple shared views of a single canvas on multiple X11
+        screens.
+
+- QClipboard
+        Fixed a rare crash related to cut & paste with the Motif
+        extension.
+
+- QFontDatabase
+        Fixed a bug where QFontInfo would return an empty family and
+        point size after trying to select a font that was not
+        installed on the system.
+
+- QFontEngine
+        Fixed a bug where scaling italic fonts would sometimes cut
+        overhangs.
+
+- QInputContext
+        Fixed a bug that led to a corrupted display in QLineEdit and
+        QTextEdit when using Japanese input methods with very long
+        input selections.
+
+- QPainter
+        Fixed a crash when setting a pen on an inactive painter.
+
+- QPrinter
+        Fixed printing on Tru64 by removing the -o argument to the lp
+        command.
+
+- QScriptEngine
+        Added support for Khmer fonts.
+        Fixed shaping of Telugu text.
+        Fixed a crash when scaling Japanese XLFD fonts by a factor of
+        1000.
+
+Embedded:
+
+- QApplication
+        Fixed a memory leak.
+
+- VNC driver
+        Fixed a memory leak.
+
+- QWidget
+        Fixed a potential crash when reparenting widgets.
diff --git a/dist/changes-3.3.6 b/dist/changes-3.3.6
new file mode 100644
index 0000000..d9464ed
--- /dev/null
+++ b/dist/changes-3.3.6
@@ -0,0 +1,27 @@
+Qt 3.3.6 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.5, 3.3.4, Qt 3.3.3, Qt 3.3.2,
+Qt 3.3.1 and Qt 3.3.0.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Platforms
+---------
+
+- It is now possible to build Qt 3.3.6 on Intel Macs. A universal
+  Qt build however requires manual work by 'lipo'-ing a PPC Qt
+  and an Intel Qt together.
+
+Compilers
+---------
+
+- The build key when building Qt with gcc 4.x has changed. This means
+  you will have to either recompile your plugins or change the configure
+  script to not reduce the gcc version string to '4'.
+
+
+Translations
+------------
+
+Various Qt translations contributed by Novell.
diff --git a/dist/changes-3.3.7 b/dist/changes-3.3.7
new file mode 100644
index 0000000..f95bf0c
--- /dev/null
+++ b/dist/changes-3.3.7
@@ -0,0 +1,12 @@
+Qt 3.3.7 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.6, 3.3.5, 3.3.4, Qt 3.3.3,
+Qt 3.3.2, Qt 3.3.1 and Qt 3.3.0.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+- QImage
+        Fixed a potential security issue which could arise when transforming
+        images from untrusted sources.
+
diff --git a/dist/changes-3.3.8 b/dist/changes-3.3.8
new file mode 100644
index 0000000..540d636
--- /dev/null
+++ b/dist/changes-3.3.8
@@ -0,0 +1,273 @@
+Qt 3.3.8 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.7, Qt 3.3.6, Qt 3.3.5, 3.3.4, Qt 3.3.3,
+Qt 3.3.2, Qt 3.3.1 and Qt 3.3.0.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Platforms
+---------
+
+- Oracle driver now builds on HP-UX
+
+Compilers
+---------
+
+Linguist
+--------
+
+- Fixed a bug where the translation area was not changed when the context was changed.
+
+Assistant
+---------
+
+- Fixed command line parsing when specifying the docPath option.
+
+Translations
+------------
+
+- Added support for Catalan.
+
+Third party components
+----------------------
+
+- libpng
+
+  * Security fix (CVE-2006-3334): Buffer overflow allows context-dependent
+    attackers to cause a denial of service and possibly execute arbitrary
+    code via unspecified vectors related to chunk error processing.
+
+  * Security fix (CVE-2006-5793): The sPLT chunk handling code
+    uses a sizeof operator on the wrong data type, which allows
+    context-dependent attackers to cause a denial of service (crash)
+    via malformed sPLT chunks that trigger an out-of-bounds read.
+
+  * Security fix: Avoid profile larger than iCCP chunk.
+    One might crash a decoder by putting a larger profile inside the
+    iCCP profile than is actually expected.
+
+  * Security fix: NULL pointer dereference.
+
+  * Disabled MMX assembler code for Intel-Mac platforms to work
+    around a compiler bug.
+
+  * Disabled MMX assembler code for x86_64 platforms.
+
+- freetype
+
+  * Security fix (CVE-2006-0747): Integer underflow allows remote
+    attackers to cause a denial of service (crash) via a font file
+    with an odd number of blue values, which causes the underflow
+    when decrementing by 2 in a context that assumes an even number
+    of values. 
+
+  * Security fix (CVE-2006-1861): Multiple integer overflows allow
+    remote attackers to cause a denial of service (crash) and possibly
+    execute arbitrary code.
+
+  * Security fix (CVE-2006-2661): A null dereference flaw allows
+    remote attackers to cause a denial of service (crash) via a
+    specially crafted font file.
+
+  * Fixed memory leak.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+
+- QAccessible
+        Fixed a potential crash when a key object is destroyed.
+
+- QApplication
+        argc() no longer returns 1 if 0 was passed as argc to the constructor.
+
+- QDateTime
+        Made QDateTime::fromString(QString(), Qt::TextDate) work with locales
+        that have two-digit day names (e.g. Di 16. Jan).
+
+- QDns
+        Stability fixes for networks with missing DNS settings.
+
+- QFileDialog
+        Ensured that files are not accidentally replaced or lost during drag 
+        and drop operations.
+
+- QFtp
+        Fixed a crash when uploading data from a closed QIODevice.
+        Fixed a potential crash when a FTP session gets deleted in a slot.
+	
+- QGLWidget
+        renderText() no longer tries to convert the text passed in to
+        a local 8 bit encoding (via local8Bit()). latin1() is used instead.
+
+- QGridLayout
+        Fixed incorrect minimum size with rich text labels in grid layouts.
+
+- QHttp
+        Fixed an overflow that could occur when chunked downloading caused
+        erroneous allocations.
+
+- QListBox
+        Fixed a potential crash that could occur if a list box is deleted in
+        a slot connected to the returnPressed() signal.
+
+- QListView
+        Set internal startDragItem pointer to 0 in clear(). This can prevent
+        crashes during drag and drop operations.
+        Fixed a documentation error in setSelectable.
+        Fixed regression in activation of leaf-nodes of type QCheckBoxController.
+
+- QTable
+        Fixed a memory leak when F2 is pressed in an empty table.
+        Ensured that the focus rectangle is painted correctly.
+        Ensured that editors in cells spanning multiple rows or columns are
+        closed correctly.
+	
+- QTextEdit
+        setDocument() no longer crashes when 0 is passed as an argument.
+        Fixed rendering of HTML tables with a fixed pixel width.
+        Fixed a potential crash when using undo/redo functionality.
+        Fixed a regression when searching for space using QTextEdit::find().
+
+- SQL plugins
+        Ensured that mysql_server_end() is only called once in the MySQL plugin.
+        Fixed fetching of strings larger than 255 characters from a
+        Sybase server through ODBC.
+        Ensured that milliseconds are not stripped from ODBC time values.
+
+- QWidget
+        Fixed an issue where adjustSize() would incorrectly take the size of
+        top-level widgets into account.
+
+
+Platform-Specific Issues
+------------------------
+
+Windows:
+
+- QAxServer
+        Fixed a regression in how the server registers type libraries.
+
+- Visual Studio 2005
+        Fixed compilation issue with the x64 compiler.
+        Fixed the behavior of qmake when executed with "qmake -tp vc".
+
+- QFont
+        Fixed crash that would occur when creating a font from an invalid string.
+        Fixed metric problems.
+
+- Fixed possible infinite loop when drawing text.
+	
+- Fixed an issue where flags specified by QMAKE_LFLAGS_RELEASE would not be
+  included in generated Visual Studio project files.
+	
+- Fixed issue that caused wizards to use the wrong class in the QMsDev plugin
+
+- Fixed an unexpected remote close in QSocket for Windows servers with a high
+  load.
+
+- Fixed crash in QFileDialog.
+
+- Fixed a regression in QWindowsXPStyle where tab widget backgrounds were
+  incorrectly propagated into child scroll views.
+  
+- Fixed issues related to using SJIS TextCodec with QSettings.
+
+- Fixed issue where a fixed size widget could change size after changing screen
+  resolution.
+
+- Fixed support for the Khmer writing system.
+
+
+Mac OS X:
+
+- Made the endian preprocessor define dependent on the architecture. This means
+  that it is possible to build a universal Qt library on one machine. However,
+  qmake_image_collection.cpp is still dependent upon the machine it was
+  generated on.
+
+- QComboBox
+        Fixed an issue where the popup would stay open after the window had
+        been minimized.
+  
+- QFont
+        Fixed support for QFont::setStretch().
+
+- QMacStyle
+        Fixed centering of items in large comboboxes.
+        Fixed editable comboboxes so that they don't truncate text.
+        Added support for Panther-style tabs for tabs on the bottom of a tab
+        widget.
+
+- QPrinter
+        Fixed Intel endian bug in printing of pixmaps with a mask/alpha
+        channel.
+        Fixed regression where active tool windows would always be disabled
+
+- QGLContext
+        Fixed a tearing issue caused by incorrect vertical sync.
+
+- Fixed a rendering issue with transparent cursors on Intel macs.
+
+- Fixed a rendering issue with icons in the dock on Intel macs.
+
+- Fixed a crash when playing back a file that does not exist.
+
+- Fixed a regression where full keyboard access was not being honored.
+
+- Fixed a regression preventing static file dialogs from being opened in a
+  contextMenuEvent() handler.
+ 
+- Fixed a regression in navigating nested popup menus.
+
+
+X11:
+
+- Fixed rendering of Japanese text with XLFD fonts.
+
+- Fixed rendering of text with stacking diacritics.
+
+- Rendering fixes for Indic scripts.
+
+- Fixed problem with applications hanging while querying the clipboard. This is
+  related to the KDE bug reported at http://bugs.kde.org/show_bug.cgi?id=80072.
+
+- Fixed a crash that could occur when Qt uses a DirectColor visual.
+
+- Fixed a rare crash in QPixmap::convertToImage() when XGetImage() fails.
+
+- Fixed issue where events were not being processed by Qt when using the Qt
+  Motif Extension.
+
+- The X input method language status window is no longer shown for popup menus
+  on Solaris.
+
+- Fixed incorrect use of colors when painting on the default (TrueColor) screen
+  when running a Qt application on a multi-screen display where the default
+  screen uses a TrueColor visual and the secondary screen a PseudoColor visual.
+
+- Fixed a bug where calling newPage() directly before destroying the QPrinter
+  caused the last page to be printed twice.
+
+- Fixed a bug on older Unix systems where incorrect font sizes could get used
+  when printing in HighResolution mode.
+
+- Fixed a crash when trying to load huge font files.
+
+- Ensured that fonts containing a '-' in the family name are correctly loaded.
+
+- Ensured that the QFont::NoAntialias flag is always honored.
+
+- Fixed incorrect shaping of some character combinations when writing Bengali.
+
+- Introduced workaround for some Arabic fonts with broken OpenType tables.
+
+- Fixed a bug where the wrong braces would get used when using the Hebrew Culmus
+  fonts.
+
+- Fixed crash in qtconfig when removing or shifting font substitution families.
diff --git a/dist/changes-4.0.1 b/dist/changes-4.0.1
new file mode 100644
index 0000000..f08aac6
--- /dev/null
+++ b/dist/changes-4.0.1
@@ -0,0 +1,786 @@
+****************************************************************************
+*                          Important Notices                               *
+****************************************************************************
+
+Meta-Object System
+------------------
+
+Qt 4.0.0 introduced a change to the way type names outside the current
+scope were handled in signals and slots declarations and connections
+which differed from the behavior in Qt 3.x.
+
+Unfortunately, this could lead to signal-slot connections that were
+potentially type-unsafe. Therefore, in Qt 4.0.1 type names must be fully
+qualified in signal-slot declarations and connections.
+
+For example, in Qt 4.0.0, it was possible to write:
+
+    connect(socket, SIGNAL(error(SocketError)), ...);
+
+In Qt 4.0.1, the above connection must be made in the following way:
+
+    connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), ...);
+
+
+Library
+-------
+
+Support for SGI Altix has been added for both gcc and Intel icc.
+
+
+QX11EmbedContainer and QX11EmbedWidget are now exported classes.
+
+This change only affects developers using Qt/X11 with gcc >= 4.0 and
+symbol visibility enabled. Applications built against Qt 4.0.1 that
+use these classes cannot be linked against Qt 4.0.0.
+
+
+****************************************************************************
+*                                Changes                                   *
+****************************************************************************
+
+Qt Designer
+-----------
+
+Fixed crash in designer when using fonts in custom widgets that
+don't have a point size set but use a pixel size instead.
+
+Fixed initial positions of the form windows in the MDI mode.
+
+Ensured that the object inspector is updated when a page is added
+to a widget stack.
+
+Ensured that the SDK is installed and the library symbols are
+exported.
+
+Fixed crash when breaking a layout after deleting all widgets within.
+
+Fixed handling of nested action groups.
+
+Fixed mouse handling to match user expectations on different
+platforms.
+
+Don't change system setting for double click interval.
+
+Disabled the richtext editor for the "statusTip" property.
+
+Improved widget handling, loading and saving for QFrame, QTabWidget,
+and Q3GroupBox.
+
+Added a platform-neutral mechanism for saving key sequences.
+
+Used Qt's list of supported image formats rather than an incomplete
+static list.
+
+Provided a way for plugins to access to the layout of container
+widgets.
+
+Added support for editable byte arrays.
+
+
+Qt Linguist
+-----------
+
+Made lupdate handle cases where the compiler converts strings using
+a different codec to that used by lupdate.
+
+Fixed bug in lupdate and lrelease's .pro file parser.
+
+Fixed lupdate's octal sequence handling.
+
+Fixed duplicate context when two contexts have the same hash value.
+
+
+Qt 3 to 4 Porting Tool
+----------------------
+
+Fixed connnect statement that did not work with the new stricter moc.
+
+Fixed incorrect porting of enum values in switch statements.
+
+Fixed header file name replacements in include directives.
+
+
+Meta Object Compiler (moc)
+--------------------------
+
+Fixed VC6 compilation of moc generated code with namespaced
+superclasses.
+
+Fixed parsing of functions that throw exceptions.
+
+Fixed compilation of moc generated code with VC6 when inheriting
+from classes inside namespaces.
+
+Improved the efficiency of signals with default arguments.
+
+
+Qt Assistant
+------------
+
+Fixed the document list for full text search indexing.
+
+Fixed case sensitive completion in the find dialog combobox.
+
+Re-enabled the "add content file" option.
+
+Removed the "General" tab in the settings dialog.
+
+Fixed registry key handling and deletion of cache files.
+
+Made it possible to read titles in the tabs in assistant.
+
+Updated the QAssistantClient documentation.
+
+Added the QtAssistantClient headers to the other library headers
+for installation.
+
+Fixed full text search for phrases.
+
+
+General Fixes
+-------------
+
+- Dialogs
+        Removed hard-coded margin and spacing values from built-in
+        dialogs.
+
+- QAbstractItemModel
+        Fixed crash caused by removing an item with expanded children.
+        Added some more see also links and defined QModelIndexList.
+
+- QAbstractItemView
+        Fixed rendering and selection issues with MultiSelection
+        mode.
+        Improved handling of persistent editors.
+        Improved performance of item insertion.
+        Improved signal handling and emission.
+
+- QAbstractSlider
+        Ensured that no changes occur if the orientation doesn't
+        change in a call to setOrientation().
+        Introduced better keyboard control for sliders.
+        Fixed sliderPressed() and sliderReleased() signal emissions.
+
+- QAbstractSocket
+        Fixed race condition in connectToHost().
+        Made bytesAvailable() return the unget buffer size as well
+        as the size of any pending data.
+        Made NetworkLayerProtocol non-internal.
+
+- QAbstractSpinBox
+        Fixed problems with locale and the "." and "," separators.
+        Improved handling of extra whitespace at the beginning and
+        end of user input.
+
+- QApplication
+        Made closeAllWindows() respect windows that reject the close
+        event.
+        Fixed crash caused by calling QApplication::setStyle()
+        before a qApp was created.
+        Improved handling of the last open window for most cases.
+        Improved event handling.
+
+- QBezier
+        Used a new algorithm for offsetting curves.
+        Improved performance by using a more sophisticated
+        algorithm and by making QBezier a POD type.
+
+- QBrush
+        Improved radial gradient rendering.
+
+- QColorDialog
+        Process the return key correctly.
+
+- QComboBox
+        Fixed behaviour of setMaxItems() to enable new items to be
+        inserted within the range allowed.
+
+- QCommonStyle
+        Ensured that mnemonics are always shown for buttons.
+        Fixed position of right corner widget when used on its own.
+
+- QDateTimeEdit
+        Improved the range of input allowed for numbers.
+
+- QDial
+        Fixed valueChanged() signal emission.
+
+- QDialog
+        Fixed Lower QSizeGrip in QDialog instead of raising it.
+
+- QDir
+        Fixed relative path handling on Windows.
+        Reverted empty string matching behavior to match Qt 3's
+        behavior.
+        Restored API compatibility with Qt 3.
+
+- QDirModel
+        Fixed accidental deletion of directories in read-only mode.
+
+- QDockWidget
+        Ensured that the size of a floating dock widget is the same
+        regardless of how it was floated.
+        Reintroduced double-clicking behavior to float a dock
+        widget.
+        Fixed incorrect moving behavior for floating widgets.
+        Ensured that dock widgets display a close icon only if they
+        can be closed.
+
+- QDockWidgetLayout
+        See QMainWindow.
+
+- QDomNodeList
+        Fixed handling of out-of-range items.
+
+- QDoubleSpinBox
+        Improved decimals handling and rounding behavior in
+        QDoubleSpinBox.
+
+- QFile
+        Fixed problems with carriage return and line feed handling
+        in readLine().
+        Ensured that pos() returns the correct value if the file
+        shrinks.
+
+- QFileDialog
+        Fixed incorrect behavior where the dialog would go to the
+        root directory if the user tried to enter a non-existent
+        directory.
+        Fixed sorting by type behavior.
+
+- QFontDatabase
+        Fixed loading of special fonts.
+        Fixed sample characters for Chinese scripts.
+
+- QFontDialog
+        Switched the locations of the OK and Cancel buttons.
+        Made items in the font dialog read-only.
+        Improved handling of the OK and Cancel buttons when the
+        dialog is in reverse layout mode.
+
+- QGifHandler
+        Reintroduced GIF plugin support.
+
+- QGridLayout
+        Improved default size handling.
+
+- QHeaderView
+        Fixed section hiding behavior.
+        Fixed Out of bounds error and improper calculation of last
+        column.
+        Improved mouse handling and widget updating.
+        Fixed crashes caused by moving or removing sections, or by
+        updating the current section.
+        Improved signal behavior for resized or removed sections.
+
+- QHttp
+        Fixed proxy authentication.
+        Fixed broken behavior when scheduling many requests to
+        different hosts.
+        Fixed socket object ownership issues with setSocket() that
+        could lead to a crash.
+
+- QImage
+        Fixed smooth scaling for image formats other than RGB and
+        ARGB32.
+
+- QImageReader
+        Fixed the default implementation of imageCount() to return a
+        valid number of images.
+
+- QInputDialog
+        Switched the locations of the OK and Cancel buttons.
+
+- QIODevice
+        Fixed problems with carriage return and line feed handling
+        in readLine().
+        Made bytesAvailable() return the unget buffer size as well
+        as the size of any pending data.
+        Fixed error handling when reading lines with QFile.
+        Fixed seek() behavior with regard to the unget buffer.
+
+- QItemDelegate
+        Improved layout handling, redrawing, signal emission,
+        and mouse click behavior.
+
+- QKeySequence
+        Fixed accidental HTML escaping of ampersands.
+
+- QLayout
+        Print out object names in warnings.
+
+- QLineEdit
+        Enabled textChanged() signal emission when using input
+        methods.
+        Improved return key press handling for users of the
+        returnPressed() signal.
+        Fixed context menu action handling.
+        Fixed editingFinished() signal emission behavior.
+        Fixed Ctrl-K and Ctrl-U behavior to cut text rather than
+        just deleting it.
+        Fixed line edit selection behavior to maintain any current
+        selection when the widget receives the keyboard focus.
+
+- QListView
+        Improved handling of hidden rows.
+        Fixed rendering when used in reverse mode.
+
+- QListWidget
+        Fixed the size policy for laying out items in the list.
+        Improved sorting performance.
+        Fixed persistent index handling when sorting.
+
+- QMainWindow
+        Fixed problems with multiple connections from QMainWindow
+        signals to QToolBar slots.
+        Fixed dock widget handling (adding a widget to all dock
+        areas) and incorrect dock area splitting behavior that
+        could lead to crashes in QMainWindow.
+        Made QMainWindow's status bar have an "Ignored" horizontal
+        size policy.
+
+- QMetaObject
+        Fixed meta objects that reported far too many enums.
+        Fixed the behavior of sender() to return the correct value
+        during queued activation.
+
+- QMetaType
+        Fixed whitespace handling in template specialization.
+        Fixed missing qt_metatype_id implementation for <void *>.
+        Added more support for compilation with QT_NO_DATASTREAM.
+
+- QMenu
+        Fixed keyboard navigation when mouse navigation is also
+        being used.
+        Fixed menu bar merging behavior.
+
+- QMenuBar
+        Fixed Alt key navigation.
+
+- QObject
+        Fixed incorrect exception handling.
+
+- QPaintEngine
+        Suppressed warnings when drawing "empty" text.
+        Fixed rendering of Underline, Overline, and StrikeOut for
+        text drawn using outlines.
+
+- QPainter
+        Improved handling of clip regions when restore() is called.
+        Improved text drawing performance.
+
+- QPaintDevice
+        Allowed construction of QImage before QApplication.
+
+- QPainterPath
+        Improved performance and rendering accuracy.
+
+- QPen
+        Fixed missing detach in setWidth().
+
+- QPixmap
+        Improved drawing speed and mask handling.
+
+- QPlastiqueStyle
+        Improved visual feedback for scrollbar page buttons and
+        slider handle.
+        Improved Plastique style on non-XRender-enabled displays.
+
+- QProcess
+        Fixed endless loop of signal being emitted if model dialog
+        is used in slot.
+        Made bytesAvailable() return the unget buffer size as well
+        as the size of any pending data.
+
+- QProxyModel
+        Improved signal handling for propagated signals.
+
+- QResource
+        Fixed Latin-1 string handling.
+        Fixed unloading of resources.
+
+- QScrollArea
+        Fixed widget resizing so that widgets that are smaller than
+        the viewport remain visible.
+
+- QSettings
+        Made it possible to store QImage/QPixmap settings.
+        Fixed race conditions in QSettings with INI files.
+        Improved handling of non-terminated strings in INI files.
+
+- QSizeGrip
+        Made the Qt 3-style constructor public.
+
+- QSpinBox
+        Fixed problems with out-of-range integers and doubles.
+
+- QSqlQueryModel
+        Fixed integration between QSqlTableModel and MS Access.
+        Fixed signal emissions for tables with only one row.
+
+- QSqlTableModel
+        Fixed problems with multiple record insertion.
+
+- QStatusBar
+        Fixed status bar height without size grip.
+
+- QTabBar
+        Fixed handling of the current page index when adding the
+        first page to QTabWidget.
+        Improved tab bar icon handling to enable icons to be updated
+        without redrawing the entire tab bar.
+
+- QTableView
+        Improved text cursor handling and support for keyboard
+        modifiers.
+        Fixed problems with disappearing headers.
+        Disallowed selection of hidden rows and columns.
+        Fixed crashes involving empty models and tables with headers
+        but no rows or columns.
+
+- QTableWidget
+        Improved sorting and signal emission behavior.
+
+- QTabWidget
+        Fixed handling of the current widget to keep the tab bar
+        updated.
+
+- QTextBrowser
+        Removed temporary visible text selection when activating
+        anchors with Shift-click.
+
+- QTextCursor
+        Fixed selection behavior for words at the beginning of lines.
+        Fixed incorrect use of character formats when calling
+        insertFragment().
+        Fixed incorrect text insertion where line feeds and carriage
+        returns would not be transformed into Unicode block
+        separators.
+
+- QTextDocument
+        Added support for page breaking.
+        Added support for relative font sizes.
+        Added support for <hr /> tags.
+        Fixed clipboard handling and drag and drop of text frames.
+        Fixed handling of closing HTML </center> tags.
+        Fixed crash (failing assertion) on import of nested empty
+        HTML tables.
+        Fixed data corruption in fromPlainText().
+        Corrected the handling of image tags inside anchors.
+        Fixed introduction of empty spaces or lines before and after
+        tables.
+        Fixed misrendering of some nested HTML tables with variable
+        sized columns.
+        Fixed crash in table drawing due to out-of-bounds access.
+        Added support for the pageCountChanged() signal.
+        Improved performance and size of PostScript images when
+        printing high resolution or scaled images.
+
+- QTextEdit
+        Improved layout and selection handling.
+        Added configuration support for non-blinking cursors.
+        Improved keyboard handling.
+        Improved text insertion handling.
+
+- QTextFormat
+        Added support for horizontal rules.
+        Improved font handling.
+
+- QTextLayout
+        Allow line breaking at tabs.
+        Improved reporting of line widths for lines ending with a
+        QChar::LineSeparator.
+        Fixed reporting of the minimum width for layouts that have
+        NoWrap/ManualWrap as their wrap policy.
+
+- QTextStream
+        Fixed locking behavior when reading from stdin.
+        Fixed seek() behavior.
+        Improved Latin-1 string handling.
+
+- QTextTable
+        Improved performance and selection handling.
+
+- QToolBar
+        Fixed toolbar resizing behavior to handle icon size changes.
+
+- QTreeView
+        Improved handling of hidden rows, columns, and child items.
+        Fixed repainting issues with newly inserted child items
+        and selections.
+        Improved scrolling behavior.
+        Fixed crashes involving column handling and empty views.
+        Fixed sorting indicator behavior.
+
+- QTreeWidget
+        Improved item insertion performance.
+        Fixed clone() and operator=() for QTreeWidgetItem.
+        Fixed crash when removing or deleting items with children.
+        Improved sorting performance.
+        Fixed sorting indicator behavior.
+        Fixed persistent index handling when sorting.
+
+- QUrl
+        Improved the performance of removeDots().
+
+- QWidget
+        Fixed problems with adding an action multiple times.
+
+- QXmlInputSource
+        Improved heuristics for determining character encodings.
+
+- Q3FileDialog
+        Fixed file selection handling.
+
+
+Platform-Specific Issues
+------------------------
+
+Windows:
+
+- QApplication
+        Fixed Block modeless elements of client when ActiveX opens a
+        modal dialog
+        Enabled tablet support.
+        Improved event handling for popup widgets.
+
+- QAxWidget
+        Support a document site only if the COM object allows proper
+        initialization with a storage.
+
+- QFileDialog
+        Updated to use the latest native Windows dialogs.
+
+- QProcess
+        Fixed behavior of forwarded read channels.
+
+- QSettings
+        Fixed behavior of childKeys() with respect to the default
+        key.
+
+- QWindowsStyle
+        Fixed menu item size.
+        Improved drawing of default push buttons.
+        Fixed rendering of sliders to correctly differentiate
+        between those in enabled and disabled states.
+
+- QWindowsXPStyle
+        Fixed menu frame rendering.
+        Reduced the space allocate to menu items.
+
+
+X11:
+
+- QApplication
+        Fixed incorrect initialization of screen and resolution.
+        Improved mouse button handling.
+        Fixed handling of withdrawn windows.
+
+- QBitmap
+        Fixed bitmap brush textures to ensure that they use the
+        correct color with XRender.
+
+- QFont
+        Fixed handle() to return useful values.
+
+- QFontDatabase
+        Fixed fonts for some writing systems not being loaded on X11
+
+- QPaintEngine
+        Fixed multi-screen support.
+        Improved performance and rendering accuracy.
+        Fixed dot-dash patterns when drawing with large pen widths.
+        Improved text rendering on exported displays.
+
+- QWidget
+        Implemented support for window opacity.
+        Added support for widgets with 32 bit sizes.
+        Improved support for different active and inactive background
+        brushes.
+        Fixed window icons on X servers that have truecolor and
+        pseudocolor visuals with different depths.
+        Fixed text rendering on exported displays.
+
+- QXIMInputContext
+        Fixed crash in XIM code with newer x.org libraries.
+        Fixed support for switching input method styles.
+
+- QX11Embed
+        Exported QX11Embed (see the Important Changes section
+        above).
+        Improved handling of non-XEmbed clients.
+        Improved geometry and focus handling.
+
+
+UNIX:
+
+- QPageSetupDialog
+        Reduced the size of the dialog.
+
+- QPrintDialog
+        Fixed initialization of color and grayscale radio buttons.
+
+- QProcess
+        Fixed incorrect notification of process termination on
+        Linux kernels up to and including the 2.4 series.
+        Made QProcess emit an error() when failing to launch a
+        program.
+
+
+Mac OS X:
+
+- QApplication
+        Fixed widgetAt() to handle transparent widgets.
+        Handle keyboard events in the active window if no focus
+        window is available.
+        Changed wheel mouse scrolling speed to match that of
+        other applications.
+
+- QComboBox
+        Fixed rendering of combobox frames.
+
+- QDnD
+        Fixed URL handling.
+
+- QClipboard
+        Fixed Junk at end of pasted text on Qt/Mac.
+
+- QCursor
+        Fixed incorrect pixmap handling.
+
+- QFileDialog
+        Fixed sheet modality issues to prevent the dialog from being
+        hidden behind other windows.
+
+- QFont
+        Default to using the Geneva font.
+        Enable kerning and fix Arabic text handling.
+
+- QLibraryInfo
+        Fixed location of qt.conf in Mac OS X bundles.
+
+- QMacStyle
+        Improvements to rendering accuracy of comboboxes, tab bars,
+        workspace windows, tool buttons, and push buttons.
+        Fixed incorrect drawing of scrollbars with "inverted
+        appearance".
+        Fixed font-related crash for applications configured to
+        use the standard desktop settings.
+
+- QMenu
+        Improved menu bar handling on navigation dialogs.
+
+- QMenuBar
+        Improved menu bar hiding/wrapping behavior.
+
+- QPaintDevice
+        Removed byte order assumptions.
+
+- QPaintEngine
+        Improved brush handling, clipping, masking, and tiling
+        operations.
+
+- QPixmap
+        Improvements to pixmap copying and conversion, masking, and
+        alpha channel handling.
+        Removed byte order assumptions.
+
+- QPrintEngine
+        Made color printing the default behavior.
+
+- QSettings
+        Sync the application's setting on construction of a
+        QSettings object.
+
+- QSysInfo
+        Included enum values for Mac OS X codenames in the
+        MacVersion version enum.
+
+- QWidget
+        Improved mouse event handling.
+        Improved interoperability between modal widgets.
+
+
+Tools
+-----
+
+- uic3
+        Fixed class name handling when used in "-convert" mode.
+        Fixed vertical space issues with .ui files converted from
+        Qt 3 to Qt 4.
+        Improved support for Qt3Support widgets.
+        Improved support for deprecated enums.
+        Added a generator for dependencies in Qt 3 .ui files.
+
+- rcc
+        Added better error reporting.
+
+- uic
+        Added code generation for tab attributes.
+        Fixed text codec handling.
+        Used UTF-8 as the default enconding in .ui files.
+        Fixed code generation for QWizard.
+
+
+Documentation
+-------------
+
+Porting:
+
+Removed QMovie from the list of implicitly shared classes that were
+previously explicitly shared.
+
+Added .ui porting document to the 4.0.1 documentation.
+
+Added sections about QHBox, QVBox, and QGrid to the porting guide.
+
+Added QImageIO and QMovie to the porting guide.
+
+Added QRegExp and some QDir functions to the porting guide.
+
+Added QObject::objectTrees() to the porting guide.
+
+Added QPopupMenu to the porting guide.
+
+
+General:
+
+Fix documentation of amortized container behavior.
+
+Added information about using specific compilers to build Qt.
+
+Removed QtMotif documentation because it is now part of Qt Solutions.
+
+Clarify parent-child relationship within QThreads.
+
+Documented potential file name clashes when using precompiled headers.
+
+Added a Windows XP gallery.
+
+Added pages to contain lists of classes for each Commercial Edition.
+
+Reintroduced the QAssistantClient documentation as part of the
+QtAssistant module.
+
+Added missing Qt Designer API documentation.
+
+- QApplication
+        Documented correct use of QApplication::setStyle().
+
+- QComboBox
+        Made removeItem() and setRootModelIndex() visible in the
+        documentation.
+
+- QMetaObject
+        Added missing documentation for QGenericArgument and
+        QGenericReturnArgument, making them visible in the
+        documentation, but not recommended for casual use.
+
+- QPainter
+        Make QPainter::setRedirected() visible and fix its
+        description.
+
+- QSqlDatabase
+        Document what happens when passing an existing connection
+        name to addDatabase().
diff --git a/dist/changes-4.1.0 b/dist/changes-4.1.0
new file mode 100644
index 0000000..396a5b7
--- /dev/null
+++ b/dist/changes-4.1.0
@@ -0,0 +1,573 @@
+Qt 4.1 introduces many new features as well as many improvements and
+bugfixes over the 4.0.x series. For more details, see the online
+documentation which is included in this distribution. The
+documentation is also available at http://doc.trolltech.com/
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Qt library
+----------
+
+- Introduced widget backing store support, allowing semi-transparent
+  (alpha-blended) child widgets and faster widget painting, as well
+  as solving long-lasting issues with non-rectangular widgets.
+
+- Integrated support for rendering Scalable Vector Graphics (SVG)
+  drawings and animations (QtSvg module).
+
+- A Portable Document Format (PDF) backend for Qt's printing system.
+
+- A unit testing framework for Qt applications and libraries.
+
+- Modules for extending Qt Designer and dynamic user interface
+  building.
+
+- Additional features for developers using OpenGL, such as support
+  for pixel and sample buffers.
+
+- A flexible syntax highlighting class based on the Scribe rich text
+  framework.
+
+- Support for network proxy servers using the SOCKS5 protocol.
+
+- Support for OLE verbs and MIME data handling in ActiveQt.
+
+- Support for universal binaries on Mac OS X.
+
+Qt Designer
+-----------
+
+- Added support for editing menu bars and tool bars.
+
+- Added support for adding comments to string properties.
+
+- Added new static QtUiTools library with improved
+  QUiLoader API for loading designer forms at run-time.
+
+- Added support for namespaces in uic generated code.
+
+- Added support for dock widgets in main windows.
+
+- Added support for editing table, tree and list widgets.
+
+- Improved palette editing and resource support.
+
+QTestLib
+--------
+
+- Added QTestLib, the Qt Unit Testing Library. See the "QTestLib"
+  chapter in the Qt documentation for more information.
+
+- Users of older versions of QtTestLib can use the updater utility in
+  tools/qtestlib/updater to convert existing autotests to work with
+  QTestLib.
+
+Boost
+-----
+
+Added boost compatible syntax for declaring signals and slots. If you
+define the macro QT_NO_KEYWORDS, "Q_SIGNALS" and "Q_SLOTS" are
+recognized as keywords instead of the default "signals" and "slots".
+Added a new keyword to qmake to enable this macro: CONFIG += no_keywords.
+
+ActiveQt
+--------
+
+QAxServer now supports mime-type handling - a ActiveX control can be
+registered to handle a certain file extension and mime-type, in which
+case QAxBindable::load and QAxBindable::save can be reimplemented to
+serialize the object.
+
+Build system
+------------
+
+Added support for linking static plugins into the application.
+
+Qt 3 to 4 Porting Tool
+----------------------
+
+Q(V|H)BoxLayout and QGridLayout usage is now ported to use
+Q3(V|H)BoxLayout/Q3GridLayout, to retain the margin/spacing behavior
+as in Qt 3.
+
+Meta Object Compiler (moc)
+--------------------------
+
+- Added support for const signals.
+
+Qt Assistant
+------------
+
+- Added -docPath command line option for easy setting of the
+  document root path.
+
+QMake
+-----
+
+- Added support for new FORMS3 profile variable to make it possible
+  to have Qt Designer forms from Qt 3 and Qt 4 in the same project.
+
+- Added support for precompiled headers on win32-g++ (MinGW)
+
+Compilers
+---------
+
+Added support for Solaris 10 on AMD64 with the compiler provided by
+Sun.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+
+New classes
+-----------
+
+- QTreeWidgetItemIterator
+        Added iterator to help iterating over items in a QTreeWidget.
+
+- QStringFilterModel
+        Allows you to provide a subset of a model to a view based on a
+        regular expression.
+
+- QSyntaxHighlighter
+        The QSyntaxHighlighter class allows you to define syntax
+        highlighting rules.
+
+- QAbstractFileEngine
+        A base class for implementing your own file and directory
+        handling back-end for QFile, QFileInfo and QDir.
+
+- QAbstractFileEngineHandler
+        For registering a QAbstractFileEngine subclass with Qt.
+
+- QFSFileEngine
+        The default file engine for regular file and directory access
+        in Qt.
+
+- Q3(H|V)BoxLayout and Q3GridLayout
+        Layout classes provided for compatibility that behave the same
+        as the Qt 4 classes but use a zero margin/spacing by default,
+        just like in Qt 3.
+
+- Added qFromLittleEndian, qToLittleEndian, qFromBigEndian and
+  qToBigEndian endian helper conversion functions (qendian.h)
+
+- Q_EXPORT_PLUGIN2 macro
+        Obsoletes Q_EXPORT_PLUGIN and allows static linking of
+        plugins.
+
+- Q3ComboBox
+        For enhanced backwards compatibility with Qt 3.
+
+- QGLPbuffer
+        For creating and managing OpenGL pixel buffers.
+
+- QNetworkProxy
+        For setting up transparent (SOCKS5) networking proxying.
+
+- QDirectPainter (Qtopia Core only)
+        Provides direct access to video framebuffer hardware.
+
+
+General improvements
+--------------------
+
+- QByteArray
+        Added toLong() and 
+
+- QColorDialog
+        Fix shortcut and focus for "Alpha channel" spinbox.
+
+- QLinkedList
+        Added conversion methods to convert from/to STL lists.
+
+- QMap/QHash
+        Fixed operator>>() to read back multiple values associated
+        to a same key correctly.
+        Added constFind(), for finding an item without causing a
+        detach.
+
+- QMap/QHash
+        Const-correctness in const_iterator's operator--(int).
+
+- QMainWindow
+        The saveState() and restoreState() functions no longer
+        fallback to using the windowTitle property when the objectName
+        property is not set on a QToolBar or QDockWidget; this
+        behavior was undocumented and has been removed.
+
+- QToolBar
+        Added Qt 3 compatibility signal visibilityChanged(bool).
+
+- QMetaType
+        Class is now fully reentrant.
+        Metatypes can be registered or queried from multiple threads.
+        Added qMetaTypeId<T>(), which returns the meta type ID of T at
+        compile time.
+
+- QMetaProperty
+        Added isResettable().
+
+- QSql
+        Oracle plugin adds support for authentication using external
+        credentials.
+        Added isValid() to QSqlError.
+
+- QThread
+        Added setPriority() and priority(), for querying and setting
+        the priority of a thread.
+
+- QTreeWidgetItem/QTreeWidget
+        Added new constructors and addChildren(), insertChildren(),
+        takeChildren(), insertTopLevelItems(), addTopLevelItems to
+        speed up insertion of multiple items.
+
+- QTextDocument
+        Added the class QTextBlockUserData and added the possibility
+        of storing a state or custom user data in a QTextBlock
+        Added useDesignMetrics property, to enable the use of design
+        metrics for all fonts in a QTextDocument.
+
+- QTextFormat
+        Added support for setting the font pixel size.
+        Added UserObject to QTextFormat::ObjectTypes enum.
+
+- QMetaType
+        The value of QMetaTypeId<T>::Defined indicates whether a given
+        type T is supported by QMetaType.
+
+- QAbstractItemView
+        Added setIndexWidget() and indexWidget() which makes it
+        possible to set a widget at a given index.
+
+        Added a QAbstractItemView::ContiguousSelection mode.
+        Added scrollToTop() and scrollToBottom().
+        Changed signals pressed(), clicked() and doubleClicked() to
+        only emit when the index is valid.
+
+- QAbstractItemModel
+        Added a SizeHintRole that can be set for each item. The item
+        delegate will now check for this value before computing the
+        size hint based on other item data.
+
+        Add QModelIndex::operator<() so we are able to use them in
+        QMap and other containers.
+
+        Added qHash function for QModelIndex.
+
+- QTableWidget
+        Added cellWidget() and setCellWidget() which makes it possible
+        to set a widget at a specified cell.
+
+        Added setCurrentCell().
+
+        Added QTableWidgetItem copy constructors.
+
+
+- QTreeWidget
+        Added setItemWidget() and itemWidget() which makes it possible
+        to set a widget on an item.
+
+- QListWidget
+        Added setItemWidget() and itemWidget() which makes it possible
+        to set a widget on an item.
+
+        Added QListWidgetItem copy constructors.
+
+- QMutableMapIterator
+        Added value() overloads to Java-style iterators that return
+        non-const references.
+
+- QTextTable
+        Added mergeCells() and splitCells() to be able to set the row
+        or column span on a table cell.
+
+- QStyle
+        Added standardIcon() which returns a default icon for standard
+        operations.
+        Added State_ReadOnly, which is enabled for read-only widgets.
+
+        Renamed QStyleOption::init() to initFrom().
+        - QGroupBox is now completely stylable (QStyleOptionGroupBox).
+        - QToolBar is now stylable according to its position in the
+          toolbar dock area (QStyleOptionToolBar).
+        - Indeterminate (busy) progress bars are now animated properly
+          in all styles.
+        - By popular request, the default toolbar icon size
+          (PM_ToolBarIconSize) in Windows and Plastique styles has
+          been changed to 24 x 24 (instead of 16 x 16 in Windows and
+          32 x 32 in Plastique).
+
+        Added PM_DockWidgetTitleMargin as pixel metric.
+
+- QHash
+        Make it possible to use QHash with a type that has no default
+        constructor.
+
+- QTableView
+        Made QTableView::setShowGrid() a slot, like in Qt 3.
+        Added setRowHeight() and setColumnWidth().
+
+- QTableWidgetSelectionRange
+        Added rowCount() and columnCount() convenience functions.
+
+- QSettings
+        Added support for custom formats in QSettings.
+
+- QTextStream
+        Added status(), setStatus() and resetStatus() for improved
+        error handling.
+        Added read(qint64 maxlen), for reading parts of a text stream
+        into a QString.
+
+- QTextCursor
+        Added support for BlockUnderCursor selection type.
+
+- QHeaderView
+        Added defaultSectionSize property which tells the default size
+        of the header sections before resizing.
+
+- QScrollBar
+        Added context menu to the scrollbar with default navigation
+        options.
+
+- QScrollArea
+        Added ensureVisible(), which can scroll the scrollarea to make
+        sure a specific point is visible.
+
+- QDateTime
+        Added addMSecs(), which adds a number of milliseconds to the QDateTime.
+
+- QDateTimeEdit
+        Added support for more date/time formats.
+        Now allows multiple sections of the same type.
+
+- QButtonGroup
+        Added handling of buttons with IDs to the buttongroup like in
+        Qt 3.
+
+- QIODevice
+        Added peek() for peeking data from a device.
+
+- QTextEdit
+        Added property tabStopWidth which sets the tab stop width in
+        pixels.
+        append(const QString &) is now a public slot.
+        Added support for inserting Unicode control characters through
+        the context menu.
+        Added property acceptRichText, for whether or not the text
+        edit accepts rich text insertions by the user.
+        Added overwriteMode property.
+
+- QDataStream
+        Added skipRawData().
+        Added support for QRegExp.
+
+- QProgressBar
+        Added support for vertical progress bars.
+
+- QImageIOHandler
+        The name() function has been obsoleted; use format() instead.
+        Added QImageIOHandler::Animation, for determining if the image
+        format supports animation.
+        Added QImageIOHandler::BackgroundColor, for setting the
+        background color for the image loader.
+
+- QImageReader
+        Added setBackgroundColor() and backgroundColor(), for setting
+        the background color of an image before it is read.
+        Added supportsAnimation(), for checking if the image format
+        supports animation.
+
+- QImageWriter
+        Added support for saving image text.
+
+- QLocale
+        Added dateFormat()/timeFormat() to query the date/time format
+        for the current locale.
+        Added toString() overloads for localized QTime and QDate
+        output.
+        Added decimalPoint(), groupSeparator(), percent(),
+        zeroDigit(), negativeSign() and exponential(), which provide a
+        means to generate custom number formatting.
+
+- QHostInfo
+        Added support for reverse name lookups.
+
+- QHostAddress
+        Added a QString assignment operator
+        Added convenience functions for initializing from a native
+        sockaddr structure.
+        Added support for the IPv6 scope-id.
+
+- QPrinter
+        Added property "embedFonts" for embedding fonts into the
+        target document.
+        Added support for printing to PDF.
+        Added support for custom print and paint engines
+
+- QPrintEngine
+        Added PPK_SuppressSystemPrintStatus, for suppressing the
+        printer progress dialog on Mac OS X.
+
+- QKeySequence
+        Added fromString() and toString() for initializing a key
+        sequence from, and exporting a key sequence to a QString.
+
+- QUrl
+        Added the port(int) function, which provides a default value
+        for the port if the URL does not define a port.
+        Support for decoding Punycode encoded hostnames in URLs.
+        Made the parser more tolerant for mistakes, and added a
+        ParsingMode flag for selecting strict or tolerant parsing.
+        Added support for the NAMEPREP standard in our i18n domain
+        name support.
+
+- QDir
+        Added the filter QDir::NoDotAndDotDot, for the
+        special directories "." and "..".
+        Added the filter QDir::AllEntries, for all entries
+        in a directory, including symlinks.
+
+
+- QAbstractSocket
+        Added slots connectToHostImplementation() and
+        disconnectFromHostImplementation() to provide polymorphic
+        behavior for connectToHost() and disconnectFromHost().
+
+- QMenuBar
+        Added setActiveAction(), which makes the provided action
+        active.
+
+- QProxyModel
+        This class has been obsoleted (see QAbstractProxyModel)
+
+- QWidget
+        Now supports three modes of modality: NonModal, WindowModal
+        and ApplicationModal.
+        Added Qt::WindowModality, obsoleted WA_ShowModal and
+        WA_GroupLeader.
+        Added Qt::WA_OpaquePaintEvent widget attribute, obsoleting
+        Qt::WA_NoBackground.
+        Added boolean autoFillBackground property.
+        Child widgets now always inherit the contents of their parent.
+
+- QPalette
+        Added QPalette::Window (obsoletes Background) and
+        QPalette::WindowText (obsoletes Foreground).
+
+- QHttpResponseHeader
+        Added two constructors and the function setStatusLine() for
+        generating a response header.
+
+- QBitArray
+        Added count(bool), for counting on and off-bits in a bit
+        array.
+
+- QVariant
+        Added support for QRegExp
+
+- QRegExpValidator
+        Added the property "regExp".
+
+- QTabBar
+        Added the property "iconSize", for setting the size of the
+        icons on the tabs.
+
+- QLineEdit
+        Added support for inserting Unicode control characters through
+        the context menu.
+
+- QString
+        Added toLong() and toULong().
+        Support for std::string conversions with embedded \0
+        characters.
+
+- QRegion
+        Added translate(), like QRect::translated().
+
+- QProcess
+        Added systemEnvironment(), which returns the environment
+        variables of the calling process.
+        Added exitStatus(), and added a new finished() signal which
+        takes the exit status as a parameter.
+
+- QComboBox
+        Made setCurrentIndex() a slot.
+
+- QFontDataBase
+        Added styleString(), for retrieving the style string from a
+        QFontInfo.
+        Added support for Myanmar fonts.
+
+- QFontMetrics
+        Added xHeight(), which returns the 'X' height of the font.
+
+- QCoreApplication
+        Added arguments(), which returns a list of command line
+        arguments as a QStringList.
+
+- QTcpSocket
+        Added support for SOCKS5 via setProxy().
+
+- QUdpSocket
+        Added property "bindMode", for binding several sockets to the
+        same address and port.
+
+- QPen
+        Added support for custom dash pattern styles and miter limits.
+        Added support for QDebug.
+
+- QDebug
+        Added support for QVector and QPair output.
+
+- QStringListModel
+        Added support for sorting.
+
+- QOpenGLPaintEngine
+        Gradients in the OpenGL paint engine are now drawn using
+        fragment programs, if the extension is available. Lots of
+        fixes, speedups and tweaks.
+
+
+Platform-Specific changes
+-------------------------
+
+Windows:
+
+- Painting
+        Added support for ClearType text rendering.
+
+- File Engine
+        Added support for long filenames/paths.
+
+X11:
+
+- QWidget
+        Added support for freedesktop.org startup notifications.
+
+Mac OS X:
+
+- Added support for universal binaries
+- Improved support for the VoiceOver accessibility tool in Mac OS X 10.4
+  and later
+
+
+3rd-party libraries
+-------------------
+
+- zlib
+        Upgraded to zlib 1.2.3.
+
+- FreeType
+        Upgraded to FreeType 2.1.10.
+
+- SQLite
+        Upgraded to SQLite 3.2.7
diff --git a/dist/changes-4.1.0-rc1 b/dist/changes-4.1.0-rc1
new file mode 100644
index 0000000..fac0ce0
--- /dev/null
+++ b/dist/changes-4.1.0-rc1
@@ -0,0 +1,554 @@
+Qt 4.1 introduces many new features as well as many improvements and
+bugfixes over the 4.0.x series. For more details, see the online
+documentation which is included in this distribution. The
+documentation is also available at http://doc.trolltech.com/
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+Qt library
+----------
+
+  - Integrated support for rendering Scalable Vector Graphics (SVG)
+    drawings and animations (QtSvg module).
+
+  - A Portable Document Format (PDF) backend for Qt's printing system.
+
+  - A unit testing framework for Qt applications and libraries.
+
+  - Modules for extending Qt Designer and dynamic user interface
+    building.
+
+  - New proxy models to enable view-specific sorting and filtering of
+    data displayed using item views.
+
+  - Additional features for developers using OpenGL, such as support
+    for pixel and sample buffers.
+
+  - A flexible syntax highlighting class based on the Scribe rich text
+    framework.
+
+  - Support for network proxy servers using the SOCKS5 protocol.
+
+  - Support for OLE verbs and MIME data handling in ActiveQt.
+
+Qt Designer
+-----------
+
+- Added support for editing menu bars and tool bars.
+
+- Added support for adding comments to string properties.
+
+- Added new static QtForm library with improved
+  QForm::Loader API for loading designer forms at run-time.
+
+- Added support for namespaces in uic generated code.
+
+- Added support for dock widgets in main windows.
+
+- Added support for editing table, tree and list widgets.
+
+- Improved palette editing and resource support.
+
+QTestLib
+--------
+
+- Added QTestLib, the Qt Unit Testing Library. See the "QTestLib" chapter
+  in the Qt documentation for more information.
+
+- Users of older versions of QtTestLib can use the updater utility in
+  tools/qtestlib/updater to convert existing autotests to work with QTestLib.
+
+Boost
+-----
+
+Added boost compatible syntax for declaring signals and slots. If you
+define the macro QT_NO_KEYWORDS "Q_SIGNALS" and "Q_SLOTS" are
+recognized as keywords instead of the default "signals" and "slots".
+
+ActiveQt
+--------
+
+QAxServer now supports mime-type handling - a ActiveX control can be
+registered to handle a certain file extension and mime-type, in which case
+QAxBindable::load and QAxBindable::save can be reimplemented to serialize
+the object.
+
+Build system
+------------
+
+Added support for linking static plugins into the application.
+
+Qt 3 to 4 Porting Tool
+----------------------
+
+Q(V|H)BoxLayout and QGridLayout usage is now ported to use
+Q3(V|H)BoxLayout/Q3GridLayout, to retain the margin/spacing
+behavior as in Qt 3.
+
+Meta Object Compiler (moc)
+--------------------------
+
+- Added support for const signals.
+
+Qt Assistant
+------------
+
+- Added -docPath command line option for easy setting of the
+  document root path.
+
+QMake
+-----
+
+- Added support for new FORMS3 profile variable to make it possible
+  to have Qt Designer forms from Qt 3 and Qt 4 in the same project.
+
+- Added support for precompiled headers on win32-g++ (MinGW)
+
+Compilers
+---------
+
+Added support for Solaris 10 on AMD64 with the compiler provided by
+Sun.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+
+New classes
+-----------
+
+- QTreeWidgetItemIterator
+        Added iterator to help iterating over items in a QTreeWidget.
+
+- QSortingProxyModel
+        The QSortingProxyModel can contain another model and handles
+        the sorting of it.
+
+- QFilteringProxyModel
+        Allows you to provide a subset of a model to a view.
+
+- QStringFilterModel
+        Allows you to provide a subset of a model to a view based on a
+        regular expression.
+
+- QSyntaxHighlighter
+        The QSyntaxHighlighter class allows you to define syntax
+        highlighting rules.
+
+- QAbstractFileEngine
+        A base class for implementing your own file and directory handling
+        back-end for QFile, QFileInfo and QDir.
+
+- QAbstractFileEngineHandler
+        For registering a QAbstractFileEngine subclass with Qt.
+
+- QFSFileEngine
+        The default file engine for regular file and directory access in Qt.
+
+- Q3(H|V)BoxLayout and Q3GridLayout
+        Layout classes provided for compatibility that behave the same
+        as the Qt 4 classes but use a zero margin/spacing by default,
+        just like in Qt 3.
+
+- Added qFromLittleEndian, qToLittleEndian, qFromBigEndian and
+  qToBigEndian endian helper conversion functions (qendian.h)
+
+- Q_EXPORT_PLUGIN2 macro
+        Obsoletes Q_EXPORT_PLUGIN and allows static linking of
+        plugins.
+
+- Q3ComboBox
+        For enhanced backwards compatibility with Qt 3.
+
+- QGLPbuffer
+        For creating and managing OpenGL pixel buffers.
+
+- QNetworkProxy
+        For setting up transparent (SOCKS5) networking proxying.
+
+- QDirectPainter (Qtopia Core only)
+        Provides direct access to video framebuffer hardware.
+
+
+General improvements
+--------------------
+
+- QByteArray
+        Added toLong() and toULong().
+
+- QFileDialog
+        Fix shortcut and focus for "Alpha channel" spinbox.
+
+- QLinkedList
+        Added conversion methods to convert from/to STL lists.
+
+- QMap/QHash
+        Fixed operator>>() to read back multiple values associated
+        to a same key correctly.
+        Added constFind(), for finding an item without causing a detach.
+
+- QMap/QHash
+        Const-correctness in const_iterator's operator--(int).
+
+- QMainWindow
+        The saveState() and restoreState() functions no longer
+        fallback to using the windowTitle property when the objectName
+        property is not set on a QToolBar or QDockWidget; this
+        behavior was undocumented and has been removed.
+
+- QToolBar
+        Added Qt 3 compatibility signal visibilityChanged(bool).
+
+- QMetaType
+        Class is now fully reentrant.
+        Metatypes can be registered or queried from multiple threads.
+        Added qMetaTypeId<T>(), which returns the meta type ID of T at compile time.
+
+- QMetaProperty
+        Added isResettable().
+
+- QSql
+        Oracle plugin adds support for authentication using external credentials.
+        Added isValid() to QSqlError.
+
+- QThread
+        Added setPriority() and priority(), for querying and setting
+        the priority of a thread.
+
+- QTreeWidgetItem/QTreeWidget
+        Added new constructors and addChildren(), insertChildren(),
+        takeChildren(), insertTopLevelItems(), addTopLevelItems to
+        speed up insertion of multiple items.
+
+- QTextDocument
+        Added the class QTextBlockUserData and added the possibility
+        of storing a state or custom user data in a QTextBlock
+        Added useDesignMetrics property, to enable the use of design metrics for
+        all fonts in a QTextDocument.
+
+- QTextFormat
+        Added support for setting the font pixel size.
+        Added UserObject to QTextFormat::ObjectTypes enum.
+
+- QMetaType
+        The value of QMetaTypeId<T>::Defined indicates whether a given type T is
+        supported by QMetaType.
+
+- QAbstractItemView
+        Added setIndexWidget() and indexWidget() which makes it
+        possible to set a widget at a given index.
+
+        Added a QAbstractItemView::ContiguousSelection mode.
+        Added scrollToTop() and scrollToBottom().
+
+- QAbstractItemModel
+        Added a SizeHintRole that can be set for each item. The item
+        delegate will now check for this value before computing the
+        size hint based on other item data.
+
+        Add QModelIndex::operator<() so we are able to use them in
+        QMap and other containers.
+
+        Added qHash function for QModelIndex.
+
+- QTableWidget
+        Added cellWidget() and setCellWidget() which makes it possible
+        to set a widget at a specified cell.
+
+        Added setCurrentCell().
+
+        Added QTableWidgetItem copy constructors.
+
+
+- QTreeWidget
+        Added setItemWidget() and itemWidget() which makes it possible
+        to set a widget on an item.
+
+- QListWidget
+        Added setItemWidget() and itemWidget() which makes it possible
+        to set a widget on an item.
+
+        Added QListWidgetItem copy constructors.
+
+- QMutableMapIterator
+        Added value() overloads to Java-style iterators that return
+        non-const references.
+
+- QTextTable
+        Added mergeCells() and splitCells() to be able to set the row
+        or column span on a table cell.
+
+- QStyle
+        Added standardIcon() which returns a default icon for standard
+        operations.
+        Added State_ReadOnly, which is enabled for read-only widgets.
+
+        Renamed QStyleOption::init() to initFrom().
+        - QGroupBox is now completely stylable (QStyleOptionGroupBox)
+        - Indeterminate (busy) progress bars are now animated properly
+          in all styles.
+
+        Added PM_DockWidgetTitleMargin as pixel metric.
+
+- QHash
+        Make it possible to use QHash with a type that has no default
+        constructor.
+
+- QTableView
+        Made QTableView::setShowGrid() a slot, like in Qt 3.
+        Added setRowHeight() and setColumnWidth().
+
+- QTableWidgetSelectionRange
+        Added rowCount() and columnCount() convenience functions.
+
+- QSettings
+        Added support for custom formats in QSettings.
+
+- QTextStream
+        Added status(), setStatus() and resetStatus() for improved error handling.
+        Added read(qint64 maxlen), for reading parts of a text stream into a
+        QString.
+
+- QTextCursor
+        Added support for BlockUnderCursor selection type.
+
+- QHeaderView
+        Added defaultSectionSize property which tells the default size
+        of the header sections before resizing.
+
+- QScrollBar
+        Added context menu to the scrollbar with default navigation
+        options.
+
+- QScrollArea
+        Added ensureVisible(), which can scroll the scrollarea to make sure a
+        specific point is visible.
+
+- QDateTime
+        Added addMSecs(), which adds a number of milliseconds to the QDateTime.
+
+- QDateTimeEdit
+        Added support for more date/time formats.
+        Now allows multiple sections of the same type.
+
+- QButtonGroup
+        Added handling of buttons with IDs to the buttongroup like in
+        Qt 3.
+
+- QIODevice
+        Added peek() for peeking data from a device.
+
+- QTextEdit
+        Added property tabStopWidth which sets the tab stop width in
+        pixels.
+        append(const QString &) is now a public slot.
+        Added support for inserting Unicode control characters through the
+        context menu.
+        Added property acceptRichText, for whether or not the text edit
+        accepts rich text insertions by the user.
+        Added overwriteMode property.
+
+- QDataStream
+        Added skipRawData().
+        Added support for QRegExp.
+
+- QProgressBar
+        Added support for vertical progress bars.
+
+- QImageIOHandler
+        The name() function has been obsoleted; use format() instead.
+        Added QImageIOHandler::Animation, for determining if the image format
+        supports animation.
+        Added QImageIOHandler::BackgroundColor, for setting the background
+        color for the image loader.
+
+- QImageReader
+        Added setBackgroundColor() and backgroundColor(), for setting the
+        background color of an image before it is read.
+        Added supportsAnimation(), for checking if the image format supports
+        animation.
+
+- QImageWriter
+        Added support for saving image text.
+
+- QLocale
+        Added dateFormat()/timeFormat() to query the date/time format for the
+        current locale.
+        Added toString() overloads for localized QTime and QDate output.
+        Added decimalPoint(), groupSeparator(), percent(), zeroDigit(),
+        negativeSign() and exponential(), which provide a means to generate
+        custom number formatting.
+
+- QHostInfo
+        Added support for reverse name lookups.
+
+- QHostAddress
+        Added a QString assignment operator
+        Added convenience functions for initializing from a native sockaddr
+        structure.
+        Added support for the IPv6 scope-id.
+
+- QPrinter
+        Added property "embedFonts" for embedding fonts into the target
+        document.
+        Added support for printing to PDF.
+        Added support for custom print and paint engines
+
+- QPrintEngine
+        Added PPK_SuppressSystemPrintStatus, for suppressing the printer
+        progress dialog on Mac OS X.
+
+- QKeySequence
+        Added fromString() and toString() for initializing a key sequence
+        from, and exporting a key sequence to a QString.
+
+- QUrl
+        Added the port(int) function, which provides a default value for the
+        port if the URL does not define a port.
+        Support for decoding Punycode encoded hostnames in URLs.
+        Made the parser more tolerant for mistakes, and added a ParsingMode
+        flag for selecting strict or tolerant parsing.
+        Added support for the NAMEPREP standard in our i18n domain name support.
+
+- QDir
+        Added the filter QDir::NoDotAndDotDot, for the
+        special directories "." and "..".
+        Added the filter QDir::AllEntries, for all entries
+        in a directory, including symlinks.
+
+
+- QAbstractSocket
+        Added slots connectToHostImplementation() and
+        disconnectFromHostImplementation() to provide polymorphic behavior for
+        connectToHost() and disconnectFromHost().
+
+- QMenuBar
+        Added setActiveAction(), which makes the provided action
+        active.
+
+- QProxyModel
+        This class has been obsoleted (see QAbstractProxyModel)
+
+- QWidget
+        Now supports three modes of modality: NonModal, WindowModal and
+        ApplicationModal.
+        Added Qt::WindowModality, obsoleted WA_ShowModal and WA_GroupLeader.
+        Added Qt::WA_OpaquePaintEvent widget attribute, obsoleting Qt::WA_NoBackground.
+        Added boolean autoFillBackground property.
+        Child widgets now always inherit the contents of their parent.
+
+- QPalette
+        Added QPalette::Window (obsoletes Background) and
+              QPalette::WindowText (obsoletes Foreground).
+
+- QHttpResponseHeader
+        Added two constructors and the function setStatusLine() for generating
+        a response header.
+
+- QBitArray
+        Added count(bool), for counting on and off-bits in a bit array.
+
+- QVariant
+        Added support for QRegExp
+
+- QRegExpValidator
+        Added the property "regExp".
+
+- QTabBar
+        Added the property "iconSize", for setting the size of the icons on
+        the tabs.
+
+- QLineEdit
+        Added support for inserting Unicode control characters through the
+        context menu.
+
+- QString
+        Added toLong() and toULong().
+        Support for std::string conversions with embedded \0 characters.
+
+- QRegion
+        Added translate(), like QRect::translated().
+
+- QProcess
+        Added systemEnvironment(), which returns the environment variables
+        of the calling process.
+        Added exitStatus(), and added a new finished() signal which takes the
+        exit status as a parameter.
+
+- QComboBox
+        Made setCurrentIndex() a slot.
+
+- QFontDataBase
+        Added styleString(), for retrieving the style string from a QFontInfo.
+        Added support for Myanmar fonts.
+
+- QFontMetrics
+        Added xHeight(), which returns the 'X' height of the font.
+
+- QCoreApplication
+        Added arguments(), which returns a list of command line arguments as a
+        QStringList.
+
+- QTcpSocket
+        Added support for SOCKS5 via setProxy().
+
+- QUdpSocket
+        Added property "bindMode", for binding several sockets to the same
+        address and port.
+
+- QPen
+        Added support for custom dash pattern styles and miter limits.
+        Added support for QDebug.
+
+- QDebug
+        Added support for QVector and QPair output.
+
+- QStringListModel
+        Added support for sorting.
+
+- QOpenGLPaintEngine
+        Gradients in the OpenGL paint engine are now drawn using
+        fragment programs, if the extension is available. Lots of
+        fixes, speedups and tweaks.
+
+
+Platform-Specific changes
+-------------------------
+
+Windows:
+
+- Painting
+        Added support for ClearType text rendering.
+
+- File Engine
+        Added support for long filenames/paths.
+
+X11:
+
+- QWidget
+        Added support for freedesktop.org startup notifications.
+
+Mac OS X:
+
+- Improved support for the VoiceOver accessibility tool in Mac OS 10.4
+  and later
+
+
+3rd-party libraries
+-------------------
+
+- zlib
+        Upgraded to zlib 1.2.3.
+
+- FreeType
+        Upgraded to FreeType 2.1.10.
+
+- SQLite
+        Upgraded to SQLite 3.2.7
diff --git a/dist/changes-4.1.1 b/dist/changes-4.1.1
new file mode 100644
index 0000000..b18539d
--- /dev/null
+++ b/dist/changes-4.1.1
@@ -0,0 +1,693 @@
+Qt 4.1.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.1.0.
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Meta Object Compiler (moc)
+        Better handling of preprocessor statements in combination with
+        multi line comments.
+	Fixed problem where moc would generate meta information for
+	invalid signals/slots.
+
+Configure / Compilation
+        Fix build of dumpcpp-dependent projects in Visual Studio 6.
+        Fixed compilation for solaris-cc-64.
+        Respect the -no-sql-mysql flag.
+	Fixed compilation with -no-qt3support on Mac OS 10.3
+	qmake now places PkgInfo in the "Contents" directory of the
+	.app bundle.
+
+Porting (qt3to4)
+	Fixed the issue where 'int red' would be translated to
+	'Qt::red'.
+	Improved handling of macros created by moc.
+
+Qt Designer
+	uic3: Prevent generation of invalid font tags
+        uic: Fixed bug that caused retranslateUI() to add existing
+        items in combo box once again
+	Fixed dependency problem where qtDesigner modules would depend
+	on a private class.
+	Added missing generation of setColumnCount() and setRowCount()
+	for QTableWidget.
+	Fixed a platform incompatibility when saving icon properties on
+	Windows.
+	Fixed a crash when breaking the layout in a dock widget.
+	Fixed a crash when opening a new .ui file while in "Edit Tab
+	Order" mode.
+	Fixed a crash when adding a widget to a QDockWidget.
+	Improved preview of signal/slot connections.
+	Fixed an issue where moving widgets in a form resulted in lost
+	signal/slot connections and tab order to get.
+	Fixed corruption of shortcut properties in .ui files when
+	saving under some locales.
+	Fixed preview of QComboBox with item icons.
+	Fixed an issue preventing cancellation of 'New resource file'
+	if previous resource file was deleted.
+	Fixed use of F1 as help shortcut.
+
+Qt Assistant 
+	Fixed problem with restoring window geometry on multi screen
+	configurations.
+
+Qt Linguist / Internationalization
+        Fixed tr() idioms, so that translation actually works.
+	Fixed encoding of translated text.
+
+Qt Translation
+	Added translation files for Simplified Chinese.
+	Fixed a problem with lupdate parsing output from uic.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General improvements
+--------------------
+
+- QAbstractItemView
+        Fix selections when mouse-tracking is turned on.
+	Fixed selection issues after row resizing.
+	Fixed focus after pressing enter.
+
+- QAbstractItemModel
+        More consistent behavior in drag-and-drop code.
+
+- QAbstractSlider
+	Ensure changed-signals are only emitted when the value
+	actually changed.
+
+- QAbstractSocket
+	Fixed a crash if disconnected during waitForReadyRead().
+
+- QAccessibleWidget 
+	Fix an off-by-one navigation error in the accessibility
+	support for menu bar and menus.
+
+- QByteArray
+	Fixed leftJustified() and rightJustified() when array contains
+	\0's.
+
+- QComboBox
+	Fixed a crash when setting and deleting the model.
+	Fixed a crash when using a QListWidget as the view.
+
+- QCoreApplication
+	Fixes race condition during plugin loading.
+
+- QCommonStyle
+	Fixed wrong size hint of PM_MenuButtonIndicator.
+
+- QDateTime
+	Fixed a regression in fromString().
+	Avoid potential hang when paring invalid date formats.
+
+- QDialog
+	Fixed an issue where setExtension()/showExtension() didn't
+	work in a constrained size mode.
+
+- QDir
+        cd() now fails when attempting to cd to a non-directory.
+
+- QDirModel
+	Improved stability when appending network drives.
+	Improved stability when handling symlinks with relative paths.
+
+- QDockWidget
+        Update toggleViewAction() when widget gets hidden with close
+        button.
+
+- QFile
+        Changed behavior of rename() to fail if a file of the same
+        name already exists.
+
+- QFileDialog
+        Make sure filter combo box gets enabled when changing from
+        Directory to ExistingFile mode.
+        Improve filename completion for files with the same name but
+        different extension.
+        Make sure the selection is updated when modifying the filename
+        by removing characters.
+        Allow typing in several file names in the file name line edit.
+        Improve handling of non-existent windows shares.
+        Improve handling of hidden directories.
+        Make it possible to create new folder when a folder called
+        "New Folder" already exists.
+	Improve usability by not changing the filename text when
+	directories are selected.
+	Improve usability by not autoselecting the first item when
+	changing directories.
+	Ensure that calling setDirectory() with a path shows the
+	directory when the path contains a file name.
+	Avoid unnecessary resolving of mount points, leading to
+	lockups on Unix.
+	Fixed potential crash when selecting an extension filter with
+	no matches in current directory.
+	Fixed a problem where using selectFilter() didn't update the
+	view.
+
+- QFileInfo
+	Fixed issue where copying a QFileInfo and calling refresh()
+	could result in file info data being cleared.
+	Fixed issue where calling readLink() would resolve link
+	targets incorrectly.
+
+- QGLWidget
+	Switching from full screen mode to normal mode no longer
+	results in incorrect window decorations.
+	Fixed overline, underline and strikethrough for text drawn
+	with renderText().
+
+- QGridLayout 
+        Respect specified alignment over default alignment.
+
+- QHeaderView
+        Respects dragDistance.
+        Respects TextColorRole.
+        Fixed painting problems caused by clicking both mouse buttons
+        at the same time.
+        Fixed painting flaws when using sort indicators.
+	Fixed issue where QStyleOptionHeader::End would not be set by
+	paintSection.
+	Only the left mouse button can now be used to move and resize
+	header sections.
+	Fixed incorrect header size after swapping header sections.
+	Fixed resize mode of header sections after section moves.
+	Fixed an assert when changing the selection model.
+
+- QHash / QSet
+        Make the operator==() not take the internal order of elements
+        into account when comparing.
+
+- QIcon
+	Fixed issue where creating QIcons with an invalid path could
+	result in a crash.
+
+- Improved handling of focus events when using input methods.
+
+- QInputDialog
+	Fixed handling of ampersands in labels.
+
+- QImage
+	Fixed drawing of QBitmap's onto a QImage.
+
+- QImageIOHandler
+        Made all supported image formats support the Size option.
+
+- QItemSelectionModel
+	Fixed an infinite loop in isRowSelected().
+
+- QItemDelegate
+        Better handling of QStyleOptionViewItem::Bottom.
+        Increased the delegate horizontal margin.
+
+- QLayout
+        Warn instead of crash when adding two layouts to a widget.
+
+- QLocale
+	Add missing entry for "nb".
+
+- QList
+	Fixed a memory leak when repeatedly removing items from the
+	end and inserting items in the middle.
+
+- QListView
+	Fixed an assert when using QProxyModel as the model.
+
+- QMainWindow
+        Handle RTL layout for dockwidgets properly.
+        Make dockwidgets remember their sizes after being hidden.
+	Improved reliability when saving and restoring state.
+
+- QMenu
+	Fixed shortcut handling of already selected submenus.
+        Fix setting the window title on torn off menus.
+        Fix bug where exec() returned the wrong QAction on some cases.
+
+- QMenuBar
+	Improved widget placement in setCornerWidget().
+
+- QMenuItem
+	Ensure space for both check mark and icon when using
+	QPlastiqueStyle.
+
+- QMYSQLDriver 
+        Fix crash when formatValue() is called without connection.
+
+- QMessageBox
+        information() now works correctly when calling it after
+        returning from QApplication::exec()
+
+- QPaintEngine
+	Fixed an out of memory issue when drawing very long lines.
+        OpenGL : Make sure the image and pixmap cache is used.
+        OpenGL : Faster rect outlining for the most common case.
+
+- QPrintEngine
+        Better font underlining/overlining.
+        Support PDF font embedding, resulting in smaller PDF files and
+        selectable text.
+        Made our generated PDFs readable by Ghostscript.
+        Support pens that have patterns/pixmaps for PDFs.
+	Support landscape mode for PDFs.
+
+- QPixmap
+	Fixed issue where save() in some cases would return true on
+	failure.
+
+- QProgressBar
+        Fix incorrect progress in some cases.
+
+- QPushButton
+        Buttons reparented into a dialog parent through the layout are
+        now auto-default.
+
+- QRadioButton
+	Fixed a potential crash in QRadioButton Qt 3 support
+	constructors.
+
+- QSortFilterProxyModel
+	Improve stability when adding rows to source model.
+	Fixed issue where some nodes would show up as expandable even
+	if all it's children had been filtered.
+	Fixed a crash when deleting rows.
+
+- QSizeGrip
+	Fixed size grip painting when maximizing a QMainWindow in a
+	QWorkspace.
+
+- QSvgRenderer
+        Better handling of invalid files.
+
+- QSvg
+        Improve stroking with pen width 0.
+        Fix rectangle filling bug.
+
+- QSyntaxHighlighter
+	Fixed missing handling of blocks of text under certain
+	conditions.
+	Improved interaction with input methods.
+
+- QScrollArea
+	Fixed an issue where the scroll area sometimes would not
+	resize to compensate for content change.
+
+- QString
+	Fixed regression in fromLocal8Bit().
+
+- QTextDocument
+        Support span style background-color.
+        Fix nested tables in html documents regression.
+
+- QTextLayout
+	Added support for soft-hyphens.
+        
+- QToolButton
+        Make popup menus appear on the correct screen.
+	Fixed ToolButtonPopupMode when QToolButton has a
+	QAction.
+
+- QToolBar
+        Combo boxes now appears as submenus in a toolbar extension.
+        setIconSize() now works correctly.
+	Relative position within toolbars are now kept when saving and
+	restoring state.
+
+- QTextBrowser
+	Fix missing line break after paragraph.
+        
+- QTextEdit
+        Improve handling of the TITLE tag.
+        Fixed navigating links via tab.
+        Improved handling of malformed html.
+        Fixed rendering for tables with thead/tbody/tfoot elements.
+	Improved copy and paste of content with whitespace
+	Make undo/redo update the cursor position.
+	Fixed lost cursorPositionChanged() signal in read-only mode.
+	Fixed memory leak when calling setHtml() repeatedly.
+	Significantly improved performance when appending and editing
+	text.
+	Improved performance when selecting all text.
+	Emit copyAvailable() on mouse selection.
+
+- QTableView
+        Fixed drawing of selections after moving columns.
+        Do not wrap to the top if Page Down is pressed.
+        Improve scrolling behavior.
+        QTableView now takes ownership of QHeaders set using
+        setHorizontalHeader()
+	Fixed issue where calling setModel(0) could result in a
+	crash.
+	
+- QTreeView
+        Fixed scrolling-related item expand bug.
+        Improve scrolling behavior.
+        QTreeView now takes ownership of QHeaders set using
+        setHorizontalHeader()
+        Avoid crash when calling setRowHidden with no model.
+	Avoid crash when calling sizeHintForColumn() in some cases.
+	Improved performance when adding rows.
+	Fixed update of view when changing row heights.
+	Fixed a bug where calling setCurrentIndex() did not update the
+	view correctly.
+	Removed extra emit of the expanded() signal on already
+	expanded branches.
+
+- QTreeWidget
+	Fixed tristate check item behavior.
+
+- QTabWidget
+        Fixed bug that caused missing resize when dynamically adding
+        widgets.
+	Fixed text positioning in a tab with an icon.
+
+        
+- QTemporaryFile
+	Fixed issue where calling open() could potentially change the
+	file name.
+
+- QTextDocument
+        Improved stability when importing incorrectly formed html
+        tables.
+	Improved stability when importing closing tags without
+	corresponding opening tags.
+        
+- QTextStream
+	Ensure valid codec converter state after calling seek(0).
+	Fixed issue where readAll() would not work with sequential
+	devices.
+
+- QTabBar
+        Improve handling of tab removal.
+
+- QUrl
+	Improve handling of hostnames containing digits.
+        Fix crash when calling hasQueryItem() on QUrl without any
+        query items.
+	Added support for parsing file names with '[' and ']'
+	characters.
+
+- QVariant
+        Improve operator==() behavior when comparing different types.
+        The QVariant(const char *) constructor is now unavailable when
+        QT_NO_CAST_TO_ASCII is set. Otherwise, it uses
+        QString::fromAscii to convert the const char * to a Unicode
+        QString to prevent loss of information.
+
+- QWidget
+        Fix regression in setMask().
+	Fixed issue where incorrect minimum size was reported after
+	reparenting from a top level widget.
+	Fixed return value of normalGeometry() after the widget has
+	been maximized.
+	Fixed crash on application exit if the widget was created
+	before the widget mapper is initialized.
+
+- QXpmHandler
+        Fixed handling of non-transparent XPM images.
+
+- XMLInputReader
+	Fixed issue where entities in XML files were not
+	resolved.
+
+- QXmlSimpleReader
+        A significant (approx. 50x) speedup in QXmlSimpleReader when
+        parsing documents which contain internal or external entities.
+
+- Q3DataTable
+	Drivers not supporting the QuerySize feature would display one
+	row of data too little.
+
+- Q3IconView
+	Fixed selection appearance.
+
+- Q3TextEdit
+        Fixed focus indicator tabbing through tables.
+	Fixed coloring when inserting text after use of setColor().
+
+- Q3TabDialog
+	Added missing selected() signal
+
+- Q3ListView
+	Fixed occasional crashes when deleting items.
+	Fixed wrong label after addLabel(QString()).
+
+- Q3ScrollView
+	Fixed default focus policy for deriving classes.
+
+- Q3ToolBar
+        Q3Action::setOn() now works correctly.
+	Adding an action now sets all action properties correctly.
+
+- Q3ActionGroup
+        Fix drop down drawing error.
+
+- Q3MainWindow
+	Fixed a regression in setUsesIconText().
+
+
+Platform-Specific changes
+-------------------------
+
+Windows:
+
+- QApplication
+	Timers now continue to fire when windows enters a modal event
+	loop.
+
+- QAxServer
+	Fixed issue where updateRegistry() would report success, even
+	though the operation failed.
+	Fixed comparison of class attributes.
+
+- QAxWidget
+	Support parameters of type short* and char* in signal/slots.
+
+- QClipboard
+        Make sure the dataChanged() signal is emitted correctly.
+
+- QColordialog
+	Fixed various selection issues in WindowsXP style.
+
+- QDockWidget
+        Improve the look of title bar buttons.
+        Improved appearance of dock widget title and frame.
+
+- QFileDialog
+        Improve handling of path names with special characters.
+        Maintain modality chain when showing a native modal inside a
+        qt modal.
+        Speedup when browsing dirs containing broken shortcuts.
+
+- QHeaderView
+	Improved header highlighting in WindowsXP style.
+
+- QInputDialog
+	Calling setText() also selects all text to be consistent with
+	other platforms.
+
+- QLabel
+	Improved appearance when disabled.
+
+- QLineEdit
+        Make QLineEdit respect the XP color scheme.
+
+- QOpenGL
+	Added workaround for missing OpenGL sample buffers on the
+	Mobile Intel 915GM Express Chipset.
+	Fixed rendering into a QPixmap.
+
+- QPainter
+	Improve Type 1 font rendering.
+	Improved performance of font rendering.
+	Use the standard fallback fonts for Asian languages.
+
+- QPrinter
+	Fixed issue where the orientation for a QPrinter would be
+	ignored.
+        Fix PCL printer line drawing bug.
+
+- QPrintDialog
+	Fix unhandled exception when a print dialog is launched from
+	within Visual Studio.
+
+- QPrintEngine
+	Ensure correct pageRect() and paperRect() when printer
+	resolution is set manually.
+
+- QTableView
+	Improved checkbox coloring within selections.
+
+- QUdpSocket
+        Better handling when sending to an unbound port.
+
+- QWidget
+        Fix setWindowOpacity() flicker.
+
+- QWindowsXPStyle
+	Fixed QApplication::setStyle() if called before construction
+	of the application object.
+
+- QWorkSpace
+        Improve window resizing.
+        Improve title bar and button appearance in XP style.
+	Improved focus handling.
+	Fixed update of child masks on style change.
+	Fixed restore action not being enabled on maximize and
+	minimize.
+	Fixed a potential crash in maximizeWindow().
+
+X11:
+
+	Reintroduced qt_x11_set_global_double_buffer() for binary
+	compatibility.
+	Improved tablet event handling.
+
+- QApplication
+	The KeypadModifier is now set when NumLock is enabled.
+
+- QBitmap
+	Fixed text drawing errors under some fontconfig
+	settings.
+
+- QLibrary
+	isLibrary() now returns true for .a and .so on AIX.
+
+- qmake
+	Improved stability when modifying environment variables
+	Allow '/' as a path separator on all platforms.
+
+- QPaintEngine
+	Fixed issue where filling and stroking ellipses could leave
+	pixel gaps.
+
+- QPainter
+        Implemented Porter-Duff composition support.
+        Fix artifacts when drawing aliased primitives with an alpha
+        pen.
+        Fixed issue where rotating pixmaps could add a pixel row in
+        some cases.
+	Fixed drawing of arcs of less than 1 degree.
+	Made drawText() honor the Qt::TextWrapAnywhere flag.
+
+- QPrinter
+	Fixed cleanup of child processes.
+
+- QPrintDialog
+	Fixed problems when using "From page" and "To page" spin
+	boxes.
+	Made it impossible to choose "OK" when no printers are
+	configured.
+
+- QProcess
+	Fixed possible deadlock when calling startDetatched().
+
+- QScrollArea
+	Catch double click also when size exceeds window system size
+	limits.
+
+- QTextEdit
+	Fixed an issue where the horizontal scrollbar did not show up.
+
+- QWorkspace
+	Fixed missing mouse event propagation to child widgets.
+
+Mac OS X:
+
+	General fixes to the drag and drop support.
+	Improved performance when resizing widgets.
+	Fixed font issues for input methods with Japanese.
+	Fixed issue with pasting Japanese text.
+	Correctly set architecture and SDKROOT when creating a Xcode
+	project.
+
+- QCursor
+        Fix alpha pixmap cursors.
+
+- QDesktopWidget
+	Improve stability when changing users.
+
+- QDockWidget 
+        Improve dock widget appearance.
+
+- QGroupBox
+	More conformant styling.
+
+- QHeaderView
+        Fix text truncating issue on headers.
+
+- QLabel
+	Fix labels painted incorrectly when using MacMetalStyle.
+
+- QMenu
+	Improved menu styling.
+	Improved popup appearance.
+
+- QPainter
+	Add support for SmoothPixmap transform.
+
+- QPushButton
+        Make Mac style obey the icon size set by setIconSize().
+	Make sure buttons are not shown as default on inactive
+	windows.
+
+- QPrintEngine
+	Fixed truncated PDF generation of large documents.
+
+- QSplashScreen
+        Fix painting errors when using showMessage().
+
+- QTextEdit
+	Fixed focus issues with Japanese input.
+	Fixed issue with pasting Unicode text between
+	applications.
+
+- QToolBar 
+        Improve tool bar appearance.
+
+- QTextFormat
+	Fixed a crash when setting a font's pixel size to -1.
+
+- QWorkSpace 
+        Improve workspace children appearance.
+
+- Q3TextEdit
+	Fixed a crash in paragraphRect() when all content had been
+	deleted.
+
+- Q3ListViewItem
+	Fixed a infinite loop when editing an item.
+
+Qtopia Core:
+
+	Removed flickering when mouse cursor is above an animation.
+	Optimized use of shared memory.
+	Optionally use iwmmxt intrinsics to optimize painting.
+	Added a simple example on how to calibrate touch screen mouse
+	handlers.
+
+- Fonts
+	Handle BDF fonts without the PIXEL_SIZE property.
+	Added Chinese and Japanese fonts.
+
+- PDF
+        Support PDF font embedding.
+
+- qvfb
+	Fixed a crash when increasing the display size in the
+	configuration dialog.
+
+- QPixmap
+	Implement QPixmap::grabWindow().
+
+3rd-party libraries
+-------------------
+
+- FreeType
+	Fix memory leak.
+
diff --git a/dist/changes-4.1.11 b/dist/changes-4.1.11
new file mode 100644
index 0000000..7c26a30
--- /dev/null
+++ b/dist/changes-4.1.11
@@ -0,0 +1,41 @@
+Qt 4.1.11 is an optimization release of 4.1.4. It maintains both forward and 
+backward compatibility (source and binary) with Qt 4.1.0.
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General improvements
+--------------------
+
+- QByteArray
+	Optimized resize() on an empty array.
+
+- QDateTimeEdit
+	Improved usability by allowing steps rounded to 15 minutes blocks.
+
+- QFile
+	Optimized the unsetError() by only modifying state if it's really 
+	changed.
+
+- QFSFileEngine
+	Optimized buffered file reads.
+
+- QSettings
+	Implemented delayed parsing of the settings file.
+
+- QString
+	Optimized the size of the QString(const char*) constructor.
+
+- SQLite driver
+	Upgraded to SQLite version 3.3.5.
+	Minimized the time a result set is kept on the server.
+
+Qtopia Core-Specific changes
+-------------------------
+
+- Added 18 and 24 bit support to the Linux framebuffer screen driver.
+- Optimized the Transformed screen driver.
diff --git a/dist/changes-4.1.3 b/dist/changes-4.1.3
new file mode 100644
index 0000000..59f0c71
--- /dev/null
+++ b/dist/changes-4.1.3
@@ -0,0 +1,879 @@
+Qt 4.1.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.1.0.
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Meta Object Compiler (moc)
+
+Configure / Compilation
+	Compile with NAS sound support enabled and no Qt 3 support.
+	Fixed some issues with resolving absolute paths when configuring
+	Qt using "-prefix".
+
+Porting (qt3to4)
+	qt3to4 now adds the needed include directive for
+	qPixmapFromMimeFactory().
+	Added rule for QDeepCopy.
+	Improved handling of files with non-unix line endings.
+	
+Qt Designer
+	Improved usability by letting the Find Icon dialog remember the last
+	path visited.
+	Fixed preview of DataTime and Date types.
+	Generate correct .ui code when saving forms containing Q3DateEdit,
+	Q3TimeEdit, Q3ProgressBar and Q3TextBrowser.
+	Fixed cursor position when editing text in QListWidget and QComboBox.
+	Fixed code generation for custom widgets containing a QComboBox.
+	Fixed a bug that prevented the windowTitle property for QDockWidgets
+        from being designable.
+	Fixed problem where Designer would fail to reflect QTreeWidget column
+        changes.
+	Fixed potential assert when font size is specified in points.
+	Fixed potential crash when breaking the layout of an empty splitter.
+	Ensured that Designer saves the used pixmap function.
+	Fixed potential crash on 64-bit platforms.
+	Ensured that windows show when restarting after a crash.
+	Improved geometry saving with multiple monitors.
+	Fixed a potential crash when using QVBoxLayout with certain widget
+        combinations.
+	Fixed a bug where breaking splitter layout would not work after
+        reopening the form.
+
+Qt Assistant
+	Assistant now sets the proper encoding attribute when saving files,
+	solving problems when viewing the page in some browsers.
+	Improved window placement on startup.
+	Improved performance of first-time keyword loading.
+
+Qt Linguist / Internationalization
+	Improved window placement on startup.
+	Fixed problem where .ts files for Qt 3 .ui files would be grayed out.
+
+uic
+	Fixed code generating bug for forms in namepsaces preventing
+        connections from being made.
+	Split large generated strings to avoid compiler errors.
+	Fixed a bug causing QLabel's font not to be set when using uic3.
+	Fixed a dependency issue when .ui files are in a subdirectory.
+	Ensured that "uic3 -convert" will convert connections.
+	Ensured that uic3 will convert QDataTable and QSqlCursor to Qt3
+        support classes.
+
+Demos / Examples
+	Fixed a bug in the Tooltips example when moving the cursor from one
+	circle to the next.
+	Fixed a bug in the FTP example which caused the Download button to be
+	incorrectly enabled/disabled.
+	Fixed a crash in the FTP example.
+	Made it easier to change the Arthur Widget properties in Designer.
+	Fixed indexing issues in the Spreadsheet demo.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General improvements
+--------------------
+
+- Fixed rendering of some GIF images.
+- Popup and Tool widgets are now correctly blocked by sibling modal dialogs.
+- Group-leader widgets are no longer blocked by non-child modal widgets.
+- A parent modal dialog of a child modal dialog can no longer be brought on
+  top of the child.
+- Made sure modal widgets are modal when opened on a closing parent.
+- Fixed expose painting error when closing a child popup.
+- Ensured that index widget pointers are maintained when a view is sorted.
+- Ensured that closingDown() returns true when the application 
+  objects are being destroyed.
+- Fixed a potential crash in the PNG image handler.
+- Improved stability of PDF font generation when embedding invalid fonts.
+
+- Q3ButtonGroup
+	Fixed incorrect behaviour when using setExclusive(false).
+
+- Q3DockWindow
+	Fixed placement when showing after being hidden.
+	Fixed issue where calling show() on a hidden Q3DockWindow would
+        make the dock window overlap the existing one.
+		
+- Q3GroupBox
+	Removed empty row at the bottom.
+
+- Q3TextEdit
+	Fixed some input method issues.
+	
+- Q3TextBrowser
+	Fixed a bug that prevented some Unicode HTML files from being
+        displayed.
+
+- Q3ToolBar
+	Ensured that toolbar separators are painted in all styles.
+
+- Q3IconView
+	Fixed a crash when disabling the view while an item is being edited.
+
+- Q3ListView
+	Fixed incorrect background color.
+	Fixed painting issues with disabled items.
+	Added support for tooltips.
+
+- Q3Table
+	Fixed a painting bug in the headers that occurred when a cell was
+	selected.
+	Ensured that checkbox backgrounds are filled.
+	Fixed issue where calling selectRow() would not deselect the current
+        row in SingleRow selection mode.
+	
+- Q3Header
+	Fixed incorrect vertical text alignment.
+	Fixed issue where a header label would be lost after swapping two
+        column headers.
+	
+- Q3UrlOperator
+	Fixed listChildren() for the case when setProtocol() hasn't been 
+	called.
+
+- Q3WhatsThis
+	Fixed handling of dynamic "What's This?" texts.
+
+- Q3WidgetStack
+	Fixed a potential crash.
+	Fixed a bug preventing arrows from showing up in some cases.
+
+- QAbstractButton
+	Ensured that QAbstractButton::setPixmap() also sets the size of the
+        pixmap.
+
+- QAbstractItemView
+	Fixed QStatusTipEvents for item views.
+	Fixed a crash occurring when removing a row in a slot connected to
+	selectionChanged().
+	Fixed issue where itemChanged() would be emitted twice.
+	Fixed issue where input methods would not work on editable itemviews.
+	Fixed potential crash.
+	Made sure the editor does not open when expanding and collapsing
+        branches in QTreeView. Note that this change introduces a system
+        dependent delay to differentiate between single and double clicks.
+	Made sure setIndexWidget() does not delete an old widget if one is
+        already set.
+	Fixed a bug causing fetchMore() to behave incorrectly with empty
+        models.
+	Fixed an issue that sometimes caused tab order to be incorrect after
+        editing items.
+
+- QAbstractSocket
+	Fixed potential crash when connecting to local sockets on BSD
+        systems.
+
+- QCheckBox
+	Only emit the stateChanged() signal when the state actually changes.
+	Improved performance.
+
+- QColorDialog
+	Improved usability.
+
+- QComboBox
+	Corrected escape of '&' in items.
+	Reset input context when showing the popup.
+	Fixed a missing update after model is reset.
+	Ensured that TextElideMode is respected.
+
+- QCommonStyle
+	Fixed incorrect values returned from sizeHintFromContents() for the
+        header sections.
+
+- QCheckBox
+	Fixed some painting issues when using CDE or Motif style.
+
+- QDatabase
+ 	Fixed bool values in prepared queries in the MYSQL driver.
+	Fixed use of stored procedures that returns a result set in MySQL
+        5.x.
+	Fixed queries on tables with a LONG field type in Oracle databases.
+	Fixed reading of large blobs from an Interbase database.
+
+- QDir
+	Fixed infinite loop in rename() when renaming a directory without
+        write permission.
+
+- QDirModel
+	Fixed possible assert on broken links.
+	Fixed a bug preventing links to "/" on Unix system from working
+        correctly.
+
+- QFile
+	Corrected error reporting on flush() and close().
+	Fixed caching issues causing wrong file sizes to be returned in some
+        cases.
+	Ensure that write() will fail when trying to write to a full disk.
+	
+- QFileDialog
+	Fixed a bug that allowed selection of multiple files in
+	getOpenFileName().
+	Ensured that the proper error message is given when deleting a
+        directory fails.
+	Fixed a bug preventing an update when changing the FileMode.
+	Added support to allow several new characters (such as @{},*~^) to be
+        used in dialog file filters.
+	Ensured that files are hidden when browsing in DirectoryOnly mode.
+	
+- QFtp
+	Fixed crash that occurred if an FTP session got deleted in a slot.
+
+- QGridLayout
+	All addWidget() functions now invalidate the layout.
+	Fixed minimum size for layouts containing widgets that maintain
+        a height-for-width size policy.
+
+- QGroupBox
+	Fixed some painting issues appearing on all styles except Windows XP.
+	Fixed keyboard handling if checkable.
+
+- QHeaderView
+	Fixed a bug preventing tooltips from being shown.
+	Fixed a painting error occurring when the sort indicator was enabled
+	and the column width became smaller than the indicator width.
+	Fixed a usability issue when resizing small headers in a fixed-width
+        QTreeWidget.
+	Ensured that the header has the correct size when the font changes.
+	Fixed a painting error that occurred when the header was hidden.
+	Fixed a painting error that occurred when the user activated the
+        context menu while pressing the left mouse key.
+	Fixed a bug giving the last section a resize cursor event though it
+        cannot be resized.
+	Icons in header views now respect the layout direction.
+	Added support for setting a pixmap.
+	Prevented views from deleting a view it does not own.
+
+- QHttp
+	Fixed issue where setProxy() would only work for the first get()
+        call.
+
+- QIcon
+	Ensured that visible icons on QToolButtons and QMenus are updated
+        when the icon of a QAction changes.
+	Fixed issue where actualSize() would return a bigger size than the
+        requested size.
+
+- QImage
+	Fixed writing to a PNG file when the alpha value is premultiplied.
+	Fixed a bug where dotsPerMeter was not preserved after a call to
+	convertToFormat().
+	Handle out of memory conditions gracefully.
+
+- QIODevice
+	Fixed return values for Qt 3 support members getch(), putch() and
+	ungetch().
+
+- QItemDelegate
+	Proper painting in inactive windows.
+	Improved hit detection for QTreeWidgetItem checkboxes.
+
+- QItemSelectionModel
+	Emit currentChanged() when the current item is deleted.
+	Fixed a bug causing the selection to be lost when an item was
+        removed.
+
+- QLibrary
+	Added support for suffixes before library extensions.
+
+- QLineEdit
+	Made sure QT_NO_CLIPBOARD is respected.
+	Fixed incorrect background color when disabled.
+
+- QListView
+	Fixed setRowHidden().
+	Made the decision to showing scrollbars independent of the previous
+        scrollbar state.
+	Ensured that setting the icon position programatically works as
+        intended.
+
+- QLocale
+	Fixed a bug causing toString() to return the wrong day of the week in
+        some cases.
+
+- QMainWindow
+	Fixed a crash when deleting the widget returned by
+        QMainWindow::statusBar().
+	Fixed a bug causing wrong behavior when removing a QToolBar with
+        removeToolBar()
+	Fixed layout error when showing the status bar after the main window.
+	Fixed incorrect assert in QMainWindowLayout::dockWidgetArea().
+	Fixed a bug making it impossible to have a dock widget under two
+        others in the same dock widget area.
+	Fixed a regression preventing insertToolBar() from inserting a
+        toolbar before an existing toolbar.
+	Ensured that QDockWidget's maximumWidth() is honored.
+	Ensured that window menu shortcuts are available before the window is
+        shown.
+
+- QMenu
+	Allowed setActiveAction() open a submenu, to be consistent with
+        QMenuBar.
+	Made it possible for the Alt key to be used to close a context menu.
+	Improved navigation behavior when using Home/End.  
+	Improved navigation behavior when using up/down arrows on a menu with
+        no selected items.
+	Fixed crash when clicking on cleared or disabled submenus.
+	Ensured that only the currently highlighted submenu is visible.
+
+- QMenuBar
+	Improved calculation of sizeHint().
+	Fixed a bug causing menu items after a spacer item to always appear
+	in the extension menu.
+	Changed activateItemAt() to behave more like its behavior in Qt 3.
+
+- QMotifStyle
+	Draw QSlider tick marks.
+	Fixed a bug preventing the focus frame background from being cleared.
+
+- QMovie
+	Improved frame delay calculations.
+
+- QObject
+	Fixed a crash when calling disconnect() on the last connection.
+
+- QPainter
+	Optimized drawing of dotted lines.
+	Fixed potential assert after calling setClipping(true).
+
+- QPainter
+	Fixed a bug causing contains(QPoint) to return the wrong result in some
+        cases.
+	Fixed some painting issues with drawArc().
+	Improved performance of drawLine() and drawEllipse().
+
+- QPen
+	Fixed a bug that caused the wrong dash patterns to be drawn when
+        changing styles.
+
+- QPicture
+	Fixed a DPI issue when drawing into a QLabel.
+	Made sure that the bounding rectangle is updated for all drawing
+        operations.
+	Improved stability when handling complex scenes.
+	Made sure SVG files saved by QPicture include namespace bindings in
+        the SVG tag.
+
+- QPlastiqueStyle
+	Improved usability in QSlider by making the hit rectangle for mouse
+	clicks wider.
+	Fixed animation of indeterminate progress bars.
+	Ensured that lines are drawn for the hierarchical relationships in
+        QTreeWidgets.
+
+- QPrinter
+	Optimized the size of PDF documents containing the same picture in
+	several places.
+	Ensured that systems with high resolution are correctly handled.
+	Fixed a bug preventing the setup() function from displaying the print
+        dialog.
+	Improved positioning of tiled pixmaps.
+
+- QPrintDialog
+	Fixed a crash that occurred when opening a page setup dialog on a PDF
+        printer.
+
+- QPushButton
+	Made sure that flat push buttons paint their contents.
+	
+- QProcess
+	Ensured that the exit status is reset after a sub-process crash.
+	Fixed a bug causing the system to lock on X11 after calling
+        startDetached() 65536 times.
+	Enabled QProcess to be used outside the GUI thread.
+
+- QScrollArea
+	Fixed problem where focusing the next child in a scroll area would
+        make the top-left part of the child scroll out of view.
+
+- QSettings
+	Made it possible to use the "Default" registry entry on Windows.
+
+- QSortFilterProxyModel
+	Fixed a crash that occurred when deleting rows.
+	Improved stability by checking the model index for validity.
+
+- QStandardItemModel
+	Made sure that the column count is updated after calling
+        removeColumn().
+
+- QSplashScreen
+	Made sure the font set with setFont() is actually used.
+
+- QSqlRelationalTableModel
+	Fixed a bug where inserting using the OnManualSubmit edit strategy
+        failed in some cases.
+	Fixed removeColumn() for columns that contain relations.
+
+- QSqlTableModel
+	Made the OnFieldChange edit strategy behave like OnRowChange when
+        inserting rows.
+
+- QStackedLayout
+	Fixed a bug causing a focus change when calling removeWidget().
+
+- QSvgRenderer
+	Fixed rendering into a QPicture.
+	Fixed issue where id attributes containing certain characters would
+	not render correctly.
+
+- QSplashScreen
+	Fixed rendering of pixmaps with alpha channels.
+
+- QSplitter
+	Ensured that non-collapsible children are respected.
+
+- QSqlRelationalTableModel
+	Fixed handling of mixed-case field names for relations.
+
+- QSqlTableModel
+	Fixed a bug preventing the value 'false' from being set on a field of
+        boolean type.
+
+- QSyntaxHighlighter
+	Fixed a regression.
+
+- QTabBar
+	Ensured that currentChanged() is only emitted when the current index
+        actually changes.
+
+- QTabWidget
+	Ensured that QTabWidget has the same behavior as QStackedWidget when
+        inserting a page at index <= currentIndex().
+
+- QTableView
+	Fixed selection handling in situations after rows/columns have been
+        moved.
+	Made decision to show scrollbars independent of the previous
+        scrollbar state.
+ 	Fixed a bug causing mouse clicks to be lost.
+	Fixed potential assertion when hiding columns in QTableView.
+	Fixed potential crash if indexes are invalid and sections have been
+        moved.
+
+- QTabWidget
+	Fixed drawing of icons.
+
+- QTextCodec
+	Fixed detection of locales with the '@' modifier.
+
+- QTextDocumentLayout
+	Made sure the right margin of a QTextBlock is filled with the
+        background color.
+
+- QTextEdit
+	Fixed a bug causing setPlainText() to emit textChanged() three times.
+	Fixed an infinte loop triggered when calling setHtml() inside
+	resizeEvent().
+	Added support for pasting text with '\r' line feeds.
+	Fixed a bug causing tables loaded from HTML to be saved incorrectly.
+	Made it possible to delete images using the Backspace key.
+	Fixed some issues with justified text in combination with forced line
+        breaks.
+	Improved stability when setting a null cursor.
+	Increased accuracy when moving text by drag and drop.
+
+- QTextBrowser
+	Fixed incorrect mouse cursor after right-clicking a link.
+	Fixed incorrect mouse cursor in read-only mode.
+	Fixed issue where arrow cursor would override custom cursors.
+	Fixed potential crash when inserting HTML.
+	Improved support for relative links.
+	Improved parsing of internal document anchors.
+
+- QTextHtmlParser
+	Fixed a bug in the whitespace handling.
+
+- QTreeWidget
+ 	Fixed a bug that caused itemChanged() to be emitted with a null
+        pointer.
+
+- QTreeWidgetItemIterator
+	Fixed incorrect assert caused by creating an iterator for an empty
+        QTreeWidget.
+
+- QToolBar
+	Fixed potential crash when resizing a tool bar with certain types of
+	widgets.
+	Fixed a bug causing hidden widgets to be shown when the toolbar is
+        moved.
+
+- QToolTip
+	Enable word breaking in rich-text tool tips.
+
+- QTextStream
+	Fixed a bug causing aboutToClose() to be connected to a NULL slot
+	after calling unsetDevice().
+	Fixed a bug causing read() or readLine() to sometimes return an empty
+        string.
+
+- QTreeView
+	Fixed some drag and drop issues.
+	Fixed a bug where the check state of an item was unchanged after an
+	itemClicked() signal was emitted.
+	Made decision to show scrollbars independent of the previous
+        scrollbar state.
+	Fixed a bug causing horizontal scrolling when only vertically
+        scrolling should occur.
+	Fixed painting of parent-child hierarchy decorations.
+	Fixed scrollbar visibility bug.
+	Fixed branch indicator painting error in right-to-left mode.
+	Fixed painting issues when using reverse layout on hidden headers.
+	Fixed a bug preventing the view from being scrolled when column 0 was
+        hidden.
+	Fixed a bug causing some custom index widgets to be incorrectly
+        placed.
+
+- QTreeWidget
+	Fixed selection handling in situations after sortItems() has been
+        called.
+
+- QUdpSocket
+	Fixed issue where unbuffered sockets would continuously emit
+        readyRead().
+
+- QUrl
+	Fixed behavior of setPort() when -1 is given as the port number.
+	setEncodedUrl() now escapes '[' and ']' after the host in tolerant
+        mode.
+	Made handling of IP encoding more consistent.
+
+- QUtf16Codec
+	Fixed bug in covertFromUnicode() on big-endian machines.
+
+- QVariant
+	Fixed handling of variants of type "QList<QVariant>".
+
+- QWidget
+	Made sure that the application does not close if a widget with a
+        visible parent exists.
+	Fixed issue where scroll() would scroll child widgets in some cases.
+	Fixed painting issues when resizing very large child widgets.
+	Fixed a bug preventing setCursor() from working with platform-
+	dependent cursors.
+
+- QWorkspace
+	Ensured that the correct position is set when maximizing a child with
+        the NoBorder hint.
+	Fixed MDI title bar text wrapping in Plastique style.
+	Fixed some painting issues when resizing child windows.
+	Improved accuracy when resizing child windows.
+
+- QXml
+	Improved parsing of entities.
+
+Platform-Specific changes
+-------------------------
+
+Windows:
+
+- Ensured that the correct default font is used on Windows 2000 and later
+  versions. This also fixes issues with international characters on some
+  systems.
+
+- Improved painting of rubber bands in Windows XP and Windows style.
+  
+- Calling showMaximixed() on a QDialog without minimize and maximize buttons
+  now behaves properly.
+
+- Improved calculation of bounding rectangles for text.
+
+- Fixed a bug making it possible to open multiple context menus using the 
+  context menu key.
+
+- Fixed writing of large files which failed on some systems.
+
+- Optimized painting of ellipses.
+
+- Fixed problem with release version of IDC.
+
+- Fixed window state bug when restoring minimized and maximized windows.
+
+- Fixed painting error on Windows XP style tabs in right-to-left mode.
+
+- Fixed incorrect toolbar button spacing in Windows XP and Windows style.
+
+- Fixed bug that caused QFontInfo::family() to return an empty string.
+
+- Ensured that tool windows are now resizable by default.
+
+- Improved precision for tablet coordinates.
+
+- Improved probing and detection for OpenGL overlay mode.
+
+- Improved the native look and feel of QComboBox.
+
+- Improved appearance of QToolButtons with menus.
+
+- Fixed issue where certain fonts would be incorrectly replaced when
+  printing.
+
+- Fixed issue where minimized fixed-size dialogs would not respond to user
+  input.
+
+- Fixed issue preventing bitmap fonts from being drawn using a scaled
+  painter.
+
+- Made sure that QMAKE_PRE_LINK is respected by qmake on Windows.
+
+- Fixed a bug causing tab widget contents to move when resized in Windows XP
+  style.
+
+- Q3FileDialog
+	Fixed potential crash in Q3FileDialog when resolving shortcuts.
+
+- QPainter
+	Fixed an issue where drawText() on a QPrinter would sometimes be
+        clipped away.
+	Fixed the behavior of drawEllipse() and drawLine() when used with
+        negative coordinates.
+	Fixed painting in OpaqueMode.
+	Fixed a bug preventing rectangles with negative coordinates from
+        being painted correctly by the raster engine.
+
+- QAxBase
+	Fixed a bug preventing proper interaction with Excel.
+
+- QAxWidget
+	Fixed conversion of short* and char* output parameters.
+
+- QFile
+	Made sure that copy() returns false when the copy target already
+        exists.
+
+- QFileInfo
+	Fixed crash that occurred when calling exists() on a invalid
+        shortcut.
+	Fixed absolute and canonical paths for files in the root directory.
+
+- QGLWidget
+	Fixed a bug causing renderPixmap() to fail on 16-bit color depths.
+
+- QLibrary
+	Enabled loading of filenames with non-standard suffixes.
+
+- QLocale
+	Added support for 'z' in time format strings.
+
+- QPrinter
+	Fixed setPageSize() to correctly update the page and paper
+        rectangles.
+
+- QTextBrowser
+	Made sure that QTextBrowser does not override
+        QApplication::setOverrideCursor().
+
+- QWindowsStyle
+	Ensured that the platform specific icons provided by the system are
+        used when appropriate.
+
+
+X11:
+
+- Fixed a bug in QFontDatabase which made isFixedPitch() return true for
+  certain non-fixed-pitch fonts, like "Sans Serif".
+
+- Correctly handle the .so file extension on HP/UX IA-64.
+
+- Fixed a crash that could occur when clicking a mouse button while dragging.
+
+- Improve QProcess resource usage by making sure it closes all unused pipes.
+
+- Made QFontEngine honor the autohinter setting from FontConfig. 
+
+- Fixed a potential crash that could occur when drawing a large number of
+  polygons/trapezoids.
+
+- QtConfig
+	Fixed missing update of window decorations.
+	Fixed assert when editing font family substitutions.
+
+- Fixed X Error that occurred when closing applications using the Motif
+  style.
+
+- Ensured that -style command line arguments are respected when using
+  customized visuals.
+
+- Fixed issues with multiple painters on the same device.
+
+- Improved backward compatibility for XCursors.
+
+- Fixed a bug causing text to be clipped incorrectly when printed.
+
+- Fixed issue where Qt::KeyPadModifier was not being set for non-numeric
+  keypad keys.
+
+- Ensured that files written by QSettings will only get user-readable
+  permissions by default.
+
+- Ensured that QContextMenuEvent is also delivered when a popup menu is
+  already open.
+
+- Added missing support for clipping of bitmaps on non-XRender systems.
+
+- Fixed platform inconsistency with cosmetic pens.
+
+- Fixed a potential crash when starting a QProcess for a non-existant
+  process.
+
+- QPainter
+	Improved stability of QPainter::setClipPath().
+	Fixed painting issues with transformed points drawn with an aliased
+        cosmetic pen.
+
+- QFontMetrics
+	Fixed a bug in boundingRect().
+	Fixed a potential crash in the constructor when it is passed a zero
+        paint device.
+
+
+Mac OS X:
+
+- Fixed issues with pasting of Japanese characters.
+
+- Fixed a bug that made the close button unavailable on modal windows.
+
+- Fixed icon rendering on x86 CPUs.
+
+- Fixed painting of QBitmap into a QPixmap.
+
+- Added the -framework and -F configure options.
+
+- Fixed a bug where the menu bar would not show all items.
+
+- Fixed several drag and drop issues.
+
+- Fixed a bug that caused the font size to change when clicking checkable
+  toolbar buttons.
+
+- Fixed a crash that occurred when using a Qt-plugin in a non-Qt application.
+
+- Fixed use of newlines in a QMessageBox.
+
+- Fixed painting of QGroupBox without any text.
+
+- Fixed rendering of Qt::FDiagPattern and Qt::BDiagPattern.
+
+- Fixed building with -no-qt3support.
+
+- Fixed painting of the sort indicator in item view headers.
+
+- Fixed text placement in QGroupBox.
+
+- Fixed icon placement in QPushButton when used with RTL scripts.
+
+- Fixed painting of read-only line edit widgets.
+
+- Fixed animation of the Composition Modes demo.
+
+- Fixed painting of QSpinBoxes smaller than 25 pixels.
+
+- Fixed a bug preventing the page ranges in the print dialog from being set.
+
+- Fixed a bug causing QPrinter::pageSize() to return incorrect sizes.
+
+- Fixed printer resolution setting.
+
+- Improved quality of PDF output.
+
+- Ensured that calling setDirtyRegion() from within dragMoveEvent() updates
+  item views correctly.
+
+- Fixed a bug resulting in painting and performance issues for embedded
+  QGLWidgets when using MacMetalStyle.
+
+- Fixed a bug that sometimes prevented widgets from being shown.
+
+- Ensured that the correct number of tick marks are painted on sliders.
+
+- Fixed issue where Qt::FramelessWindowHint widgets were not visible in
+  Expose.
+
+- Fixed a painting error that occurred when unchecking checkboxes.
+
+- Fixed a bug that caused file dialogs and frameless windows to appear
+  outside screen bounds.
+
+- Prevented windows from losing their shadows after using QRubberBand.
+
+- Fixed a potential crash in QPixmap::copy() when given an area outside image
+  bounds.
+
+- Improved QToolButton arrow appearance.
+
+- Fixed an issue causing QDateTime::toString(Qt::LocalDate) to return
+  incorrect dates.
+
+- Improved performance of QPainter::drawImage().
+
+- Fixed sometimes incorrect drawing with QPainterPath.
+
+- Improved key translation for non-Latin keyboard layouts.
+
+- QGLWidget
+	Fixed update issues when QGLWidgets are embedded in a QTabWidget.
+
+- QLibrary
+	isLibrary() now supports .dylib libraries with version numbers.
+
+- QWidget
+	Fixed a platform inconsistency with isActiveWindow().
+
+- Designer
+	Fixed some painting issues with widgets that are not laid out.
+	Allow dragging of widgets in Designer when the toolbox is hidden.
+        Fixed a bug preventing Designer from being hidden using
+        "Command + H".
+
+
+Qtopia Core:
+
+- Added configure options to build decorations and mouse drivers as plugins.
+
+- Lots of new documentation.
+
+- Added support for 8 and 16 bit screens.
+
+- Fixed a bug that could result in painting errors after setting a new
+  decoration with QApplication::qwsSetDocoration().
+
+- New skins for QVfb provided in the X11 package.
+
+- Fixed the transparent corners of the window decoration using the Plastique
+  style.
+
+- Removed dependency of shared memory when using QT_NO_QWS_MULTIPROCESS.
+
+- Fixed input method focus change problems.
+
+- Ensured that fonts are searched for using QLibraryInfo::LibrariesPath
+  instead of PrefixPath.
+
+- Ensured that the smooth font flag is respected when parsing the 'fontdir'
+  file.
+
+- Fixed crash on systems where Helvetica font is not available.
+
+- Reduced memory usage with large fonts.
+
+- Added support for QIODevice::canReadLine().
+
+- Ensured that the Qtopia Core data directory owner is checked against the
+  effective user.
+
+- Fixed appearance of the title bar font when the application font has not
+  been set.
+
+- Ensured that the correct keycodes are generated for SysRq and PrtSc.
+
+- Added support for transformed screens to QDirectPainter.
+
+- Fixed issues with -title and -geometry command line arguments.
+
+- Improved sound support.
diff --git a/dist/changes-4.1.4 b/dist/changes-4.1.4
new file mode 100644
index 0000000..426959e
--- /dev/null
+++ b/dist/changes-4.1.4
@@ -0,0 +1,125 @@
+Qt 4.1.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.1.0.
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Configure / Compilation
+	Compile with -no-qt3support on Windows.
+	Compile on Linux with icc 9.1.
+	Compile on tru64-g++.
+	Compile MySQL plugin with client libraries below MySQL 4.1.
+	Compile SQLite on Tru64 V5.1B with gcc 3.3.4.
+	Compile ODBC plugin on 64-bit Windows.
+	Disable fastcall calling convention on faulty gcc compilers.
+
+Demos / Examples
+	Fixed a crash in the Torrent example.
+	Container extension example: Fixed regression that caused Designer
+	to crash when previewing a MultiPageWidget and changing the page.
+
+Designer
+	Generate unique object names for splitters.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General improvements
+--------------------
+
+- Fixed crash in QGLWidget::makeCurrent() when called from a thread not
+  created with QThread.
+- Fixed a crash that occurred when writing a PNG image when Qt is built
+  statically.
+- Fixed Arabic shaping for some fonts.
+- Limited the character string to 255 characters when writing Type1 fonts to
+  a PostScript file, in accordance with the PostScript specification.
+- Fixed regression in painting of clipped, cosmetic lines with angles of
+  0-45 degrees.
+- Documented the rules for starting and stopping timers in multithreaded
+  applications.
+
+- QCommonStyle
+	Added protection against null pointer in pixelMetric() for
+	PM_TabBarTabVSpace.
+
+- QDirModel
+	Fixed crash when dragging and dropping a file into a directory.
+
+- QHeaderView
+	Fixed painting errors when scrolling a header that has a large
+	number of sections.
+
+- QListView
+	Fixed assert when hiding all the rows.
+	Fixed crash when setting the model to a null pointer.
+
+- QMainWindow
+	Fixed possible crash when calling setCentralWidget() multiple
+        times.
+
+- QPainter
+	Fixed a regression in drawPoint() that caused painting errors
+	when setting the pen width to 0 (e.g. cosmetic pen) and then
+	setting a scale.
+
+- QPlastiqueStyle
+	Fixed a regression that caused flat push buttons to be painted
+	like normal push buttons.
+
+- QSortFilterProxyModel
+	Emit modelReset() signal when setting a source model.
+
+- QTextEdit
+        Ensure that the cursor is visible after dragging & dropping text
+
+- QTreeView
+	Fixed potential assert when asking for the coordinates of a
+	non-existing item.
+	Fixed a regression that caused selections to be	painted
+	incorrectly when the last column was hidden.
+
+- QWidget
+	Fixed crash when deleting the widget in closeEvent().
+
+- QWorkspace
+	Fixed crash caused by setting the window title when windowWidget is
+        null.
+
+Platform-Specific changes
+-------------------------
+
+Windows:
+
+- Fixed a bug that caused application text to be absent in Qt applications
+  on Windows NT 4.0.
+- Fixed resource leak in non-accelerated GL contexts.
+
+
+X11:
+
+- Improved performance of clipped bitmaps on systems that don't use XRender.
+- Made QFont::setStretch() work when using FontConfig/FreeType fonts.
+- Documented scrolling of transparent/opaque widgets.
+
+
+QPaintEngine
+	Support OddEven fill rule.
+
+QPainter
+	Fixed a regression that caused drawImage() to ignore the width
+	and height of the source rectangle and draw the whole image without
+	any clipping.
+
+
+Qtopia Core:
+
+- Fixed crash due to incorrect assembly code in implementation of
+  q_atomic_swp() for ARM.
+- Set the Q_PACKED macro when using icc on ARM, so that the generated
+  code is binary compatible with gcc-generated code.
diff --git a/dist/changes-4.1.5 b/dist/changes-4.1.5
new file mode 100644
index 0000000..fefc91b
--- /dev/null
+++ b/dist/changes-4.1.5
@@ -0,0 +1,14 @@
+Qt 4.1.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.1.0.
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+- QImage
+        Fixed a potential security issue which could arise when transforming
+        images from untrusted sources.
+
diff --git a/dist/changes-4.2.0 b/dist/changes-4.2.0
new file mode 100644
index 0000000..f42da27
--- /dev/null
+++ b/dist/changes-4.2.0
@@ -0,0 +1,2506 @@
+Qt 4.2 introduces many new features as well as many improvements and
+bugfixes over the 4.1.x series. For more details, see the online
+documentation which is included in this distribution. The
+documentation is also available at http://doc.trolltech.com/
+
+The Qt version 4.2 series is binary compatible with the 4.1.x series.
+Applications compiled for 4.1 will continue to run with 4.2.
+
+The Qtopia Core version 4.2 series is binary compatible with the 4.1.x
+series except for some parts of the device handling API, as detailed
+in Platform Specific Changes below.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+
+New features
+------------
+
+- QCalendarWidget provides a standard monthly calendar widget with date
+  selection features.
+
+- QCleanlooksStyle provides the new Cleanlooks style, a clone of the GNOME
+  ClearLooks style, giving Qt applications a native look on GNOME desktops.
+
+- QCompleter provides facilities for auto completion in text entry widgets.
+
+- QDataWidgetMapper can be used to make widgets data-aware by mapping them
+  to sections of an item model.
+
+- QDesktopServices provides desktop integration features, such as support
+  for opening URLs using system services.
+
+- QDialogButtonBox is used in dialogs to ensure that buttons are placed
+  according to platform-specific style guidelines.
+
+- QFileSystemWatcher enables applications to monitor files and directories
+  for changes.
+
+- QFontComboBox provides a standard font selection widget for document
+  processing applications.
+
+- QGraphicsView and related classes provide the Graphics View framework, a
+  replacement for Qt 3's canvas module that provides an improved API, enhanced
+  rendering, and more responsive handling of large numbers of canvas items.
+
+- QGLFramebufferObject encapsulates OpenGL framebuffer objects.
+
+- QMacPasteboardMime handles Pasteboard access on Qt/Mac. This obsoletes
+  QMacMime as the underlying system has changed to support Apple's new
+  Pasteboard Manager. Any old QMacMime objects will not be used.
+
+- QNetworkInterface represents a network interface, providing information
+  about the host's IP addresses and network interfaces.
+
+- QResource provides static functions that control resource lookup and
+  provides a way to navigate resources directly without levels of
+  indirection through QFile/QFileEngine.
+
+- QSystemTrayIcon allows applications to provide their own icon in the
+  system tray.
+
+- QTimeLine gives developers access to a standard time line class with which
+  to create widget animations.
+
+- The QtDBus module provides inter-process communication on platforms
+  that support the D-BUS protocol.
+
+- The QUndo* classes in Qt's Undo framework provide undo/redo functionality
+  for applications.
+
+- Support for the Glib event loop to enable integration between Qt and non-Qt
+  applications on the GNOME desktop environment.
+
+- Improved Accessibility for item-based views and QTextEdit.
+
+- Support for main window animations and tabbed dock widgets.
+
+- Added an SVG icon engine to enable SVG drawings to be used by QIcon.
+
+- Widgets can now be styled according to rules specified in a style sheet,
+  using a syntax familiar to users of Cascading Style Sheets (CSS). Style
+  sheets are set using the QWidget::styleSheet property.
+
+- Introduced a new key mapper system which improves the shortcut system by
+  only testing the real possible shortcuts, such as Ctrl+Shift+= and Ctrl++
+  on an English keyboard.
+
+- Improved and enhanced QMessageBox to support native look and feel on many
+  common platforms.
+
+- Experimental support for Qt usage reporting ("metered licenses") on Linux,
+  Windows and Mac OS X. Reporting is disabled by default.
+
+- A screen magnification utility, pixeltool, is provided. It is designed to help
+  with the process of fine-tuning styles and user interface features.
+
+- New qrand() and qsrand() functions to provide thread safe equivalents to
+  rand() and srand().
+
+
+General improvements
+--------------------
+
+- Item views
+
+      * Selections are maintained when the layout of the model changes
+        (e.g., due to sorting).
+
+      * Convenience views can perform dynamic sorting of items when the data
+        in items changes.
+
+      * QStandardItem provides an item-based API for use with
+        QStandardItemModel and the model/view item view classes.
+
+      * QStandardItemModel API provides a classic item-based approach to
+        working with models.
+
+      * Single selection item views on Mac OS X cannot change their current
+        item without changing the current selection when using keyboard
+        navigation.
+
+- Plastique style has improved support for palettes, and now requires
+  XRender support on X11 for alpha transparency.
+
+- Tulip containers
+
+      * Added typedefs for STL compatability.
+
+      * Added function overloads to make the API easier to use.
+
+- Added the Q3TextStream class for compatiblity with Qt 3 and to assist with
+  porting projects.
+
+- OpenGL paint engine
+
+      * Added support for all composition modes of QPainter natively using
+        OpenGL.
+
+      * Fixed a case where very large polygons failed to render correctly.
+
+      * Ensured that glClear() is only called in begin() if the
+        QGLWidget::autoFillBackground() property is true.
+
+      * Ensured that a buffer swap is only performed in end() if
+        QGLWidget::autoBufferSwap() is true.
+
+      * Improved text drawing speed and quality.
+
+- Raster paint engine
+
+      * Fixed blending of 8 bit indexed images with alpha values.
+
+      * Fixed drawing onto QImages that were wider than 2048 pixels.
+
+      * Fixed alpha-blending and anti-aliasing on ARGB32 images.
+
+      * Improved point drawing performance.
+
+      * Fixed issue where lines were drawn between coordinates that were
+        rounded instead of truncated.
+
+      * Ensured that setClipRegion(QRegion()) clips away all painting
+        operations as originally intended.
+
+
+Third party components
+----------------------
+
+- Dropped support for MySQL version 3.
+
+- Updated Qt's SQLite version to 3.3.6.
+
+- Updated Qt's FreeType version to 2.2.1.
+
+- Updated Qt's libpng version to 1.2.10.
+
+
+Build System
+------------
+
+- Auto-detect PostgreSQL and MySQL using pg_config and mysql_config on UNIX
+  based systems in the configure script
+
+- Added "-system-sqlite" option to configure to use the system's SQLite
+  library instead of Qt's SQLite version.
+
+- Added QT_ASCII_CAST_WARNINGS define that will output a warning on implicit
+  ascii to Unicode conversion when set. Only works if the compiler supports
+  deprecated API warnings.
+
+- Added Q_REQUIRED_RESULT to some functions. This macro triggers a warning
+  if the result of a function is discarded. Currently only supported by gcc.
+
+
+- Qt/X11, Qt/Mac and Qtopia Core only:
+
+     * Added all QT_NO_* defines to the build key.
+
+
+- Qt/X11 and Qtopia Core only:
+
+     * As in Qt 3, the configure script enables the -release option by
+       default, causing the Qt libraries to be built with optimizations. If
+       configured with the -debug option, the debug builds no longer result
+       in libraries with the _debug suffix.
+
+       On modern systems, flags are added to the Qt build to also
+       generate debugging information, which is then stored in a
+       separate .debug file. The additional debug information does not
+       affect the performance of the optimized code and tools like gdb
+       and valgrind automatically pick up the separate .debug
+       files. This way it is possible to get useful backtraces even
+       with release builds of Qt.
+
+     * Removed the last vestiges of the module options in the configure
+       script, previously they were available but did not function.
+
+     * Implemented a -build option in the configure script to conditionally
+       compile only certain sections of Qt.
+
+     * Made it possible to build Qt while having "xcode" set as your
+       QMAKESPEC on OSX.
+
+
+- Windows only:
+
+     * Populated the build key, as done on all the other platforms.
+
+     * Fixed dependency generation in Visual Studio Solutions (.sln)
+       created by qmake.
+
+     * Added missing platforms to the Visual Studio project generator (X64,
+       SH3DSP and EBC).
+
+     * Made UIC3 use a temporary file for long command lines.
+
+     * Removed the object file (.o) conflicts with MinGW that appeared when
+       embedding a native resource file which was named the same as a normal
+       source file.
+
+     * Fixed mkspec detection when generating project files outside of QTDIR.
+
+     * Removed compiler warnings with MinGW g++ 3.4.5.
+
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+
+- QAbstractButton
+
+      * Returns QPalette::Button and QPalette::ButtonText for
+        backgroundRole() and foregroundRole(), respectively, rather than
+        QPalette::Background and QPalette::Foreground.
+
+      * Ensured that nextCheckState() is called only when there is a state
+        change.
+
+- QAbstractItemModel
+
+      * When dropping rows only insert rows that were actually dropped, not
+        the continuous row count from first to last.
+
+      * Added a supportedDragActions property to be used by
+        QAbstractItemView when starting a drag.
+
+      * When updating changed persistent indexes, ignore those that haven't
+        actually changed.
+
+      * Fixed endian issue with createIndex().
+
+      * Added FixedString matching for match().
+
+      * Changed the sorting algorithm to use a stable sort.
+
+      * Added persistentIndexList() function.
+
+- QAbstractItemView
+
+      * Added possibility to copy elements to clipboard on read-only views.
+
+      * Improved handling of QAbstractItemModel::supportedDropActions().
+
+      * Ensured that the current item is selected when using keyboard
+        search.
+
+      * Ensured that the view starts with a valid current index.
+
+      * Ensured that data is only committed in currentChanged() if the
+        editor is not persistent.
+
+      * Fixed crash that occurred when a modal dialogs was opened when
+        closing an editor.
+
+      * Added verticalScrollMode and horizontalScrollMode properties.
+
+      * Added setItemDelegateForRow() and setItemDelegateForColumn().
+
+      * Ensured that existing models are disconnected properly when
+        replaced.
+
+      * Ensured that the doubleClicked() signal is only emitted when the
+        left button has been double-clicked.
+
+      * Changed setSelection(...) to work when given a non-normalized
+        rectangle.
+
+      * Fixed regression for shift-selections in ExtendedSelection for
+        all views.
+
+      * Added dragDropMode property and implemented move support in all of
+        the views and models.
+
+      * For edit triggers SelectedClicked and DoubleClicked, only trigger
+        editing when the left button is clicked.
+
+      * Trigger SelectedClicked editing on mouse release, not mouse press.
+
+      * Suppressed the doubleClicked() signal in cases where the clicks
+        happened on two different items.
+
+      * Enabled keyboard search to be programmatically reset by calling
+        keyboardSearch() with an empty string as argument.
+
+      * Don't allow drops on items that don't have the Qt::ItemIsDropEnabled
+        flag set.
+
+      * Added modelAboutToBeReset() and layoutAboutToBeChanged() signals.
+
+      * Suppressed assertion in dropMimeData() for cases where mimeTypes()
+        returns an empty list.
+
+      * Ensured consistent behavior of drag and drop when rootIndex() is a
+        valid model index.
+
+      * Made it possible to check a checkbox with only a single click when
+        using the CurrentChanged edit trigger.
+
+      * Ensured that WhatsThis events are propagated when the relevant item
+        doesn't have a valid "What's This?" value.
+
+      * Added PositionAtCenter scrollHint.
+
+      * Added support to allow items to be checked and unchecked using the
+        keyboard.
+
+      * Added support for keypad navigation.
+
+- QAbstractProxyModel
+
+      * Added default implementations for data(), headerData() and flags()
+
+- QAbstractScrollArea
+
+      * Added ability to set a corner widget.
+
+      * Added ability to set scroll bar widgets.
+
+      * Added support for custom scroll bars.
+
+- QAbstractSpinBox
+
+      * Added a hasAcceptableInput() property.
+
+      * Ensured that fixup/validate are called for third party subclasses of
+        QAbstractSpinBox as well.
+
+      * Fixed geometry issues when toggling frames on and off for spinboxes.
+
+      * Added a property for correctionMode.
+
+      * Added a property for acceleration.
+
+- QAbstractPrintDialog
+
+      * Fixed handling of existing printer options so that storage of page
+        ranges using setFromTo() works as expected when printing in PDF format.
+
+- QAction
+
+      * Added the setAutoRepeat(bool) function to disable auto-repeating
+        actions on keyboard shortcuts.
+
+- QApplication
+
+      * Added saveStateRequest() and commitDataRequest() signals so that
+        QApplication does not need to be subclassed to enable session
+        management in an application.
+
+      * Added the styleSheet property to get/set the application style sheet.
+
+      * Support sending key events to non-widget objects.
+
+      * Ensured that argc and argv as passed to the QApplication constructor
+        will always be zero-terminated on all platforms after QApplication
+        consumes command line options for itself.
+
+- QBrush
+
+      * Added a constructor that accepts a QImage.
+
+- QButtonGroup
+
+      * Added pressed() and released() signals.
+
+      * Fixed a bug caused by removing buttons from button groups. Removed the
+        internal mapping as well.
+
+      * Ensured that checkedButton() returns the correct value with
+        non-exclusive groups.
+
+- QClipboard
+
+      * Added support for find text buffer.
+
+- QColor
+
+      * Fixed corruption in setRed(), setGreen() and setBlue() for HSV/CMYK
+        colors.
+
+- QComboBox
+
+      * Fixed drawing issues related to certain FocusPolicy values.
+
+      * Ensured that the ItemFlags of an Item (ItemIsEnabled,...) are
+        respected.
+
+      * Fixed cases where the popup could be shown completly on screen, but
+        weren't.
+
+      * Added the InsertAlphabetically insert policy.
+
+      * Fixed case where a QPixmap could not be displayed using a QIcon.
+
+      * Fixed the type of the modelColumn property from bool to int.
+
+      * Updated documentation to clarify the differences between activated(),
+        highlighted() and currentIndexChanged(), and describe what they
+        actually mean.
+
+      * Updated the behavior to ensure that, if the combobox isn't editable,
+        the Qt::DisplayRole rather than the Qt::EditRole is used to query the
+        model.
+
+- QCoreApplication
+
+      * Added flags to enable/disable application-wide features such as
+        delayed widget creation.
+
+- QCursor
+
+      * Added support for the newly added Qt::OpenHandCursor and
+        Qt::ClosedHandCursor enum values.
+
+- QDate
+
+      * Support dates all the way down to Julian Day 1 (2 January 4713 B.C.)
+        using the Julian calendar when appropriate.
+
+- QDateTime
+
+      * Fixed parsing issue in fromString(const QString &, Qt::DateFormat).
+
+- QDateTimeEdit
+
+      * Added the calendarPopup property to enable date selection using the
+        new QCalendarWidget class.
+
+      * Added a setSelectedSection() function to allow the currently selected
+        section to be programmatically set.
+
+- QDesktopWidget
+
+      * Remove a potential out-of-bounds read.
+
+- QDialog
+
+      * Improved stability in cases where the default button is deleted.
+
+- QDir
+
+      * Improved support for i18n file paths in QDir::tempPath().
+
+      * Improved support for UNC paths when the application is run from a
+        share.
+
+      * Ensured that mkpath() properly supports UNC paths.
+
+      * Obsoleted QDir::convertSeparators().
+
+      * Introduced QDir::toNativeSeparators() and QDir::fromNativeSeparators().
+
+      * Added a QDebug streaming operator.
+
+- QDirModel
+
+      * Fixed conversion from bytes to larger units in QDirModel in the file
+        size display.
+
+      * Remove hardcoded filtering of the '.' and '..' entries.
+
+- QErrorMessage
+
+      * Made qtHandler() work in cases where the message handler is invoked
+        from threads other than the GUI thread.
+
+- QEvent
+
+      * Added the KeyboardLayoutChange event type which is sent when the
+        keyboard layout changes.
+
+- QFile
+
+      * Improved support for UNC paths when the application is run from a
+        share.
+
+      * Added support for physical drives (e.g., "//./Physical01").
+
+      * Ensured that QFile::error() and QIODevice::errorString() are set
+        whenever possible when errors occur.
+
+      * Renamed readLink() to symLinkTarget().
+
+- QFileDialog
+
+      * Fixed a case where view mode got disabled.
+
+- QFileInfo
+
+      * Improved support for UNC paths when the application is run from a
+        share.
+        
+      * Improved support for drive-local relative paths, such as "D:".
+
+      * Renamed readLink() to symLinkTarget().
+
+- QFlags
+
+      * Added the testFlag() convenience function.
+
+- QFont
+
+      * Added NoFontMerging as a flag to QFont::StyleStrategy.
+
+- QFontDatabase
+
+      * Added functions for handling application-local fonts at run-time:
+        addApplicationFont(), removeApplicationFont(),
+        applicationFontFamilies(), etc.
+
+- QFontDialog
+
+      * Enabled support for custom window titles.
+
+- QFontMetrics/QFontMetricsF
+
+      * Added the elidedText() function.
+
+      * Added the averageCharWidth() function.
+
+- QFrame
+
+      * Fixed a rendering issue when showing horizontal and vertical lines
+        created using Designer.
+
+- QFtp
+
+      * Improved parsing of the modified date in list().
+
+      * Ensured that all data has been received when downloading, before the
+        data connection is closed.
+
+      * Added support for FTP servers that reject commands with a 202 response.
+
+- QGLFormat
+
+      * Added the openGLVersionFlags() function.
+
+      * Added support for setting the swap interval for a context
+        (i.e., syncing to the vertical retrace).
+
+      * Added support for setting red, green and blue buffer sizes.
+
+- QGLWidget
+
+      * Fixed a resource leak that could occur when binding QImages with the
+        bindTexture() function.
+
+      * Fixed renderText() to produce proper output when depth buffering is
+        enabled.
+
+      * Fixed bindTexture() to respect premultiplied QImage formats.
+
+      * Ensured that the updatesEnabled property is respected.
+
+- QGradient
+
+      * Added default constructors and setter functions for all gradients and
+        their attributes.
+
+- QGridLayout
+
+      * Do not segfault if cellRect() is called before setGeometry(), 
+        even though the result is documented to be undefined.
+
+      * Fixed maximum size handling when adding spacing.
+
+- QGroupBox
+
+      * Activating a group box by a shortcut will now show the focus rectangle.
+
+      * Added the clicked() signal
+
+- QHash
+
+      * Prevent conversion of iterator or const_iterator to bool
+        (e.g., if (map->find(value))) because the conversion always returned
+        true. Qt 4.1 code that doesn't compile because of this change was most
+        probably buggy.
+
+      * Added the uniqueKeys() function.
+
+- QHeaderView
+
+      * Use the current resize mode to determine section sizes when
+        new rows are inserted.
+
+      * Recover the internal state if other widgets steal the mouse release
+        event.
+
+      * Ensure that moved sections can be removed without asserting.
+
+      * Be more robust with regards to arguments sent to the rowsInserted slot.
+
+      * Let the stretchLastSection property override the globalResizeMode in
+        the resizeSections() function.
+
+      * Renamed ResizeMode::Custom to ResizeMode::Fixed.
+
+      * Added the swapSections() convenience function.
+
+      * Added a more "splitter-like" resize mode.
+
+      * Added the possibility for the user to turn off stretch mode by
+        resizing the header section. This includes the stretchLastSection
+        property.
+
+      * Added the minimumSectionSize property.
+
+      * Get the section size hint from the Qt::SizeHintRole, if set.
+
+      * Added the ResizeToContents resize mode.
+
+      * Ensure that all header contents are centered by default.
+
+      * Improved the internal structure to be more memory efficient.
+
+- QHostAddress
+
+      * Added QDataStream streaming operators.
+
+- QHttp
+
+      * Support percent-encoded paths when used with a proxy server.
+
+      * Improved handling of unexpected remote socket close.
+
+- QHttpHeader
+
+      * Improved support for case-insensitive header searching.
+
+- QIcon
+
+      * Fixed issue where actualSize() might return a larger value than the
+        requested size.
+
+      * Fixed improper pixmap caching
+
+      * Added QDataStream operators for QIcon.
+
+      * Added the Selected mode.
+
+- QImage
+
+      * Added support for 16 bit RGB format.
+
+      * Added QPoint overloads to various (int x, int y) functions.
+
+      * Added support for faster/better rotation of images by 90/180/270
+        degrees.
+
+      * convertToFormat() now supports the color lookup table.
+
+      * Improved algorithm for smooth scaling to produce better results.
+
+- QImageReader
+
+      * Ensured that size() returns an invalid QSize if the image I/O handler
+        does not support the QImageIOHandler::Size extension.
+
+      * Added support for reading negative BMP images.
+
+      * Improved handling of invalid devices.
+
+      * Added optimizations to ensure that the most likely formats and plugins
+        are tested first when reading unknown image formats.
+
+      * Improved reading of BMP images from sequential QIODevices.
+
+      * Support for scaledSize() with JPEG images.
+
+      * It is now possible to query the supported options of an image by
+        calling supportedOptions().
+
+      * Stability fixes for the built-in XBM reader.
+
+- QImageWriter
+
+      * Ensured that an error is reported when attempting to write an image
+        to a non-writable device.
+
+      * It is now possible to query the supported options of an image by
+        calling supportedOptions().
+
+- QIODevice
+
+      * Fixed a casting bug in QIODevice::getChar().
+
+      * Improved reading performance significantly by using an internal buffer
+        when a device is opened in buffered mode.
+
+      * Some behavioral differences have been introduced:
+
+        + The following functions now need to call the base implementation
+          when reimplemented: atEnd(), bytesAvailable(), size(), canReadLine().
+
+        + pos() should return the base implementation directly.
+
+        + QIODevice now handles the device position internally. seek() should
+          always end up calling the base implementation.
+
+- QItemDelegate
+
+      * Use a widget's USER property to set and get the editor data.
+
+      * Removed unnecessary assertions.
+
+      * Added the clipping property to enable clipping when painting.
+
+      * When the model specifies a font, resolve the font over the existing
+        one rather than replacing it.
+
+      * Fixed issue with rendering of selected pixmaps.
+
+      * Ensured that QItemEditorFactory is called with the variant's
+        userType() so that the factory can distinguish between multiple user
+        types.
+
+      * Ensured that Key_Enter is propagated to the editor before data is
+        committed, so that the editor has a chance to perform custom input
+        validation/fixup.
+
+      * Let the line edit grow to accomodate long strings.
+
+      * Made it easer to subclass the item delegate.
+
+      * Added support for keypad navigation.
+
+- QItemSelectionModel
+
+      * Improved overall speed, particularly when isSelected() is used.
+
+      * Added functions for getting the selected rows or columns.
+
+      * Ensured that the current index is updated when it is being removed.
+
+      * Ensure that QAbstractItemView::clearSelection() only clears the
+        selection and not the current index.
+
+      * Added the hasSelection() function.
+
+      * Fixed some connection leaks (connections were not disconnected) when
+        an QItemSelectionModel was deleted. This should also speed up some
+        special cases.
+
+- QKeySequence
+
+      * Added a set of platform-dependent standard shortcuts.
+
+      * Fixed incorrect parsing of translated modifiers.
+
+- QLabel
+
+      * Added support for text selection and hyperlinks.
+
+      * Improved handling of scaled pixmaps.
+
+      * Made handling of QMovie safer to avoid object ownership issues.
+
+- QLibrary
+
+      * Added support for hints to control how libraries are opened on UNIX
+        systems.
+
+      * Added errorString() to report the causes of errors when libraries
+        fail to load.
+
+      * Added easier way to debug plugin loading: Setting QT_DEBUG_PLUGINS=1
+        in the environment will enable debug message printing on the
+        console.
+
+      * Increased the number of acceptable file name suffixes used to
+        recognize library files.
+
+- QLineEdit
+
+      * Ensured that the Unicode context menu gets shown if language
+        extensions are present.
+        
+      * Ensured that editingFinished() is not emitted if a validator is set
+        and the text cannot be validated.
+
+      * Ctrl+A now triggers select all on all platforms.
+
+      * Call fixup on focusOut() if !hasAcceptableInput().
+
+      * Added auto-completion support with the setCompleter() function.
+
+      * Fixed painting errors when contents margins were set.
+
+      * Invalid text set using setText() can now be edited where previously
+        it had to be deleted before new text could be inserted.
+
+      * Use SE_LineEditContents to control the contents rect of each
+        QLineEdit.
+
+- QListView
+
+      * Added the batchSize property.
+
+      * Don't un-hide currently hidden rows when new rows are inserted.
+
+      * Fixed partial repainting bug that occurred when alternatingRowColors
+        was enabled.
+
+      * Ensured that the resize mode is not reset in setViewMode() if it was
+        already set.
+
+      * Fixed crash that occurred when the first item was hidden and
+        uniformItemSizes was set.
+
+      * Added the wordWrap property for wrapping item text.
+
+      * Allow the user to select items consecutively when shift-selecting.
+
+      * Ensured that only the top item is selected when the user clicks on
+        an area with several items are stacked on top of each other.
+
+      * Optimized hiding and showing of items.
+
+      * Fixed issue where dragging an item in Snap mode did not respect the
+        scroll bar offsets.
+
+      * Fixed issue in Snap mode where a (drag and) drop did not always
+        query the item that existed in the corresponding cell for an enabled
+        Qt::ItemIsDropEnabled flag. 
+
+- QListWidget/QTreeWidget/QTableWidget
+
+      * Ensured the dataChanged() signal is emitted when flags are set on an
+        item.
+
+      * Removed unnecessary assertions.
+
+      * Added more convenience functions in QListWidget, QTableWidget and
+        QTreeWidget for selecting, hiding, showing, expanding and collapsing
+        nodes.
+
+      * Ensured that changes to items are reported.
+
+- QLocale
+
+      * Fixed bug in the string-to-number functions which sometimes caused
+        them to fail on negative numbers which contained thousand-
+        separators.
+
+      * Implemented the numberOptions property for specifying how
+        string-to-number and number-to-string conversions should be
+        performed.
+
+- QMainWindow
+
+      * Added support for tabbed dock widgets.
+
+      * Enhanced look and feel of dock widget handling. When a dock widget
+        hovers over a main window, the main window animates the existing
+        dock widgets and main area to show how it will accept the dock
+        widget if dropped.
+
+      * Fixed issues related to insertToolBarBreak().
+
+- QMap
+
+      * Prevent conversion of iterator or const_iterator to bool
+        (e.g., if (map->find(value))), because the conversion always
+        returned true. Qt 4.1 code that doesn't compile because of this
+        change was most probably buggy.
+
+      * Added the uniqueKeys() function.
+
+- QMenu
+
+      * Added the aboutToHide() signal.
+
+      * Added the isEmpty() accessor function.
+
+      * Clear menuAction() when setMenu(0)
+
+      * Added support for widgets in menus via QWidgetAction.
+
+      * Collapse multiple consecutive separators. This can be turned off
+        with the collapsibleSeparators property.
+
+      * Made scrollable menus wrap, just like non-scrollable ones.
+
+- QMessageBox
+
+      * Updated the API to allow more than 3 buttons to be used.
+
+      * Added support to display buttons in the order required by
+        platform-specific style guidelines.
+
+      * Added support for display of informative text using the
+        informativeText property.
+
+      * Added the detailedText property to allow detailed text to be
+        displayed.
+
+      * Improved sizing of message box (especially on Mac OS X).
+
+      * Changed the behavior so that long text strings are automatically
+        wrapped.
+
+      * Updated icon handling to use QStyle::standardIcon() where possible.
+
+- QMetaObject
+
+      * Added the userProperty() and normalizedType() functions.
+
+- QMetaType
+
+      * Ensured that all type names are normalized before registering them.
+
+      * Added support for handling Qt's integer typedefs: qint8, qint16,
+        etc.
+
+- QModelIndex
+
+      * Added the flags() convenience function.
+
+- QMutexLocker, QReadLocker, and QWriteLocker
+
+      * These classes now track the state of the lock they are holding.
+        They will not unlock on destruction if unlock() has been called.
+
+- QObject
+
+      * thread() will always return a valid thread, even if the object was
+        created before QApplication or in a non-QThread thread.
+
+      * When thread() returns zero, events are no longer sent to the object.
+        (Previous versions of Qt would send posted events to objects with no
+        thread; this does not happen in Qt 4.2).
+
+      * Added support for dynamically added properties via the new
+        property(), setProperty(), and dynamicPropertyNames() functions.
+
+      * Fixed a crash that could occur when a child deleted its sibling.
+
+- QPainter
+
+      * Fixed a crash the occurred when drawing cosmetic lines outside the
+        paint device boundaries.
+
+      * Fixed a pixel artifact issue that occurred when drawing cosmetic
+        diagonal lines.
+
+      * Fixed opaque backgrounds so that they are identical on all
+        platforms.
+
+      * Optimized drawing of cosmetic lines at angles between 315 and 360
+        degrees.
+
+      * Added the setRenderHints() function.
+
+      * Fixed a memory corruption issue in drawEllipse().
+
+- QPixmap
+
+      * Fixed crash caused by setting a mask or alpha channel on a pixmap
+        while it was being painted.
+
+      * Changed load() and save() to no longer require a format string.
+
+      * Ensured that grabWidget() works before the specified widget is first
+        shown.
+
+- QPluginLoader
+
+      * Added errorString() to report the causes of errors when plugins fail
+        to load.
+        
+- QPrinter
+
+      * Added support for PostScript as an output format on all platforms.
+
+      * Significantly reduced the size of the generated output when using
+        the PostScript and PDF drivers.
+
+      * Fixed issue where fromPage()/toPage() returned incorrect values when
+        generating PDF files.
+
+      * Ensured that setOutputFormat() preserves previously set printer
+        properties.
+
+      * Updated setOutputFileName() to automatically choose PostScript or
+        PDF as the output format for .ps or .pdf suffixes.
+
+- QProcess
+
+      * Added support for channel redirection to allow data to be redirected
+        to files or between processes.
+
+- QPushButton
+
+      * Ensured that, when a menu is added to a push button, its action is
+        also added to enable keyboard shortcuts.
+
+- QRect, QRectF, QRegion
+
+      * Renamed unite(), intersect(), subtract(), and eor() to united(),
+        intersected(), subtracted(), and xored() respectively.
+
+      * Added QRegion::intersects(QRegion) and QRegion::intersects(QRect).
+
+      * Fixed case where rect1 & rect2 & rect3 would return a non-empty
+        result for disjoint rectangles.
+
+- QRegExp
+
+      * Added RegExp2 syntax, providing greedy quantifiers (+, *, etc.).
+
+      * Marks (QChar::isMark()) are now treated as word characters,
+        affecting the behavior of '\b', '\w', and '\W' for languages
+        that use diacritic marks (e.g., Arabic).
+
+      * Fix reentrancy issue with the regexp cache.
+
+- QScrollArea
+
+      * Added the ensureWidgetVisible() function to facilitate scrolling to
+        specific child widgets in a scroll area.
+
+- QScrollBar
+
+      * Ensured that a SliderMove action is triggered when the slider value is
+        changed through a wheel event.
+
+- QSet
+
+      * Added QSet::iterator and QMutableSetIterator.
+
+- QSettings
+
+      * Store key sequences as readable entries in INI files.
+
+      * Detect NFS to prevent hanging when lockd isn't running.
+
+- QShortcut
+
+      * Added the setAutoRepeat(bool) function to disable auto-repeating
+        actions on keyboard shortcuts.
+
+- QSize
+
+      * Fixed potential overflow issue in scale().
+
+- QSlider
+
+      * Added support for jump-to-here positioning.
+
+- QSortFilterProxyModel
+
+      * Handle source model changes (e.g., data changes, item insertion
+        and removal) in a fine-grained manner, so that the proxy model
+        behaves more like a "real" model.
+
+      * Added sortRole, filterRole and dynamicSortFilter properties.
+
+      * Perform stable sorting of items.
+
+      * Fixed support for drag and drop operations where one item is dropped
+        on top of another.
+
+      * Ensure that persistent indexes are updated when the layout of the
+        source model changes.
+
+      * Made match() respect the current sorting and filtering settings.
+
+      * Forward mimeTypes() and supportedDropActions() calls to source
+        models.
+
+      * Added the ability to filter on all the columns.
+
+      * Added the filterChanged() function to enable custom filtering to be
+        implemented.
+
+- QSqlQuery
+
+      * Added execBatch() for executing SQL commands in a batch. Currently
+        only implemented for the Oracle driver.
+
+      * Fixed a case where executedQuery() would not return the executed
+        query.
+
+- QSqlRelationalTableModel
+
+      * Fixed issue related to sorting a relational column when using the
+        PostgreSQL driver.
+
+      * revertAll() now correctly reverts relational columns.
+
+- QStackedLayout
+
+      * Fixed crash that occurred when removing widgets under certain
+        conditions.
+
+- QStackedWidget
+
+      * Fixed crash that occurred when removing widgets under certain
+        conditions.
+
+      * Fixed issue where the size hint of the current widget would not be
+        respected.
+
+- QStandardItemModel
+
+      * Added an item-based API for use with QStandardItem.
+
+      * Reimplemented sort().
+
+      * Added the sortRole property.
+
+- QStatusBar
+
+      * Added the insertWidget() and insertPermanentWidget() functions.
+
+- QString
+
+      * Added support for case-insensitive comparison in compare().
+
+      * Added toUcs4() and fromUcs4() functions.
+
+- QStyle
+
+      * Added the following style hint selectors:
+        SH_Slider_AbsoluteSetButtons, SH_Slider_PageSetButtons,
+        SH_Menu_KeyboardSearch, SH_TabBar_ElideMode, SH_DialogButtonLayout,
+        SH_ComboBox_PopupFrameStyle, SH_MessageBox_TextInteractionFlags,
+        SH_DialogButtonBox_ButtonsHaveIcons, SH_SpellCheckUnderlineStyle,
+        SH_MessageBox_CenterButtons, SH_Menu_SelectionWrap,
+        SH_ItemView_MovementWithoutUpdatingSelection.
+
+      * Added the following standard pixmap selectors:
+        SP_DirIcon, SP_DialogOkButton, SP_DialogCancelButton,
+        SP_DialogHelpButton, SP_DialogOpenButton, SP_DialogSaveButton,
+        SP_DialogCloseButton, SP_DialogApplyButton, SP_DialogResetButton,
+        SP_DialogDiscardButton, SP_DialogYesButton, SP_DialogNoButton,
+        SP_ArrowUp, SP_ArrowDown, SP_ArrowLeft, SP_ArrowRight, SP_ArrowBack,
+        SP_ArrowForward.
+
+      * Added PE_PanelScrollAreaCorner and PE_Widget as primitive element
+        selectors.
+
+      * Added PM_MessageBoxIconSize and PM_ButtonIconSize as pixel metric
+        selectors.
+        
+      * Added SE_LineEditContents and SE_FrameContents as sub-element
+        selectors.
+
+      * Added SE_FrameContents to control the contents rectangle of a
+        QFrame.
+
+- QSvgHandler
+
+      * Improved style sheet parsing and handling.
+
+      * Added support for both embedded and external style sheets.
+
+      * Improved parsing of local url() references.
+
+      * Improved coordinate system handling.
+
+      * Fixed issue where the viewbox dimensions would be truncated to integer
+        values.
+
+      * Fixed support for gradient transformations.
+
+      * Fixed opacity inheritance behavior.
+
+      * Added support for gradient spreads.
+
+      * Fixed gradient stop inheritance behavior.
+
+      * Fixed parsing of fill and stroke properties specified in style sheets.
+
+      * Added support for reading and writing the duration of animated SVGs.
+
+      * Fixed incorrect rendering of SVGs that do not specify default viewboxes.
+
+      * Fixed radial gradient rendering for the case where no focal point is
+        specified.
+
+- QSyntaxHighlighter
+
+      * Added various performance improvements.
+
+- Qt namespace
+
+      * Added ForegroundRole and BackgroundRole, allowing itemviews to use
+        any QBrush (not just QColor, as previously) when rendering items.
+
+      * Added NoDockWidgetArea to the ToolBarArea enum.
+
+      * Added NoToolBarArea to the DockWidgetArea enum.
+
+      * Added GroupSwitchModifier to the KeyboardModifiers enum. It
+        represents special keys, such as the "AltGr" key found on many
+        keyboards.
+
+      * Added several missing keys to the Key enum: Key_Cancel, Key_Printer,
+        Key_Execute, Key_Sleep, Key_Play and Key_Zoom.
+
+      * Added OpenHandCursor and ClosedHandCursor for use with QCursor.
+
+- QTabBar
+
+      * QTabBar text can now be elided; this is controlled by the elideMode
+        property.
+
+      * You can now turn on or off the "scroll buttons" for the tab bar with
+        the usesScrollButtons property.
+
+      * Non-pixmap based styles will now fill the background of the tab with
+        the palette's window role.
+
+- QTabletEvent:
+
+      * Ensured that QTabletEvents are dispatched with the proper relative
+        coordinates.
+
+      * Added proximity as another type of a tablet event (currently only sent
+        to QApplication).
+
+- QTableView
+
+      * Added API for spanning cells.
+
+      * Ensured that cells are selected when the user right clicks on them.
+
+      * Added a corner widget.
+
+      * Added the setSortingEnabled property.
+
+- QTableWidget
+
+      * Added the clearContents() function to enable the contents of the view
+        to be cleared while not resetting the headers.
+
+      * QTableWidget now uses stable sorting.
+
+      * Allow sorting of non-numerical data.
+
+      * Add convenience table item constructor that takes an icon as well as
+        a string.
+
+- QTabWidget
+
+      * Added missing selected() Qt3Support signal.
+
+      * Clarified documentation for setCornerWidget().
+
+      * Ensured that the tab widget's frame is drawn correctly when the tab
+        bar is hidden.
+
+      * Ensured that the internal widgets have object names.
+
+      * Added iconSize, elideMode, and usesScrollButtons as properties (see
+        QTabBar).
+
+- QTcpSocket
+
+      * Fixed a rare data corruption problem occurring on heavily loaded
+        Windows servers.
+
+- QTemporaryFile
+
+      * Added support for file extensions and other suffixes.
+
+      * Fixed one constructor which could corrupt the temporary file path.
+
+- QTextBrowser
+
+      * Fixed various bugs with the handling of relative URLs and custom
+        protocols.
+
+      * Added isBackwardAvailable(), isForwardAvailable(), and
+        clearHistory() functions.
+
+- QTextCodec
+
+      * Allow locale-dependent features of Qt, such as QFile::exists(), to
+        be accessed during global destruction.
+
+- QTextCursor
+
+      * Added columnNumber(), blockNumber(), and insertHtml() convenience
+        functions.
+
+- QTextDocument
+
+      * Added convenience properties and functions: textWidth, idealWidth(),
+        size, adjustSize(), drawContents(), blockCount, maximumBlockCount.
+
+      * Added support for forced page breaks before/after paragraphs and
+        tables.
+
+      * Added CSS support to the HTML importer, including support for
+        CSS selectors.
+
+      * Added defaultStyleSheet property that is applied automatically for
+        every HTML import.
+
+      * Improved performance when importing HTML, especially with tables.
+
+      * Improved pagination of tables across page boundaries.
+
+- QTextEdit
+
+      * Fixed append() to use the current character format.
+
+      * Changed mergeCurrentCharFormat() to behave in the same way as
+        QTextCursor::mergeCharFormat, without applying the format to the
+        word under the cursor.
+
+      * QTextEdit now ensures that the cursor is visible the first time the
+        widget is shown or when replacing the contents entirely with
+        setPlainText() or setHtml().
+
+      * Fixed issue where the setPlainText() discarded the current character
+        format after the new text had been added to the document.
+
+      * Re-added setText() as non-compatibility function with well-defined
+        heuristics.
+
+      * Added a moveCursor() convenience function.
+
+      * Changed the default margin from 4 to 2 pixels for consistency with
+        QLineEdit.
+
+      * Added support for extra selections.
+
+- QTextFormat
+
+      * Fixed the default value for QTextBlockFormat::alignment() to return
+        a logical left alignment instead of an invalid alignment.
+
+      * Added UnderlineStyle formatting, including SpellCheckUnderline.
+
+- QTextStream
+
+      * Added the pos() function, which returns the current byte-position
+        of the stream.
+
+- QTextTableCell
+
+      * Added the setFormat() function to enable the cell's character format
+        to be changed.
+
+- QThread
+
+      * Related to changes to QObject, currentThread() always returns a
+        valid pointer. (Previous versions of Qt would return zero if called
+        from non-QThread threads; this does not happen in Qt 4.2).
+
+- QToolBar
+
+      * Introduced various fixes to better support tool buttons, button
+        groups and comboboxes in the toolbar extension menu.
+
+      * Fixed crash that occurred when QApplication::setStyle() was called
+        twice.
+
+- QToolButton
+
+      * Fixed an alignment bug for tool buttons with multi-line labels and
+        TextUnderIcon style.
+
+- QToolTip
+
+      * Added the hideText() convenience function.
+
+      * Added the showText() function that takes a QRect argument specifying
+        the valid area for the tooltip. (If you move the cursor outside this
+        area the tooltip will hide.)
+
+      * Added a widget attribute to show tooltips for inactive windows.
+
+- QTranslator
+
+      * Added support for plural forms through a new QObject::tr() overload.
+
+      * Ensured that a LanguageChange event is not generated if the
+        translator fails to load.
+
+      * Fixed a bug in isEmpty().
+
+      * Added Q_DECLARE_TR_FUNCTIONS() as a means for declaring tr()
+        functions in non-QObject classes.
+
+- QTreeView
+
+      * Ensured that no action is taken when the root index passed to
+        setRootIndex() is the same as the current root index.
+
+      * When hiding items the view no longer performs a complete re-layout.
+
+      * Fixed possible segfault in isRowHidden().
+
+      * Significantly speed up isRowHidden() for the common case.
+
+      * Improved row painting performance.
+
+      * After expanding, fetchMore() is called on the expanded index giving
+        the model a way to dynamically populate the children.
+
+      * Fixed issue where an item could expand when all children were
+        hidden.
+
+      * Added support for horizontal scrolling using the left/right arrow
+        keys.
+
+      * Added a property to enable the focus rectangle in a tree view to be
+        shown over all columns.
+
+      * Added more key bindings for expanding and collapsing the nodes.
+
+      * Added the expandAll() and collapseAll() slots.
+
+      * Added animations for expanding and collapsing branches.
+
+      * Take all rows into account when computing the size hint for a
+        column.
+
+      * Added the setSortingEnabled property.
+
+      * Fixed the behavior of the scrollbars so that they no longer
+        disappear after removing and re-inserting items while the view is
+        hidden.
+
+      * Fixed memory corruption that could occur when inserting and removing
+        rows.
+
+      * Don't draw branches for hidden rows.
+
+- QTreeWidget
+
+      * Added the const indexOfTopLevelItem() function.
+
+      * Improved item insertion speed.
+
+      * Fixed crash caused by calling QTreeWidgetItem::setData() with a
+        negative number.
+
+      * QTreeWidget now uses stable sorting.
+
+      * Made construction of single column items a bit more convenient.
+
+      * Added the invisibleRootItem() function.
+
+      * Made addTopLevelItems() add items in correct (not reverse) order.
+
+      * Ensured that the header is repainted immediately when the header
+        data changes.
+
+- QUiLoader
+
+      * Exposed workingDirectory() and setWorkingDirectory() from
+        QAbstractFormBuilder to assist with run-time form loading.
+
+- QUrl
+
+      * Added errorString() to improve error reporting.
+
+      * Added hasQuery() and hasFragment() functions.
+
+      * Correctly parse '+' when calling queryItems().
+
+      * Correctly parse the authority when calling setAuthority().
+
+      * Added missing implementation of StripTrailingSlash in toEncoded().
+
+- QVariant
+
+      * Added support for all QMetaType types.
+
+      * Added support for QMatrix as a known meta-type.
+
+      * Added support for conversions from QBrush to QColor and QPixmap,
+        and from QColor and QPixmap to QBrush.
+
+      * Added support for conversions between QSize and QSizeF, between
+        QLine and QLineF, from long long to char, and from unsigned long
+        long to char.
+
+      * Added support for conversions from QPointF to QPoint and from QRectF
+        to QRect.
+
+      * Fixed issue where QVariant(Qt::blue) would not create a variant of
+        type QVariant::Color.
+
+      * Added support for conversions from int, unsigned int, long long,
+        unsigned long long, and double to QByteArray.
+
+- QWhatsThis
+
+      * Improved look and feel.
+
+- QWidget
+
+      * Delayed creation: Window system resources are no longer allocated in
+        the QWidget constructor, but later on demand.
+
+      * Added a styleSheet property to set/read the widget style sheet.
+
+      * Added saveGeometry() and restoreGeometry() convenience functions for
+        saving and restoring a window's geometry.
+
+      * Fixed memory leak for Qt::WA_PaintOnScreen widgets with null paint
+        engines.
+        
+      * Ensured that widget styles propagate to child widgets.
+
+      * Reduced flicker when adding widget to layout with visible parent.
+
+      * Fixed child visibility when calling setLayout() on a visible widget.
+
+      * Speed up creation/destruction/showing of widgets with many children.
+
+      * Avoid painting obscured widgets when updating overlapping widgets.
+
+- QWorkspace
+
+      * Resolved issue causing the maximized controls to overlap with the
+        menu in reverse mode.
+
+      * Fixed issue where child windows could grow a few pixels when
+        restoring geometry in certain styles.
+
+      * Ensured that right-to-left layout is respected when positioning new
+        windows.
+
+      * Fixed crash that occurred when a child widget did not have a title
+        bar.
+
+      * Fixed issue where maximized child windows could be clipped at the
+        bottom of the workspace.
+
+- quintptr and qptrdiff
+
+      * New integral typedefs have been added.
+
+- Q3ButtonGroup
+
+      * Fixed inconsistencies with respect to exclusiveness of elements in
+        Qt 3.
+
+      * Fixed ID management to be consistent with Qt 3.
+
+- Q3Canvas
+
+      * Fixed several clipping bugs introduced in 4.1.0.
+
+- Q3CanvasView
+
+      * Calling setCanvas() now always triggers a full update.
+
+- Q3Grid, Q3Hbox, Q3VBox
+
+      * Fixed layout problem.
+
+- Q3IconView
+
+      * Fixed a case where selected icons disappeared.
+
+- Q3ListBox
+
+      * Fixed inconsistencies in selectAll() with respect to Qt 3.
+
+      * Fixed possible crash after deleting items.
+
+- Q3ListView
+
+        Fixed possible crash in Q3ListView after calling clear().
+
+        Fixed inconsistent drag and drop behavior with respect to Qt 3.
+
+- Q3Process
+
+      * Stability fixes in start().
+
+- Q3Socket
+
+      * No longer (incorrectly) reports itself as non-sequential.
+
+- Q3Table
+
+      * Improved behavior for combobox table elements.
+
+
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+- Interbase driver
+      
+      * Fixed data truncation for 64 bit integers on 64 bit operating
+        systems.
+
+- MySQL driver
+      
+      * When using MySQL 5.0.7 or larger, let the server do the text
+        encoding conversion.
+
+      * Added UNIX_SOCKET connection option.
+
+      * Improved handling of TEXT fields.
+
+- OCI driver
+    
+      * Improved speed for meta-data retrieval.
+     
+      * Fixed potential crash on Windows with string OUT parameters.
+
+      * Improved handling of mixed-case table and field names.
+
+- ODBC driver
+
+      * Improved error reporting if driver doesn't support static result
+        sets.
+
+      * Improved support for the Sybase ODBC driver.
+
+- SQLite driver
+
+      *  QSqlDatabase::tables() now also returns temporary tables.
+ 
+      *  Improved handling of mixed-case field names.
+
+
+
+****************************************************************************
+*                             QTestLib                                     *
+****************************************************************************
+
+- Added "-silent" options that outputs only test failures and warnings.
+
+- Reset failure count when re-executing a test object
+
+- Added nicer output for QRectF, QSizeF, and QPointF
+
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+
+Qtopia Core
+-----------
+
+- Fixed the -exceptions configure switch.
+
+- Fixed a build issue preventing the use of MMX instructions when
+  available.
+
+- Fixed leak of semaphore arrays during an application crash.
+
+- Fixed cases where the wrong cursor was shown.
+
+- Fixed cases where QWidget::normalGeometry() would return wrong value.
+
+- Allow widgets inside QScrollArea to have a minimum size larger than the 
+  screen size.
+
+- Allow (0,0) as a valid size for top-level windows.
+
+- VNC driver
+
+      * Fixed keyboard shortcut problem when using the VNC driver.
+
+      *  Fixed issue with the VNC driver that prevented client applications to
+         connect in some cases.
+
+      *  Fixed a leak of shared memory segments in the VNC driver.
+
+      *  Reduced CPU consumption in the VNC driver.
+
+      *  Implemented dynamic selection of the underlying driver for the VNC and
+         transformed screen drivers.
+
+      *  Improved error handling when clients connects to the server.
+
+- Graphics system
+
+      * Introduced new API for accelerated graphics hardware drivers.
+
+      * Implemented support for multiple screens.
+
+      * QScreen has binary incompatible changes. All existing screen drivers
+        must be recompiled.
+
+      * QWSWindow, QWSClient, QWSDisplay and QWSEvent have binary 
+        incompatible changes. QWSBackingStore has been removed. 
+        Existing code using these classes must be recompiled.
+
+      * Added support for OpenGL ES in QGLWidget. 
+
+      * Implemented support for actual screen resolution in QFont.
+
+      * Removed internal limitation of 10 display servers.
+
+      * Improved memory usage when using screens with depths less than 16
+        bits-per-pixel.
+
+      * Fixed 16 bits-per-pixel screens on big-endian CPUs.
+
+      * Optimized CPU usage when widgets are partially hidden.
+
+      * Improved detection of 18 bits-per-pixel framebuffers.
+
+      * Improved performance when using a rotated screen with 18 or 24
+        bits-per-pixel depths.
+
+      * Improved speed of drawing gradients.
+
+      * Introduced the QWSWindowSurface as a technique to create
+        accelerated paint engines derived from QPaintEngine.
+
+      * Implemented the Qt::WA_PaintOnScreen flag for top-level widgets.
+
+      * Extended QDirectPainter to include non-blocking API and support for 
+        overlapping windows. Existing code that subclasses QDirectPainter 
+        must be recompiled.
+
+      * Implemented QWSEmbedWidget which enables window embedding.
+
+      * Removed hardcoded 72 DPI display limitation.
+
+- Device handling
+
+      * QWSMouseHandler has binary incompatible changes. All existing mouse
+        drivers must be recompiled.
+
+      * Fixed an issue of getting delayed mouse events when using the
+        vr41xx driver.
+
+      * Improved event compression in the vr41xx mouse handler.
+
+      * Improved algorithm for mouse calibration which works for all
+        screen orientations.
+
+      * Fixed an issue causing mouse release events with wrong positions
+        when using a calibrated and filtered mouse handler on a rotated
+        screen.
+
+      * Made the tty device configurable for the Linux framebuffer screen
+        driver.
+
+      * Fixed a deadlock issue when using drag and drop and a calibrated
+        mouse handler.
+
+      * Autodetection of serial mice is turned off to avoid disrupt serial
+        port communication. Set QWS_MOUSE_PROTO to use a serial mouse.
+
+- QVFb
+
+      * Fixed an issue preventing QVFb from starting on some systems.
+
+      * Added support for dual screen device emulation in QVFb.
+
+- QCopChannel
+
+      *  Added a flush() function so that the QWS socket can be flushed,
+         enabling applications to ensure that QCop messages are delivered.
+
+
+Linux and UNIX systems
+----------------------
+
+- Printing
+ 
+      * Improved CUPS support by sending PDF instead of Postscript to
+        CUPS on systems that have a recent CUPS library, improving the
+        print quality.
+
+      * Added a new and improved QPrintDialog.
+
+      * Improved font embedding on systems without FontConfig.
+
+- QApplication
+
+      * When available, use Glib's mainloop functions to implement event
+        dispatching.
+
+- QPlastiqueStyle
+
+      * Added support to enable KDE icons to be automatically used on
+        systems where they are available.
+
+- QTextCodec
+     
+      * Uses iconv(3) (when available) to implement the codec returned by
+        QTextCodec::codecForLocale(). The new codec's name is "System"
+        (i.e., QTextCodec::codecForLocale()->name() returns "System"
+        when iconv(3) support is enabled).
+
+
+AIX
+---
+
+- The makeC++SharedLib tool is deprecated; use the "-qmkshrobj" compiler
+  option to generate shared libraries instead.
+
+
+X11
+---
+
+- Added support to internally detect the current desktop environment.
+
+- QAbstractItemView
+
+      * Fixed assertion caused by interrupting a drag and drop operation
+        with a modal dialog on X11.
+     
+      * Ensured that release events dispatched when closing a dialog
+        with a double click, are not propagated through to the window
+        underneath.
+
+- QCursor
+
+      * Fixed crash occuring when the X11 context had been released before
+        the cursor was destructed.
+
+- QGLWidget
+
+      * Fixed crashes that could occur with TightVNC.
+ 
+      * Improved interaction between QGLWidget and the Mesa library.
+
+- QMenu
+ 
+      * Made it possible for popup menus to cover the task bar on KDE.
+
+- QMotifStyle
+
+      * Ensured that the font set on a menu item is respected.
+
+- QX11EmbedContainer, QX11EmbedWidget
+
+      * Added missing error() functions.
+
+- QX11PaintEngine
+  
+      * Increased speed when drawing polygons with a solid pixmap brush.
+
+      * Fixed masked pixmap brushes.
+
+      * Increased QImage drawing performance.
+
+- Motif Drop support
+     
+      * Support for drops from Motif applications has been refactored and is
+        now working properly. QMimeData reports non-textual data offered in
+        Motif Drops using a MIME type of the form "x-motif-dnd/ATOM", where
+        ATOM is the name of the Atom offered by the Motif application.
+
+- Font rendering
+
+      * Improved stability when rendering huge scaled fonts.
+
+      * Enabled OpenType shaping for the Latin, Cyrillic, and Greek
+        writing systems.
+
+      * Improved sub-pixel anti-aliasing.
+
+      * Improved font loading speed.
+
+
+Mac OS X
+--------
+
+- Mac OS 10.2 support dropped.
+
+- QuickDraw support in QPaintEngine dropped; everything folded into the
+  CoreGraphics support.
+
+- All libraries in Qt are now built as frameworks when -framework mode is
+  selected (default) during the configuration process.
+ 
+- Many accessibility improvements, including better VoiceOver support. The
+  following widgets have had their accessibilty updated for this release:
+  QSplitter, QScrollBar, QLabel, QCheckBox, QRadioButton, QTabBar,
+  QTabWidget, QSlider, and QScrollBar.
+
+- Hidden files are now reported as hidden by QFileInfo, QDirModel, etc.
+
+- Windows now have a transparent size grips, an attribute for specifying an
+  opaque size grip was added.
+
+- Metrowerks generator has been removed.
+
+- Ensured that the anti-aliasing threshold setting is followed.
+
+- Added a standard "Minimize" menu item to Assistant's Window menu.
+
+- The documentation now has "Xcode-compatible" links so that it can be added
+  into Xcode's documentation viewer. This needs to be done by the developer
+  as regenerating Xcode's index takes quite a long time
+
+- QAbstractScrollArea
+
+      * Improved look and feel by aligning the scroll bars with the size
+        grip.
+
+- QClipboard
+ 
+      * Data copied to the clipboard now stays available after the
+        application exits.
+
+      * Added support for the Find clipboard buffer.
+
+      * Fixed encoding of URLs passed as MIME-encoded data.
+
+- QComboBox
+
+      * Improved the popup sizing so it's always wide enough to display its
+        contents.
+
+      * Improved the popup placement so it stays on screen and does not
+        overlap the Dock.
+
+      * The minimumSizeHint() and sizeHint() functions now honor
+        minimumContentsLength.
+
+- QKeyEvent
+
+      * The text() of a QKeyEvent is filled with the control character if
+        the user pressed the real Control key (Meta in Qt) and another key.
+        This brings the behavior of Qt on Mac OS X more in line with Qt on
+        other platforms.
+
+- QLibrary
+
+      * Removed the dependency on dlcompat for library loading and resolving
+        in favor of native calls. This means that you can unload libraries
+        on Mac OS X 10.4 or later, but not on 10.3 (since that uses dlcompat
+        itself).
+
+- QMacStyle
+
+      * QMacStyle only uses HITheme for drawing now (no use of Appearance
+        Manager).
+
+      * Fixed placement of text on buttons and group boxes for non-Latin
+        locales.
+
+      * Fixed rendering of small and mini buttons.
+
+      * Attempt to be a bit smarter before changing a push button to bevel
+        button when the size gets too small.
+
+      * Draws the focus ring for line edits when they are near the "top" of
+        the widget hierarchy.
+
+      * Ensured that the tickmarks are drawn correctly.
+
+      * Implemented the standardIconImplementation() function.
+
+      * Fixed the look of line edits.
+
+      * "Colorless" controls now look better.
+
+      * Fixed the sort indicator.
+
+      * Improved the look of text controls, such as QTextEdit, to fit in
+        better with the native style.
+
+- QMenu
+
+      * Popups no longer show up in Expose.
+
+      * Ensured that the proper PageUp and PageDown behavior are used.
+
+- QMenuBar
+
+      * Added support for explicit merging of items using QAction::MenuRole.
+
+      * Added support for localization of merged items.
+
+- QMessageBox
+
+      * A message box that is set to be window modal will automatically
+        become a sheet.
+
+      * Improved the look of the icons used to fit in with the native style.
+  
+- QPainter
+     
+      * Fixed off-by-one error when drawing certain primitives.
+
+      * Fixed off-by-many error when drawing certain primitives using a
+        scaling matrix.
+
+      * Fixed clipping so that setting an empty clip will clip away
+        everything.
+
+      * Fixed changing between custom dash patterns.
+
+      * Added combinedMatrix() which contains both world and viewport/window
+        transformations.
+      
+      * Added the setOpacity() function.
+
+      * Added MiterJoins that are compliant with SVG miter joins.
+
+- QPainterPath
+     
+      * Added the arcMoveTo() and setElementPosition() functions.
+
+- QPixmap
+
+      * Added functions to convert to/from a CGImageRef (for CoreGraphics
+        interoperability).
+ 
+      * Fixed various Qt/Mac masking and alpha transparency issues.
+
+- QPrinter
+     
+      * Made QPrinter objects resuable.
+
+- QProcess
+
+      * Always use UTF-8 encoding when passing commands.
+
+- QScrollBar
+
+      * Improved handling of the case where the scrollbar is to short to
+        draw all its controls.
+
+- QTextEdit
+
+      * Improved the look of the widget to fit in with the native style.
+
+- QWidget
+
+      * All HIViewRefs inside Qt/Mac are created with the
+        kWindowStandardHandlerAttribute.
+
+      * Added the ability to wrap a native HIViewRef with create().
+
+      * Windows that have parents with the WindowStaysOnTopHint also get the
+        WindowStaysOnTopHint.
+
+
+Windows
+-------
+
+- Ensured that widgets do not show themselves in a hover state if a popup
+  has focus.
+
+- Fixed issues with rendering system icons on 16 bits-per-pixel displays.
+
+- Fixed issue where fonts or colors would be reset on the application
+  whenever windows produced a WM_SETTINGSCHANGE event.
+
+- Fixed a bug with Japanese input methods.
+
+- Compile SQLite SQL plugin by default, as on all the other platforms.
+
+- Fixed build issue when not using Precompiled Headers (PCH).
+
+- Made Visual Studio compilers older than 2005 handle (NULL == p)
+  statements, where p is of QPointer type.
+
+- Fixed HDC leak that could cause applications to slow down significantly.
+
+- Ensured that timers with the same ID are not skipped if they go to different
+  HWNDs.
+
+- Improved MIME data handling
+
+      * Resolved an issue related to drag and drop of attachments from some
+        applications.
+
+      * Resolved an issue where pasting HTML into some applications would
+        include parts of the clipboard header.
+ 
+      * Improved support for drag and drop of Unicode text.
+
+      * Made it possible to set an arbitrary hotspot on the drag cursor on
+        Windows 98/Me.
+
+- ActiveQt
+
+    * Fixed issues with the compilation of code generated by dumpcpp.
+
+    * Made ActiveQt controls behave better when inserted into Office
+      applications.
+
+    * Ensured that slots and properties are generated for hidden functions and
+      classes.
+
+    * Ensured that the quitOnLastWindowClosed property is disabled when
+      QApplication runs an ActiveX server.
+
+    * Ensured that controls become active when the user clicks into a subwidget.
+
+    * Added support for CoClassAlias class information to give COM class a
+      different name than the C++ class.
+
+- QAccessible
+     
+      * Ensured that the application does not try to play a sound for
+        accessibility updates when no sound is registered.
+
+- QAxBase
+ 
+      * Fixed potential issue with undefined types.
+
+- QDir
+  
+      * Fixed bug where exists() would return true for a non-existent drive
+        simply because the specified string used the correct syntax.
+ 
+      * Improved homePath() to work with Japanese user names.
+
+- QFileDialog
+
+      * Added support for relative file paths in native dialogs.
+
+      * Enabled setLabelText() to allow context menu entries to be changed.
+      
+      * Ensured that users are denied entry into directories where they
+        don't have execution permission.
+
+      * Disabled renaming and deleting actions for non-editable items.
+
+      * Added a message box asking the user to confirm when deleting files.
+
+- QFileInfo
+      
+      * Fixed absoluteFilePath() to return a path that begins with the
+        current drive label.
+
+- QGLWidget
+       
+      * Fixed usage of GL/WGL extension function pointers. They are now
+        correctly resolved within the context in which they are used.
+
+- QGLColormap
+
+      * Fixed cases where the colormap was not applied correctly.
+
+- QMenu
+ 
+      * Made it possible for popup menus to cover the task bar.
+
+- QPrinter
+
+      * Added support for printers that do not have a DEVMODE.
+
+      * Fixed a drawing bug in the PDF generator on Windows 98/Me.
+
+      * Made it possible to programmatically change the number of copies
+        to be printed.
+
+      * Fixed possible crash when accessing non-existent printers.
+
+- QProcess
+
+      * Fixed lock-up when writing data to a dead child process.
+
+- QSettings
+
+      * Fixed bug causing byte arrays to be incorrectly stored on
+        Win95/98/Me.
+
+      * Allow keys to contain HKEY_CLASSES_ROOT and HKEY_USERS to allow all
+        registry keys to be read and prevent unintentional use of
+        HKEY_LOCAL_MACHINE.
+
+      * Fall back to the local machine handle if a key does not start with a
+        handle name.
+
+- QUdpSocket
+
+       * Introduced fixes for UDP broadcasting on Windows.
+
+- QWhatsThis
+
+       * Improved native appearance.
+
+- QWidget
+ 
+       * Top-level widgets now respect the closestAcceptableSize of their
+         layouts.
+
+       * Ensured that getDC() always returns a valid HDC.
+
+- QWindowsStyle
+
+      * We no longer draw splitter handles in Windows style. This resolves
+        an inconsistency with XP style, so that the two styles can use the
+        same layout interchangeably. Note that it is fully possible to style
+        splitter handles (if a custom style or handle is required) using
+        style sheets.
+
+      * Disabled comboboxes now have the same background color as disabled
+        line edits.
+ 
+- QWindowsXPStyle
+  
+      * Made QPushButton look more native when pressed.
+
+      * Improved the look of checked tool buttons.
+
+      * Defined several values that are not present in MinGW's header files.
+
+
+
+****************************************************************************
+*                   Significant Documentation Changes                      *
+****************************************************************************
+
+
+- Updated information about the mailing list to be used for porting issues
+  (qt-interest).
+
+- Demos / Examples
+
+      * Added a new directory containing desktop examples and moved the
+        Screenshot example into it.
+
+      * Added a new Chat client network example which uses QUdpSocket to
+        broadcast on all QNetworkInterface's interfaces to discover its
+        peers.
+
+      * The Spreadsheet demo now uses the QItemDelegate, QCompleter, and
+        QDateTimeEdit with calendar popup.
+
+      * An OpenGL button is added to some of the demos to toggle usage of
+        the OpenGL paint engine.
+
+      * Fixed crash resulting from incorrect painter usage in the Image
+        Composition example
+
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+
+Assistant
+---------
+
+- Middle clicking on links will open up new tabs.
+
+- Added "Find as you type" feature to search documentation pages.
+
+- Added "Sync with Table of Contents" feature to select the current page in
+  the contents.
+
+- Fixed issue where activating a context menu over a link would cause the
+  link to be activated.
+
+- Provides a default window title when not specified in a profile.
+
+- Fixed JPEG viewing support for static builds.
+
+- Fixed crash that could occur when opening Assistant with old and invalid
+  settings.
+
+- Fixed display of Unicode text in the About dialog.
+
+
+Designer
+--------
+
+- Added QWidget and the new widgets in this release to Designer's widget
+  box.
+
+- Updated the dialog templates to use the new QDialogButtonBox class.
+
+- Backup files created by Designer no longer overwrite existing files.
+
+- Promoted widgets inherit the task menu items of the base class.
+
+- Enums are no longer ordered alphabetically in the property editor.
+
+- Fixed issue where shortcuts could be corrupted in certain situations.
+
+- Line endings in .ui files now match the standard line endings for the
+  platform the files are created on.
+
+- Ensured that a warning is displayed whenever duplicate connections are
+  made in the connections editor.
+
+- Added shortcuts for the "Bring to Front" and "Send to Back" form editor
+  actions.
+
+- Added new 22 x 22 icons.
+ 
+- Fixed selection of dock widgets in loaded forms.
+
+- Made QWidget::windowOpacity a designable property.
+
+- Numerous improvements and fixes to the action and property editors.
+
+- Windows only
+
+      * The default mode is Docked Window.
+
+- Mac OS X only
+
+      * Preview of widgets is no longer modal.
+
+      * Passing really long relative paths into the resource will no longer
+        cause a crash.
+
+
+Linguist
+--------
+
+- Added a new "Check for place markers" validation feature.
+
+- Added the "Search And Translate" feature.
+
+- Added the "Batch translation" feature.
+
+- Added support for editing plural forms.
+
+- Extended the .ts file format to support target language, plural forms,
+  source filename, and line numbers.
+
+- Added the "Translated Form Preview" feature.
+
+- Added placeholders for "hidden" whitespace (i.e., tabs and newlines) in
+  the translation editor.
+
+
+lupdate
+-------
+
+- Added the -extensions command-line option in order to recursively scan
+  through a large set of files with the specified extensions.
+
+- Made lupdate verbose by default (use -silent to obtain the old behavior).
+
+- Improved parsing of project files.
+
+- Fixed some issues related to parsing C++ source files.
+
+
+lrelease
+--------
+
+- Made lrelease verbose by default (use -silent to obtain the old behavior).
+
+- Disabled .qm file compression by default (pass -compress to obtain the old
+  behavior).
+  
+      
+moc
+---
+
+- Fixed support for enums and flags defined in classes that are themselves
+  declared in namespaces.
+
+- Added support for the -version and -help command line options (for
+  consistency with the other tools).
+
+
+rcc
+---
+
+- Added support for the -binary option to generate resources that are
+  registered at run-time.
+
+
+qmake
+-----
+
+- Added support for an Objective C compiler on platforms that support it via
+  OBJECTIVE_SOURCES. Additionally, Objective C precompiled headers are
+  generated as necessary.
+
+- Added support for a qt.conf to allow easy changing of internal target
+  directories in qmake.
+
+- Added support for the recursive switch (-r) in shadow builds.
+
+- Introduced QMAKE_CFLAGS_STATIC_LIB to allow modified flags to be
+  passed to temporary files when compiling a static library.
+
+- Added a target.targets for extra qmake INSTALLS. The $files() function
+  is now completely consistent with wildcard matching as specified to
+  input file variables.
+
+- Added QMAKE_FUNC_* variables to EXTRA_COMPILERS for late evaluation
+  of paths to be calculated at generation time. $$fromfile() will no
+  longer parse input file multiple times.
+
+- Added support for -F arguments in LIBS line in the Xcode generator.
+
+- $$quote() has changed to only do an explicit quote, no escape sequences
+  are expanded. A new function $$escape_expand() has been added to allow
+  expansion of escape sequences: \n, \t, etc.
+
+- Added a $$QMAKE_HOST variable to express host information about the
+  machine running qmake.
+
+- Added a $$replace() function.
+
+- Ensured that PWD is always consulted first when attempting to resolve an
+  include for dependency analysis.
+
+- Added support for UTF-8 encoded text in .pro files.
+
+- Variables $$_PRO_FILE_ and $$_PRO_FILE_PWD_ added for features to detect
+  where the .pro really lives.
+
+- Added QMAKE_FRAMEWORK_VERSION to override the version inside a .framework,
+  though VERSION is still the default value.
+
+- Added support for custom bundle types on Mac OS X.
+
+- Added support for Mac OS X resources (.rsrc) in REZ_FILES.
+
+
+qt3to4
+------
+
+- qt3to4 now appends to the log file instead of overwriting it.
+
+- Fixed one case where qt3to4 was inserting UNIX-style line endings on
+  Windows.
+
+- Added the new Q3VGroupBox and Q3HGroupBox classes to ease porting.
+
+- Updated the porting rules for this release.
+
+
+uic
+---
+
+- Added support for more variant types: QStringList, QRectF, QSizeF,
+  QPointF, QUrl, QChar, qlonglong, and qulonglong.
+
+- Fixed code generated by uic for retranslating item view widgets so that
+  the widgets are not cleared when they are retranslated.
+
+- Ensured that no code is generated to translate empty strings.
+
+
+uic3
+----
+
+- Added line numbers to warnings.
+
+- Ensured that warnings show the objectName of the widget in question.
+
+- Added support for word wrapping in labels when converting files from uic3
+  format.
+
+- Ensured that the default layouts are respected when converting files from
+  uic3 format.
+
+- Ensured that double type properties are handled correctly.
diff --git a/dist/changes-4.2.0-tp1 b/dist/changes-4.2.0-tp1
new file mode 100644
index 0000000..b2a994d
--- /dev/null
+++ b/dist/changes-4.2.0-tp1
@@ -0,0 +1,20 @@
+Qt 4.2 introduces many new features as well as many improvements and
+bugfixes over the 4.1.x series. For more details, see the online
+documentation which is included in this distribution. The
+documentation is also available at http://doc.trolltech.com/
+
+The Qt version 4.2 series is binary compatible with the 4.1.x series.
+Applications compiled for 4.0 or 4.1 will continue to run with 4.2.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Qt 4.2 contains a lot of changes, which will be fully documented in the
+final release.
+
+For this tech preview, please concentrate on the new features and provide
+feedback on the qt4-preview-feedback mailing list (see
+http://lists.trolltech.com/ for details)
+
+
diff --git a/dist/changes-4.2.1 b/dist/changes-4.2.1
new file mode 100644
index 0000000..5cbcc2c
--- /dev/null
+++ b/dist/changes-4.2.1
@@ -0,0 +1,14 @@
+Qt 4.2.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.2.0.
+
+The Qt version 4.2 series is binary compatible with the 4.1.x and 4.0.x series.
+Applications compiled for 4.0 or 4.1 will continue to run with 4.2.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+- QImage
+        Fixed a potential security issue which could arise when transforming
+        images from untrusted sources.
+
diff --git a/dist/changes-4.2.2 b/dist/changes-4.2.2
new file mode 100644
index 0000000..25131a1
--- /dev/null
+++ b/dist/changes-4.2.2
@@ -0,0 +1,827 @@
+Qt 4.2.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.2.0.
+
+The Qt version 4.2 series is binary compatible with the 4.1.x and 4.0.x
+series. Applications compiled for 4.0 or 4.1 will continue to run with 4.2.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Configuration/Compilation
+
+  * Fixed issues with unresolved zlib symbols on aix-g++ resulting from a
+    missing "-lz" in gui/Makefile.
+
+  * Fixed compilation when an unsupported version of MySQL is auto-detected
+    by the configure script.
+
+  * Fixed QtDBus linking errors when compiling with the Intel C++ Compiler
+    for Linux.
+
+  * Fixed compilation when using Q_ARG and Q_RETURN_ARG macros with template
+    types.
+
+  * Make Qt compile with QT_NO_TOOLTIP and QT_NO_STATUSBAR
+
+- Documentation
+
+  * Added new overviews and substantially improved Qtopia Core-specific
+    documentation.
+
+- Demos / Examples
+
+  * Fixed crash in the Settings Editor example resulting from entering
+    certain input to a QTreeWidget using QLineEdit as an inline editor.
+
+  * Fixed crash in the Ported Canvas example that occurred when creating a
+    new canvas from one that was shrunk to its minimum size.
+
+- I/O
+
+  * Fixed divide by zero when loading malformed BMP files.
+
+- Qt Assistant
+
+  * Fixed a bug that prevented the view from scrolling to anchors within
+    pages.
+
+- Qt Designer
+
+  * Fixed crash that could occur when pasting a QGridLayout into a
+    QTabWidget.
+
+  * Fixed the signals & slots connection editor to automatically scroll to 
+    the correct items.
+
+  * Fixed blocking behavior that would occur when previewing modal forms.
+
+  * Made OK the default button in the "Promote to Custom Widget" dialog.
+
+  * Ensured that main window forms that include size grips are repainted
+    correctly when they are resized.
+
+  * Fixed bug in Form Settings dialog - it wasn't possible to reset the
+    "Pixmap Function" field.
+
+- Qt Linguist
+
+  * Fixed bug where lupdate would leave out the namespace part of the context.
+  
+  * Fixed bug in lupdate where the paths of the generated ts files was not 
+    relative to the pro file.
+
+  * Fixed bug in lupdate that caused strings that contained \r\n were not 
+    translated.
+
+  * Improved the user interface with some minor layout changes.
+
+  * Improved handling of forms without layouts.
+
+  * Fixed crash caused by navigating to the previous node when the current
+    node was the first and topmost node.
+
+  * Fixed bug in the preview translation feature where forms that did not
+    have any layout got a height of 0.
+
+  * Fixed bug where "Search and Translate" did not trigger a repaint on the
+    items that got translated, leading people to believe that 
+    "Search and Translate" did not work.
+
+  * Fixed a layout problem with the "Search and Translate" dialog.
+
+- qmake
+
+  * Fixed crash that could occur when using the LIB_PATH variable if a .libs
+    directory is located on one of the paths held by the variable.
+
+  * Improved generation of Xcode projects to avoid problems with qmake
+    project files that contain certain Qt-dependent declarations.
+
+  * Improved support for Objective C sources in the Xcode project generator
+    to ensure that they are added to the project's target.
+
+
+Third party components
+----------------------
+
+- libpng
+
+  * Security fix (CVE-2006-5793): The sPLT chunk handling code
+    uses a sizeof operator on the wrong data type, which allows
+    context-dependent attackers to cause a denial of service (crash)
+    via malformed sPLT chunks that trigger an out-of-bounds read.
+
+  * Security fix: Avoid profile larger than iCCP chunk.
+    One might crash a decoder by putting a larger profile inside the
+    iCCP profile than is actually expected.
+
+  * Security fix: Avoid null dereference.
+
+  * Disabled MMX assembler code for Intel-Mac platforms to work
+    around a compiler bug.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General improvements
+--------------------
+
+- Accessibility
+
+  * Fixed a potential assert when navigating menus while assistive tools are
+    running.
+
+  * Fixed a crash when getting accessibility information from an item view
+    without a model.
+
+  * Fixed item view accessibility bug where QAccessibleInterface::text()
+    would return an empty string for child indexes larger
+    than one.
+
+- Item views
+
+  * Fixed QHeaderView and QTableView overflow issues when the length
+    of all the rows or columns went over the maximum allowed integer value.
+
+  * When reset is emitted by a QAbstractItemModel, QHeaderView will now
+    always update the header count().
+
+  * Fixed incorrect scrolling in QHeaderView when items are hidden.
+
+  * Fixed bug where QHeaderView would disappear if the sections were moved
+    and the model was reset.
+
+  * QDataWidgetMapper::mappedWidgetAt() now always returns the right
+    mapped index for a widget no matter in which order they were inserted
+
+  * Fixed crash due to incorrect update of persistent model indexes in
+    QSortFilterProxyModel::layoutChanged().
+
+  * Fixed bug that could cause QSortFilterProxyModel::removeRows() and
+    QSortFilterProxyModel::removeColumns() to remove the wrong source model
+    items.
+
+  * Fixed bug in QSortFilterProxyModel that caused stale proxy mappings to
+    remain when source model items were removed and later reinserted,
+    resulting in an incorrect proxy model.
+
+  * Fixed bug in QSortFilterProxyModel that caused items to not appear
+    in a QTreeView when adding children to a formerly childless source item.
+
+  * Fixed painting bug for spanning cells in QTableView when the item
+    background is transparent.
+
+  * Fixed regression in QListWidget and QTreeWidget that caused persistent
+    indexes to not be updated when sorting items.
+
+  * Enter key can now be used to start item editing when the edit trigger
+    is AnyKeyPressed.
+
+  * Fixed regression where QAbstractItemView::setRootIndex() wasn't
+    always updating the view, causing possibly painting errors.
+
+  * Fixed regression that caused incorrect propagation of Enter key press
+    from a QAbstractItemView in editing mode.
+
+  * Date and time editors are now initialized correctly with the current
+    date and time.
+
+  * QTableView tab focus handling has been improved. Although tab key
+    navigation is enabled by default, you can tab out of a view if the
+    model is either missing or unable to handle the key (e.g., an empty
+    model).
+
+  * Fixed bug in QItemDelegate that would scale decoration pixmaps.
+
+  * Fixed buge that would not let the column delegate create the editor
+    for an edited item.
+
+  * Fixed bug where the QTableCornerButton would ignore the view
+    selectionMode.
+
+  * Fixed compatibility issue with QTreeWidgetItem serialization
+    between Qt 4.2.x and Qt 4.(0/1).x.
+
+  * Made sure the QTableWidget::cellEntered() signal is emitted
+    correctly.
+
+  * Made sure that commitData() uses the row/column delegate
+    when these are set.
+
+  * Fixed incorrect QTableView scrollbar ranges when rows were hidden.
+
+  * Fixed QItemDelegate to let text be bottom aligned.
+
+- Graphics View
+
+  * The background cache in QGraphicsView is now properly initialized to
+    the full viewport.
+
+  * Fixed incorrect cursor updates when moving between items.
+
+  * QGraphicsItem::setMatrix() now properly clears the original item before
+    repainting.
+
+  * QGraphicsEllipseItem is now only drawn as a full ellipse at angles that
+    are multiples of 360 degrees (..., -720, -360, 360, 720, ...).
+
+  * Fixed a crash when selecting one selectable item, then moving another
+    movable item.
+
+  * Fixed a crash during item construction caused by a pure virtual function
+    call in QGraphicsItem.
+
+  * Fixed mouse grabber book-keeping problems in QGraphicsScene which fell out
+    of sync when opening modal dialogs or popups from within a mouse event
+    handlers.
+
+  * QGraphicsScene now forwards unhandled events to QObject, allowing the use
+    of timers in QGraphicsScene subclasses.
+
+- Meta-Object Compiler (moc)
+
+  * Split long string literals in the generated code to work around
+    limitations in MSVC.
+
+  * Fixed crash on *BSD that could occur on invalid input.
+
+- Painting
+
+  * Improved numerical stability in the path stroker, fixing a crash when
+    stroking paths containing curve segments whose control points are
+    approximately on the same line.
+
+  * Fixed raster paint engine memory corruption in QBitmap when source buffer
+    was smaller than the destination buffer.
+
+  * Avoid rounding errors when drawing parts of a pixmap using the Quartz 2D
+    engine.
+
+  * Added caching of QGradient's color table for the raster paint engine.
+    This means that if a gradient with the same stops and colors is used
+    again, it will be quickly fetched from the cache, avoiding the
+    expensive calculations of the color lookup table.
+
+  * Fixed a crash on Windows and with QImage caused by specifying
+    Qt::CustomDashLine without an actual pattern.
+
+  * Fixed a bug in the raster paint engine which would occasionally cause
+    pixel errors when drawing polygons.
+
+  * Fixed memory corruption in the OpenGL paint engine when drawing complex
+    polygons with a cosmetic pen.
+
+  * Fixed rendering of transformed brushes when drawing linear gradients
+    with the OpenGL paint engine where the transformations used were not
+    angle-preserving.
+
+  * Improved handling of OpenGL errors.
+
+  * Fixed bug in the raster paint engine where extra lines would be drawn
+    when drawing a path partially outside the viewport using a dashed pen.
+
+  * Fixed an assert in QImage that was triggered when reading PNG files
+    with certain palettes.
+
+  * Fixed an issue where stroking and drawing aliased QPainterPaths with a
+    non-cosmetic pen would produce incorrect results.
+
+  * Fixed an issue where text was cut off when drawn onto a QImage.
+
+  * Fixed an issue where text would be drawn onto a QPicture with an
+    incorrect position.
+
+  * Fixed an issue where enabling/disabling clipping when drawing into a
+    QImage did not have any effect.
+
+  * Fixed bug in QImage::createHeuristicMask where the color table was not 
+    initialized properly.
+
+- Qt Resource Compiler (rcc)
+
+  * Improved handling of relative paths in .qrc files.
+
+- Style Sheets
+
+  * Made general performance improvements.
+
+  * Fixed crash that could occur when a widget with a style sheet was
+    reparented into a widget with no style sheet.
+
+  * Ensured that a widget's custom palette is not overwritten when not styled
+    using a style sheet.
+
+  * Added support to allow colors to be specified with alpha components.
+
+  * Added support for group box styling.
+
+  * Removed broken support for automatic image scaling.
+
+- SQL plugins
+
+  * Fixed incorrect translation of error strings in the Oracle plugin.
+  
+  * Made sure PQfreemem is called to free allocated buffers in PostgreSQL.
+
+  * Fixed regression from Qt 4.1.4 behavior that prevented tables in schemas
+    from working correctly in the SQL data models.
+
+  * Prevented possible trailing garbage for TEXT fields in the MySQL plugin.
+
+- Text handling
+
+  * Fixed a bug in the Bidi algorithm.
+
+- QAbstractItemView
+
+  * Made commitData() more robust by ignoring cases in which no valid index
+    is associated with the editor.
+
+  * Ensured that the itemEntered() signal is emitted consistently on all
+    platforms.
+
+- QBrush
+
+  * Ensured that transformations are correctly copied when brushes are copied.
+
+- QCalendarWidget
+
+  * Fixed setting the text format, correcting repainting and date resetting
+    issues.
+
+- QComboBox
+
+  * Fixed wrong scroll arrows for the popup menu.
+
+- QCompleter
+
+  * Fixed issue where the highlighted() signal was emitted twice if
+    setModel() was called twice.
+
+  * Made completers usable inside dialogs.
+
+- QDataStream
+
+  * Fixed streaming of qreal on (embedded) platforms where qreal values are
+    not equivalent to double values; i.e., sizeof(qreal) != sizeof(double).
+
+- QDateTime/QDateTimeEdit
+
+  * Fixed a bug that allowed you to type in larger numbers than 12 in 12-hour
+    fields.
+
+  * Fixed a bug that occurred when QDate::shortMonthName() was longer than
+    3 characters.
+
+  * Improved the handling of left-to-right languages.
+
+- QDialogButtonBox
+
+  * QDialogButtonBox now sets the default button to the first button with
+    the Accept role if no other button has explicitly been set as the
+    default when it is shown. This is to stop a regression where using the
+    autoDefault property with the Mac and Cleanlooks styles would set the
+    Cancel button as the default.
+
+- QDir
+
+  * Fixed an assert in QDir::entryList() when reading file entries with
+    names containing invalid Unicode encodings.
+
+- QFileDialog
+  * Fixed bug that showed a non-existing folder for every space the user typed 
+    after a dot (.) in the lineedit.
+
+- QFileSystemWatcher
+
+  * Fixed compilation on Linux/HPPA.
+
+- QFSFileEngine
+
+  * Fixed broken UNC path support.
+
+- QIODevice
+
+  * Fixed a data corruption bug when reading large blocks from devices
+    opened in Text mode.
+
+  * Fixed seeking to positions larger than the maximum allowed integer value.
+
+- QLineEdit
+
+  * Fixed scrolling in line edits with custom paddings.
+
+  * Fixed crash on Linux when the text contains QChar::LineSeparator.
+
+- QListView/QListWidget
+
+  * Fixed bug with cursor navigation in cases where a grid size has been
+    set.
+
+  * Ensured that the drop indicator is not shown in icon view mode to avoid
+    painting artifacts.
+
+- QLocale
+
+  * Fixed crash on Mac OS X and Windows caused when one of the separator
+    strings was an empty string.
+
+  * Fixed double to string conversion bug on embedded architectures.
+
+- QMainWindow
+
+  * Fixed bug allowing non-floatable dock widgets to be floated when the
+    DockWidgetMoveable option is set.
+
+  * Fixed several bugs in laying out docked QDockWidgets which have
+    minimumSize() and/or maximumSize() set.
+
+  * Improved saving and restoring of the state of main windows and their dock
+    widgets when using saveState() and restoreState().
+
+  * Fixed handling of dock widgets that are non-closable to the user so that
+    they can be programmatically closed.
+
+  * Fixed regression from Qt 4.1.4 behavior to ensure that palette changes
+    to main windows are also propagated to their children.
+
+- QMenuBar
+
+  * Improved event handling to avoid sending events when a menu bar has no
+    parent widget.
+
+- QObject
+
+  * Fixed memory leak when calling QObject::moveToThread(0).
+
+- QPainter
+
+  * Fixed reentrancy issue that would otherwise lead to crashes if more than
+    one QImage is deleted at the same time (from different threads).
+
+- QPalette
+
+  * Improved handling of the palette obtained from QApplication::palette()
+    in cases where QApplication::setStyle() has been called before a
+    QApplication instance has been constructed (as recommended by the
+    documentation).
+
+- QPluginLoader
+
+  * Fixed a potential crash that could occur when calling staticInstances()
+    from a global destructor.
+
+- QProgressBar
+
+  * Document that drawing of text in vertical progress bars is style-dependent.
+
+- QSqlRelationalTableModel
+
+  * Ensured that the internal cache is correctly cleared when reverting
+    inserted rows.
+
+- QSvg
+
+  * Improved parser robustness and parsing speed.
+
+- QTextCodec
+
+  * Fixed race-condition in QTextCodec::codecForLocale().
+
+  * Fixed potential off-by-one string handling bug.
+
+- QTextDocument
+
+  * Fixed support for pixel font sizes in imported HTML.
+
+- QTextOption
+
+  * Ensured that the textDirection property is respected.
+
+- QTextStream
+
+  * Ensured that readLine() no longer treats "\r\n" as being two lines if
+    called after QTextStream::pos().
+
+- QToolButton
+
+  * Fixed an issue where tool button popup menus were positioned incorrectly
+    on multi-screen setups.
+
+- QTreeView/QTreeWidget
+
+  * Fixed possible assert when painting if there were layouts pending.
+
+  * Fixed possible segfault when a model emits layoutChanged().
+
+  * Fixed erroneous expanding/collapsing of items when the user
+    double-clicked in the checkbox area of an item.
+
+  * Fixed a crash in setRowHidden() caused by hiding then un-hiding items
+    in a hierarchy.
+
+  * Fixed setSortingEnabled() which could could cause incorrect painting.
+
+- QVariant
+
+  * Fixed behavior where conversion of invalid variants to integers would be
+    incorrectly reported as successful.
+
+  * Fixed a crash in the compatibility function QVariant::asByteArray()
+    when called on a null variant.
+
+- QWidget
+
+  * Made setWindowTitle() work on hidden widgets that are never shown.
+    (Fixing a bug in QtSingleApplication on Windows.)
+
+  * Made QWidget::restoreGeometry() restore windows to the correct screen
+    on multi-screen systems.
+
+  * Fixed a bug where the stacking order of widgets would get out of sync
+    and cause entire widgets, or parts of them, not to be updated properly.
+
+  * Fixed QWidget::setParent() to not recreate the native window ID of
+    all child widgets when reparenting the parent to top-level.
+
+  * Fixed incorrect resize handling of dock widgets that are resized to the
+    extent of the screen or to their maximum defined sizes.
+
+- QWorkspace
+
+  * Fixed memory corruption that caused crashes inside Visual Studio.
+
+- QMessageBox
+
+  * Made QMessageBox::setText() adjust the size of the text area
+    when setting a new text. 
+
+- QXmlInputSource
+
+  * Ensured that QXmlInputSource does not read in the whole document at once,
+    enabling arbitrarily large files to be parsed with QXmlSimpleReader.
+
+- Qt3 support
+
+  * Fixed QPainter::xForm() and QPainter::xFormDev().
+
+  * Fixed crash in Q3IconView when selecting several items without releasing
+    the left mouse button, then clicking the right mouse button.
+
+  * Fixed incorrect behavior of setLabel() to replace labels rather than
+    inserting more of them.
+
+  * Ensured that Q3IconView is included in the Desktop Light package.
+
+  * Fixed regression of a feature in Qt 4.1.4 by reintroducing support for
+    Q3Accel.
+
+- QDBus
+
+  * Fixed getting and setting of invalid properties
+    so the don't cause errors in in libdbus-1.
+
+  * Fixed bug where QtDBus could generate invalid XML in some cases.
+
+  * Fixed bug where QtDBus can sometimes generate names that break
+    the standard.
+
+  * Fixed crash in QtDBus when connecting a signal to a slot with
+    less parameters.
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+
+  * Fixed positioning of text with stacking diacritics.
+
+  * Added fixes for Indic text rendering.
+
+  * Fixed rendering of Greek and other latin scripts with XLFD fonts.
+
+  * Fixed encoding detection of XLFD fonts.
+
+  * Fixed crash in QX11EmbedContainer.
+
+  * Ensured that QPrinter doesn't generate PDF when printing to raw CUPS
+    printers.
+
+  * Improved behavior of QPrintDialog so that, if CUPS is not installed or
+    reports that no printers are available, it falls back to the printers
+    set up for lpr/lprng.
+
+  * Fixed paper size selection when printing with CUPS.
+
+  * Suppressed/avoided the generation of floating point exceptions in the
+    X11 paint engine.
+
+  * Fixed an endianess issue when drawing QImages.
+
+  * Fixed X errors when scaling/copying null pixmaps.
+
+  * Fixed an issue where bitmap/XLFD fonts where drawn garbled.
+
+  * Fixed X error when resizing to its minimum size.
+
+  * Fixed widgets painted all black if the system palette contains X11
+    color names.
+
+  * Fixed loading plugins built in debug mode and linked against the
+    default (release) build.
+
+  * Fixed input of non-ascii chars in Qt widgets when application was
+    run with empty LANG environment variable.
+
+  * Fixed QApplication::hasPendingEvents() returning true even if no
+    events were pending when using the Glib event dispatcher.
+
+  * Fixed rare event loop dead-lock when posting many custom events to
+    a receiver in another thread.
+
+- QPlastiqueStyle
+
+  * Disabled checked radio buttons and checkboxes are now rendered correctly.
+
+
+Windows
+-------
+
+  * Fixed drawing of the 0xad character with symbol fonts.
+
+  * Fixed stacking order of dialogs when a child is created before its
+    parent.
+
+  * Fixed printing to PDF when no printers are installed.
+
+  * Fixed "print to file" dialog only showing once after it has been canceled.
+
+  * Fixed name clashes in enum values when running dumpcpp (ActiveQt).
+
+  * Fixed a lock-up in QNetworkInterface for machines with multiple network
+    interfaces.
+
+  * Fixed a lock-up in QAbstractSocket::waitForReadyRead() when 0 was passed
+    as a timeout value.
+
+  * Fixed "Invalid HANDLE" exception when a non-Qt thread that owns Qt
+    objects terminates.
+
+  * Fixed potential crash when calling QCoreApplication::applicationFilePath().
+
+  * Fixed compilation problem with precompiled headers in qt3support. PCH is
+    now disabled for qt3support.
+
+  * Fixed issues with low-level keyboard handling for certain (international)
+    keyboard layouts where input of accented characters would only work
+    inconsistently.
+
+  * Fixed bug in QWidget::setGeometry() caused by incorrectly taking the
+    geometry of the window decoration into account.
+
+  * Made it possible to load files in a Japanese environment.
+
+  * Improved the appearance of dock widgets on Windows XP.
+
+  * Fixed the appearance of the window menu when triggered with Alt-Space.
+
+- QAxServer
+
+  * Ensured that characters that some IStorage implementations don't support
+    are removed from stream names.
+
+  * Fixed regression that prevented ActiveQt controls from being activated
+    once they had been closed.
+
+- QSettings
+
+  * Fixed potential deadlocks that could occur when saving settings,
+    particularly if an error occurs while settings are being written.
+
+Mac OS X
+--------
+
+  * Fixed a regression that made it impossible to drag images from non-Qt
+    application to Qt applications.
+
+  * Fixed an issue with flickering/disappearing widgets when the
+    Qt::WA_MacMetalStyle attribute is set.
+
+  * Updated the documentation to clarify QActionWidget behavior with regard
+    to adding a QActionWidget to a menu in the menu bar and using the same
+    menu as a popup.
+
+  * Ensured that the correct QList<QUrl> is returned when dragging Finder
+    items to Qt applications.
+
+  * Documented how to debug with debug frameworks.
+
+  * Fixed text selection in the PDF generator.
+
+  * Fixed a bug where the cursor would not switch to the arrow cursor over
+    child widgets with that cursor set.
+
+  * Fixed incorrect handling of FramelessWindow modal dialogs to ensure that
+    they do not have title bars and cannot be moved.
+
+  * Fixed a crash that could occur when enabling "Accessibility for assistive
+    devices" in System Preferences while a Qt application was running.
+
+  * Fixed a painting error where a one-pixel border at the bottom-right
+    corner of widgets wasn't being (re)painted correctly.
+
+  * Fixed an item view scrolling bug where cell widgets were scrolled
+    incorrectly.
+
+  * Made handling of popup behavior depend on the window type to ensure that
+    they are raised above other windows correctly.
+
+  * Fixed crashes caused by incorrect pointer handling for contexts.
+
+  * Ensured that the resize cursor shape is shown when the mouse cursor is
+    positioned over the edges of floating dock widgets.
+
+  * Fixed issue that caused menus to be opened behind widgets with the
+    WindowStaysOnTopHint hint set.
+    
+  * Fixed handling of the QAssistantClient class for framework builds.
+
+- QMacStyle
+
+  * Fixed a crash that occurred when an invalid rectangle was given for an
+    inactive button.
+      
+	  * Improved performance when rendering vertical gradients.
+	
+- QSystemTrayIcon
+
+  * Ensured that the enable state of actions are properly handled and that
+    aboutToShow() is emitted when appropriate.
+
+
+- Qtopia Core
+
+  * Fixed delivery of mouse events to overlapping popups.
+
+  * VNC: Fixed use of the VNC driver with the Multi driver.
+
+  * Fixed cursor state when switching between different screens.
+
+  * Improved performance when using an accelerated mouse cursor.
+
+  * Optimized linear gradient drawing using fixed point math for use on
+    platforms without floating point hardware.
+
+  * QCustomRasterPaintDevice::metric(): Fixed default values of PdmWidth and
+    PdmHeight.
+
+  * Fixed bug in QWidget::setMask().
+
+  * Fixed incorrect line edit editing behavior where the contents would be
+    cleared even for read-only line edits in certain situations.
+
+  * Fixed calibration of rotated screens in the Mouse Calibration example.
+
+  * Fixed setMode() in the LinuxFb, VNC and Transformed screen drivers.
+
+  * Fixed crash when using QWSCalibratedMouseHandler with filter size < 3.
+
+  * Fixed QScreen::alloc() for non-default color maps.
+
+  * Fixed a bug preventing a QWSEmbedWidget from being displayed if the
+    remote widget was hidden before it was embedded.
+
+  * Fixed screen area reservation when using the QDirectPainter class.
+
+  * Fixed compilation of the MySQL driver when using the minimum
+    configuration.
+
+  * Fixed left-to-right positioning for menu items in XP style.
+
+- QVFb
+
+  * Fixed crash that could occur when switching between certain skins.
+
+  * Fixed crash that could occur when recording.
+
+  * Enabled saving of animations in locations other than in /tmp.
+
+- QWhatsThis
+
+  * Fixed the unintentional double shadow effect for "What's This?" help.
+
+
+****************************************************************************
+*                             QTestLib                                     *
+****************************************************************************
+
+   * Added missing documentation for the QVERIFY2 macro.
diff --git a/dist/changes-4.2.3 b/dist/changes-4.2.3
new file mode 100644
index 0000000..8041602
--- /dev/null
+++ b/dist/changes-4.2.3
@@ -0,0 +1,373 @@
+Qt 4.2.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.2.0.
+
+The Qt version 4.2 series is binary compatible with the 4.1.x and 4.0.x
+series. Applications compiled for 4.0 or 4.1 will continue to run with 4.2.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Configuration/Compilation
+    * Fixed architecture detection on UltraSPARC-T1 systems.
+    * Fixed compilation on embedded architectures when qreal is not double.
+    * Compile on OpenBSD.
+
+- Documentation
+    * Completed documentation for "Implementing Atomic Operations",
+      which is useful for people porting Qt to a new hardware architecture.
+
+- Translations
+    * Added a new unofficial Portuguese translation courtesy of Helder
+      Correia.
+
+- Qt Linguist
+    * Made the columns in the phrasebook resizeable.
+
+- lupdate
+    * Fixed bug in the .pro parser of lupdate. It should accept backslashes.
+    * Fixed a severe slowdown in lupdate. (~400x speedup.)
+    * Fixed traversal of subdirectories.
+
+- moc
+    * Don't create trigraphs in the generated code for C++ casts.
+
+- uic
+    * Fixed a bug that generated excessive margins for Q3GroupBox.
+
+Third party components
+----------------------
+
+- libpng
+
+  * Security fix: Avoid null dereferences.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General improvements
+--------------------
+
+- Graphics View
+
+    * Calling QGraphicsScene::update() without arguments now correctly
+      updates the entire scene.
+    * Changing the background brush in QGraphicsScene now correctly updates
+      the entire scene
+    * Fixed a crash in QGraphicsScene due to stale pointers in the BSP tree.
+    * QGraphicsScene::createItemGroup() now allows you to create an empty
+      group (previously caused an assert in debug mode).
+    * Fixed rendering bugs with QGraphicsPixmapItem::offset().
+    * Adding an item to a QGraphicsScene now always implicitly causes an
+      update.
+    * Fixed a crash caused by deleting a QGraphicsScene that is being viewed
+      by a QGraphicsView.
+    * Items with zero width or height (e.g., a horizontal or vertical line
+      with a zero-width cosmetic pen) are now rendered correctly.
+    * Fixed a crash in QGraphicsScene::destroyItemGroup(), and when removing
+      items from a group.
+
+- Item views
+    * Fixed data loss in QTreeWidget, QTableWidget and QListWidget that
+      occurred when performing a drag and drop copy operation on items
+      containing data in custom roles.
+
+    * Fixed signal emission bugs in QSqlQueryModel and QSqlTableModel that
+      caused the view to contain invalid items when used with a
+      QSortFilterProxyModel.
+
+    * Fixed a bug in word-wrapped text that could cause all new-line
+      characters, and the last line in string containing at least one
+      newline character, to be removed.
+
+    * Fixed bug in QListView where the last item of a batch was not always
+      displayed.
+
+- QAction
+    * Fixed a possible crash when using alternate shortcuts on a QAction.
+
+- QByteArray
+    * Fixed a crash in toUpper().
+
+- QCleanlooksStyle
+    * Indeterminate progress bars are now correctly animated.
+
+- QComboBox
+    * Fixed broken case sensitive completion.
+    * Changing the font on a QComboBox now changes the font on the popup as
+      well.
+
+- Q3TextEdit
+    * Fixed regression where some shortcuts didn't work on Mac OS X.
+
+- Q3Canvas
+    * Fixed potential memory overrun when determining a clipping chunk.
+
+- Q3Socket
+    * Fixed unexpected remote disconnection bugs (also QTcpSocket).
+
+- QFile
+    * Performance enhancements in QFile::copy().
+    * Allow reading past the previous end of the file if the file grows.
+    * Reliably allow QFile::readLine() and QFile::readAll() to be used to
+      read from stdin on all platforms.
+
+- QFileDialog
+    * Fixed crash that could occur when the filter began with ';;'.
+    * Fixed assertion caused by calling setFilters() with an empty list.
+    * Fixed problem with file entries not being laid out correctly.
+
+- QGridLayout
+    * Fixed bug in handling of fixed size spacers spanning multiple
+      rows/columns
+
+- QLayout
+    * Fixed bug caused by setting minimumSize() and SizePolicy::Fixed on a
+      widget that implements minimumSizeHint() but not sizeHint().
+
+- QLineEdit
+    * Fixed crash caused by moving the cursor over a QChar::LineSeparator
+      in the text.
+
+- QPainter
+    * Fixed bug in QPainter::drawPoints() when using the raster paint engine
+      which caused some points to be missing.
+    * Removed memory leak in raster paint engine when drawing complex
+      polygons/paths.
+
+- QProcess
+    * Fixed a crash that could occur when calling QProcess::waitForFinished()
+      from inside a slot connected to a signal emitted by QProcess.
+    * Fixed a race condition on Windows where QProcess::bytesToWrite() would
+      return a short byte count.
+
+- QTextDocument
+    * Fixed find() with backward searches.
+    * Match CSS style selector case insensitively.
+    * Fixed HTML import for tables with missing cells and rowspan/colspan
+      attributes. 
+
+- QSortFilterProxyModel
+    * Fixed a crash caused by calling filterChanged().
+    * Fixed a crash caused by removing items from the source model.
+    * Fixed a bug that could cause a model to enter an invalid state when
+      filtering items in a hierarchy, causing items in a QTreeView to
+      erroneously be collapsed.
+    * Fixed a bug that could cause invalid items to be added when inserting
+      new items to the source model.
+
+- QSyntaxHighlighter
+    * Fixed failing assertion that could occur when installing a syntax
+      highlighter before the document has created a layout.
+
+- QPluginLoader
+    * Fixed compilation of Q_EXPORT_PLUGIN when used with templates.
+
+- QTcpSocket
+    * Fixed a bug where QTcpSocket would time out when connecting to a
+      closed service on Windows.
+    * Fixed a race condition when calling waitFor...() functions with a very
+      short timeout value.
+    * Fixed unexpected remote disconnect problems on Windows.
+    * Improved the reliability of the waitFor...() functions with SOCKS5
+      proxy support.
+
+- QTextLayout
+    * Fixed rendering of surrogate pairs and cursor navigation with them.
+
+- QTextEdit
+    * Fixed crash in QTextEdit::setExtraSelection() that could occur when
+      used with null cursors.
+    * Fixed scrollbar bug which could cause the bottom of the text to be
+      unreachable.
+
+- QTextStream
+    * Fixed QTextStream::readLine() so it can be used reliably with stdin on
+      all platforms, and updated the documentation to reflect this.
+
+- QMacStyle
+    * Ensured that tab bars are drawn correctly regardless of the font used.
+
+- QMenuBar
+    * Properly marked the "text heuristic matching" strings for translation.
+
+- QMenu
+    * Fixed incorrect scrolling on large menus on Mac OS X.
+
+- QPlastiqueStyle
+    * Ensured that indeterminate progress bars are now always animated and
+      fixed a rendering bug.
+
+- QPrinter
+    * Fixed a bug on X11 that caused the printer to generate too many
+      copies.
+    * Fixed a bug in the PostScript driver that could cause invalid
+      PostScript to be generated.
+
+- QSqlRelationalTableModel
+    * Ensured that the internal cache is cleared after
+      QSqlRelationalTableModel::submitAll() is called. 
+
+- QSqlDriver
+    * Ensured that QSqlDriver::formatValue() doesn't cut off characters from
+      field names.
+
+- QTextTable
+    * Removed false assertion when deleting the first row or column in a
+      table.
+    * Fixed crash when splitting cells in the rightmost column of a table.
+    * Fixed issue where QTextTable::splitCells() would shift cells further
+      down in the table.
+    * Fixed crash in QTextTable::mergeCells() caused by merging an already
+      merged cell.
+    
+- QToolTip
+    * Fixed QToolTip sizes when used with HTML tags like <BR>.
+
+- QUdpSocket
+    * Fixed a busy-wait causing the event loop to spin when writing a
+      datagram to an unbound port.
+    * QUdpSocket now reliably emits readyRead() in connected mode.
+
+- QUrl
+    * Fixed a crash that would occur as a result of calling errorString() on
+      an empty URL.
+
+- SQL plugins
+    * Prevent crashes in QSqlQuery after reopening a closed ODBC connection.
+    * Prevent crash when retrieving binary data from ODBC.
+    * The Interbase driver now returns a valid handle through
+      QSqlDriver::handle().
+
+- QMutex
+    * Fixed race condition in QMutex::tryLock() that would prevent all
+      other threads from acquiring the mutex
+
+- QList
+    * Fixed crash when modifying a QList that must be detached from a
+      separate thread
+
+- QWidget
+    * Fixed case where a modal dialog could be stacked below its parent
+      window when the dialog was shown first
+    * Fixed an erroneous hideEvent() from being sent immediately after
+      window creation
+    * Fixed problem with missing text in QWidget::whatsThis().
+
+- QWindowsStyle
+    * Fixed a crash that could occur when deleting a QProgressBar after its
+      style was changed.
+
+- QVariant
+    * Fixed assertion caused by streaming in a variant containing a float.
+
+- QAbstractItemView
+    * Fixed focus problem with cell widgets.
+
+- QTableView
+    * Fixed problem with context menus clearing the selections.
+
+- QHeaderView
+    * Fixed assertion that could occur when removing all sections when some
+      sections had been moved.
+    * Fixed a bug that could prevent the user from resizing the last 
+      visible section if the "real" last section was invisible.
+
+- QListView
+    * Fixed crash when calling reset.
+
+- QTableWidget
+    * Fixed painting problem that could occur when rows were swapped.
+
+- QTreeView
+    * Fixed a crash that could appear when removing all the children of an
+      item.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+    * Fixed detection of Type1 symbol fonts.
+    * Fixed crash on exit in QSystemTrayIcon when QApplication is used
+      as the parent.
+    * Fixed animation GUI effects on tooltips, menus, and comboboxes.
+    * Fixed crashes in threaded programs when Qt uses the Glib main
+      loop.
+    * Fixed bug where an empty LANG environment variable could prevent input
+      of non-ASCII chars in Qt widgets.
+    * Fixed leak of initial style created by QApplication after calling
+      QApplication::setStyle().
+    * Fixed erroneous event delivery to a widget that has been destroyed.
+    * Prevent shortcuts for keypad arrow keys from being activated when
+      Num Lock is on.
+    * Fixed bug which caused incorrect drawing of subrectangles of bitmaps.
+    * Fixed bug in rendering of the Bengali script.
+
+Windows
+-------
+    * Fixed compilation with -no-stl.
+    * Fixed compilation with Windows SDK for Vista.
+    * Fixed an issue that could cause missing text when Cleartype was used.
+    * Fixed the hot-spot locations for OpenHandCursor and CloseHandCursor.
+    * Fixed infinite warning loop about adopted threads in applications with
+      many threads.
+    * Fixed assertion caused by hiding a child widget whose window has not
+      yet been created.
+    * Fixed QWindowsXPStyle so that it is possible to draw a
+      QStyle::CE_DockWidgetTitle without having an actual instance of
+      QDockWidget.
+    * Fixed crash when drawing text with large font sizes.
+    * Fixed support for the Khmer language.
+    * Fixed incorrect reporting of frameGeometry() after a window is closed.
+    * Fixed crash when handling spurious WM_CHAR from Remote Desktop Client.
+    * Fixed crash in JPEG plugin while loading.
+    * Fixed crash in QFileDialog::getExistingDirectory() when specifying
+      a parent that has not been shown yet.
+
+Mac OS X
+--------
+    * Fixed regression where dragging/copying Unicode text in Qt to another
+      application would only export the non-Unicode version.
+    * Fixed regression where releasing the mouse button would send two mouse
+      releas events to a widget.
+    * Fixed regression where the drop action would be reset after a native
+      "DragLeave" event was received.
+    * Wrapping a (non-Qt) window's content view and resizing before showing
+      the window for the first time now works correctly.
+    * Ensured that the content view is always created before we QWidgets are
+      added to a window - this allows better integration with Cocoa apps.
+    * Fixed regression where text/uri-list was inadvertently disabled for
+      clipboards.
+    * Fixed regression where setting the brushed metal style on a message
+      box would show the label in a non-metallic style.
+    * Fixed the open source binary package to have the correct definitions
+      for development.
+
+Qtopia Core
+-----------
+    * Fixed a data corruption bug in QDataStream on ARM processors where
+      reading and writing doubles/qreals would be incompatible with streams
+      on other platforms.
+      Note: corrupt data streams generated with previous versions of Qtopia
+      Core on ARM platforms cannot be read with this version.
+    * Fixed a possible buffer overflow in the VNC driver.
+    * Fixed a memory leak in the windowing system.
+    * Fixed painting errors occuring with use of QT::WA_PaintOnScreen on
+      certain screen configurations.
+    * Improved performance when using a 16-bit brush as the background on a 
+      16-bit screen.
+    * Improved performance of 16-bit semi-transparent solid fills.
+    * Fixed crash that could occur when saving a 16-bit image in BMP or PPM
+      formats.
+    * Fixed bug where window icons would not be shown in Plastique style.
+    * Fixed bug in QWSServer::setMaxWindowRect() on rotated displays.
+    * Fixed crash with normalized Unicode characters and QPF fonts.
+    * Ensured that QWidget::minimumSize() does not become larger than the
+      screen size.
+
diff --git a/dist/changes-4.2CEping b/dist/changes-4.2CEping
new file mode 100644
index 0000000..530c650
--- /dev/null
+++ b/dist/changes-4.2CEping
@@ -0,0 +1,73 @@
+Changes for Qt/CE 4.2.x "Ping" release.
+
+****************************************************************************
+*                           Features                                       *
+****************************************************************************
+
+- Added QtNetwork
+
+- Added QFEATURES system
+
+- Added more examples/demos
+
+- configure.exe
+    * additions for QFEATURES
+
+- Native look and feel
+    * click&hold opens context menu
+    * only allow single application launch, second startup changes to running instance
+    * added experimental Windows CE 6 support
+
+****************************************************************************
+*                           Bug fixes                                      *
+****************************************************************************
+
+- qmake
+    * fix Visual Studio project file generator for THUMB instructions
+
+- Styles
+    * removed big icon images to reduce library sizes
+
+- QColorDialog
+    * fix size issues for Windows CE
+
+- QDebug
+    * fix multiple output of lines when using Visual Studio
+
+- QFile
+    * fix creation/resolving links
+
+- QFontDatabase
+    * fix bug for multiple system fonts available on device
+
+- QFontEngine
+    * fix alignment issues for line edits
+
+- qgetenv/qputenv
+    * fix memory leak
+
+- QLocale
+    * fix timezone issues regarding standard SDK.
+
+- QMessageBox 
+    * fix OK button bug
+
+- QSessionManager
+    * fix id creation
+
+- QTabWidget
+    * fix positioning bug
+
+- QWidget
+    * fix size related bugs
+    * fix window-animation when switching between menus (WindowsCEStyle)
+
+- QWindowsCEStyle
+    * various fixes
+
+- QWindowsMobileStyle
+    * smartphone fixes
+
+- winmain module
+    * fix leak
+
diff --git a/dist/changes-4.3.0 b/dist/changes-4.3.0
new file mode 100644
index 0000000..f4e1d1a
--- /dev/null
+++ b/dist/changes-4.3.0
@@ -0,0 +1,2445 @@
+Qt 4.3 introduces many new features as well as many improvements and
+bugfixes over the 4.2.x series. For more details, see the online
+documentation which is included in this distribution. The
+documentation is also available at http://doc.trolltech.com/4.3
+
+The Qt version 4.3 series is binary compatible with the 4.2.x series.
+Applications compiled for 4.2 will continue to run with 4.3.
+
+The Qtopia Core version 4.3 series is binary compatible with the 4.2.x
+series except for some parts of the device handling API, as detailed
+in Platform Specific Changes below.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.trolltech.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain
+more information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Configuration/Compilation
+    * Fixed OpenBSD and NetBSD build issues.
+
+- Legal
+    * Added information about the OpenSSL exception to the GPL.
+
+- Documentation and Examples
+    * Added information about the TS file format used in Linguist.
+    * Moved platform and compiler support information from
+      www.trolltech.com into the documentation.
+    * Added an Accessibility overview document.
+    * Added new example to show usage of QCompleter with custom tree models.
+
+- Translations
+    * Added a Slovak translation of Qt courtesy of Richard Fric.
+    * Added a Ukrainian translation of Qt courtesy of Andriy Rysin.
+    * Added a Polish translation of the Qt libraries and tools courtesy of
+      Marcin Giedz, who also provided a Polish phrasebook for Qt Linguist.
+    * [155464] Added a German translation for Qt Designer.
+
+- Added support for the CP949 Korean Codec.
+
+- [138140] The whole Qt source compiles with the QT_NO_CAST_FROM_ASCII
+  and QT_NO_CAST_TO_ASCII defines and therefore is more robust when
+  using codecs.
+
+- Added support for HP-UX 11i (Itanium) with the aCC compiler
+
+- Changed dialogs to respond much better to the LanguageChange event.
+  (i.e. run time translation now works much better.)
+
+- Signals and slots
+    * [61295] Added Qt::BlockingQueuedConnection connection type, which
+      waits for all slots to be called before continuing.
+    * [128646] Ignore optional keywords specified in SIGNAL() and SLOT()
+      signatures (struct, class, and enum).
+    * Optimize emitting signals that do not have anything connected to them.
+
+- [121629] Added support for the MinGW/MSYS platform.
+
+- [102293] Added search path functionality (QDir::addSearchPath)
+
+- Almost all widgets are now styleable using Qt Style Sheets.
+
+Third party components
+----------------------
+
+- Updated Qt's SQLite version to 3.3.17.
+
+- Updated Qt's FreeType version to 2.3.4.
+
+- Updated Qt's libpng version to 1.2.16.
+
+- Added libtiff version 3.8.2 for the TIFF plugin.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+- QAbstractButton
+    * [138210] Ensured strictly alternating ordering of signals resulting
+      from auto-repeating shortcuts. Fixed a repeat timer bug that cause
+      cause infinite retriggering to occur.
+    * [150995] Fixed bug where non-checkable buttons take focus when
+      activating shortcuts.
+    * [120409] Fixed bug where the button was set to unpressed when the
+      right mouse button was released.
+
+- QAbstractItemView
+    * [111503] Ensured that focus is given back to the view when the Tab key
+      is pressed while inside an editor.
+    * [156290] Use slower scrolling when the ScrollMode is set to
+      ScrollPerItem.
+    * Ensured that the item view classes use the locale property when
+      displaying dates and numbers to allow easy customization.
+    * Fixed a repaint issue with the focus rectangle in cases where
+      selection mode is NoSelection.
+    * [147422] Detect when persistent editors take/lose focus and update the
+      view accordingly.
+    * [146292] Items are now updated even if they contain an editor.
+    * [130168] Auto-scrolling when clicking is now delayed to allow
+      double-clicking to happen.
+    * [139247] Fixed bug where clicking on a partially visible item was
+      triggering a scroll and the wrong item was then clicked.
+    * [137729] Use dropAction() instead of proposedAction() in
+      QAbstractItemView::dropEvent().
+    * Fixed a bug that prevented keyboardSearch() from ignoring disabled
+      items.
+    * [151491] Ensured that we pass a proper MouseButtonPress event in
+      QAbstractItemView::mouseDoubleClickEvent().
+    * [147990] Ensured that double-clicking does not open an editor when
+      the edit trigger is set to SelectedClicked.
+    * [144095] Ensured that sizeHintForIndex() uses the correct item
+      delegate.
+    * [140180] Ensured that clicking a selected item clears all old
+      selections when the view is using the ExtendedSelection selection mode
+      and SelectedClicked as an edit trigger.
+    * [130168] Fixed bug where double clicking on partially visible items
+      would not activate them.
+    * [139342] Allow editing to be started programatically, even if there
+      are no edit triggers.
+    * [130135] Added public slot, updateIndex(const QModelIndex &index).
+
+- QAbstractProxyModel
+    * [154393] QAbstractProxyModel now reimplements itemData().
+
+- QAbstractSlider
+    * [76155] Fixed bug where the slider handle did not stop under the
+      mouse.
+
+- QAbstractSocket
+    * [128546] Fixed bug where an error was emitted with the wrong type.
+
+- QAccessible
+    * Added preliminary support for the upcoming IAccessible2 standard.
+    * Made improvements to most of the accessible interfaces.
+    * [154534] Ensured that our accessible interfaces honour
+      QWidget::setAccessibleName() and QWidget::setAccessibleDescription().
+    * Avoid crash if QAccessibleInterface::object() returns 0.
+      (It is absolutely legal to return a null value.)
+
+- QApplication
+    * Added a flash() method for marking windows that need attention.
+    * [86725] Allow the -style command line argument to override a
+      style set with QApplication::setStyle() before QApplication
+      construction.
+    * [111892] Fixed a bug that caused Qt to steal all input when
+      connecting the QAction::hovered() signal to a slot that called
+      QMainWindow::setEnabled(false).
+    * [148512] Fixed QApplication::keyboardModifiers() to update
+      correctly when minimizing the window when Qt::MetaModifier is held
+      down.
+    * [148796] Fixed a bug that prevented Qt from detecting system font
+      changes.
+    * [154727] Prevent a crash when a widget deletes itself in an key
+      event handler without accepting the event.
+    * [156484] Fixed a bug where lastWindowClosed() was emitted for each
+      top-level window when calling QApplication::closeAllWindows().
+    * [157667] Ensured that widgets with the Qt::WA_DeleteOnClose property
+      set are properly deleted when they are closed in the dropEvent()
+      handler following a drag that was started in the same application.
+    * [156410] Implemented QEvent::ApplicationActivate and
+      QEvent::ApplicationDeactivate on all platforms. Note that
+      QEvent::ApplicationActivated and QEvent::ApplicationDeactivated are
+      now deprecated.
+
+- QAtomic
+    * [126321] Fixed several flaws in the inline assembler implementations
+      for several architectures (ARM, i386, PowerPC, x86-64).
+    * [133043] Added support for atomic fetch-and-add.
+
+- QAuthenticator
+    * New Class. Needed for authentication support in the Network module.
+      Currently supports the Basic, Digest-MD5 and NTLM authentication
+      mechanisms.
+
+- QBitArray
+    * [158816] Fixed crash in operator~().
+
+- QCalendarWidget
+    * Don't set maximum width for month/year buttons.
+    * Ensured that the QPalette::Text role is used for default text.
+    * Added a date editor which can be configured with the dateEditEnabled
+      and dateEditAcceptDelay properties.
+    * [137031] Ensured that grid lines are drawn properly when headers are
+      not visible.
+    * [151828] Ensured that the language can be set with
+      QCalendarWidget::setLocale().
+
+- QChar
+    * Updated the Unicode tables to Unicode 5.0.
+    * Added foldCase() and toTitleCase() methods.
+    * Added public API to handle the full Unicode range.
+
+- QCleanlooksStyle
+    * [129506] Sliders now look and behave correctly in both reversed and
+      inverted appearance modes.
+    * [131490] Group boxes no longer reserve space for their titles when no
+      title is set.
+    * [134344] A sunken frame is now used to indicate checked menu items
+      with icons.
+    * [133691] Improved the appearance of spin boxes and buttons when used
+      against dark backgrounds.
+    * [154499] Fixed a rendering issue with disabled, checked push buttons.
+    * [154862] Fixed an issue causing combo boxes to sometimes show clipped
+      text.
+    * Slider appearance is now based on Clearlooks Cairo and the performance
+      on X11 has been improved.
+    * The appearance of tab bars when used with Qt::RightToLeft layout
+      direction has been improved.
+    * Dock widget titles are now elided if they are too long to fit in the
+      available space.
+
+- QClipboard
+    * Ensured that calling clear() on the Mac OS X clipboard really clears
+      its data.
+    * [143927] Don't drop alpha channel information when pasting pixmaps on
+      Mac OS X.
+    * The Mac OS X clipboard support now understands TIFF information and
+      can export images as TIFF as well.
+    * [145437] Fixed crash that could occur when calling setMimeData() twice
+      with the same data.
+    * QMacMime now does correct normalization of file names in a URL list
+      from foreign applications.
+
+- QColor
+    * [140150] Fixed bug where QColor::isValid() would return true for
+      certain invalid color strings.
+    * [120367] Added QColor::setAllowX11ColorNames(bool), which enables
+      applications to use X11 color names.
+    * Fixed internal errors in toHsv() due to inexact floating point
+      comparisions.
+
+- QColorDialog
+    * [131160] Enabled the color dialog to be used to specify an alpha color
+      on Mac OS X.
+
+- QColumnView
+    * A new widget that provide a column-based implementation of
+      QAbstractItemView.
+
+- QComboBox
+    * Significantly reduced the construction time of this widget.
+    * [155614] Speeded up addItem() and addItems().
+    * [150768] Ensured that inserting items doesn't change the current text
+      on editable combo boxes.
+    * [150902] Ensured that only the left mouse button can be used to open
+      the popup list.
+    * [150735] Fixed pop-up hiding behind top-level windows on Mac OS X.
+    * [156700] Fixed bug where the popup could be closed when pressing the
+      scroll arrows.
+    * [133328] Fixed bug where disabled entries were not grayed out.
+    * [134085] Fixed bug where the AdjustToContents size policy had no
+      effect.
+    * [152840] Fixed bug where QComboBox would not automatically scroll to
+      the current item.
+    * [90172] Fixed bug where the sizeHint() implementation iterated over
+      all icons to detect their availability.
+
+- QCompleter
+    * Significantly reduced the construction time of this widget.
+    * Added support for lazily-populated models.
+    * [135735] Made QCompleter work when used in a QLineEdit with a
+      QValidator.
+    * Added the wrapAround property to allow the list of completions to
+      wrap around in popup mode.
+    * Added support for sharing of completers, making it possible for the
+      same QCompleter object to be set on multiple widgets.
+    * [143441] Added support for models that sort their items in descending
+      order.
+
+- QCoreApplication
+    * Added support for posted event priorities.
+    * [34019] Added the QCoreApplication::removePostedEvents() overload
+      for removing events of a specific type.
+    * Documented QCoreApplication::processEvents() as thread-safe;
+      calling it will process events for the calling thread.
+    * Optimized delivery of QEvent::ChildInserted compatibility events.
+    * [154727] Enabled compression of posted QEvent::DeferredDelete events
+      (used by QObject::deleteLater()) to prevent objects from being deleted
+      unexpectedly when many such events are posted.
+    * Ensured that duplicate entries in library paths are ignored.
+
+- QCryptographicHash
+    * New Class. Provides support for the MD4, MD5 and SHA1 hash functions.
+
+- QCursor
+    * [154593] Fixed hotspot bug for cursors on Mac OS X.
+    * [153381] Fixed crash in the assignment operator in cases where the
+      cursor was created before a QApplication instance.
+
+- QDataWidgetMapper
+    * [125493] Added addMapping(QWidget *, int, const QByteArray &) and
+      mappedPropertyName(QWidget *) functions.
+
+- QDateTime
+    * [151789] Allow passing of date-only format to QDateTime::fromString()
+      (according to ISO 8601).
+    * [153114, 145167] Fixed bugs that could occur when parsing strings to
+      create dates.
+    * [122047] Removed legacy behavior which assumed that a year between 0
+      and 99 meant a year between 1900 and 1999.
+    * [136043] Fixed the USER properties.
+
+- QDateTimeEdit
+    * [111557, 141266] Improved the behavior of the widget with regard to
+      two-digit years. Made stepping work properly.
+    * [110034] Don't change current section when a WheelEvent is received.
+    * [152622] Don't switch section when a FocusInEvent is received if the
+      reason is Popup.
+    * Fixed a bug that would cause problems with formats like dd.MMMM.yyyy.
+    * [148522] Ensured that the dateRange is valid for editors that only
+      show the time.
+    * [148725] Fixed a bug with wrapping and months with fewer than 31 days.
+    * [149097] Ensured that dateTimeChanged() is emitted, even if only date
+      or time is shown.
+    * [108572] Fixed the behavior to ensure that typing 2 into a zzz field
+      results in a value of 200 rather than 002.
+    * Ensured that the next field is entered when a separator is typed.
+    * [141703] Allow empty input when only one section is displayed.
+    * [134392] Added a sectionCount property.
+    * [134392] Added sectionAt(), currentSectionIndex(), and
+      setCurrentSectionIndex() functions.
+    * Added a NoButtons value for the buttonSymbols property.
+
+- QDesktopWidget
+    * [135002] Ensured that the resized() signal is emitted after the
+      desktop is resized on Mac OS X.
+
+- QDial
+    * [151897] Ensured that, even with tracking disabled, the signal
+      sliderMoved() is always emitted.
+    * [70209] Added support for the inverted appearance property.
+
+- QDialog
+    * [131396] Fixed a crash in QDialog::exec() that could occur when the
+      dialog was deleted from an event handler.
+    * [124269] Ensured that the size grip is hidden for extended dialogs.
+    * [151328] Allow the use of buttons on the title bar to be explicitly
+      specified on Mac OS X.
+
+- QDialogButtonBox
+    * [154493] Moved the Action role before the Reject role on Windows to
+      conform with platform guidelines.
+
+- QDir
+    * [136380] QDir's permission filters on Unix now behave the same as on
+      Windows (previously the filters' behavior was reversed on Unix).
+    * [158610] Passing QDir::Unsorted now properly bypasses sorting.
+    * [136989] Ensured that removed dirs are reported as non-existent.
+    * [129488] Fixed cleanPath() for paths with  the "foo/../bar" pattern.
+
+- QDirIterator
+    * New class. Introduced to provide a convenient way to examine the
+      contents of directories.
+
+- QDockWidget
+    * [130773] Ensure that dock widgets remember their undocked positions
+      and sizes.
+    * Added support for vertical title bars, which can be used to save space
+      in a QMainWindow.
+    * Added support for setting an arbitrary widget as a custom dock widget
+      title bar.
+    * [141792] Added the visibilityChanged() signal which is emitted when
+      dock widgets change visibility due to show or hide events, or when
+      being selected or deselected in a tabbed dock area.
+    * Added the dockLocationChanged() signal which is emitted when dock
+      widgets are moved around in a QMainWindow.
+    * [135878] Titlebars now support mnemonics properly.
+    * [138995] Dock widget titlebars now correctly indicate their activation
+      state.
+    * [145798] Ensured that calling setWindowTitle() on a nested, docked
+      dock widget causes the title in the tab bar to be updated.
+
+- QDomDocument
+    * [128594] Ensured that comment nodes are indented correctly when
+      serializing a document to a string.
+    * [144781] Fixed crash that would occur when the owner document of new
+      attributes was not adjusted.
+    * [107123] Ensured that appendChild() does not erroneously add two
+      elements to document nodes in certain cases.
+
+- QDoubleSpinBox
+    * [99254] Allow higher settings for decimals.
+
+- QDrag
+    * [124962] Added QDrag::exec() to allow the default proposed action to
+      be changed.
+
+- QFile
+    * [128352] Refactored the backend on Windows with major performance
+      improvements; in particular line and character reading is now much
+      faster.
+    * [146693] Fixed a lock-up in copy().
+    * [148447] QFile now supports large files on Windows where support is
+      available.
+    * Generally improved support for stdin.
+    * Byte writing performance has improved on all platforms.
+    * [151898] Added support for reading lines with an embedded '\0'
+      character.
+
+- QFileDialog
+    * Updated the dialog to use native icons.
+    * Made general improvements to the dialog's performance.
+    * Added a sidebar to show commonly used folders.
+    * [134557] Added the ability to use a proxy model.
+    * Added dirEntered() and filterSelected() signals, previously found in
+      Qt 3's file dialog.
+    * [130353] Fixed Qt/Mac native file dialog pattern splitting
+    * [140332] Made the dialog respond much better to the LanguageChange
+      event.
+    * [154173] Fixed a memory deallocation error.
+    * Made the selected filter argument work for native Mac OS X file
+      dialogs.
+
+- QFileInfo
+    * Ensured that the value of Mac FS hidden flag is returned for symbolic
+      links and not their targets; i.e., hidden links are not followed.
+    * [128604] Introduced isBundle() for Mac OS X bundle types.
+    * [139106] Fixed bug that could cause drives to be reported as hidden
+      on Windows.
+
+- QFileSystemWatcher
+    * [155548] Reliability fixes.
+    * When in polling mode, send change notification when file permissions
+      change.
+    * [144049, 149637] Fixed a bug that prevented watching a directory
+      for notification on Windows.
+    * [143381] Fixed bug that caused addPath() and removePath() to fail when
+      passing an empty string.
+
+- QFocusFrame
+    * [128713, 129126] Made the focus frame visible in more situations on
+      Mac OS X.
+
+- QFont
+    * X11: Add a method to retrieve the FreeType handle from the QFont.
+
+- QFontComboBox
+    * [132826] Fixed a bug that could cause the popup list to be shown
+      off-screen.
+    * [155614] Speeded up addItem() and addItems().
+    * [160110] Fixed crash that could occur when setting a pixel size for
+      the fonts.
+
+- QFontMetrics
+    * [152013] Fixed bug where boundingRect() gave sizes that were too large
+      when compiled using Visual Studio 6.
+    * [145980] Added tightBoundingBox() method.
+
+- QFrame
+    * [156112] Fixed bug where the default frame was not correct when
+      created without a parent and reparented afterwards.
+    * [150995] Fixed bug where setting the frame style did not invalidate
+      the size hint
+
+- QFSFileEngine
+    * Fixed bug in fileTime() on Win98 and WinME
+    * Ensured that the working directory of a Windows shortcut is set when
+      a link is created.
+    * Improved the reliability of buffered reads on platforms that cache
+      their EOF status.
+
+- QFtp
+    * [107381] Greatly improved LIST support; QFtp now supports more server
+      types.
+    * [136008] Improved tolerance for servers with no EPRT/EPSV support.
+    * [150607] Fixed a race condition when using ActiveMode for uploading.
+
+- QGL
+    * [158971] Fixed a resource leak in the GL texture cache.
+
+- QGLFramebufferObject
+    * Made it possible to configure the depth/stencil buffer in a
+      framebuffer object.
+    * Added support for floating point formats for the texture in a
+      framebuffer object.
+
+- QGLPixelBuffer
+    * [138393] Made QGLPixelbuffer work under Windows on systems without the
+      render_texture extension.
+
+- QGLWidget
+    * [145621] Avoided a QGLFormat object copy when checking the buffer
+      format with the doubleBuffer() function.
+    * [100519] Rewritten renderText(). It now supports Unicode text, and it
+      doesn't try to overwrite previously defined display lists.
+
+- QGraphicsItem
+    * [151271] Fixed crash that could occur when calling update on items
+      that are not fully constructed.
+    * Ensured that the selected state no longer changes state twice
+      for each mouse click.
+    * [138576] setParent() now correctly adds the child to the parent's
+      scene.
+    * [130263] Added support for partial obscurity testing with the
+      isObscured(QRectF) function.
+    * [140725] QGraphicsTextItem is now also selectable when editable.
+    * [141694] QGraphicsTextItem now calls ensureVisible() if it has input
+      focus.
+    * [144734] Fixed bugs in unsetCursor().
+    * [144895] Improved bounding rectangle calculations for all standard
+      items.
+    * Added support for QTransform.
+    * [137055] Added QGraphicsItem::ItemPositionHasChanged and
+      ItemTransformHasChanged.
+    * Added several convenience functions.
+    * [146863] Added ItemClipsToShape and ItemClipsChildrenToShape clipping
+      flags.
+    * [139782] Greatly improved hit and selection tests.
+    * [123942] Added the ItemIgnoresTransformations flag to allow items to
+      bypass any inherited transformations.
+    * All QGraphicsItem and standard item classes constructors have now had
+      their scene arguments obsoleted.
+    * [150767] Added support for implicit and explicit show and hide.
+      Explicitly hidden items are no longer implicitly shown when their
+      parent is shown.
+    * [151522] Fixed crash when nesting QGraphicsItems that enabled child
+      event handling.
+    * [151265] Cursors now change correctly without mouse interaction.
+    * Added deviceTransform() which returns a matrix that maps between item
+      and device (viewport) coordinates.
+    * Added the ItemSceneChange notification flag.
+    * [128696] Enabled moving of editable text items.
+    * [128684] Improved highlighting of selected items.
+
+- QGraphicsItemAnimation
+    * [140522] Fixed special case interpolation bug.
+    * [140079] Fixed ambiguity in the position of insertions when multiple
+      items are inserted for the same step in an animation.
+
+- QGraphicsScene
+    * [130614] Added the invalidate() function for resetting the cache
+      individually for each scene layer.
+    * [139747] Fixed slow memory leaks caused by repeatedly scheduling
+      single-shot timers.
+    * [128581] Added the selectionChanged() signal which is emitted when
+      the selection changes.
+    * Introduced delayed item reindexing which greatly improves performance
+      when moving items.
+    * The BSP tree implementation has undergone several optimizations.
+    * Added new bspTreeDepth property for fixating the BSP tree depth.
+    * Optimization: Reduced the number of unnecessary index lookups.
+    * [146518] Added the selectionArea() function.
+
+- QGraphicsSceneWheelEvent
+    * [146864] Added wheel orientation.
+
+- QGraphicsView
+    * [136173] Hit-tests are now greatly improved for thin items.
+    * [133680] The scroll bars are now shown at their maximum extents
+      instead of overflowing when the transformed scene is larger than
+      the maximum allowed integer range.
+    * [129946] Changing the viewport no longer resets the acceptsDrops()
+      property.
+    * [139752] ScrollHandDrag is now allowed also in non-interactive mode.
+    * [128226] Fixed rubber band rendering bugs (flicker and transparency).
+    * [144276] The selection is no longer reset by scroll-dragging.
+    * Added support for QTransform.
+    * [137027] Added new viewportUpdateMode() property for better control
+      over how QGraphicsView schedules updates.
+    * Several convenience functions have been added.
+    * [146517] Added rubberBandSelectionMode() for controlling how items are
+      selected with the rubber band.
+    * [150344] Fixed the scroll bar ranges to prevent the scroll bars from
+      hiding parts of the scene.
+    * [150321] Added new optimizationFlags() property, allowing individual
+      features to be disabled in order to speed up rendering.
+    * The level of detail algorithm has been changed to improve support for
+      transformations that change the view's aspect ratio.
+    * [154942] Fixed background rendering in render().
+    * [156922] render() now properly supports all transformations, source
+      and target rectangles.
+    * [158245] Calling setScene(0) now implicitly calls update().
+    * [149317] Added NoViewportUpdate to the set of modes that can be set
+      for updating a view.
+
+- QGridLayout
+    * [156497] Fix a one-off error that could cause the bottom button in
+      a QDialogButtonBox to be cropped.
+
+- QHeaderView
+    * This widget now uses Qt::NoFocus as its default focus policy.
+    * [99569] Improved performance, providing up to a 2x speed increase for
+      some cases.
+    * [146292] Fixed bug that made it impossible to resize the last section
+      under certain circumstances.
+    * [144452] Fixed bug that caused setDefaultAlignment() to have no
+      effect.
+    * [156453] Fixed column resizing bug that could cause branches in one
+      column to be drawn in the next.
+    * [142640] Ensured that the Qt::SizeHintRole is used when available.
+    * [142994] Hidden items are now restored to their original size when
+      shown.
+    * [127430] Added saveState() and restoreState().
+    * [105635] Added support for drag selecting.
+
+- QHostInfo
+    * [141946] No longer stops working after QCoreApplication is destroyed.
+    * [152805] Now periodically reinitializes DNS settings on Unix.
+
+- QHttp
+    * [139575] Fixed state for servers that use the "100 Continue" response.
+    * Added support for the HTTPS protocol.
+    * Improved proxy support.
+    * Added support for server and proxy authentication.
+
+- QIcon
+    * Added cacheKey() as a replacement for serialNumber().
+    * Fixed the streaming operators.
+
+- QImage
+    * [157549] Fixed a crash that could occur when calling copy() with
+      negative coordinates.
+    * Added cacheKey() as a replacement for serialNumber().
+    * [131852] Optimized rotations by 90 and 270 degrees.
+    * [158986] Fixed painting onto an images with the Format_RGB16 image
+      format.
+    * Fixed rotations by 90 and 270 degrees for images with the Format_RGB16
+      image format.
+    * [152850] Fixed bugs in text() and setText().
+    * Fixed a crash that could occur when passing a 0 pointer to the
+      constructor that accepts XPM format image data.
+    * [150746] Added a constructor that accepts an existing memory buffer
+      with non-default stride (bytes per line).
+
+- QImageReader
+    * [141781] Fixed support for double byte PPM files (>256 colors).
+
+- QImageWriter
+    * Added support to enable compression if a plugin supports it.
+
+- QInputDialog
+    * [115565] Disabled OK button for non-acceptable text (getInteger() and
+      getDouble()).
+    * [90535] Input dialogs now have a size grip
+
+- QIntValidator, QDoubleValidator
+    * Validators now use the locale property to recognize numbers
+      formatted for various locales.
+
+- QItemDelegate
+    * [145142] Ensured that text is not drawn outside the bounds of a cell.
+    * [137198] Fixed handling of cases where the decoration position is set
+      to be at the bottom of an item to prevent the text from being
+      incorrectly positioned.
+    * [142593] Take word wrap into account when calculating an item's size
+      hint.
+    * [139160] Ensured that the focus rectangle is shown, even for empty
+      cells.
+
+- QItemSelectionModel
+    * Made optimizations for some common cases.
+    * [143383] Fixed incorrect behavior of hasSelection().
+
+- QLabel
+    * [133589] Fixed performance problems with plain text labels.
+    * Fixed support for buddies with rich text labels.
+    * [136918] Fixed setText() to not turn off mouse tracking when the text
+      used is plain text.
+    * [143063] Ensured that the mouse cursor is reset when a link is
+      clicked.
+    * [156912] Fixed bug where the mouse cursor shape was changed to the
+      pointing hand cursor, but would not be correctly cleared afterwards.
+
+- QLayout
+    * Added new features to Qt's layout system to enable:
+      - independent values for all of the four margins,
+      - independent horizontal spacing and vertical spacing in QGridLayout,
+      - non-uniform spacing between layout items,
+      - layout items to occupy parts of the margin or spacing when required
+        by the application or style.
+
+- QLibrary
+    * Fixed bug that caused QLibrary::load() to discard the real error
+      message if the error was something else than ERROR_MOD_NOT_FOUND.
+      (Win32)
+    * Fixed bug that prevented QLibrary::load() from loading a library with
+      no suffix (because LoadLibrary automagically appended the .dll suffix
+      on Win32).
+    * Corrected behavior of fileName() to ensure that, if we loaded a
+      library without specifying a suffix and the file found had the .dll
+      suffix, the fileName found is returned instead of the fileName
+      searched for (as was previously the case).
+    * [156276] Fixed behavior of unload() to return true only if the library
+      could be unloaded.
+
+- QLineEdit
+    * [156104] Ensured that input methods are disabled when not in the
+      Normal edit mode.
+    * [157355] Fixed drag and drop bug on Mac OS X that could occur when
+      dragging inside the widget.
+    * [151328] Ensured that the caret is removed when text is selected on
+      Mac OS X.
+    * [136919] Ensured that fewer non-printable characters are replaced
+      with spaces.
+
+- QList
+    * Fixed a race-condition in QList::detach() which could cause an
+      assertion in debug mode.
+
+- QListView
+    * [136614] Fixed the behavior of Batched mode to ensure that the last
+      item of the batch is displayed.
+    * Fixed some issues with jerky scrolling in ScrollPerItem mode if the
+      grid size was different to the delegate's size hint.
+    * [113437] Prevent noticeable flicker on slow systems in Batched mode
+      by laying out the first batch immediately.
+    * [114473] Added a new property to QListView: selectionRectVisible.
+    * Fixed a bug that could cause too many items to be selected.
+    * Fixed issue that could cause list views to have incorrect scroll bar
+      ranges if their grid sizes differed from their item sizes.
+    * [144378] Improved navigation for cases where an item is taller than
+      the viewport.
+    * [148846] Fixed an issue that prevented scroll bars from being updated
+      correctly when items were moved programmatically.
+    * [143306] Improved support for keyboard navigation and selection.
+    * [137917] Shift-click extended mode selection in icon mode now selects
+      the correct items.
+    * [138411] Fixed bug where hidden items would cause drawing problems
+      when pressing Ctrl+A.
+
+- QListWidget
+    * [146284] Ensured that the effect of SingleSelection mode is also taken
+      into account when setSelected() is called on items.
+    * [151211] Added removeCellWidget() and removeItemWidget() functions.
+
+- QLocale
+    * Updated the locale database to CLDR 1.4: more locales supported;
+      numerous fixes to existing locales.
+
+- QMacStyle
+    * [159270] Fixed drawing of icons on buttons with no text.
+    * [146364] Fixed drawing of multi-line text for items in a QToolBar.
+    * [145346] Removed unwanted wrapping of text in a QPushButton.
+    * Fixed drawing of "Flat" group boxes.
+    * [113472] Fixed drawing of text on vertical headers when resizing.
+    * [148509] Ensured that the correct font is used for buttons and labels
+      when the application is not configured to use the desktop settings.
+    * [106100] Improved the look of push buttons with menus.
+    * Made fixes to Qt's layout system that enable more native-looking
+      forms.
+    * [151739] Buttons with an icon are now centered correctly.
+    * [142672] Fixed font size bug on the drop down box for QComboBox.
+    * [148832] The button on a combo box is now showing as pressed when the
+      drop down menu is shown.
+    * [147377] Ensured that combo boxes now scale correctly on Mac OS X.
+    * [143901] Fixed the highlight color for widgets such as QComboBox so
+      that it follows the system settings on Mac OS X.
+    * [151852] Fixed size calculation for QPushButton with an icon.
+    * [133263] Removed the coupling of text size and button kind, enabling
+      them to be set independently.
+    * [133263] Ensured that QPushButton respects calls to setFont().
+    * [141980] Text with small font sizes is now centered vertically correct
+      inside push buttons.
+    * [149631] Ensure that beveled button types are chosen if text doesn't
+      fit inside a button instead of cutting the text.
+    * [151500] Fixed incorrect QPushButton text clipping behavior.
+    * [147653] Fixed bug that caused the sort indicator to be drawn on top
+      of the text in QHeaderView.
+    * [139149] Fixed issues with CE_SizeGrip in right-to-left mode.
+    * [139311] Improved drawing of the title in QGroupBox.
+    * [128713] Ensured that drawing of the focus frame now follows pixel
+      metrics.
+    * [142274] Made QSlider tickmark drawing more like Cocoa.
+    * focusRectPolicy() is now obsolete. This is now controlled by the
+      Qt::WA_MacShowFocusRect attribute.
+    * widgetSizePolicy() is now obsolete. This is now controlled by the
+      Qt::WA_Mac*Size attribute.
+    * [129503] Ensured that a group box without a title no longer allocates
+      space for it.
+    * Ensured that a more appropriate width is used for push buttons.
+    * [132674] Ensured that tab bar drawing is correct when the tab's font
+      isn't as tall as the default.
+    * [126214] Ensured that the QSizeGrip is drawn correctly in brushed
+      metal windows.
+    * Improved styling of docked QDockWidgets.
+
+- QMainWindow
+    * [145493] Fixed a crash that could occur when calling setMainWindow(0)
+      on X11.
+    * [137013, 158094] Fixed bugs relating to the handling of size hints,
+      minimum/maximum sizes and size policies of QDockWidgets in main
+      windows.
+    * [147964] Animated tool bar areas adjust dynamically when a QToolBar is
+      dragged over them.
+    * Added the dockOptions property. This makes it possible to:
+        - specify that tabbed dock areas should have vertical tab bars,
+        - disable tabbed docking altogether,
+        - force tabbed docking, disallowing the placement of dock widgets
+          next to each other.
+    * Fixed bugs in saving and restoring main window state.
+    * [143026] Fixed support for hiding and showing toolbars on Mac OS X.
+    * [131695] Add unified toolbar support on Mac OS X.
+
+- QMdiArea
+- QMdiSubWindow
+    * New classes. QMdiArea is a replacement for QWorkspace.
+
+- QMenu
+    * The addAction() overloads that accept a slot argument now honor the
+      slot's bool argument correctly.
+    * [129289] Added support for handling context menus from within a menu.
+    * [144054] Fixed scrolling logic.
+    * [132524] Allow setVisible() of separator items on Mac OS X native
+      menu items.
+    * [131408] Torn-off menus now have fixed sizes to prevent the window
+      system from resizing them.
+    * [113989] Added some fuzziness to the "snap to" detection.
+    * [155030] Do not disable command actions when merge is disabled.
+    * [131702] Tear-off menus no longer appear only once.
+    * [138464] Ensured that, if a popup menu does not fit on the right-hand
+      side of the screen, it is aligned with the right side of the parent
+      widget instead of the left side.
+    * [130343] Ensured that only the left mouse button triggers menu actions
+      on Windows.
+    * [139332] Fixed an issue that caused submenus to close when moving the
+      mouse over a separator.
+    * [157218] Ensured that torn-off menus are not closed when Alt is
+      pressed.
+    * [135193] Ensured that the size hint, maximum size and minimum size are
+      taken into account for each QWidgetAction.
+    * [133232] Improved handling of menus that are opened at specified
+      positions.
+    * [141856] Fixed bug where exec() would return NULL if the user pressed
+      a mnemonic shortcut.
+    * [133633] Fixed focus problem with keyboard navigation between menus
+      and widget actions.
+    * [134560] Fixed bug that prevented status tips from being shown for
+      actions in tool button menus.
+    * [150545] Fixed memory leak on Mac OS X.
+    * [138331] Fixed bug that could cause menus to stay highlighted after
+      the closing of a dialog.
+    * Menu shortcuts are now cleared if the corresponding QAction is cleared
+      on Mac OS X.
+    * Fixed bug that could cause changes to shortcut to not take effect on
+      Mac OS X.
+    * [12536] Don't allow Tab to be used to navigate menus on Mac OS X.
+    * [108509] Prevented shortcuts from stealing keyboard navigation keys.
+    * [134190] Added support for Shift+Tab to enable backwards navigation.
+
+- QMenuBar
+    * [135320] Make show() a no-op on Mac OS X to prevent the menu bar from
+      being visible at the same time as a native Mac menu bar.
+    * [115471] Fixed torn-off menu behavior to ensure that mouse events
+      are propagated correctly on second level tear-offs.
+    * [126856] Fixed an issue that could cause several menus to be open at
+      the same time.
+    * [47589] The position of the menu is now shifted horizontally when
+      there is not enough space (neither above nor below) to display it.
+    * [131010] Fixed bug where adding an action and setting its menu would
+      prevent the action from being triggered through its shortcut.
+    * [142749] Fixed bug where setEnabled(false) had no effect on Mac OS X.
+    * [141255] Made it possible to make an existing menu bar an application-
+      wide menu bar with setParent(0) on Mac OS X.
+
+- QMessageBox
+    * [119777] Ensured that pressing Ctrl+C in message boxes on Windows
+      copies text to the clipboard.
+    * Added setDefaultButton(StandardButton) and
+      setEscapeButton(StandardButton) functions.
+
+- QMetaObject
+    * Optimized invokeMethod() to avoid calling type() unnecessarily.
+
+- QMetaType
+    * [143011] Fixed isRegistered() to return false when the type ID does
+      not correspond to a user-registered type.
+
+- QModelIndex
+    * [144919] Added more rigorous identity tests for model indexes.
+
+- QMotifStyle
+    * [38624] Fixed the behavior when clicking on a menu bar item a
+      second time; the menu will now close in the same way that native
+      Motif menus do.
+
+- QMutex
+    * [106089] Added tryLock(int timeout), which allows a thread to specify
+      the maximum amount of time to wait for the mutex to become available.
+    * [137309] Fixed a rare deadlock that was caused by compiling with
+      optimizations enabled.
+    * Optimized recursive locking to avoid two unnecessary atomic operations
+      when the current thread already owns the lock.
+    * Optimized non-recursive mutexes by avoiding a call to pthread_self()
+      on Unix.
+
+- QNetworkInterface
+    * [146834] Now properly generates broadcast addresses on Windows XP.
+
+- QNetworkProxy
+    * Added support for transparent HTTP CONNECT client proxying.
+    * Added support for complex authenticators through QAuthenticator.
+
+- QObject
+    * Added a compile time check to ensure that the objects passed to
+      qobject_cast contain a Q_OBJECT macro.
+    * [133901] Improved the run time warnings from setParent() that is
+      output when trying to set a new parent that is in a different thread.
+    * [140106] Fixed a deadlock that could occur when deleting a QObject
+      from the destructor of a QEvent subclass.
+    * [133739] Fixed compiler warnings from g++ in findChildren<T>().
+    * Documented the QEvent::ThreadChange that is sent by moveToThread().
+    * [130367] Improved the run time warning that is output when creating
+      a QObject with a parent from a different thread.
+    * [114049] Made dumpObjectInfo() also dump connection information.
+
+- QPageSetupDialog
+    * [136041] Margins are now saved and used properly when printing.
+
+- QPainter
+    * Fixed stroking of non-closed polygons with non-cosmetic pens in the
+      OpenGL paint engine.
+    * [133980] Fixed stroking bug for RoundJoin and MiterJoin with paths
+      containing successive line segments with a 180 degree angle between
+      them.
+    * [141826] Fixed stroking with MiterJoin of paths with duplicated
+      control points.
+    * [139454, 139209] Fixed problem with SmoothTransformation that caused
+      images to fade out toward the edges in raster paint engine.
+    * Added the HighQualityAntialiasing render hint to enable pixel shaders
+      for anti-aliasing in the OpenGL paint engine.
+    * [143503] Fixed broken painting when using a QPainter on a
+      non-top-level widget where the world matrix is disabled then
+      re-enabled.
+    * [142471] Fixed dashed line drawing of lines that are clipped against
+      the device rectangle.
+    * [147001] Fixed bug with drawing of polygons with more than 65536
+      points in the raster paint engine.
+    * [157639] Calling drawPolygon() from multiple threads no longer causes
+      an assertion.
+    * Optimized line and rectangle drawing in the raster paint engine.
+    * [159047] Fixed case where fillRect() would ignore the brush origin.
+    * [143119] Fixed bug where drawing a scaled image on another image would
+      cause black lines to appear on the edges of the scaled image.
+    * [159894] Fixed X11 errors when using brush patterns on multiple
+      screens.
+    * [148524] Fixed X11 errors when drawing bitmaps containing a color
+      table with alpha values.
+    * [141871] Optimized and fixed drawing of extremely large polygons.
+    * [140952] Fixed transformed text drawing on X11 setups that used
+      fontconfig without Xrender.
+    * [139611] Fixed smooth transformation of pixmaps for X11.
+    * [132837] Fixed text drawing on images with certain fonts on Mac OS X.
+    * [147911] Use font anti-aliasing when rotating small fonts on Windows.
+    * [127901] Optimized gradient calculations.
+    * [139705, 151562] Optimized clipping algorithms in the raster paint
+      engine.
+    * Optimized blending operations in the raster paint engine using MMX,
+      3DNOW and SSE2.
+    * Optimized fillRect() for opaque brushes.
+    * Made general speed optimizations, especially in the OpenGL and raster
+      paint engines.
+
+- QPainterPath
+    * [136924] Correctly convert Traditional Chinese fonts (e.g., MingLiu)
+      to painter paths.
+
+- QPicture
+    * [142703] QPicture now correctly preserves composition mode changes.
+    * Fixed QPicture text size handling on devices with non-default DPI.
+    * [133727] Fixed text alignment handling when drawing right-to-left
+      formatted text into a QPicture.
+    * [154088] Fixed bugs that could occur when reading QPicture files
+      generated with Qt 3.
+
+- QPixmap
+    * Added cacheKey() as a replacement for serialNumber().
+    * [97426] Added a way to invert masks created with createMaskFromColor().
+    * Fixed a crash that could occur when passing a 0 pointer to the
+      constructor that accepts XPM format image data.
+
+- QPixmapCache
+    * [144319] Reinserting a pixmap now moves it to the top of the Least
+      Recently Used list.
+
+- QPlastiqueStyle
+    * [133220] Fixed QProgressBar rendering bugs.
+
+- QPrintDialog
+    * [128964] Made "Print" the default button.
+    * [138924] Ensured that the file name is shown in the file dialog when
+      printing to a file
+    * [141486] Ensured that setPrintRange() correctly updates the print
+      dialog on X11.
+    * [154690] Ensured that "Print last page first" updates the QPrinter
+      instance on X11.
+    * [149991] Added support for more text encodings in the PPD subdialog.
+    * [158824] Disable the OK button in the dialog if no printers are
+      installed.
+    * [128990] X11: Don't immediately create an output file when a file name
+      is entered in the print dialog.
+    * [143804] Ensured that the default printer is set to the one specified
+      by the PRINTER environment variable.
+
+- QPrinter
+    * Added the supportedPaperSources() function.
+    * [153735] Significantly speeded up generation of PDF documents with Asian
+      characters.
+    * [140759] Documented that the orientation cannot be changed on an active
+      printer on Mac OS X (native format).
+    * [136242] PostScript generator: Don't generate huge PostScript files for
+      pattern brushes.
+    * [139566] Added support for alpha blending when printing on Windows.
+    * [151495] Fixed image scaling problems when printing on Windows.
+    * [146788] Optimized drawTiledPixmap() on Windows.
+    * [152637] PDF generator: Ensured that the pageRect property is set up
+      correctly.
+    * [152222] PDF generator: Fixed bug that lead to fonts being too small on
+      Mac OS X.
+    * [151126] Ensured that ScreenResolution is respected on Mac OS X.
+    * [151141] PDF generator: Make PDFs using the default font on Mac OS X
+      searchable.
+    * [129297, 140555] PS/PDF generator: Drastically reduced the sizes of
+      generated files and speeded up generation when using simple pens.
+    * [143803] Correctly set the default printer name on X11.
+    * [134204] PDF generator: Ensured that the correct output is generated
+      when drawing 1-bit images
+    * [152068] PS generator: Ensured that the correct PostScript is generated
+      when embedding TrueType fonts with broken POST tables.
+    * [143270] X11: Ensure that sigpipe is ignored when printing to an
+      invalid printer using the PDF generator.
+
+- QProcess
+    * [97517] Added suport for specifying the working directory of detached
+      processes as well as retrieving the PID of such processes.
+    * [138770] Greatly improved the performance of stdin and stdout handling
+      on Windows.
+    * [154135] Fixed crashes and lock-ups due to use of non-signal-safe
+      functions on Unix.
+    * [144728] Fixed race conditions on Windows that would occur when
+      calling bytesWritten() while using the waitFor...() functions.
+    * [152838] Ensured that finished() is no longer emitted if a process
+      could not start.
+
+- QProgressBar
+    * [146855] Ensured that setFormat() now calls update() if the format
+      changes.
+    * [152227] Improved support for wide ranges across the entire integer
+      range.
+    * The setRange() function is now a slot.
+    * [137020] Ensured setValue() forces a repaint for %v.
+
+- QProgressDialog
+    * The setRange() function is now a slot.
+    * [123199] Ensured that the Escape key closes dialog even when the
+      cancel text is empty.
+
+- QPushButton
+    * [114245] Fixed some styling issues for push buttons with popup menus.
+    * [158951] Buttons with icons now center their content to be more
+      consistent with buttons that do not have icons in most styles.
+    * [132211] Fixed setDefault() behavior.
+
+- QReadWriteLock
+    * [106089] Added the tryLockForRead(int) and tryLockForWrite(int)
+      functions which allow a thread to specify the maximum amount of time
+      to wait for the lock to become available.
+    * [131880] Added support for recursive write locking.
+
+- QRectF
+    * [143550] Added the QRectF(topRight,bottomLeft) constructor.
+
+- QRegion
+    * Added several optimizations for common operations on X11 and Qtopia
+      Core.
+
+- QResource
+    * Allow a QByteArray to be used for run time resource registration.
+
+- QScrollArea
+    * [140603] Fixed flickering when the scroll widget is right-aligned.
+
+- QSemaphore
+    * Add the tryAcquire(int n, int timeout) function which allows a thread
+      to specify the maximum amount of time to wait for the semaphore to
+      become available.
+
+- QSettings
+    * [153758] Fixed various bugs that could occur when writing to and
+      reading from the Windows registry.
+
+- QSizeGrip
+    * Added support for size grips in TopLeftCorner/TopRightCorner on Windows.
+    * Added support for size grips on subwindows.
+    * [150109] Fixed bug where the position could change during resize.
+    * [156114] Fixed incorrect size grip orientation on X11.
+
+- QSlider
+    * Prevent the widget from getting into infinite loops when extreme
+      values are used.
+
+- QSocketNotifier
+    * [148472] Mac OS X now prevents the file descriptor from being closed
+      when a socket notifier is deregistered.
+    * [140018] Mac OS X will now invalidate the backing native socket
+      notifier upon deregistration.
+    * Optimized performance by avoiding some debugging code in release
+      builds.
+
+- QSortFilterProxyModel
+    * [151352] Ensured that the dataChanged() signal is emitted when
+      sorting.
+    * [154075] Added support to handle the insertion of rows in the source
+      model.
+    * [140152] Added a property to force the proxy model to use QString's
+      locale-aware compare method.
+
+- QSpinBox
+    * [141569] Disallow typing -0 in a QSpinBox with a positive range.
+    * [158445] Add the keyboardTracking property. When set to false, don't
+      send valueChanged() with every key press.
+    * [143504] Made undo/redo work correctly.
+    * [131165] Fixed highlighting according to the native look on Mac OS X.
+
+- QSplashScreen
+    * [38269] Added support for rich text.
+
+- QSplitter
+    * [139262] Fixed bug that caused the splitter to snap back and forth in
+      certain situations.
+
+- QSql
+    * Added NumericalPrecisionPolicy to allow numbers to be retrieved as
+      double or float.
+
+- QSqlDriver
+    * [128671] Added SimpleLocking to DriverFeature.
+
+- QSqlQueryModel
+    * [155402] Fixed bug where the rowsAboutToBeRemoved() and rowsRemoved()
+      signals were emitted when setQuery() was called on an already empty
+      model.
+    * [149491] Fixed bug where blank rows were inserted into the model if
+      the database driver didn't support the QuerySize feature and the
+      result set contained more than 256 rows.
+
+- QSqlRelationalTableModel
+    * [142865] Fixed support for Interbase and Firebird by not using 'AS' in
+      generated SQL statements.
+
+- QSqlTableModel
+    * [128671] Ensured that the model has no read locks on a table before
+      updating it. Fixes parallel access for in-process databases like
+      SQLite.
+    * [140210] Fixed bug where setting a sort order for a column caused no
+      rows to be selected with PostgreSQL and Oracle databases due to
+      missing escape identifiers in the generated SQL statement.
+    * [118547] Don't issue asserts when inserting records before calling
+      select() on the model.
+    * [118547] Improved error reporting.
+
+- QSslCertificate
+- QSslCipher
+- QSslError
+- QSslKey
+- QSslSocket
+    * New classes. Added support for SSL to QtNetwork.
+
+- QStandardItemModel
+    * Reduced the construction time when rows and columns are given.
+    * [133449] Improve the speed of setData()
+    * [153238] Moving an item will no longer cause that item to lose its
+      flags.
+    * [143073] Calling setItemData() now triggers the emission of the
+      dataChanged() signal.
+
+- QStatusbar
+    * [131558] Increased text margin and fixed a look and feel issue on
+      Windows.
+
+- QString
+    * fromUtf8() now discards UTF-8 encoded byte order marks just like the
+      UTF-8 QTextCodec.
+    * [154454] Fixed several UTF-8 decoder compliance problems (also affects
+      the UTF-8 QTextCodec).
+    * Removed old compatibility hack in fromUtf8()/toUtf8() to allow round
+      trip conversions of invalid UTF-8 text.
+    * Added support for full Unicode case mappings to toUpper() and
+      toLower().
+    * Correctly implemented case folding with the foldCase() method. (Also
+      for QChar.)
+    * [54399] Added more overloads (taking up to 9 arguments) for arg().
+
+- QStringListModel
+    * Made it possible for items to be dropped below the other visible items
+      on a view with a QStringListModel.
+
+- QStyle
+    * Added the SP_DirHomeIcon standard pixmap to provide the native icon
+      for the home directory.
+    * Added documentation to indicate that pixel metrics are not necessarily
+      followed for all styles.
+    * standardPixmap() has been obsoleted. Use standardIcon() instead.
+    * Added SP_VistaShield to support Vista UAC prompts on Windows Vista.
+    * [103150] Added SH_FocusFrame_AboveWidget to allow the focus frame to
+      be stacked above the widget it has focus on.
+    * The default password character is now a Unicode circle, the asterisk
+      is still used for QMotifStyle and its subclasses.
+    * [127454] CE_ToolBoxTab now draws two parts, CE_ToolBoxTabShape and
+      CE_ToolBoxTabLabel. This should make QToolBox more styleable.
+    * [242107] Added a QStyleOptionToolBoxV2 with tab position and selected
+      position enums.
+
+- QStyleOption
+    * [86988] Added an initializeFromStyleOption() function for the many
+      widgets that need to create a QStyleOption subclass for style-related
+      calls.
+
+- QSyntaxHighligher
+    * [151831] Fixed bug where calling rehighlight() caused highlighBlock()
+      to be called twice for each block of text.
+
+- QSystemTrayIcon
+    * [131892] Added support to allow messages to be reported via AppleScript
+      on Mac OS X.
+    * [151666] Increased the maximum tool tip size to 128 characters on the
+      Windows platforms that support it.
+    * [135645] Fixed an issue preventing system tray messages from working
+      on some Windows platforms.
+    * Addded the geometry() function to allow the global position of the
+      tray icon to be obtained.
+	
+- QTabBar
+    * [126438] Added the tabAt(const QPoint &pos) function.
+    * [143760] Fixed a bug where scroll buttons were shown even when
+      disabled.
+    * [130089] Ensured that the tool tip help is shown on disabled tabs.
+    * [118712] Enabled auto-repeat on scroll buttons.
+    * [146903] Ensured that the currentChanged() signal is emitted when a
+      tab is removed
+    * Ensured that corner widgets are taken into account when calculating
+      tab position in the case where the tab bar is centered.
+    * [132091] Re-introduced the Qt 3 behavior for backwards scrolling of
+      tabs.
+    * [132074] Ensured that currentChanged() is always emitted when the
+      current tab is deleted.
+
+- QTableView
+    * No longer allow invalid spans to be created.
+    * [145446] Fixed bug where setting minimum height on horizontal header
+      caused the the table to be rendered incorrectly.
+    * [131388] Fixed case where information set using setRowHeight() was
+      lost on a subsequent call to insertRow().
+    * [141750] Fixed issue where spanned table items were painted twice per
+      paint event.
+    * [150683] Added property for enabling/disabling the corner button.
+    * [135727] Added the wordWrap property.
+    * [158096] resizeColumnToContents(int i) now has the same behavior that
+      resizeColumnsToContents() uses for individual columns.
+
+- QTableWidget
+    * [125285] Ensured that dataChanged() is only emitted once when
+      setItemData() is used to set data for more than one role.
+    * [151211] Added removeCellWidget() and removeItemWidget().
+    * [140186] Fixed bug where calling setAutoScroll(false) would have no
+      effect.
+
+- QTabWidget
+    * Tab widgets now take ownership of their corner widgets and allow
+      corner widgets to be unset.
+    * [142464] Fixed incorrect navigation behavior that previously made it
+      possible to navigate to disabled tabs.
+    * [124987] Ensured that a re-layout occurs when a corner widget is set.
+    * [111672] Added the clear() function.
+
+- QtAlgorithms
+   * [140027] Improved the performance of qStableSort() on large data sets.
+
+- QTcpSocket
+    * Added several fixes to improve connection reliability on Windows.
+    * Made a number of optimizations.
+    * Improved detection of ConnectionRefusedError on Windows and older
+      Unixes.
+    * Added support for proxy authentication.
+
+- QTemporaryFile
+    * [150770] Fixed large file support on Unix.
+
+- QTextBrowser
+    * [126914] Fixed drawing of the focus indicator when activating links.
+    * [82277] Added the openLinks property to prevent QTextBrowser from
+      automatically opening any links that are activated.
+
+- QTextCodec
+    * Improved the UTF-8 codec's handling of large, rare codepoints.
+    * [154932] The UTF-8 codec now keeps correct state for sequence
+      f0 90 80 80 f4 8f bf bd.
+    * [154454] Fixed several UTF-8 decoder compliance problems also
+      affecting QString::fromUtf8().
+    * Fixed the UTF-8 codec's handling of incomplete trailing UTF sequences
+      to be the same as QString::fromUtf8().
+
+- QTextCursor
+    * The definition of the block character format (obtained using the
+      blockCharFormat() and QTextBlock::charFormat() functions) has been
+      changed to be the format used only when inserting text into an empty
+      block.
+      If a QTextCursor is positioned at the beginning of a block and the
+      text block is not empty then the character format to the right of the
+      cursor (the first character in the block) is returned.
+      If the block is empty, the block character format is returned.
+      List markers are now also drawn with the character format of the first
+      character in a block instead of the invisible block character format.
+
+- QTextDecoder
+    * Added the hasFailure() function to indicate whether input was
+      correctly encoded.
+
+- QTextDocument
+    * [152692] Ensured that the print() function uses the document's default
+      font size.
+    * Added the defaultTextOption property.
+    * Setting a maximum block count implicitly now causes the undo/redo
+      history to be disabled.
+    * Made numerous fixes and speed-ups to the HTML import.
+    * [143296] Fixed HTML import bug where adding a <br> tag after a table
+      would cause two empty lines to be inserted instead of one.
+    * [144637, 144653] Ensured that the user state property of QTextBlock is
+      now preserved.
+    * [140147] Fixed layout bug where the document size would not be updated
+      properly.
+    * [151526] Fixed problem where the margins of an empty paragraph above a
+      table would be ignored.
+    * [136013] The "id" tag can now be used to specify anchors.
+    * [144129] Root frame properties are now properly exported/imported.
+
+- QTextDocumentFragment
+    * QTextDocumentFragment no longer stores the root frame properties,
+      the document title or the document default font when it is created
+      from a document or from HTML. Use QTextDocument's toHtml() and
+      setHtml() function if you want to propagate these properties to and
+      from HTML.
+
+- QTextEdit
+    * [152208] Ensured that the undo/redo enabled state is preserved across
+      setPlainText() and setHtml() calls.
+    * [125177] Added a print() convenience function that makes it possible
+      to support QPrinter::Selection as selection range.
+    * [126422] Fixed bug in copy/paste which could cause the background
+      color of pasted text to differ from that of the copied text.
+    * [147603] Fixed various cases where parts of a text document would be
+      inaccessible or hidden by the scroll bars.
+    * [148739] Fixed bug where setting the ensureCursorVisible property
+      would not result in a visible cursor.
+    * [152065] Fixed cases where currentCharFormatChanged() would not be
+      emitted.
+    * [154151] The undoAvailable() and redoAvailable() signals are no longer
+      emitted too many times when entering or pasting text.
+    * [137706] Made the semantics of the selectionChanged() signal more like
+      QLineEdit::selectionChanged().
+
+- QTextFormat
+    * [156343] Fixed crash that could occur when streaming QTextFormat
+      instances.
+
+- QTextLayout
+    * Fixed support for justified Arabic text.
+    * [152248] Fixed assert in sub/superscript handling of fonts specified
+      in pixel sizes.
+    * Optimized text layout handling for pure Latin text.
+    * Ensured that OpenType processing is skipped altogether if a font does
+      not contain OpenType tables.
+    * Fixed some issues in the shaper for Indic languages.
+    * Upgraded the line breaking algorithm to the newest version
+      (http://www.unicode.org/reports/tr14/tr14-19.html).
+    * [140165] Changed boundingRect() to report the actual position of the
+      top left line instead of incorrectly reporting (0, 0) for the top-left
+      corner in every case.
+    * Fixed various problems with text kerning.
+
+- QTextStream
+    * [141391] Fixed bug that could occur when reusing a text stream with
+      the setString() method.
+    * [133063] atEnd() now works properly with stdin.
+    * [152819] Added support for reading and writing NaN and Inf.
+    * [125496] Ensured that uppercasebase and uppercasedigits work as
+      expected.
+
+- QTextTable
+    * [138905] Fixed bug where merging cells in a QTextTable would cause
+      text to end up in the wrong cells.
+    * [139074] Fixed incorrect export of cell widths to HTML when exporting
+      tables containing column spans.
+    * [137236] Fixed bug where a text table would ignore page breaks.
+    * [96765] Improved handling of page breaks for table rows spanning
+      several pages.
+    * [144291] Fixed crash that could occur when using setFormat() with an
+      old format after inserting or removing columns.
+    * [143501] Added support for vertical alignment of table cells.
+    * [136397, 144320, 144322] Various border styles and border brushes are
+      now properly supported.
+    * [139052] Made sure that empty text table cells get a visible
+      selection.
+
+- QtGlobal
+    * Added Q_FUNC_INFO, a macro that expands to a string describing the
+      function it is used in.
+    * [132145] Fixed Q_FOREACH to protect against for-scoping compiler bugs.
+    * Fixed a race condition in the internal Q_GLOBAL_STATIC() macro.
+    * [123910] Fixed crashes on some systems when passing 0 as the
+      message to qDebug(), qWarning(), and qFatal().
+
+- QThread
+    * [140734] Fixed a bug that prevented exec() from being called more than
+      once per thread.
+    * Optimized the currentThread() function on Unix.
+    * Added the idealThreadCount() function, which returns the ideal number
+      of threads that can be run on the system.
+
+- QThreadStorage
+    * [131944] Refactored to allow an arbitrary number of instances to be
+      created (not just 256 as in previous versions).
+    * Updated documentation, as many caveats have been removed in Qt 4.2 and
+      Qt 4.3.
+
+- QTimeEdit
+    * [136043] Fixed the USER properties.
+
+- QTimeLine
+    * [145592] Fixed the time line state after finished() has been emitted.
+    * [125135] Added the resume() function to allow time lines to be resumed
+      as well as restarted.
+    * [153425] Fixed support for cases where loopCount >= 2.
+
+- QTimer
+    * Added the active property to determine if the timer is active.
+
+- QToolBar
+    * [128156, 138908] Added an animation for the case where a tool bar is
+      expanded to display all its actions when its extension button is
+      pressed.
+
+- QToolBox
+    * [107787] Fixed rendering bugs in reversed mode.
+
+- QToolButton
+    * [127814] Ensured that the popup delay respects style changes.
+    * [130358] Ensured that Hover events are sent to the associated QAction
+      when the cursor enters a button.
+    * [106760] Fixed bug where the button was drawn as pressed when using
+      MenuButtonPopup as its popup mode.
+
+- QToolTip
+    * [135988] Allow tool tips to be shown immediately below the cursor
+    * [148546] The usage of tool tip fading now adheres to the user settings
+      on Mac OS X.
+    * [145458] Tool tip fading now looks native on Mac OS X (fading out
+      rather than in).
+    * [145557] Fixed bug that caused tool tips to remain visible if the
+      cursor left the application quickly enough on Mac OS X.
+    * [143701] Fixed bug that caused tool tips to hide behind stay-on-top
+      windows on Mac OS X.
+    * [158794] Fixed bug on Mac OS X where isVisible() returned true even
+      if the tool tip was hidden.
+
+- QTreeView
+    * [158096] Added checks to prevent items from being dropped on their own
+      children.
+    * [113800] When dragging an item over an item that has child items,
+      QTreeView will now automatically expand after a set time.
+    * [107766] Added a style option (enabled in the Windows style) to
+      select the first child when the right arrow key is pressed.
+    * [157790] It was possible to get in a state where clicking on a branch
+      (+/- in some styles) to expand an item didn't do anything until
+      another location in the view was clicked.
+    * Made it possible to create a selection with a rectangle of negative
+      width or height.
+    * [153238] Ensured that drops on branches are interpreted as drops onto
+      the root node.
+    * [152868] Fixed setSelection() so that it works with negative
+      y-coordinates.
+    * [156522] Fixed repaint errors for selections in reversed mode.
+    * [155449] Prevented the tree from having huge columns when setting the
+      alignment before it is shown.
+    * [151686] Hidden rows are now filtered out of the user selection range.
+    * [146468] Fixed bug where the indexRowSizeHint could be incorrect in
+      the case where columns were moved.
+    * [138938] Fixed an infinite loop when calling expandAll() with no
+      column.
+    * [142074] Scroll bars are no longer shown when there are no items.
+    * [143127] Fixed bug that prevented the collapsed() signal from being
+      emitted when the animated property was set to true.
+    * [145199] Fixed crash that could occur when column 0 with expanded
+      items was removed and inserted.
+    * [151165] Added the indexRowHeight(const QModelIndex &index) function.
+    * [151156] Add support for hover appearance.
+    * [140377] Add the expandTo(int depth) function.
+    * Clicking in the empty area no longer selects all items.
+    * [135727] Added the wordWrap property.
+    * [121646] setSelection() now selects the item within the given
+      rectangle.
+    * Added the setRowSpanning(int row, const QModelIndex &parent) and
+      isRowSpanning(int row, const QModelIndex &parent) functions.
+
+- QTreeWidget
+    * [159078] Fixed drag and drop bug on Mac OS X that could occur when
+      dragging inside the widget.
+    * [159726] Fixed crash that could occur when dragging a QTreeWidgetItem
+      object with an empty last column.
+    * [154092] Fixed case where the drag pixmap could get the wrong position
+      when dragging many items quickly.
+    * [152970] Hidden items are no longer returned as selected from the
+      selectedItems() function.
+    * [151211] Added the removeCellWidget() and removeItemWidget()
+      functions.
+    * [151149] Made the header text left-aligned instead of center-aligned
+      by default.
+    * [131234] Made it possible to do lazy population by introducing the
+      QTreeWidgetItem::ChildIndicatorPolicy enum.
+    * [134194] Added the itemAbove() and itemBelow() functions.
+    * [128935] The disabled state of an item is now propagated to its
+      children.
+    * [103421] Added the QTreeWidgetItem::setExpandable() function.
+    * [134138] Added the QTreeWidgetItem::removeChild() function.
+    * [153361] Ensured that items exist before emitting itemChanged().
+    * [155700] Fixed a crash in QTreeWidget where deleted items could still
+      be referenced by a selection model.
+
+- QUdpSocket
+    * [142853] Now continues to emit readyRead() if the peer temporarily
+      disappears.
+    * [154913] Now detects datagrams even when the sender's port is invalid.
+
+- QUndoStack
+    * [142276] Added the undoLimit property which controls the maximum
+      number of commands on the stack.
+
+- QUrl
+    * [134604] Fixed the behavior of the obsolete dirPath() function on
+      Windows.
+
+- QValidator
+    * [34933] Added support for scientific notation.
+
+- QVariant
+    * [127225] Unloading a GUI plugin will no longer cause a crash in
+      QVariant in a pure QtCore application.
+
+- QWaitCondition
+    * [126007] Made the behavior of wakeOne() consistent between Windows and
+      Unix in the case where wakeOne() is called twice when exactly 2
+      threads are waiting (the correct behavior is to wake up both threads).
+
+- QWidget
+    * [139359] Added the locale property to make it easy to customize how
+      individual widgets display dates and numbers.
+    * [155100] Fixed a regression that could cause Qt::FramelessWindowHint
+      to be ignored for frameless windows.
+    * [137190] Ensured that windows with masks are now rendered correctly
+      with respect to window shadows on Mac OS X.
+    * [139182] Added the render() function to allow the widget to be
+      rendered onto another QPaintDevice.
+    * [131917] Fixed bug where minimum and maximum sizes were not respected
+      when using X11BypassWindowManagerHint.
+    * [117896] Fixed setGeometry() to be more consistent across Mac OS X,
+      Windows, X11 and Qtopia Core.
+    * [132827] Allow the focus to be given to a hidden widget; it will
+      receive the focus when shown.
+    * Reduced the overhead of repainting a widget with lots of children.
+    * Clarified the documentation for the Qt::WA_AlwaysShowToolTips widget
+      attribute.
+    * [154634] Ensured that the Qt::WA_AlwaysShowToolTips widget attribute
+      is respected for all widgets.
+    * [151858] Improved the approximation returned by visibleRegion().
+    * [129486] Ensured that calling setLayout() on a visible widget causes
+      its children to be shown, making its behavior consistent with the
+      QLayout::addWidget() behavior.
+
+- QWindowsStyle
+    * [110784] Scroll bar and spin box arrows now scale with the widget size.
+    * Given certain panel and button frames a more native appearance.
+    * [142599] Ensured that a QDockWidget subclass is not required when
+      using the style to draw a CE_DockWidgetTitle.
+
+- QWindowsXPStyle
+    * [150579] Fixed the use of the wrong background color for QSlider.
+    * [133517] Fixed styling of the unused area in header sections.
+    * [48387] Fixed styling of MDI/Workspace controls.
+    * [109317] Fixed a rendering issue with tab widgets in the Silver color
+      scheme.
+    * [114120] Ensured that the frame property for combo boxes is respected.
+    * [138444] Fixed crash that could occur when passing 0 as the widget
+      argument to drawComplexControl().
+
+- QWizard
+- QWizardPage
+    * New classes. Based on QtWizard and QtWizardPage in Qt 4 Solutions.
+      Redesign of QWizard from Qt 3.
+
+- QXmlParseException
+    * [137998] Fixed incorrect behavior where systemId/publicId was never
+      reported.
+
+- QXmlSimpleReader
+    * QXmlSimpleReader no longer reads entire files into memory, allowing
+      it to handle large XML files.
+
+- Q3DateEdit
+    * [131577] Fix a bug that could occur when entering out-of-range years
+      in a Q3DateEdit.
+
+- Q3DockWindow
+    * [125117] Fixed some style issues with Windows XP and Plastique styles.
+
+- Q3GroupBox
+    * Added FrameShape, FrameShadow, lineWidth, and midLineWidth properties.
+
+- Q3ListView
+    * [150781] Fixed a crash in setOpen() (previously fixed in Qt 3).
+
+- Q3ScrollView
+    * [125149] Mouse events should not be delivered if the Q3ScrollView is
+      disabled.
+      This fixed the case where items were still selectable when Q3ListView
+      was disabled using the setEnabled() function.
+
+- Q3SqlCursor
+    * [117996] Improved support for tables and views that have fields with
+      whitespace in their names.
+
+- Q3TextEdit
+    * [136214] Fixed invalid memory reads when using undo/redo
+      functionality.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+- Interbase driver
+
+    * [127724] Added support for OUT values from stored procedures. (See the
+      SQL Database Drivers documentation for details.)
+    * [159123] Fixed crash that could occur when fetching data from
+      Interbase 2007 databases.
+    * [143474] Added support for SQL security-based roles.
+    * [134608] Fixed bug where queries in some cases returned empty VARCHAR
+      fields if they contained non-ASCII characters.
+    * [143471] Fixed bug that caused fetching of multisegment BLOB fields to
+      fail in some cases.
+    * [125053] Fixed bugs where NUMERIC fields were corrupted or returned as
+      the wrong type in some cases.
+
+- MySQL driver
+    * [156342] Fixed bug where BINARY and VARBINARY fields were returned as
+      QString instead of QByteArray.
+    * [144331] Fixed bug where a query would become unusable after executing
+      a stored procedure that returns multiple result sets.
+
+- OCI driver
+
+    * Added support for low-precision retrieval of floating point numbers.
+    * [124834] Fixed bug where the binding strings failed on certain
+      configurations.
+    * [154518] Fixed bug where connections were not properly terminated,
+      which lead to resource leaks and connection failures.
+
+- ODBC driver
+
+    * Increased performance for iterating a query backwards.
+    * [89844] Added support for fetching multiple error messages from an
+      ODBC driver.
+    * [114440] Fixed bug where binding strings longer that 127 characters
+      failed with Microsoft Access databases.
+    * [139891] Fixed bug where unsigned ints were returned as ints.
+
+- SQLite driver
+    * [130799] Improved support for attatched databases when used with
+      QSqlTableModel.
+    * [142374] Improved error reporting in cases where fetching a row fails.
+    * [144572] Fixed the implementation of escapeIdentifier() to improve
+      support for identifiers containing whitespace and reserved words when
+      used with the model classes.
+
+- PostgreSQL driver
+
+    * [135403] Properly quote schemas in table names ("schema"."tablename").
+    * [138424] Fixed resource leak that occurred after failed connection
+      attempts.
+
+- DB2 driver
+
+    * [110259] Fixed bug where random characters were prepended to BLOB
+      fields when fetched.
+    * [91441] Fixed bug where binding strings resulted in only parts of the
+      strings being stored.
+
+****************************************************************************
+*                             QTestLib                                     *
+****************************************************************************
+
+  * [138388] Floating point numbers are now printed in printf's "%g" format.
+  * [145643] QEXPECT_FAIL does not copy or take ownership of "comment"
+    pointer.
+  * [156346] Gracefully handle calls to qFatal().
+  * [154013] Don't count skips as passes.
+  * [145208] Display QByteArrays in convenient ways.
+  * Output well-formed XML.
+
+****************************************************************************
+*                               QDBus                                      *
+****************************************************************************
+
+- Library
+
+    * Added support for QList<QDBusObjectPath> and QList<QDBusSignature>
+      to allow them to be used without first having to register the types.
+
+    * Added support for using QtDBus from multiple threads.
+
+    * Made it possible to marshal custom types into QDBusArgument.
+
+    * qdbuscpp2xml:
+        * [153102] Ensure that Q_NOREPLY is ignored.
+        * [144663] Fixed problems with executing qdbuscpp2xml on Windows.
+        * Don't require moc to be on a path listed in the PATH environment
+          variable.
+
+    * QDBusInterface:
+	* Changed asserts in the QDBusInterface constructor to QDBusErrors.
+    * QDBusConnection:
+	* Added a separate slot for delivering errors when calling
+          callWithCallback().
+
+
+- Viewer
+
+    * Moved QDBusViewer from demos to QDBus tools.
+    * Added ability to get and set properties.
+    * Added support for demarshalling D-Bus variants.
+    * Added a property dialog for entering arguments.
+    * Made QDBusObjectPath clickable in the output pane.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+    * [153346] Ensured that tablet events are not delivered while a drag and
+      drop operation is in progress.
+    * [141756] Ensured that the Plastique or Cleanlooks styles are not used
+      as default styles when Xrender is not available.
+    * [139455] Fixed QX11EmbedContainer race causing sudden unembedding of
+      clients.
+    * [96507] Added support for using _POSIX_MONOTONIC_CLOCK as the
+      timer source (also affects Qtopia Core).
+    * [128118] Fixed garbage output when calling QPixmap::grabWindow()
+      on a window on a non-default screen.
+    * [133119] Ensured that X11 color names are detected in the
+      RESOURCE_MANAGER property.
+    * [56319] Added support for _NET_WM_MOVERESIZE to QSizeGrip, which
+      cooperates with the window manager to do the resizing.
+    * Fixed QWidget::isMaximized() to return false when the window is
+      only maximized in a single direction.
+    * [67263] Fixed a bug that could cause applications to freeze while
+      querying the clipboard for data.
+    * [89224] Fixed the behavior of minimized Qt applications to show the
+      correct icon (instead of the standard OpenWindows icon) on Solaris.
+    * [116080] Ensured that the TIMESTAMP clipboard property is set using
+      XA_INTEGER (as defined in the ICCCM).
+    * [127556] Refactored timer accounting code to be more efficient and
+      less cumbersome to maintain.
+    * [132241] Add support for DirectColor visuals. Qt will now create and
+      initialize a colormap when using such visuals.
+    * [140737] Fixed QEventDispatcherGlib::versionSupported() to be much
+      simpler.
+    * Fixed a bug where QWidget::windowFlags() would not include
+      Qt::X11BypassWindowManagerHint for Qt::ToolTip and Qt::Popup windows.
+    * [146472] Fixed a bug where QWidget::setWindowFlags() would disable
+      drag and drop operations from outside Qt applications.
+    * [150352] Fixed painting errors after show(), hide(), then show()
+      under GNOME.
+    * [150348] Fixed a bug that would incorrectly set the Qt::WA_SetCursor
+      attribute on top-level windows.
+    * [135054] Fixed system palette detection code to use contrast that is
+      more similar to the desktop settings.
+    * [124689] Documented potential QDrag::setHotSpot() inefficiency on X11.
+    * [121547] Fixed QWidget::underMouse() to ensure that the value it
+      returns is correctly updated after the mouse button is released.
+    * [151742] Improved robustness when executing in an X11-SECURITY
+      reduced ssh-forwarded session.
+    * [142009] Fixed a bug that caused an application using the Qt Motif
+      Extension to freeze when trying to copy text into a QTextEdit.
+    * [124723] Fixed PseudoColor detection to correctly handle cases where
+      the colormap is not sequential.
+    * [140484] Don't use the GLib event dispatcher if GLib version is too
+      old.
+    * Fixed a bug where a window would get an incorrect size after the
+      second call to show().
+    * [153379] Fixed shortcuts where the modifier also includes Mode_switch
+      in the modifier mask; for example, Alt+F on HP-UX.
+    * [154369] Fixed drag and drop to work properly after re-creating a
+      window ID.
+    * [151778] Fixed mouse enter/leave event platform inconsistencies.
+    * [153155] Added the QT_NO_THREADED_GLIB environment variable, which
+      tells Qt to use Glib only for the GUI thread.
+    * Fixed restoreGeometry() to ensure that full-screen windows are moved
+      to the correct position.
+    * [155083] Don't use legacy xlfd fonts if we have fontconfig available
+      on Solaris.
+    * [150348] Fixed bug where setCursor() would not work properly after a
+      setParent() call.
+    * Made Plastique the default style on X11.
+
+Windows
+-------
+    * Added an experimental DirectX-based paint engine.
+    * [141503] Ensured that clicks inside tool windows won't cause them to
+      be activated if there is no child widget to take focus.
+    * [153315] Improved handling of Synaptic touchpad wheel messages.
+    * [150639] Added support for CF_DIBV5 format and improved support for
+      transparent images on the clipboard.
+    * [146862] Improved readability of progress bar text when shown in
+      the Highlight palette color.
+    * [146928] Fixed issue where shortcut events were discarded when auto-
+      repeat was disabled.
+    * [141079] Ensured that wheel events contain button information.
+    * [149367] Ensured that QMimeData::formats() returns all the available
+      formats in the object.
+    * [135417] Ensured that WM_SYSCOLORCHANGE does not trigger resetting of
+      fonts.
+    * [137023] Fixed a crash that could occur while translating mouse
+      events.
+    * [138349] Fixed incorrect focus handling with multiple top-level
+      widgets.
+    * [111211] Ensured that tool windows don't steal focus from their
+      parents while opening.
+    * [143812] Fixed a bug which can break the widget's ability to maximize
+      after saving and restoring its state.
+    * [111501] Ensured that SPI_SETWORKAREA messages trigger calls to
+      QDesktopWidget::workAreaResized().
+    * [141633] Fixed command line parsing for GUI applications.
+    * [134984] Ensured that SockAct events are not triggered from
+      processEvents(ExcludeSocketNotifiers).
+    * [134164] Ensured that top-level widgets configured with
+      MSWindowsFixedSizeDialogHint are centered properly.
+    * [145270] Fixed mapFromGlobal() and mapToGlobal() for minimized or
+      invisible widgets.
+    * [132695] Fixed a potential crash that could occur when changing the
+      application style after the system theme had been changed.
+    * [103739] Workspace title bars now respect custom title bar heights in
+      the Windows XP style.
+    * [48770] Improved size grip behavior in top-level widgets.
+    * [113739] Fixed an issue that could occur when using QWidget::scroll()
+      with on-screen painting.
+    * [129589] Added support for moving the mouse cursor to the default
+      button in dialogs.
+    * [139120] Added support for resolving native file icons through
+      QFileIconProvider.
+    * [129927] Added the QWindowsVista style to support native look and feel
+      on Windows Vista.
+    * [106437] Removed the Windows XP style from the list of keys supplied
+      by QStyleFactory::keys() on platforms where it is not available.
+    * [109814] Improved UNC path support.
+    * [157261] Fixed crash that could occur when using Alt keycodes with
+      text handling widgets.
+    * [116307] Ensured that QEvent::WindowActivate is sent for tool windows.
+    * [150346] Fixed a bug that would cause an application to exit when its
+      last window (a modal dialog) was closed and a new window shown
+      immediately afterwards.
+    * [90144] Fixed a bug that caused QApplication::keyboardModifiers() to
+      return modifiers even after they had been released.
+    * [142767] Fixed a bug that allowed a QPushButton to become pressed even
+      though its mousePressEvent() handler function was never called.
+    * [151199] Usage of blocking QProcess API in a thread no longer hangs
+      the desktop.
+    * [144430] Made the shortcut system distinguish between Key_Return and
+      Key_Enter.
+    * [144663] Made sure qdbuscpp2xml can parse moc output on Windows.
+    * [126332] Made QDBus compile on Windows platforms.
+    * [133823, 160131] Fixed bug in the QWidget::scroll() overload that
+      accepts a rectangle argument.
+
+- ActiveQt
+    * Ensured that, when loading a typelib file to obtain information about
+      a control, the typelib is processed correctly.
+    * [158990] Ambient property change events are now emitted regardless of
+      the container's state.
+    * [150327] ActiveQt based controls will now return the correct Extents
+      depending on the size restrictions set on the widget.
+    * [141296] Ensured that the ActiveQt DLL is unloaded from the same
+      thread which loaded it.
+
+- Qt Style Sheets
+    * Added support for background clipping using the border-radius
+      property.
+    * Almost all widgets are now styleable using style sheets.
+    * Added support for the -stylesheet command line option to QApplication.
+    * Added support for styling through SVG.
+    * Added support to allow colors and brushes to be specified as
+      gradients.
+
+Mac OS X
+--------
+
+    * qtconfig is no longer available on Mac OS X. All settings are read
+      from the system's configuration.
+    * [156965] Always offers a 'TEXT' type flavor for non-Pasteboard-aware
+      Mac Application pastes.
+    * [158087] Fixed various mouse event propagation bugs.
+    * Introduced Q_WS_MAC32/Q_WS_MAC64 for 64 vs. 32-bit detection compile
+      time infrastructure.
+    * [156431] Introduced WA_MacAlwaysShowToolWindow to allow windows to
+      behave as utility windows as opposed to floating windows.
+    * [155651] Qt will now follow the HIView focus chain to allow wrapped
+      HIViewRef's to take focus when appropriate.
+    * [149753] Qt will not deliver mouse release events to widgets that do
+      not process mouse press events (including widgets with the
+      WA_MacNoClickThrough attribute set).
+    * Introduced support for 64-bit Mac OS X builds. Only available on
+      Mac OS X 10.5 (Leopard).
+    * [145166] Ensured that CoreGraphics high quality interpolation is used
+      when using SmoothPixmapTransform.
+    * [134873] Ensured that the widget hierarchy is used to find a widget
+      with a cursor rather than using the frontmost widget.
+    * [132178] Enforced the requirement for double click detection that the
+      second click must be near the previous click to prevent false double
+      clicks being reported.
+    * [131327] Fixed mouse propagation for top-level widgets with the
+      WA_MacNoClickThrough attribute set.
+    * Now entirely QuickDraw clean.
+    * [155540] Ensured that asymmetic scales work with cosmetic pens.
+    * [141300] Fixed an issue that prevented QFontDatabase/QFontDialog from
+      showing all fonts installed on the system.
+    * Fixed writing system detection in QFontDatabase.
+    * [148876] Fixed bug that caused characters to be committed twice in the
+      Chinese Input method.
+    * Removed the use of an extra setFocus() in the event loop when a window
+      is activated.
+    * [152224] Fixed bug in QWidget's window state.
+    * [156431] Added the WA_MacAlwaysShowToolWindow widget attribute to
+      allow Mac users to create utility-window-style applications.
+    * [144110] Fixed resizing of sheets on Panther.
+    * [140014] Made it possible to drag QUrls on Panther.
+    * [155312] Fixed bug that could occur when dragging several URLs to
+      Finder and certain other applications.
+    * [155244] Fixed bug that could occur when dragging a URL to Finder.
+    * [153413] Fixed bug that could occur when dragging URLs between Qt applications.
+    * [152450] Fixed bug that could occur when dragging URLs to applications
+      such as the trash can.
+    * [151158] Fixed an issue that prevented widgets from receiving drag
+      events if a move event was ignored.
+    * [145876] Ensured that a drag move event is always received directly
+      after a drag enter event (according to the documentation).
+    * [156365] Fixed event bug when dragging URLs to receivers that only
+      refer to a drop location.
+    * [119251] Tool tips and dialogs no longer cause full-screen windows to
+      show their menu bar and the dock.
+    * [147640] Fixed QScrollArea scrolling behavior when showing regions
+      with dimensions between 2^15 and 2^16 pixels.
+    * [158988] Ensured that a mouse enter event is now sent before a mouse
+      press event upon window activation.
+    * [157313] Fixed hanging bug that could occur if the system clock was
+      adjusted backwards while using sockets.
+    * [151411] Fixed window switching bug (Cmd + ~) that could occur when
+      showing a modal dialog with a popup.
+    * Ensured that changing a shortcut containing a cursor movement key now
+      works correctly.
+    * [143912] Fixed focus problem caused by mouse hovering over widgets
+      with modal sheets.
+    * [141456] Fixed activation bug exhibited by minimized windows upon
+      being shown.
+    * [155394] Fixed issue where a widget's move and resize state were not
+      set correctly upon widget initialization.
+    * [254325] Fixed sheet transparency bug.
+    * [152481] Fixed crash that could occur when clicking in a window when a
+      modal print dialog is showing.
+    * [143835] Removed unnecessary window updates for active windows.
+    * [145552] A mouse up event is now sent when a window drag has finished
+      after a mouse press.
+    * [146443] Ensure that, if a window is moved before it is shown for the
+      first time, it is placed correctly when it is shown.
+    * [141387] Fixed bug that caused two near-simultaneous mouse presses on
+      different widgets to be interpreted as a single click.
+    * [139087] Fixed activation for some types of shortcuts, such as
+      QKeySequence(Qt::CTRL | Qt::Key_Plus).
+    * Only use Roman for determining with System Fonts since Mac OS X will
+      perform the necessary translation.
+    * When using OpenGL, ensured that the 32-bit accumulation buffer is used
+      in preference to the 64-bit accumulation buffer by default.
+    * [123467] Fixed bug where the event loop would spin and not emit
+      aboutToBlock() when popup menus were shown.
+    * [137677] QString::localAwareCompare() now respects the sorting order
+      set in the system preferences.
+    * [139658] Mac OS X accessibility no longer requires that
+      QApplication::exec() is called.
+    * [118814, 126253, 105525] Fixed several QCombobox look and feel issues.
+    * [145075] Fixed aliased line drawing bug.
+    * [122826] Fixed QScrollBar painting error.
+    * [131794] PixelTool and QWidget::grabWindow() now work on non-primary
+      monitors.
+    * [160228] The Quartz 2D-based paint engine now respects the font style
+      strategy.
+    * Made miscellaneous changes to make wrapping non-Qt HIViews easier.
+    * Qt is now built with MACOSX_DEPLOYMENT_TARGET set to 10.3 (since Qt
+      can only be run on Mac OS X 10.3 and above).
+    * QSound now uses NSSound for its implementation instead of the
+      deprecated C QuickTime API. This means that the QtGui library is no
+      longer dependant on the QuickTime framework.
+    * Added a -dwarf-2 configure option to allow people to turn on DWARF2
+      debugging symbols when that is not the default.
+      The ability to use DWARF2 debugging symbols was added in later version
+      of the Xcode 2.x series.
+    * Fixed many assertions when running against Carbon_debug.
+    * Renamed the Qt::WA_MacMetalStyle attribute to WA_MacBrushedMetal.
+    * Changing the Qt::WA_MacBrushedMetal attribute will now cause a
+      StyleChange event to be sent.
+    * The Qt translations and Qt Linguist phrase books have been added to
+      the binary package.
+    * [134630] Fixed loading of plugins in the case where universal plugins
+      are used but the wrong architecture is accidentally read first,
+      instead of returning an architecture mismatch.
+    * QCursor now uses NSCursor internally instead of the deprecated
+      QuickDraw functions.
+    * Corrected the encoding and decoding functions for QFile to handle
+      different Unicode normalization forms.
+
+Qtopia Core
+-----------
+
+ - New font system
+    * A new font subsystem has been implemented that, by default, allows
+      glyphs rendered at run time to be shared between applications. A new
+      pre-rendered font format (QPF2) has also been implemented together
+      with a new "makeqpf" tool to generate them.
+    * Support for custom font engine plugins has been added through
+      QAbstractFontEngine and QFontEnginePlugin.
+    * The default font family has been changed to DejaVu Sans.
+
+- OpenGL ES
+    * [126421, 126424] Added QGLWindowSurface and QGLScreen framework for
+      OpenGLES (and others) on Qtopia Core. A sample implementation can be
+      found in the examples/qtopiacore directory.
+
+ - Accelerated graphics API
+    * [150564] API changes in QWSWindowSurface. New functions include
+      QWSWindowSurface::move() to enable accelerated movement of top-level
+      windows.
+    * [152755] API clarification: The windowIndex parameter to
+      exposeRegion() now always refers to the window that is being changed.
+    * [150569, 139550] Made API additions to QWSWindow to give QScreen
+      information about the window state, window flags, and window dirty
+      region
+    * [150746] Added QScreen::pixelFormat() and QScreen::setPixelFormat() to
+      enable drawing optimizations for some formats.
+
+ - General fixes
+    * Improved support for compiling a LSB (Linux Standard Base) compliant
+      Qtopia Core library.
+    * [133365] Added the QWSServer::setScreenSaverBlockLevel() function to
+      make it possible to block the key/mouse event that stops the screen
+      saver at a particular level.
+    * Fixed QFontDatabase::addApplicationFont() for Qtopia Core.
+    * [131714] Fixed performance problems with drag and drop operations.
+    * [96507] Added support for using _POSIX_MONOTONIC_CLOCK as the timer
+      source (also effects Qt/X11).
+    * [132346] Fixed a performance bug causing unnecessary screen copies
+      when using a hardware cursor.
+    * [121496] Made lots of performance improvements in the VNC driver.
+    * [138615] Fixed color conversion for cases where the VNC server is
+      running on a big-endian machine.
+    * [131321] Optimized text drawing.
+    * [136282] Fixed a bug preventing QWidget::setCursor() and
+      QWidget::unsetCursor() from taking effect immediately.
+    * [139318] Fixed a performance bug that would cause non-visible regions
+      to receive paint events.
+    * [139858] Implemented acceleration for the 'pc' mouse handler.
+    * [140705, 140760] Improved release of used resources (e.g, shared
+      memory and hardware resources) when the application exits
+      unexpectedly.
+    * [144245] Fixed a problem with some cross-compilers triggered by using
+      math.h functions taking a double argument when using float data.
+    * Optimized QSocketNotifier activation.
+    * [156511] Implemented QDirectPainter::ReservedSynchronous which makes
+      a QDirectPainter object behave as a QDirectPainter region allocated
+      using the static functions.
+    * [94856] Fixed console switching when using the Tty keyboard driver.
+    * [157705] Ensured that device parameters are passed to keyboard and
+      mouse plugins.
+    * [156704] Fixed QPixmap::grabWindow() for 18 and 24-bit screens.
+    * [154689] Fixed the -no-gfx-multiscreen configure script option.
+    * [160404] Fixed 4-bit grayscale support in QVFb and QScreen.
+    * Optimized QCop communication.
+    * Fixed bug in QWidget::setMask() for visible widgets.
+    * [152738] Allow transparent windows to be shown on top of unbuffered
+      windows.
+    * [154244] Fixed bug where a client process would not terminate when
+      server closed.
+    * [152234] No longer send key events for one client to other client
+      processes for security and performance reasons.
+    * [148996] Added checks in the server to avoid buffer overruns if
+      clients send malformed commands
+    * [154203] Fixed mouse calibration bug with mirrored/180-degree-rotated
+      touch screens.
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+- MinGW
+    * [119777] Removed the dependency on mingwm.dll when compiled with the
+      -no-exceptions option.
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- Build System
+    * Auto-detect Xoreax IncrediBuild with XGE technology, and enable
+      distribution of moc and uic.
+    * Shadow builds are now supported by nmake/mingw-make of the Qt build
+      system.
+    * [151184] Separated the -make options for demos and examples
+    * [150610] Fixed the build system to take into account that fvisibility
+      requires gcc on Unix builds.
+    * [77152] Ensured that, at "make install" time, all meta-information
+      files will be cleaned up to remove reference to source code path.
+    * [139399] Ensured that the environment CC/CXX on Unix are taken into
+      account when running the build tests.
+    * [145344] Ensured that "make confclean" will remove all files
+      generated by configure.
+    * [145659] Added ability to disable SSE.
+    * Added DWARF2 detection and support into the build system to reduce
+      the debug library size.
+    * Added macx-g++-64 meta-spec for Qt configuration purposes.
+    * [127840] The pkgconfig files (.pc) are now placed into lib/pkgconfig.
+    * [135547] Allow Windows line endings on UNIX and vice versa in
+      .qt-license files.
+    * [133068] GIF support is now enabled by default.
+    * [137728] Fixed failed build on Mac OS X and Solaris when using the
+      -separate-debug-info command line option for the configure script.
+    * [137819] Added support for precompiled headers with the Intel C++
+      Compiler for Linux.
+    * Re-used qplatformdefs.h from linux-g++ in the linux-icc mkspec.
+    * [121633] Added linux-icc-64 mkspec which is needed for building on
+      some 64-bit hosts.
+    * Removed cd_change_global from win32-msvc's qmake.conf file.
+    * [116532] Keep intermediate manifest file in object directory instead
+      of the destination directory.
+    * Added a configuration type to qconfig.pri on Windows.
+    * Corrected paths in Makefile generation when configuring with the
+      -fast command line option.
+    * Added tests to auto-detect a suitable TIFF library.
+    * [152252] Fixed auto-detection of MSVC.NET 2005 Express Edition in
+      configure.exe.
+    * [151267] Ensured that the manifest tool does not get forward slashes
+      when writing paths to manifest files.
+    * [153711] Ensured that the directory separators used in .qmake.cache
+      are correct for normal MinGW and Cygwin MinGW.
+    * [154192] Fixed a problem with configure.exe executing non-existing
+      scripts.
+    * [128667] Added a confclean build target on Windows for the top-level
+      project file.
+
+
+- Assistant
+    * [99923] Added a context menu for the tabs in the tab bar. Right click
+      on a tab to get a list of common options.
+    * Assistant now uses the "unified toolbar" look on Mac OS X.
+
+- Designer
+    * [151376] Added a context menu to the tab order editor.
+    * [39163] Added a tab order editor shortcut - using Ctrl with the left
+      mouse button makes it possible to start ordering from the selected
+      widget.
+    * [159129] Fixed a crash in the tab order editor.
+    * Improved snapping behavior for multi-selections and negative
+      positions.
+    * [126671] Made it possible to move widgets by using the cursor keys
+      without modifiers. The Shift modifier enables resizing, the Control
+      modifier enables snapping behavior.
+    * [111093] Added a file tool bar.
+    * [156225] Fixed the delete widget command for cases where the deleted
+      widget is a child of a QSplitter widget.
+    * [101420] Improved the WYSIWYG properties of forms with respect to the
+      background colors used.
+    * [112034] Enabled Ctrl + drag as a shortcut for copying actions in
+      menus and tool bars.
+    * [128334] Double clicking on a widget now invokes the default action
+      from its task menu.
+    * [129473] Fixed bug in the handling of default tab orders.
+    * [131994] Made it possible to set the tab order for checkable group
+      boxes.
+    * Added new cursor shapes.
+    * [137879] Improved the editor for key sequence properties.
+    * [150634] Improved refreshing behavior of all properties after property
+      changes.
+    * [147655] Fixed shadow build issues.
+    * [151567, 149966] Ensured that object names are unique.
+    * [80270] Fixed bug with saving icons taken from resources which are
+      specified with aliases.
+    * [152417] Fixed loading/saving of header labels of Q3Table widgets.
+    * Added the QColumnView widget to the widget box.
+    * Added support for new margin (left, top, right and bottom) and spacing
+      (horizontal and vertical) properties of the layout classes.
+    * [146337] Ensure that the margin and spacing properties are not saved
+      if they have the default values.
+    * Fixed layout handling in Q3GroupBox
+    * [124680] Ensured that the correct pages are displayed when selecting a
+      QStackedWidget page in the object inspector.
+    * [88264] Ensured that breaking a nested layout doesn't break the parent
+      container's layout.
+    * [129477] Added support for dynamic properties via the context menu in
+      the property editor.
+    * [101166] Added an "Add separator" action to the standard context menu.
+    * [132238] Added a "Recent files" button to the New Form dialog.
+    * [107934] Updated the font anti-aliasing property from a boolean
+      property to a property with 3 values.
+    * [155464] Added a German translation.
+    * [146953] Enabled support to allow widgets to be dragged onto the
+      object inspector.
+    * [152475] Ensured that the widget box saves and restores its state.
+    * [111092] Added support to allow images to be dragged from the resource
+      editor and dropped onto the action editor or icon properties in the
+      property editor.
+    * [111091] By default, icon dialogs now open to show the resource
+      browser.
+    * [152475] Added a button to load newly found custom widget plugins to
+      the plugin dialog.
+    * [151122] Added warnings for custom widget plugin issues such as load
+      failures and class name mismatches.
+    * [138645] Improved the form preview on Mac OS X, provided a close
+      button and a menu entry.
+    * [103801] Made buddy editing possible for custom widgets derived from
+      QLabel.
+    * [148677] Added a font chooser for tool windows.
+    * [107233] Made the grid customizable, provided default and per-form
+      grid settings.
+    * [149325] Provided a form editor context menu in the object inspector.
+    * [147174] Changed the elide mode and improved column resizing behavior
+      of property editor and object inspector.
+    * [147317] Improved handling for switching user interface modes,
+      preventing the geometries of form window from being changed.
+      Made 'Bring to front' deiconify windows.
+    * [146629] Fixed never ending loop on Linux triggered by scrolling
+      quickly through the pages of a QStackedWidget.
+    * [145806] Enabled KDialog to be used as a template.
+    * [142723] Enabled the pages of QStackedWidget, QTabWidget and QToolBox
+      to be promoted.
+    * [105916] Enabled QMenuBar to be promoted.
+    * [147317] Improved the New Form dialog.
+    * [95038] Fixed handling of layout defaults.
+    * [103326] Made it possible to make connections to form signals.
+    * [145954] Added a new dialog for promoted widgets with the ability to
+      specify global include files.
+      Added promotion candidates to the form's context menu.
+    * [127232] Ensured that global include files returned by
+      QDesignerCustomWidgetInterface::includeFile() are handled correctly.
+    * [139985] Improved handling of layouts for custom widgets.
+    * [99129] Made custom implementations of QDesignerMemberSheetExtension
+      work correctly.
+    * [87181] Added support for setting properties on items in a multi-
+      selection.
+      Added support for sub-properties. For example, changing the font size
+      of a multi-selection does not overwrite other font settings.
+      Added undo-support for property comments.
+    * [135360] Added tooltips to the property editor, action editor and
+      object inspector.
+    * [103215] Added handling of escaped newline characters for text
+      properties.
+      Added support for validators and syntax highlighting for style sheets.
+    * [135468] Added support for tool bar breaks.
+    * [135620] Fixed several issues concerning handling of properties of
+      promoted widgets.
+    * [109077] Provided multi-selection support in the object inspector.
+    * [133907] Made in-place editing of plain label texts possible.
+    * [134657] Fixed table widget editor.
+    * [90085] Made the resource editor consume a little less horizontal
+      screen real estate.
+    * [105671] Added support to allow main windows to be maximized while
+      being previewed.
+    * Added a style sheet editor.
+
+- Linguist
+    * Translations can be exported to and imported from XLIFF files.
+    * [136633] Fixed "Find" so that it searches in comments.
+    * [129163] Fixed bug that prevented "Next Unfinished" from working if
+      there was no selected item.
+    * [125131] Made the translation loading behavior consistent with
+      Assistant and Designer.
+    * [125130] Added the -resourceDir command line argument for consistency
+      with Assistant and Designer, to allow the path of translation files
+      to be specified.
+    * [124932] XML files (.ts and .xlf) are now written with platform-
+      specific line endings.
+    * [128081] Ensure that the tree view does not lose focus when the up
+      and down cursor keys are used for navigation.
+      Use Shift+Ctrl+K and Shift+Ctrl+L instead if you really want this
+      behavior.
+    * [139079] Added a DTD to document the TS file format.
+
+- lupdate
+    * Made some small improvements in lupdate's .pro file parser.
+      Fixed bug in inclusion of relative .pri files.
+    * [140581] Improved namespace/context parsing.
+    * [142373] Fixed bug when running lupdate on a SUBDIRS .pro file that
+      prevented TS files from being created.
+    * [135991] Ensure that .pro file comments are handled correctly when
+      they occur within a list of several variable assignments.
+    * [154553] Fixed bug with CODECFORTR that caused saving of incorrect
+      characters.
+
+- rcc
+    * [158522] By default compression is now set to the zlib default
+      (normally level 6).
+    * [133837] Allow absolute paths in .qrc files (accessible through the
+      original filesystem path).
+    * [146958] No longer returns error when a .qrc is empty. A (mostly)
+      empty file is generated instead.
+
+- moc
+    * [149054] Fixed parsing of old-style C enums.
+    * [145205] Ensured that a warning is given when a known interface
+      (marked with Q_DECLARE_INTERFACE) is subclassed that is not mentioned
+      in Q_INTERFACES.
+    * [97300] Allow @file to be given as the options input file to handle
+      command lines larger than allowed by the operating system.
+
+- uic
+    * [144383] Added checks to prevent generated code from calling
+      ensurePolished() before each constructor is finished.
+    * [138949] Ensured that font and size policy instances are reused in
+      generated code.
+    * [141350] Ensured that color brushes are reused in generated code.
+    * [141217] Improved handling of include files of Qt 3 classes.
+    * [144371] Ensure that each form's objectName property is not set in
+      setupUi() to avoid problems in cases where the name was already set.
+    * Added support for the QWidget::locale property.
+    * [141820] Fixed generation of connections in the form.
+    * [137520] Ensured that code to set toolTip, statusTip and whatsThis
+      properties is not generated when the corresponding QT_NO_*
+      preprocessor macros are defined.
+    * [128958] Ensured that static casts are not used in generated code.
+    * [116280] Added support for qulonglong and uint types.
+
+-uic3
+    * [137915] Added functionality to extract images via the -extract
+      command line option.
+    * [129950] Added the -wrap command line option which specifies that a
+      wrapper class which is Qt 3 source compatible should be generated.
+
+- qmake
+    * [121965] Implemented DSW (Workspace files) generation for MSVC 6.0
+      users.
+    * [132154] Added support for /bigobj option in the vcproj generator.
+    * Fixed crash with dependency analysis.
+    * Ensure that cleanup rules are not added for extra compilers with no
+      inputs.
+    * LEX/YACC support has been moved into .prf files.
+    * [156793] Introduced PRECOMPILED_DIR for PCH output (defaults to
+      OBJECTS_DIR).
+    * [257985] Fixed qmake location detection bug.
+    * Ensured that empty INCLUDEPATH definitions are stripped out.
+    * Allow QMAKE_UUID to override qmake deteremined UUID in the vcproj
+      generator.
+    * [151332] Ensured that .pc files are terminated with an extra carriage
+      return.
+    * [148535] Introduced QMAKE_FRAMEWORKPATH and used it internally.
+    * [127415] Fixed object_with_source.
+    * [127413] Introduced QMAKE_FILE_IN_PATH placeholder for extra
+      compilers.
+    * [95975] Replaced QMAKE_FILE_IN for custom build steps in DSP
+      generator.
+    * [141749] Added checks to prevent cyclical dependencies.
+    * [146368] Ensured that GNUmake .d files are removed upon distclean.
+    * Improved extensibility of the precompiled header support to allow icc
+      precompiled headers.
+    * [147142] Short-circuit previously seen library paths to avoid
+      cyclical .prl processing.
+    * [144492] Ensured that INSTALL_PROGRAM is set for INSTALLS in
+      macx-xcode projects.
+    * [143720] Extra compilers will now depend upon the input file
+      automatically.
+    * Introduced QMAKE_DISTCLEAN for extra files to be removed upon
+      invocation of "make distclean".
+    * [133518] Reduced the noise created by qmake warnings.
+    * [108012] Brought macx-xcode into line with macx-g++ with regards to
+      custom bundle types.
+    * [128759] Added support for spaces in paths to linked libraries.
+    * [83445] Made sure that "make distclean" in a library with a DESTDIR
+      really does remove the destination symbolic links.
+    * The subdir generator will now use - to separate target words and _ to
+      separate internally appended words.
+    * [125557] Fixed broken generation of dependencies for extra compilers.
+    * Ensured that the QMAKE_QMAKE variable is given a reasonable default
+      before parsing and evaluating project files.
+    * For Unix/Mac OS X, configure now has an -optimized-qmake option that
+      allows people to build qmake with optimizations.
+      This is disabled by default as older versions of some compilers take
+      a long time to build an optimized qmake. qmake is already built with
+      optimizations on Windows.
+    * [130979] Made the incremental link option case-insensitive.
+    * Ensured that paths for custom build steps in vcproj files have the
+      correct seperators.
+    * Avoid duplicate dependency paths, reduce file stats.
+    * [91313] Ensured that multiple commands in the DSP generator are
+      separated with \n\t characters.
+    * [108681] Added checks to avoid problems with uic3 files having
+      dependencies on themselves.
+    * [130977] Added support for non-flat output for vcproj files with
+      single configuration.
+    * [134971] Added support for more compiler and linker options for
+      vcproj files, and added catch-all cases which add options to
+      AdditionalOptions variables.
+    * [140548] Fixed escaping of the custom build step for image
+      collections.
+    * [114833] Ensured that paths in vcproj always have native filing
+      system separators.
+    * [144020] Only allow CONFIG+=staticlib for TEMPLATE==lib.
+    * [97300] Handle large number of include paths on Windows for moc by
+      using temporary files. (See moc changes.)
+    * [150519] Ensured that qmake is compiled with the correct mkspec on
+      Windows.
+    * [148724] Added manifest files to project clean up.
+    * [123501] Added /LIBPATH to AdditionalLibraryPaths in vcproj files.
+    * [80526] Made sure that extra compiler commands are not corrupted due
+      to path separator fixing.
+    * [109322] Moved hardcoded extra compilers, yacc and lex, into the PRF
+      (feature) system.
+    * [101783] Added a _DEBUG to Resource Tool for debug builds on Windows.
+    * [145074] Added a custom build step on input files, for extra compiler
+      files with built-in compilers for the output files.
+    * [150961] Added support for QMAKE_PRE_LINK in the DSP and VCPROJ
+      generators.
+    * Added checks to avoid double escaping of DESTDIR_TARGET file paths in
+      Windows Makefiles.
+    * Ensured that file paths for COPY_FILE and QMAKE_BUNDLE are escaped.
+    * [83765] Ensured that input files instead of output files are added to
+      extra compiler steps under certain conditions.
+    * [101482] Fixed relative path handling for RC_FILE.
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+- QTiffPlugin
+    * [93364] Added support for the TIFF image format.
diff --git a/dist/changes-4.3.1 b/dist/changes-4.3.1
new file mode 100644
index 0000000..71de8e9
--- /dev/null
+++ b/dist/changes-4.3.1
@@ -0,0 +1,519 @@
+Qt 4.3.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.3.0.
+
+The Qt version 4.3 series is binary compatible with the 4.2.x, 4.1.x and
+4.0.x series. Applications compiled for Qt 4.0, 4.1 or 4.2 will continue to
+run with Qt 4.3.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Translations
+    * Updated the German translation to provide complete coverage of Qt.
+
+- QDBusView
+    * Added icons for Mac OS X and Windows.
+
+- Intel C++ Compiler for Linux
+    * Added support for version 10 of the compiler. See the Compiler
+      Notes documentation for known problems and work-arounds for this
+      compiler.
+    * Added linux-icc-32 mkspec, for building with the 32-bit compiler
+      on 64-bit hosts.
+
+Third party components
+----------------------
+
+- FreeType
+    * Security fix (CVE-2007-2754): Integer overflow in the
+      TT_Load_Simple_Glyph function in freetype 2.3.4 and earlier allows
+      remote authenticated users to execute arbitrary code via crafted BDF
+      fonts.
+
+- SQLite
+    * File descriptors are not inherited during spawn() anymore.
+
+Build System
+------------
+
+    * Fixed native builds on ARM architectures.
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- QAbstractItemView
+    * [166605] Fixed regression causing keyboard modifiers to have no effect
+      during drag and drop operations.
+    * [169233] Fixed bug that would prevent text from being selected in
+      double spin box editors.
+    * [168917] Text would sometimes not be selected in the editor.
+
+- QAbstractItemModel
+    * [166714] Fixed regression causing persistent indexes to not be
+      correctly updated.
+
+- QAbstractPrintDialog
+    * [163000] Fixed bug on Unix where the PrintSelection option would not
+      be enabled unless PrintPageRange was also enabled.
+
+- QApplication
+    * [166677] Windows only: Fixed an issue with alert() where windows
+      would keep flashing after being activated by the user.
+    * [168974] Fixed problems with compilation that could occur when
+      QT3_SUPPORT and QT_NO_CURSOR were defined.
+
+- QComboBox
+    * [165130] Mac OS X only: Fixed bug that caused an editable combo box to
+      cut off list entries.
+
+- QDesktopServices
+   * [165817] Fixed misleading documentation of
+     QDesktopServices::setUrlHandler().
+
+- QDialog
+    * [166900, 166514] Fixed bug where a dialog could remain visible after
+      hide() had been called.
+
+- QFile
+   * [167217] Fixed regression that prevented the sequential bit from being
+     reset when reopening a file.
+
+- QFileDialog:
+   * [164947] Mac OS X only: Ensure that the parent of a native sheet dialog
+     is activated before a sheet is shown.
+
+- QFSFileEngine:
+   * [163406] Ensured that QFile::readLine() works on all platforms when
+     QFile is opened on file descriptor 0.
+
+- QGLWidget
+    * [162085] X11 only: Fixed usage of QGLWidget on multiple X11 screens.
+    * [164707] X11 only: Fixed the transparent overlay color usage to make
+      it possible to draw with a solid black color. Qt::transparent is now
+      always returned as the transparent color in an overlay.
+    * [162143] Fixed a crash that could occur when calling renderPixmap()
+      with extremely large sizes. It now gracefully fails instead.
+
+- QGraphicsItem
+    * [163430] Improved precision of QGraphicsItem::ItemIsMovable move
+      operations, and fixed move support for
+      QGraphicsItem::ItemIgnoresTransformations.
+
+- QGraphicsItemAnimation
+    * [164585] Fixed setTimeLine(0) to properly remove the existing timeline,
+      and also ensured that setting the same timeline twice works fine.
+
+- QGraphicsScene
+    * [163555] Flat items (items whose bounding rect width or height is 0)
+      no longer cause a full viewport update when they are updated.
+
+- QGraphicsView
+    * [160828] Fixed bug in QGraphicsScene/View::render() which could cause
+      nothing to be rendered for QPicture target devices.
+    * [163919] Scroll bar ranges are no longer reset to (0,0) when the
+      scroll bars are disabled (Qt::ScrollBarAlwaysOff).
+    * [163537] Scroll bar ranges are now correct also for styles with a
+      viewport frame only around the viewport itself (e.g., Motif and Mac
+      OS X style).
+    * [158245] Calling setScene(0) now recalculates the scroll bar ranges.
+    * [170619, 157400] Fixed rendering bugs that could occur when using a
+      semi-transparent foreground or background brush.
+    * [170619, 168885] Fixed a bug that would cause the rubber band to
+      appear after invoking a context menu.
+
+- QHostInfo
+    * [168233] Ensured that all pending look-ups are terminated on
+      application exit to avoid a delayed application shutdown while waiting
+      for the look-ups to complete.
+    * [167487] Fixed support for Unix platforms that allow IPv6 look-ups
+      through getaddrinfo(), but that don't support IPv6 sockets.
+
+- QImage
+    * [163727] Fixed artifacts in scaled images that could occur when using
+      Qt::FastTransformation.
+    * [169908] Fixed a crash that could occur when reading 4-bit
+      uncompressed BMP images.
+
+- QLocale
+    * [167534] Fixed bug that would cause QLocale::toString() to return
+      garbage if passed an invalid time or date.
+
+- QMainWindow
+    * [166004, 167651] Made the unified toolbar handle layout requests.
+    * Mac OS X only: Don't move the window's title bar when clicking on the
+      toolbar button.
+    * [164105] Made the unified toolbar handle showMaximized().
+    * [162555] Move OpenGL contexts when the toolbar button is pressed and
+      we are using the unified toolbar.
+    * [169063] Fixed a crash that could occur when setting a new menu bar
+      and the old one contained corner widgets.
+
+- QMdiArea
+    * [162573] Improved switching between maximized subwindows (less
+      flickering).
+    * [162046, 164264] Improved activation behavior.
+    * [170770] Fixed inconsistent behavior with scroll bars when a subwindow
+      is maximized.
+    * [169873] Fixed incorrect positions of tiled subwindows.
+
+- QMdiSubWindow
+    * [168129] Improved the way a default window icon is selected.
+    * [169859] Improved menu bar buttons for maximized subwindows.
+    * Improved support for size grips.
+    * [169543] Windows only (XP style): Fixed a problem where the frame
+      width was 1 pixel wider than it should have been.
+    * [168829] Fixed incorrect margins of maximized subwindows inside
+      QMainWindow.
+
+- QMenu
+    * [166652] Fixed a regression where context menus could not be triggered
+      with the right mouse button.
+    * [161789] Fixed a bug that prevented tear-off handles from being
+      activated when they were dragged down from the menu bar item.
+
+- QMenuBar
+    * [168892] Fixed bug that made the extension always appear when adding a
+      separator to a menu bar.
+    * [166181] Fixed bug that caused extensions to be misplaced.
+    * [166242] Fixed bug that could cause menus to be collapsed.
+
+- QMessageBox
+    * Ensured that the default button isn't lost when the modality of the
+      message box is changed.
+
+- QMacStyle
+    * Ensured that items with State_Focus actually get the focus ring drawn.
+
+- QNetworkProxy
+    * [170549] Fixed a regression from 4.2.3 in the default constructor; if
+      used before any other proxy settings were applied, it would fail to
+      initialize the proxy handlers, effectively disabling support for
+      SOCKS5 and HTTP proxies.
+
+- QOpenGLPaintEngine
+    * [166087] Fixed a memory leak caused by not releasing GL program
+      handles if they failed to compile.
+    * [166054] Ensured that push and pop operations are performed on the
+      texture matrix stack and the client state attributes when begin()
+      and end() are called.
+    * [161021] Fixed rendering of points with cosmetic pens with widths
+      greater than 0.
+
+- QPainter
+    * [158815] Fixed rendering artifacts for extended composition modes with
+      semi-transparent or anti-aliased drawing.
+    * [163744] Fixed aliased ellipse drawing artifacts (horizontal lines)
+      in raster engine.
+    * [166623] Fixed bug where gradients with ObjectBoundingMode would be
+      drawn at an incorrect offset.
+    * [167497] Fixed color bleeding artifacts at the edges when drawing
+      images/pixmaps with SmoothPixmapTransform on X11.
+    * [168621] Fixed bug which would cause projective transformations to be
+      incorrectly applied for non-top-level widgets.
+    * [168623] Fixed drawing of gradients with projective transformations.
+    * [167891] Fixed an assert in QBezier::shifted() that occured when
+      drawing certain paths.
+
+- QPlastiqueStyle
+    * [167145] Fixed a regression with combo and spin box text margins.
+
+- QPrintDialog
+    X11 only:
+    * [142701] Fixed an assert which could occur on a system with CUPS
+      setup, but no printers available.
+    * [165957] Added support to allow printers to be chosen from the
+      NPRINTER and NGPRINTER enviroment variables.
+      Ensured that CUPS command line options are not used when not using
+      CUPS.
+    * [158807] Fixed page ordering when printing to a CUPS printer or to PDF
+      files.
+    * [155129] Fixed Landscape printing with CUPS version < 1.2.
+
+    Windows only:
+    * [166054] Fixed a crash which could occur when trying to use a
+      QPrintDialog to configure a printer set to use
+      QPrinter::PostScriptFormat as output format.
+    * [162729] Fixed an assert that could occur when entering an invalid
+      page range.
+
+- QPrintEngine
+    * [166499] Windows only: Fixed a bug that could cause printing from a
+      QTextEdit to produce incorrect wrong results under certain
+      circumstances.
+    * [161915] Mac OS X only: Drawing vertical lines with a dot pattern now
+      work correctly on OS X 10.3.9.
+
+- QProcess
+    * [161944] QProcess::setReadChannel() no longer affects the contents of
+      the stderr / stdout / unget buffers. QProcess::readAllStandardError()
+      and QProcess::readAllStandardOutput() no longer clear any unget data
+      or buffered data.
+
+- QPixmap
+    * [167841] Fixed bug where filling a QPixmap with an alpha color would
+      fail to detach the pixmap, causing copies of the pixmap to be changed
+      as well.
+    * [157166] X11 only: Fixed problem with disappearing icons on 8-bit
+      TrueColor displays.
+    * [161307] Mac OS X only: Drawing bitmaps on pixmaps now works
+      correctly.
+
+- QRasterPaintEngine
+    * [166710] Fixed bug that prevented Qt::OpaqueMode from being taken into
+      account under certain circumstances when QPainter::fillRect() was
+      called.
+    * [159538] Fixed drawing of a monochrome image into another monochrome
+      image.
+    * [166000] Fixed compilation of mmxext optimizations.
+    * [156925] Fixed performance bug in 3DNow! optimizations.
+
+- QRegion
+    * [167445] Removed potential assert in QRegion::operator^ on Unix.
+
+- QScriptEngine
+    * [165899] Fixed bug where calling an overloaded slot from a script
+      would pick the wrong overload when the argument is a QObject.
+    * [166903] Fixed crash when evaluating a call to a script function that
+      ends with an if-statement with a true-part that ends with a return
+      statement (and has no else-part).
+
+- QScrollArea
+    * [167838] Use micro focus rectangle (if "active") instead of the entire
+      widget in ensureWidgetVisible().
+
+- QSortFilterProxyModel
+    * [167273] Fixed regression that caused QSortFilterProxyModel to assert
+      when changing data in a QSqlTableModel source model with the
+      OnFieldChange edit strategy.
+
+- QSqlQueryModel
+    * [166880] Fixed a bug where setQuery() could cause a crash by calling
+      hasFeature() on the wrong driver instance.
+
+- QSqlRelationalTableModel
+    * [140782] Fixed a bug which caused insertRecord() to fail when record()
+      returns a record containing duplicate field names.
+
+- QSslCertificate
+    * [168116] Don't crash when passing 0 to QSslCertificate::fromDevice();
+      issue a warning instead. This fix also removes warnings about
+      uninitialized symbols when accessing the static functions in
+      QSslCertificate before creating a QSslSocket.
+
+- QSslSocket
+    * [164356] Fixed a crash that could occur when passing a string to
+      setCiphers().
+    * [166633] Fixed a memory leak that would occur with each established
+      connection.
+    * [165962] Fixed support for wildcard certificates.
+    * [167593] Fixed a bug that caused QSslSocket::protocol() to be ignored
+      and set to the default of SSLv3 under certain circumstances.
+    * [167380] Fixed a crash when assigning a null key for SSL servers.
+    * [169571] Fixed a crash that could occur after disconnecting from a
+      remote address.
+
+- QTcpSocket
+    * [169183] Removed a qWarning() when reading from a closed socket
+      (regression from 4.2.3).
+
+- QTemporaryFile
+    * [167565] Fixed a regression from 4.2.3; size() would always return 0.
+
+- QTextEdit
+    * [161577] Fixed regression causing Shift-Backspace to be ignored.
+    * [165833] Fixed floating point overflow causing incorrect page heights
+      for text documents.
+    * [167377] Fixed performance regression when appending a lot of text in
+      NoWrap line break mode when there is a horizontal scroll bar.
+    * [163446] Fixed excessive emission of selectionChanged() signals when
+      moving the cursor.
+    * [167701] Fixed QTextEdit::setLineWrapMode to not change the
+      wordWrapMode property when called with NoWrap.
+
+- QTextDocument
+    * [160631] Fixed missing HTML export of page break policies.
+    * [163258] Fixed bug that prevented text table borders from being drawn
+      in QLabels and tool tips.
+    * [166670] Fixed layout bug that caused the right margin property of
+      paragraphs inside table cells to be ignored.
+    * [168406] Fixed rendering bug which would cause incorrect background
+      fills for paragraphs with a left margin set.
+
+- QTextLayout
+    * [166083] Fixed incorrect line breaking when breaking at a tab
+      character.
+    * [165861] Fixed support for QTextOption::NoWrap.
+
+- QLabel
+    * [162515] Fixed bug that prevented QLabel's alignment from being
+      applied properly to rich text.
+
+- QUrl
+    * Fixed a bug in QUrl::clear() which left some internal data uncleared.
+
+- QWidget
+    * [165177] Fixed crash that could occur when deleting a focus widget from a
+      window with a non-null parent.
+    * [165654] Fixed issue with incorrect repainting that could occur when
+      deleting an opaque child widget.
+
+- QWindowsVistaStyle
+    * [162730] Fixed the use of an incorrect font for item views on Windows
+      Vista.
+    * [157324] Improved the native appearance of indeterminate progress
+      bars.
+    * [170012] Fixed a bug which prevented the busy mode of a progress bar
+      from working when both its range and value were set to zero.
+
+- QWindowsXPStyle
+    * [132695] Fixed a crash issue that could occur after multiple system
+      theme changes.
+
+- QWizard
+    * [159684] AeroStyle: Fixed bug that caused the minimum height to be set
+      too low.
+    * [161670] AeroStyle: Fixed a problem that caused title bar buttons to
+      remaining glowing after the mouse had left the window.
+    * [161678] AeroStyle: Fixed a problem with incorrect vertical center
+      alignment of wizard buttons.
+
+- Q3Header
+    * [167283] Fixed regression in painting of the header.
+
+- Q3ListViewItem
+    * [165853] Fixed background coloring of a cell.
+
+- Q3Socket
+    * [163563] Fixed regression in canReadLine(); it now properly searches
+      all internal buffers.
+
+- Q3Table
+    * [168497] Fixed incorrect updates when using setUpdatesEnabled().
+
+- Q3Wizard
+    * [168195] Fixed bug that could cause the wrong page to be shown when
+      reopening a wizard.
+
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+- Interbase driver
+    * [149761] Added support for compiling Firebird 2.0 on 64-bit platforms.
+    * [165423] Fixed a regression causing an assert when calling a stored
+      procedure without out-parameters.
+    * [166238] Fixed a bug that caused only the first segment of multi-
+      segmented BLOBs to be retrieved in some cases.
+
+- ODBC driver
+    * [167167] Fixed a regression that caused a crash when checking DBMS
+      general information when connecting to a database.
+    
+- SQLite driver
+    * Use new sqlite3_prepare16_v2 instead of sqlite3_prepare16 when
+      possible.
+    * [167665] Fixed a regression that caused field names to be escaped
+      multiple times when selecting from views.
+    
+****************************************************************************
+*                               Examples                                   *
+****************************************************************************
+
+- Secure Socket Client
+    * New example, showing how to use QSslSocket to communicate over an
+      encrypted (SSL) connection.
+    
+- Accelerated Screen Driver
+    * Ensured that the example does not crash if it is unable to get a
+      pointer to the frame buffer.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+
+    * [163862] Fixed a bug where QClipboard would escape all non-ASCII
+      characters that were copied from GTK+ applications.
+    * [165182] Fixed building with the Intel C++ Compiler for Linux on
+      IA-64 (Itanium) (missing functions in qatomic_ia64.h)
+    * [163861] Fixed building on AIX 5.3 where the _POSIX_MONOTONIC_CLOCK
+      macro was accidentally redefined.
+    * [166650] Fixed a regression from 4.2.3 where calling QWidget::move()
+      in a reimplementation of QWidget::showEvent() did not work.
+    * [166097] QWidget::show() no longer overwrites the _NET_WM_STATE
+      property. Instead, QWidget now merges any existing _NET_WM_STATE
+      property together with its own state.
+    * Fixed the QAtomic implementation on the Alpha, which previously
+      caused all applications to hang on start-up.
+    * [165229] Changed the linux-lsb-g++ specification to avoid linking with
+      libGLU (which is not part of the LSB specification).
+    * [155083, 146833] Ensure that all font substitutions from fontconfig
+      are obeyed by using a strong binding for QFont's family with
+      fontconfig.
+
+Windows
+-------
+
+    * [169105] Fixed a regression where calling resize() on a minimized
+      window did not work.
+    * [169376] Fixed a race condition that would cause a crash when
+      stopping timers in a thread.
+    * [165440] Fixed a crash that could occur when using Google's Pinyin
+      input method with Qt.
+
+Mac OS X
+--------
+
+    * QMake's Xcode generator is now more robust when determining which
+      version of Xcode projects it should generate. It also uses launch
+      services to determine Xcode's location as well.
+    * Small changes to be more Leopard compatible
+    * [167020] Ensured that the translations are really included in the
+      binary package.
+    * [164530] Ensured that the DPI for fonts don't change when the
+      resolution changes.
+    * [165530] Fixed a bug that caused Q_DECLARE_METATYPE() in a
+      precompiled header to interfere with the Objective-C 'id' keyword.
+    * [165659] Fixed bold/italic font rendering for some fonts.
+
+Qtopia Core
+-----------
+
+    * Fixed support for bitmap fonts.
+    * [164297] Fixed a potential crash in accelerated paint engines.
+    * [160970] Fixed support for 1-bit black and white screens.
+    * [164783] Fixed bug in 4-bit grayscale support which resulted in pink
+      colors under certain circumstances.
+    * [164955] Fixed painting error when using QWidget::move().
+    * [166368] Fixed bug in QWidget::setFixedSize() when using multiple
+      screens.
+    * [165686] Fixed bug in QPixmap::grabWindow() when using multiple
+      screens.
+    * [130925] Fixed use of QWSWindowSurface::move() when acceleration is
+      available.
+    * [143865] Implemented QWSCalibratedMouseHandler::getCalibration()
+      properly to fill all return values.
+    * [161820] Fixed incorrect detection of glib libraries when cross-
+      compiling.
+    * [152914] Improved the framebuffer test example.
+    * [171454] Fixed painting errors when zooming in QVFb.
+
+
+****************************************************************************
+*                   Important Behavior Changes
+****************************************************************************
+
+- QScrollArea
+    * [167838] Use micro focus rectangle (if "active") instead of the entire
+      widget in ensureWidgetVisible().
diff --git a/dist/changes-4.3.2 b/dist/changes-4.3.2
new file mode 100644
index 0000000..2bec4e6
--- /dev/null
+++ b/dist/changes-4.3.2
@@ -0,0 +1,604 @@
+Qt 4.3.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.3.0 and Qt 4.3.1.
+
+The Qt version 4.3 series is binary compatible with the 4.2.x, 4.1.x and
+4.0.x series. Applications compiled for Qt 4.0, 4.1 or 4.2 will continue to
+run with Qt 4.3.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Legal
+    * This version adds the Academic Free License 3.0, Artistic License 2.0,
+      Zope Public License 2.1 and Eclipse Public License to the GPL
+      Exception for developers using the Open Source Edition of Qt.
+      See the Trolltech GPL Exception Version 1.1 page in the documentation
+      for more information.
+
+Tools
+-----
+
+- Designer
+    * [175822] Fixed incorrect behavior of the widget editing mode that
+      could occur when a form was resized.
+    * [174797] Fixed a crash that could occur when several commands were
+      redone in one go.
+
+Build System
+------------
+
+    * Enabled MSVC project generator for the Qt Open Source edition.
+    * Ensured that the QMAKE_CC and QMAKE_CXX variables are not defined in
+      the Xcode project generator to allow distributed (distcc) builds to
+      work again.
+    * [165183] Make DESTDIR work again in the Xcode generator.
+    * Fixed a bug in escape_expand() that could cause text to be corrupted.
+    * Updated the compiler notes for version 10.0.026 of the Intel C++
+      Compiler for Linux. Precompiled header support has been fixed in
+      this version of the compiler, so the -no-pch workaround is no longer
+      needed. Note that there is still one outstanding bug in the 64-bit
+      compiler that requires configuring and building Qt with -debug.
+    * Updated the compiler notes for HP-UX platforms and compilers.
+    * Introduced support for 32-bit builds on HP-UXi Itanium: hpuxi-acc-32.
+    * [163661] Fixed the dependency generator for ActiveQt server projects
+      and certain custom compilers
+    * [169756] Fixed mocinclude.tmp usage for Visual Studio 6.0 project
+      files for cases where the length of the includes exceeds the amount
+      allowed on the command line.
+    * [166407] Fixed the generated target rules when using YACCSOURCES.
+    * [156948] Ensured that QTPLUGIN libraries come before the Qt libraries
+      on the link line.
+    * Ensured that support for libtiff is not built if Qt is configured
+      without zlib support.
+    * [172629] Ensured that syncqt does not generate zero-size master
+      include files for modules that are not found.
+    * Fixed generation of dependencies for EXTRA_TARGETS.
+    * [159113] Ensured that the description for the Post Link build step in
+      VS 2003 does not contain any \n characters.
+
+I18n
+----
+    * Fixed a crash in lupdate/lrelease that could occur if the XML parser
+      reported an error.
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Qt Script
+    * QScriptEngine::evaluate() no longer throws a syntax error in the case
+      where the script contains no actual statements.
+    * [175714] Fixed parsing of octal numbers on Windows and Mac OS X.
+
+- Style Sheets
+    * QMainWindow now respects the background-image style property.
+    * [171858] Ensured that QPushButton uses the correct color when the
+      text-align property is set.
+    * Fixed various bugs in QMenu styling.
+    * [168286] Fixed a bug that prevented the background from being clipped
+      correctly when the border-radius and background-clip properties were
+      defined.
+    * Fixed a QComboBox styling bug where the popup would show an extra row
+      when a style sheet was used.
+    * [177168] Fixed a memory leak where QStyleSheetStyle is never
+      destroyed.
+    * [172315] Fixed a stack-overflow when using the isActiveWindow
+      property as a selector.
+
+- Text rendering
+    * [168625] Fixed rendering of text with perspective transforms on X11
+      and Qtopia Core.
+    * [173792] Fixed transformed rendering of non-scalable/bitmap Freetype
+      glyphs.
+
+- QAbstractItemView
+    * [168493] Fixed drag and drop regression when a parent item in a tree
+      doesn't allow item to be dropped on it.
+    * [174848] Fixed a crash that could occur if the row currently being
+      edited was removed.
+
+- QCalendarWidget
+    * [171532] Fixed keyboard navigation (pressing "w" doesn't select the
+      "Wed" cell anymore).
+    * [173852] Fixed SingleLetterDayNames mode for the Chinese language.
+
+- QColorDialog
+    * [153436] Fixed a crash in QColorDialog that could occur when choosing
+      a color in the Gray colorspace.
+
+- QColumnView
+    * Ensured that selectAll() selects all items in cases where the
+      selection range contained multiple items.
+    * [170751] Fixed incorrect selection behavior caused by clicking on a
+      previously selected folder.
+    * [170753] Prevented items from being reselected on deselection in some
+      cases.
+    * [170753] Ensured that the full path is selected when passing an index
+      to select.
+    * [170753] Fixed a bug that could occur when deselecting an item that
+      caused its parent to be deselected.
+
+- QCoreGraphicsPaintEngine
+    * [170352] Fixed aliased strokes that were drawn 1 pixel too far to the
+      left on Mac OS X versions < 10.4.
+    * [172006] Fixed point drawing with a scaled painter on Mac OS X.
+
+- QDataWidgetMapper
+    * [172427] Fixed a crash that could occur when submitting data from the
+      mapped widget to the model.
+
+- QDateTimeEdit
+    * [118867] Fixed a bug that prevented valid values from being entered
+      when certain range restrictions were applied.
+    * [171920] Fixed a bug with parsing long day names.
+
+- QDir
+    * [176078] Fixed a crash that could occur when entering directories with
+      very long path entries.
+
+- QDirIterator
+    * [176078] Fixed a crash that could occur when entering directories with
+      very long path entries.
+
+- QDockWidget
+    * [174249] Fixed bug where it was possible to dock into a minimized
+      QMainWindow.
+
+- QFile
+    * [175022] Fix regression in handle() on Windows.
+
+- QFileDialog
+    * Fixed possible deadlock.
+    * Ensured that selection changed signals are reconnected when setting a
+      filter on a dialog.
+    * [171158] Fixed a crash that could occur when using the Forward button
+      to navigate into a folder that was deleted.
+    * [166786] (Windows) Fixed bug that prevented some files from being
+      shown in certain cases.
+    * [165289] (Windows) Fixed issue that caused UNC paths to be ignored
+      when used as initial paths for a file dialog.
+    * [140539] (Windows) Dialog no longer accesses floppy drives
+      automatically when launched.
+
+- QFontDatabase
+    * [176450] Added some missing tr() calls and made all strings
+      localizable.
+
+- QFSFileEngine
+    * [177363] Fixed a bug in fileTime() that caused the time returned to
+      depend on whether or not it was called during a Daylight Saving Time
+      period.
+
+- QGLPixelBuffer
+    * [179143] (Windows) Fixed a memory leak that would occur when a
+      QGLPixelBuffer was deleted. This would appear as a slowdown in
+      performance to the user.
+
+- QGLWidget
+    * [169131] Fixed an issue with renderPixmap() where text drawn with
+      renderText() was clipped to the size of widget, not the resulting
+      pixmap.
+    * [175513] Fixed an issue with renderText() which would cause artifacts
+      when bitmap fonts were used.
+    * [172474] (Windows) Fixed an issue with disappearing text when using
+      renderText() together with renderPixmap().
+    * [173944] (Mac OS X) Fixed a crash that could occur when requesting a
+      GL context with an overlay.
+
+- QGraphicsItem
+    * [174299] Fixed and improved bounding rect calculations for most
+      standard items.
+
+- QGraphicsScene
+    * [174450] Flat items are now rendered correctly also when NoIndex is
+      set.
+
+- QGraphicsTextItem
+    * [174429] This item now respects QGraphicsItem::ItemClipsParentToShape.
+
+- QGraphicsView
+    * (X11) A workaround has been applied to resolve random clipping errors
+      that would sometimes leave trailing artifacts and horizontal/vertical
+      white lines in the viewport.
+
+- QHeaderView
+    * [178483] Prevented crash that could occur when recomputing the layout
+      under certain conditions.
+
+- QHttp
+    * [176822] Fixed a bug that caused POST requests to submit an empty body
+      after a proxy authentication request.
+    * [176403] QHttp no longer resets proxy settings on sockets set with
+      QHttp::setSocket() (regression from 4.2.3).
+    * [175170] Prevent live lock when response ends with a stray '\r'.
+    * [172763] Fixed a bug that caused QHttp to ask the proxy server to
+      connect to the wrong address when in SSL (non-caching) mode.
+    * [172775] Fixed the emission of the done() signal under some conditions
+      (mostly SSL only).
+
+- QImage
+    * [176831] Fixed a bug that caused conversions to Format_RGB16 to give
+      incorrect colors.
+    * [169908] Fixed a crash that could occur when reading 4 bits per pixel
+      uncompressed BMP images.
+
+- QItemDelegate
+    * [173969] QDoubleSpinBox editors now allow negative input.
+    * [179119] Item checkboxes were rendered without a margin.
+
+- QLabel
+    * Fixed a crash that could occur when changing the contents of a label
+      in a slot connected to the linkActivated() signal.
+
+- QLayout
+    * Fixed a performance regression from Qt 4.2 related to the introduction
+      of QStyle::layoutSpacing().
+
+- QLibrary
+    * [178304] Fixed a bug that caused a crash if QLibrary::errorString()
+      was called before QLibrary had a file name associated with it.
+
+- QListView
+    * [270837] Fixed assert that could occur when setting a root index with
+      no children in icon mode.
+
+- QMainWindow
+    * [175479] Fixed unified toolbar handling on Mac OS X to prevent
+      assertions in the layout engine.
+    * [174575] Several crashes fixed.
+
+- QMdiArea
+    * [173391] (Windows) Fixed bug where a subWindowActivated() signal was
+      not emitted when the top-level window was minimized.
+    * [173628] Fixed bug that could cause an endless resize loop when using
+      Qt::ScrollBarAsNeeded as the scroll bar policy.
+
+- QMdiSubWindow
+    * [176769] Fixed bug where the title bar font was not updated on
+      QEvent::FontChange.
+    * [173087] Ensured that double-clicking the system menu closes the
+      window.
+    * [173363] Fixed bug where the title bar was not immediately updated
+      after changing the window title.
+
+- QMenu
+    * [111348] QMenu now takes focus with the QPopupMenuReason.
+    * [176201] Fixed possible crash when clearing the menu from a triggered
+      signal.
+
+- QPainter
+    * [168621] Fixed an offset bug in drawing with perspective transforms.
+    * [172017] (X11 and OpenGL) Fixed drawing of non-cosmetic points with
+      the FlatCap cap style.
+    * [175010] Fixed some bugs related to dash offsets.
+    * [170517] Fixed issue with missing tab stops when painting to a
+      printer.
+
+- QPainterPath
+    * Fixed the behavior of addText() when used with italic fonts.
+    * [178515] Fixed QPainterPath::pointAtPercent() to work correctly on
+      line segments in a path.
+
+- QPicture
+    * [168621] Ensured that the correct scale is used when rendering to a
+      device with different x and y resolutions.
+
+- QPixmap
+    * Ensure that the proper color space is used in QPixmap::grabWindow() on
+      Mac OS X.
+
+- QPlastiqueStyle
+    * [174104] Fixed a regression in Plastique that caused spin boxes to
+      have incorrect heights.
+
+- QRasterPaintEngine
+    * [169997] Fixed aliased rendering of complex paths with a large number
+      of subpaths.
+    * [174914] Fixed use of QPainter::setOpacity() when drawing a pixmap
+      into a 16-bit buffer.
+    * [177919] Fixed a problem with drawing bitmaps.
+    * [177654] (Windows) Fixed an issue with transformed bitmaps being
+      returned as pixmaps.
+
+- QSqlQuery
+    * [173710] Fixed a bug that caused value() to return null-variants
+      instead of real values after re-executing a prepared query.
+
+- QSqlRelationalTableModel
+    * [176374] Fixed an unfortunate change in 4.3.0. Display column names
+      were aliased to prevent duplicate column names in records in order to
+      fix a bug in insertRecord().
+      However all display columns were always aliased - even when not
+      necessary. From now on, display column names will only be aliased when
+      there are name clashes, and only the conflicting columns will be
+      aliased.
+
+- QSqlTableModel
+    * [170783] Fixed a bug that caused empty rows to be displayed in a
+      QTableView when a new model was set on the view. This was caused by
+      QSqlTableModel emitting the rowsAboutToBeInserted() and rowsInserted()
+      signals even when the new model was empty.
+
+- QSslSocket
+    * [177198] Fixed the emission of the proxyAuthenticationRequired()
+      signal.
+    * [174625] Ensured that only one attempt is made to resolve OpenSSL
+      symbols.
+    * [173734] Removed two memory leaks.
+    * [172285] (Windows) Fixed link error that occurred when Qt was built
+      as a static library with OpenSSL enabled.
+
+- QSvgGenerator
+    * [167921] Fixed a rounding error; improved precision.
+    * [167921] Allow rendering to a device that's not open; warn if the
+      device is not writable.
+    * [167921] Fixed a bug that caused QSvgGenerator to confuse 'cm' units
+      with 'mm' units.
+
+- QSvgRenderer
+    * [172550] Fixed incorrect linear gradient parsing for certain SVGs.
+    * [175651] Fixed a crash that could occur when loading SVGs with
+      undefined URLs.
+
+- QTableView
+    * [171128] Fixed painting problems caused by deleting hidden rows.
+    * [175462] Fixed a bug where the region for selection spanning items was
+      calculated incorrectly.
+
+- QTcpSocket
+    * Fixed a crash that could occur when using SOCKS5 proxy before
+      constructing a QCoreApplication.
+    * [174517] (Windows) Prevented stalling when connecting to offline
+      hosts.
+
+- QTextBrowser
+    * [173945] Fixed bug that could prevent scrolling to an anchor in an
+      HTML file from working successfully.
+
+- QTextEdit
+    * [171130] Fixed bug that could occur when appending text lists to a
+      document, causing the first list element to be treated as normal text
+      instead of a list element.
+    * [172367] Fixed a bug that caused the result of setPlainText() to use
+      HTML attributes if preceded by a call to setHtml().
+    * [173574] Fixed a bug that prevented floating image links from being
+      clickable.
+    * [174276] Fixed resizing performance in cases where wrapping is
+      disabled.
+    * [172646] Fixed a bug that caused leading spaces in marked up text to
+      be lost when the text was copied and pasted.
+
+- QTextLayout
+    * Fixed a regression in the line breaking algorithm that lead to wrong
+      results for justified text.
+
+- QTextStream
+    * [174516] (Windows) Fixed a bug in readLine() when reading "\r\r\n"
+      from devices opened in QIODevice::Text mode.
+
+- QToolBar
+    * [270967] Fixed the behavior of floating toolbars.
+
+- QTreeView
+    * [171947] Fixed a bug that prevented alternate colors in an inactive
+      QTreeView from being painted with the correct inactive palette role.
+    * Prevented a number of possible crashes that could occur when there are
+      pending changes.
+    * [177165] Fixed a bug that caused minimum column widths to become
+      independent of the width of the text in the header.
+    * [177945] (Mac OS X) Fixed a crash that could occur when dragging over
+      an empty region.
+    * [174437] Fixed a bug that made it possible to interactively change
+      the check state of an item, even if it was disabled.
+    * [172426] Fixed a segmentation fault in QModelIndex that would occur
+      when showing QTreeView with QSortFilterProxyModel and delayed layout
+      changes were pending.
+
+- QTreeWidget
+    * [174396] Fixed an issue that could cause setItemExpanded() to fail.
+    * [172876] Ensured that itemBelow() and itemAbove() return correct
+      values.
+    * [171271] Fixed a possible crash caused by updating items too quickly.
+
+- QUtf8Codec
+    * [175794] Fixed an off-by-one buffer overflow bug.
+
+- QWidget
+    * [157496] (Windows) Fixed a memory leak in setWindowIcon().
+    * [175114] Fixed issue with missing update after hiding a child of a
+      hidden widget.
+    * [176455] Fixed a regression that prevented a parent layout from being
+      invalidated in certain situations if the widget had a fixed size.
+
+- QWizard
+    * [177716] Ensured that the commit button is enabled and disabled
+      correctly according to QWizardPage::isComplete().
+
+- QX11PaintEngine
+    * [173977] Fixed drawing of tiled bitmaps into a bitmap when XRender is
+      used.
+    * [175481] Fixed a crash that could occur when performing complex
+      transformations with a QRegion.
+
+- Q3Action
+    * [175536] Fixed a formatting error in the tool tip string
+      representation of actions with shortcuts.
+
+- Q3ButtonGroup
+    * [177677] Fixed a application freeze that could occur when resetting
+      the ID of a button inside a button group.
+
+- Q3FileDialog
+    * [165470] Fixed broken scrolling behavior that occurred after toggling
+      between detail/list view mode.
+
+- Q3Header
+    * [176202] Fixed memory leak when replacing icons using setLabel().
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+Build System
+------------
+
+- Q3ToolBar
+    * [176525] Ensured that the tool buttons of a vertical tool bar are
+      center-aligned instead of left-aligned.
+
+I18n
+----
+    * Fix crash in lupdate/lrelease that occured if the xml parser threw an error.
+
+Linguist
+--------
+
+    * [276076] Let Linguist show existing translations to other languages
+      as "auxillary sources" 
+
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+- Interbase driver
+    * [175144] Fixed a build issue that prevented the QIBASE driver from
+      being built at the same time as the QODBC driver if Firebird header
+      files older than v2.0 were used.
+    * [177530] Fixed a regression introduced in Qt 4.3.0 that broke stored
+      procedure support for Interbase/Firebird. When executing a procedure
+      without parameters, the values were not retrievable.
+
+****************************************************************************
+*                               Examples                                   *
+****************************************************************************
+
+- Draggable Text Example
+    * Fixed usability bugs.
+
+- Torrent Client Example
+    * Several stability fixes have been applied.
+
+- Ported Asteroids Example
+    * Modifications to significantly improve performance.
+
+- Ported Canvas Example
+    * [139392] Prevented a crash that could occur when adding items after
+      shrinking the canvas to zero width and zero height.
+
+- Secure Socket Example
+    * [173550] Usability fixes.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+    * [169366] Fixed intermittent program hangs in the 64-bit PowerPC
+      implementation used on AIX.
+    * [176192] Fixed the behavior of show() followed by move() to correctly
+      place the window when called before the event loop is running.
+    * [133870] Fixed crashes in the 64-bit PowerPC implementation used
+      on Linux.
+    * [177143] Fixed a bug where the last activated QShortcut would be
+      incorrectly repeated when pressing a key with no KeySym defined.
+    * [171224] Fix copy and paste of non-ASCII text from Qt 3 to Qt 4
+      applications.
+    * Applied a workaround for a bug in gcc 3.4.2 that would cause 64-bit,
+      bootstrapped applications to crash on Solaris.
+    * [170792] Fixed subpixel anti-aliasing of fonts across X11
+      server/clients with different endianness.
+
+Windows
+-------
+    * [172621] Fixed an issue that caused large pixmaps to be printed
+      incorrectly.
+    * [170000, 171239, 173213] Fixed several issues with printing that
+      resulted in single and multipage printing being garbled.
+    * [168642] Fixed an issue with text disappearing when printing.
+    * [175517] Fixed a crash that could occur when calling setNumCopies() on
+      an invalid/non-existing printer.
+    * [173219] Fixed an issue that caused fonts to be incorrectly scaled
+      beyond 64 point font sizes.
+    * [276527] Fixed a memory leak in QWindowsVistaStyle.
+
+Mac OS X
+--------
+    * Note for Leopard pre-release builds: Qt 4.3.x applications running on
+      the August Leopard pre-release (build 9A527) will not show any windows
+      because of a regression in the Carbon library. This has been addressed
+      for a future OS X release. In the meantime, if you *must* test your
+      application against this Leopard build, please contact Trolltech.
+    * [178551] Fixed a regression that made it impossible to deliver mouse
+      move events to other widgets after a double-click on a widget that was
+      immediately hidden as a result of the double-click event.
+    * [172475] Ensured that OpenGL top-level widgets are not repainted when
+      another, independent, top-level widget is resized.
+    * Ensured that the maximized bit is removed when a window is resized by
+      user interaction.
+    * [170000] Fixed an issue that caused QPrinter::newPage() to incorrectly
+      reset the current QPainter state.
+    * [178531] Fixed an OpenGL text rendering issue that could cause garbled
+      text.
+    * [171173] Fixed a crash at application exit that could occur if
+      accessibility features had been used.
+    * [175164] Fixed a regression where font base lines for labels,
+      checkboxes and radio buttons were not properly aligned.
+    * [173007] Fixed a regression that prevented qt_mac_set_native_menubar()
+      from working.
+    * [130809] Ensured that bold fonts are used correctly when generating
+      PDFs.
+    * [164962] Improved support for Mac drawers in QMainWindow.
+
+Qtopia Core
+-----------
+    * Ensured that the font database cache is preserved across QWS server
+      restarts.
+    * Made some start-up time improvements for the server process.
+    * [272527] Fixed a bug in the internal crash handler that released
+      resources in some non-fatal incidents.
+    * [169569] Fixed a bug that caused uninitialized data to be blitted to
+      the screen when a window was shown and resized before the first paint
+      event.
+    * [274291] Added support for setting the QT_QWS_FONTDIR environment
+      variable to set the font installation path.
+    * [174264] Fixed synchronization of QDirectPainter::startPainting() to
+      be able to guarantee that QDirectPainter::allocatedRegion() returns
+      the correct result.
+    * [175994] Fixed missing updates in parent and sibling widgets when
+      using the QWindowSurface::buffer() and QWindowSurface::flush()
+      mechanism to paint outside a paint event.
+    * [170488] Implemented true synchronous behavior when creating a
+      QDirectPainter with the ReservedSynchronous flag.
+    * [275284] Fixed implementation of the Hybrid OpenGL integration.
+    * [178269] Fixed loading of the VNC screen driver when compiled as a
+      plugin.
+    * [178261] Fixed loading of the Transformed screen driver when compiled
+      as a plugin.
+    * [276651] Fixed mouse calibration in some configurations when using the
+      tslib mouse driver.
+    * [173037] Fixed re-entrancy problem that could cause
+      QClipboard::mimeData() to block in some situations.
+    * [174076] Added the QWS_CONNECTION_TIMEOUT environment variable to
+      allow the time out to be customized for client applications connecting
+      to the QWS server.
+    * [167661] Added support to enable some "broken" BMP images to be
+      rendered correctly.
+    * [176445] Added support for the Glib event loop; this is disabled by
+      default.
+    * Added livelock protection: events from the QWS server can no longer
+      starve local timer events or posted events.
diff --git a/dist/changes-4.3.3 b/dist/changes-4.3.3
new file mode 100644
index 0000000..5bf6da0
--- /dev/null
+++ b/dist/changes-4.3.3
@@ -0,0 +1,358 @@
+Qt 4.3.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.3.0 through Qt 4.3.2.
+
+The Qt version 4.3 series is binary compatible with the 4.2.x, 4.1.x and
+4.0.x series. Applications compiled for Qt 4.0, 4.1 or 4.2 will continue to
+run with Qt 4.3.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Legal
+
+    * This version adds the Common Development and Distribution License
+      (CDDL) to the GPL Exception for developers using the Open Source
+      Edition of Qt.
+      See the Trolltech GPL Exception Version 1.1 page in the documentation
+      for more information.
+    * This version upgrades the Qt Commercial License to version 3.4,
+      the Qtopia Core Commercial License to 1.2 and the Qt Academic
+      License to 1.4
+
+Build System
+------------
+
+    * [177865] Fixed the Unix configure script to correctly identify
+      g++ 4.3.0 as "g++-4" in the build key.
+    * [186588] Added the missing QSsl forwarding header file.
+    * [181414] Fixed an issue that caused moc to bail out on C++0X >> as
+      used in some templates.
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+- QDir
+    * [186068] Fixed documentation for QDir::CaseSensitive.
+    * [177988] Fixed a regression from 4.2.3 causing entryList() to ignore
+      QDir::System.
+
+- QDirIterator
+    * [185502] Fixed fileInfo() which could return an incorrect value for
+      some paths.
+
+- QDockWidget
+    * Fixed an issue that caused close buttons of dock widgets to be hidden
+      when they were resized to their minimum sizes.
+    * [180199] Dock widgets with vertical title bars can now be re-docked
+      on Mac OS X.
+    * [184668] Fixed crash that could occur when setting the title bar
+      widget twice.
+
+- QFileDialog
+    * [178894] Fixed a bug that prevented the OK button from being enabled
+      when there were files selected, but no current file.
+    * [179146] Fixed abug in selectFile() that prevented the selection from
+      being cleared when called with an empty string.
+    * [279490] Ensured that filesSelected() is emitted in AnyFile mode and
+      directoryEntered() is emitted when the sidebar is clicked.
+    * [277161] Fixed a bug that caused incorrect permissions for files to be
+      obtained, resulting in the Delete action being incorrectly enabled.
+    * [184314] Fixed an assertion in completer on Windows and fixed top-
+      level completion on all platforms.
+
+- QGLWidget
+    * [177996] Fixed a crash that could occur when drawing QImages created
+      outside of the GUI thread.
+    * [180832] Fixed potential crashes in renderText().
+
+- QGraphicsScene
+    * [182442] Fixed regression from 4.2 that could cause a crash when
+      deleting a scene being viewed by more than one view.
+
+- QGraphicsTextItem
+    * [181027] Fixed regression from 4.3.0 that caused movable text items to
+      jump around.
+
+- QHeaderView
+    * [178483] Fixed crash that would occur when attempting to compute a
+      visual index for an invalid model index.
+    * [182501] Fixed regression that caused stretched sections to use the
+      minimum size when not visible.
+
+- QTableView
+    * [175328] Fixed grid drawing errors in table views containing spanned
+      items.
+
+- QListView
+    * [184204] Fixed broken layout in right-to-left mode with no horizontal
+      scroll bar.
+
+- QTreeView
+    * [182041] Fixed problem with drag and drop in cases where the columns
+      were swapped.
+    * [186624] Fixed branch expanding animation.
+
+- QItemDelegate
+    * [181221] Fixed problem with the rectangle that was used to check the
+      mouse coordinates when clicking on the check box.
+
+- QHttp
+    * [178715] Fixed a problem where QHttp would not correctly parse the
+      server response if Content-Length was 0 and authentication was
+      required.
+    * [170860] Fixed a problem where QHttp would emit the done() signal
+      if the HTTP proxy server closed the connection after requesting
+      authentication.
+
+- QLabel
+    * [173188] Fixed QLabel::setAlignment(Qt::AlignJustify) to have the
+      desired effect.
+
+- QMainWindow
+    * [154834] Fixed restoreState() to be able to load data from previous
+      minor releases.
+    * [179713] Fixed failed assertions when inserting toolbars.
+    * [180824] Fixed a crash when removing a toolbar on a main window with
+      the unifiedTitleAndToolBarOnMac property set.
+
+- QMdiArea
+    * [185281] Fixed a bug where closing a modal dialog caused a different
+      sub-window to be activated.
+
+- QMdiSubWindow
+    * [183647] Improved WindowBlinds support.
+    * [188849] Fixed a crash that occurred when using a regular QWidget as
+      the menu bar in a QMainWindow.
+
+- QMenuBar
+    * [173556] Fixed a bug where the corner widgets did not swap sides when
+      changing layout direction.
+
+- QProcess
+    * [180836] Fixed issue with defunct processes on Unix.
+
+- QPainter
+    * Made the QPainter::drawText() overload with the QTextOption argument
+      support justified text.
+    * [179726] Fixed a problem with the bounds calculation for handling
+      fallback in certain painting operations. This could be perceived as a
+      clipping bug on some platforms.
+
+- QPainterPath
+    * [169280, 170046, 173034] Fixed cases where calling
+      QPainterPath::united(), QPainterPath::intersected(), or
+      QPainterPath::subtracted() would cause infinite loops or would not
+      produce the expected result.
+    * [178260] Fixed a bug in the stroking of painter paths which could
+      cause uninitialized data access for paths with extreme curvature.
+    * [183725] Fixed a bug where intersecting a path against itself would
+      return an empty path.
+
+- QPixmap
+    * [178986] Fixed a regression from 4.2: image/pixmap scaling caused the
+      sampling to be shifted by half a pixel.
+
+- QRasterPaintEngine
+    * [177919] Fixed a problem with drawing bitmaps.
+
+- QScriptEngine
+    * Fixed the parsing of large numbers (larger than 2^32).
+
+- QStyle
+    * [186511] Fixed the default QStyle() constructor to create a
+      QStylePrivate object, which is required by QStyle::layoutSpacing().
+
+- QStyleSheet
+    * [178598] Fixed a memory leak when using border images.
+    * [175722] Fixed a bug which broke mouse handling in checkbox items
+      when styling the check mark.
+
+- QStyleSheetStyle
+    * [182862] Setting a stylesheet with background-image on QMenu::item
+      now works.
+
+- QSvgGenerator
+    * [176705] Fixed a bug which caused radial gradients to produce
+      malformed XML output.
+    * [182196] Fixed a regression which caused gradient fills to be stored
+      as image data instead of native data.
+    * [182244] Fixed a bug in SVG export of ObjectBoundingMode gradients.
+
+- QStringListModel
+    * [180184] Fixed a bug that prevented sorting from updating persistent
+      model indexes.
+
+- QTableView
+    * [182210] Fixed a bug which caused the table view to hang when it had
+      views with 100,000,000 rows.
+
+- QTextBrowser
+    * [176042] Fixed incorrect behavior with selectAll() that caused it to
+      select all links if a link had the focus.
+
+- QTextDocument
+    * [177489] Fixed a bug in page breaking of text frames which could cause
+      missing page breaks and overdrawing.
+
+- QTreeView
+    * Fixed a possible crash that could occur when setting scrollPerPixel
+      while height was 0.
+    * [178771] Fixed an assertion that could occur when pressing the left or
+      right arrow key when the root index had no children, but when the
+      current index had not been set to invalid.
+    * [182618] Improved the performance of adding expanded or spanned items.
+    * [184072] Improved the performance of hiding rows.
+
+- Q3DockWindow
+    * [176167] Fixed an issue that made it impossible to move a Q3DockWindow
+      with the mouse if it did not have a title.
+
+- Q3ToolBar
+    * [182657, 185381] Fixed crashes caused by calling clear() and then
+      re-adding items.
+
+- Q3Wizard
+    * [176548] Fixed a crash caused by calling removePage() before a wizard
+      is shown.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+
+- QApplication
+    * Fixed a bug that could cause a programmer specified application font
+      to be overridden by the automatically-detected system font.
+
+- QCUPSSupport
+    * [180669] QCUPSSupport::QCUPSSupport() no longer crashes when the CUPS
+      library cannot be loaded.
+
+- QPrintDialog
+    * Fixed a bug that caused the selected file to be truncated before the
+      overwrite dialog was shown.
+
+- QWidget
+    * Fixed a bug that caused QWidget::windowState() to return an incorrect
+      state after restoring a maximized window.
+
+- QX11EmbedContainer
+    * [186819] Fixed embedClient() to not cause an X server lock-up when
+      passed an invalid window ID.
+
+  HP-UX
+  -----
+    * [179538] Fixed a bug that caused uic3 to hang in q_atomic_lock()
+      on PA-RISC based HP-UX machines.
+    * [177397] Fixed a QGL module compile problem on HP-UX systems.
+
+Windows
+-------
+
+- QFileDialog
+    * Fixed occasional crashes when dealing with the system icons.
+    * [175041] [181912] Ensured that shortcuts are handled correctly.
+    * Fixed a crash that could occur when opened with QDir::temp() as the
+      initial path.
+
+- QGLPixelBuffer
+    * [177154] Fixed support for floating point buffers with NVIDIA hardware
+      through the GL_NV_float_buffer extension.
+    * [179143] Fixed a memory leak that could occur when deleting a
+      QGLPixelBuffer.
+
+- QPixmap
+    * [185715] Fixed an assertion that could occur when reading icon
+      information for file types.
+
+- QPixmapCache
+    * [182363] Fixed a crash that could occur when inserting a null pixmap.
+
+Mac OS X
+--------
+
+- Fixed multiple issues preventing binaries built on Leopard from being
+  deployed on Tiger and Panther systems.
+
+- QCoreGraphicsPaintEngine
+    * [170352] Fixed a problem where all aliased strokes were offset by
+      1 pixel to the left on Mac OS X < 10.4.
+    * [172006] Fixed a problem with drawing points when FlatCap or
+      SquareCap was set as the pen style.
+
+- QGLWidget
+    * [181819] Fixed a bug that caused the contents of QGLWidgets not to
+      be moved or updated.
+
+- QCheckBox
+    * [182827] Fixed a crash caused by deleting a QCheckBox in an event
+      posted from the toggled() slot.
+
+- QDialog
+    * [281331] Fixed a bug that caused a QDialog with a modal parent to not
+      be modal.
+    * [279513] Fixed a bug that could occur when using the
+      Qt::WindowStaysOnTopHint flag on dialogs that would cause the drop down
+      menu to be hidden.
+
+- [180466] Ensured that an Embedded HIWebView in a floating window will
+  receive an activation.
+
+- Fixed brushed metal windows on Leopard.
+
+- Made QMenus have proper rounded edges on Leopard.
+
+- Fixed a regression that caused text to always be rendered with anti-
+  aliasing in OpenGL.
+
+- [179882] Fixed a regression where applications with both full-screen and
+  non-full-screen windows could get into an indeterminate state.
+
+- [182908] Fixed a crash on PPC which was caused by using a static Qt in a
+  plugin in another application.
+
+Qtopia Core
+-----------
+
+    * [179060] Fixed a potential crash when Qtopia Core is compiled without
+      FreeType support.
+    * [187589] Fixed a problem that caused windows not to appear on screen
+      when using gcc 4.1.1 ARM EABI toolchains.
+    * [179533] Fixed temporary blitting of uninitialized data to the screen
+      areas of some windows when they are shown for the first time.
+    * [180487] Fixed the use of FreeType fonts for unprivileged processes
+      in a LIDS environment.
+    * [179883] Fixed the use of -D QT_QWS_DEPTH_GENERIC configure options
+      when using a transformed screen driver.
+    * [182150] Fixed the use of incorrect colors that resulted from using
+      the VNC driver on top of the Linux framebuffer driver on big-endian
+      systems.
+    * Optimized drawing of images on 16-bit screens when using a painter
+      with an opacity value of less than 1.0.
+    * [183118] Updated the framebuffer test application to work on 18 bit
+      screens.
+    * [184181] Ensured that the QDesktopWidget::workAreaChanged() is emitted
+      when the available screen geometry is changed.
+    * [185508] Fixed missing mouse move/press event on touch screens when
+      pressing on a newly-activated window.
+    * [185301] Fixed a crash in QImage::convertToFormat() that could occur
+      when converting an image having a stride that is not a multiple of 4.
+    * [186266] Fixed a race condition which could result in painting errors
+      around the window decoration under certain circumstances.
+    * [186409] Fixed string to number conversions in QtScript when
+      configured with -D QT_QLOCALE_USES_FCVT.
+    * [186611] Fixed color conversion in QScreen::solidFill() (used when
+      drawing the screen background) when configured with
+      -D QT_QWS_DEPTH_GENERIC.
+    * [125481] Fixed a painting error with RGBA framebuffers and partially
+      transparent windows.
+    * Fixed inconsistency in 16-bit alpha blending which caused the
+      leftmost/rightmost pixels to be calculated differently due to
+      rounding errors.
diff --git a/dist/changes-4.3.4 b/dist/changes-4.3.4
new file mode 100644
index 0000000..fe076d9
--- /dev/null
+++ b/dist/changes-4.3.4
@@ -0,0 +1,112 @@
+Qt 4.3.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.3.0 through Qt 4.3.3.
+
+The Qt version 4.3 series is binary compatible with the 4.2.x, 4.1.x and
+4.0.x series. Applications compiled for Qt 4.0, 4.1 or 4.2 will continue to
+run with Qt 4.3.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Legal
+
+    * This version adds the GNU General Public License (GPL) version 3
+      to all Qt Open Source editions. The GPL Exception version 1.1
+      applies to both versions of the GPL license.
+
+Build System
+------------
+    * Ensure that Qt plugin paths are only added once to the LIBS variable.
+    * MinGW: Ensure that PRE_TARGETDEPS and POST_TARGETDEPS are properly
+      escaped in dependency lists, so they match the rules in the Makefiles.
+
+I18n
+----
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- QApplication
+    * [193842] Fixed a bug where a statically built Qt would still try
+      to load Qt plugins (such as style, imageformat, and sqldriver
+      plugins) which causes the application to crash.
+
+- QCoreApplication
+    * [190356] Fixed a regression from 4.2 where the order of posted
+      events with the same priority would be sent out of order.
+
+- QComboBox
+    * [166349] Fixed crash resulting from making the combo box non-editable from a
+      slot caused by a line edit Key_Enter event.
+
+- QFileDialog
+    * [193483] Fixed crash when hidden directory is set as the current directory
+      and hidden directories are not set to be visible.
+    * [191301] Fixed QFileDialog closes even if the users indicate they do not
+      wish to replace.
+
+- QSslSocket
+    * [191705] Fixed crash on remote disconnect
+    * [190133] Fixed security bug in QSslSocket's certificate verification
+
+- QTreeWidget
+    * [191300] Adding QTreeWidgetItems into a sorted QTreeWidget can be slow.
+    * [155700] Fixed potential assert when deleting QTreeWidgetItems with
+      sorting enabled.
+
+- QDirModel
+    * [191765] Fixed crash when using QModelIndex from QDirModel::index()
+      for a UNC path.
+
+- QHeaderView
+    * [190624] Fixed case when stretch resize sections would give wrong
+      section sizes to all other sections.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+
+****************************************************************************
+*                               Examples                                   *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+
+Windows
+-------
+* [191309] Fixed a bug preventing browsing to UNC paths in the file dialog.
+* [180010] Fixed a memleak in the raster paint engine. The HDC for the raster buffer was
+	   not cleaned up correctly.
+* [191305] Fixed a possible memleak and problem with calling QGLPixelBuffer::doneCurrent()
+	   under Windows.
+
+Mac OS X
+--------
+* [188837] Fixed a bug that would make Qt applications not quit when someone logs out of Leopard
+* [192030] Prevent a crash when dragging over a widget that has a focus frame
+* [291319] Send the kEventQtRequestWindowChange event when moving QGLWidgets.
+* Fix binary compatibility issue in the OpenGL module that could cause problems when using
+   Qt binaries compiled on Tiger for development on Leopard. The Mac binary package now supports 
+   development on Leopard.
+
+Qtopia Core
+-----------
+* [189195] Fix crash when using fonts containing embedded bitmaps with
+  zero width and non-zero height.
+* [189829] Fixed parsing of device specification in the QWS_KEYBOARD
+  environment variable when specifying multiple keyboards.
diff --git a/dist/changes-4.3.5 b/dist/changes-4.3.5
new file mode 100644
index 0000000..c674d87
--- /dev/null
+++ b/dist/changes-4.3.5
@@ -0,0 +1,109 @@
+Qt 4.3.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.3.0 through Qt 4.3.4.
+
+The Qt version 4.3 series is binary compatible with the 4.2.x, 4.1.x and
+4.0.x series. Applications compiled for Qt 4.0, 4.1 or 4.2 will continue to
+run with Qt 4.3.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+    * [201242] Fixed an bug that caused bootstrapped tools (qmake,
+      moc, uic, and rcc) to crash or run into infinite loops.
+    * [190776] Fixed a bug that would generate invalid build keys in
+      some gcc compiler versions. Backported from Qt 4.4.
+
+- Legal
+
+    * This version updates the GPL Exception to version 1.2 in all
+      Open Source editions of Qt. This version is compatible with the
+      GPL version 3 and adds the LGPL version 3 to its list of
+      acceptable licenses.
+
+Third party components
+----------------------
+
+- libpng
+    * Security fix (CVE-2008-1382)
+
+Build System
+------------
+
+I18n
+----
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- QCalendarWidget
+    * Fixed handling of leap year while changing the date in calendar widget.
+
+- QComboBox
+    * [203827] Fixed problems caused by the line edit not being hidden for
+      a non-editable QComboBox.
+
+- QMdiArea
+    * [209615] Fixed an assert when removing a sub-window from one QMdiArea and
+      adding it to another QMdiArea.
+
+- QMdiSubWindow
+    * [192794] Fixed a bug where installed event filters were removed
+      when maximizing a window.
+
+- QPainter
+    * [204194] Fixed division-by-zero issue in raster paint engine when
+      calling drawLine with the same starting and ending point.
+    * [205443, 207147] Fixed floating point exception when drawing near-vertical
+      or near-horizontal lines in the raster paint engine.
+
+- QWizard
+    * [180397] Fixed crash resulting from AeroStyle being assumed even when
+      some of the required symbols were unresolved.
+    * [197953] QWizard no longer crashes on Windows if an accessibility
+      application (like Microsoft Narrator) is running.
+
+- QWorkspace
+    * [206368] Fixed a crash resulting from the icon in the title bar not
+      being deleted when deleting a sub-window.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+
+****************************************************************************
+*                               Examples                                   *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+
+Windows
+-------
+
+- QRasterPaintEngine
+    * [198509] Fixed a resource leak which occured when QPainter::drawText()
+    was called.
+
+Mac OS X
+--------
+
+- QRasterPaintEngine
+    * [198924] Fixed a byte order problem when drawing QImages on an X11
+    server running on PPC Macs.
+
+Qtopia Core
+-----------
diff --git a/dist/changes-4.3CE-tp1 b/dist/changes-4.3CE-tp1
new file mode 100644
index 0000000..41aaea8
--- /dev/null
+++ b/dist/changes-4.3CE-tp1
@@ -0,0 +1,53 @@
+Changes for Qt/CE 4.3.x "Feierabend" release.
+
+****************************************************************************
+*                           Features                                       *
+****************************************************************************
+
+- Added precompiled platform tools to package
+
+- Added/Updated documentation
+
+- Added/Updated examples
+
+****************************************************************************
+*                           Bug fixes                                      *
+****************************************************************************
+
+- cetest
+   * cleanup directory hierarchy in case user specified.
+   * fixed libpath option which was not case-insensitive.
+
+- configure.exe
+   * fixed order of c-runtime deployment.
+   * fixed --(xy)prefix options to work in Windows Command Prompt.
+
+- QDesktopWidget
+   * fixed SIP handling bug.
+
+- QFeatures
+   * fixed custom configuration build issues.
+
+- QFileDialog
+   * updated UI to fit on embedded screen.
+   * in case no native dialog exists on device, use Qt FileDialog instead.
+   * fixed file extension bug.
+
+- QFSFileEngine
+   * workaround for Windows Mobile for taking MAX_PATH not into account.
+
+- QGraphicsView
+   * fixed bug when qreal is not double.
+
+- QLibraryInfo
+   * fixed legacy bug about not finding the plugins path.
+
+- QSysInfo
+   * added Windows CE 6.
+
+- QWidget
+   * fixed potential minimize/maximize bug.
+
+- QPaintEngine
+   * detect bitdepth on startup and create 16bit buffers, if possible.
+
diff --git a/dist/changes-4.3CEconan b/dist/changes-4.3CEconan
new file mode 100644
index 0000000..5d78e57
--- /dev/null
+++ b/dist/changes-4.3CEconan
@@ -0,0 +1,72 @@
+Changes for Qt/CE 4.3.x "Conan the Librarian" release.
+
+****************************************************************************
+*                           Features                                       *
+****************************************************************************
+
+- Added QtSql
+
+- Added QSqlite plugin
+
+- Added sql examples
+
+- Added 16bit painting engine
+
+- Added options to cetest
+
+- Added Windows Mobile 6 mkspecs
+
+****************************************************************************
+*                           Bug fixes                                      *
+****************************************************************************
+
+- cetest
+   * added -conf option to specify a qt.conf file to be deployed
+   * added -f option to specify a .pro file to be parsed
+   * copy in buffered mode
+   * deployment rules can use wildcard logic
+   * fixed a bug in debug/release parsing
+   * try to get results though unittest might have crashed
+
+- configure.exe
+   * fixed usage of c-runtime deployment on desktop win32 build
+   * new parameters for cross-compilation
+
+- QApplication 
+   * fixed minimal qfeature build configuration
+
+- QEventDispatcher
+   * fixed minimal qfeature build configuration
+
+- QFileDialog
+   * fixed internal handling of path separators
+   * fixed unexpected behaviour due to uninitialized memory
+
+- QFileSystemModel
+   * fixed different behaviour for Qt/CE
+
+- QFileSystemWatcher
+   * updated documentation
+
+- QtGui
+   * fixed floating point issues
+
+- QKeyMapper
+   * fixed short-cut algorithm
+   * fixed virtual key handling
+
+- QMessageBox
+   * fixed minimal qfeature build configuration
+
+- qmake.exe
+   * deployment rules can use wildcard logic
+
+- QTableView
+   * fixed style issue for header item
+
+- shadow build
+   * locate qglobal.h in correct directory
+
+- zlib
+   * fix build logic
+
diff --git a/dist/changes-4.3CEkicker b/dist/changes-4.3CEkicker
new file mode 100644
index 0000000..009dc33
--- /dev/null
+++ b/dist/changes-4.3CEkicker
@@ -0,0 +1,53 @@
+Changes for Qt/CE 4.3.x "Kicker" release.
+
+****************************************************************************
+*                           Features                                       *
+****************************************************************************
+
+- Integrated to Qt 4.3
+
+- Added QtXml
+
+- Added QtSvg
+
+- Added full QCursor support in case SDK supports it
+
+- Added temporary tool sdkscanner for reading Visual Studio configuration
+
+****************************************************************************
+*                           Bug fixes                                      *
+****************************************************************************
+
+- configure.exe
+   * Fixed qconfig.h creation using host platform paths
+   * Fixed sanity check for -host parameter
+
+- drag'n'drop
+   * Fixed for SDKs with cursor support
+   * Added examples
+
+- Example portedasteroids
+   * Fixed linking issues
+
+- QFileIconProvider
+   * Windows CE specific path fixes
+
+- QFsFileEngine
+   * Windows CE specific path fixes
+
+- QPixmap
+   * Fixed icon library loading
+
+- QSplashScreen
+   * Fixed painting bug
+
+- QTestLib
+   * Allow more than 256 bytes for qDebug() while debugging
+
+- QWidget
+   * Fixed bug in maximize()/minimize()
+
+- WIMMXT support
+
+- Windows CE 6.0 support
+   * fixed network issues with wince6* mkspecs
diff --git a/dist/changes-4.3CEsweetandsour b/dist/changes-4.3CEsweetandsour
new file mode 100644
index 0000000..fab21ad
--- /dev/null
+++ b/dist/changes-4.3CEsweetandsour
@@ -0,0 +1,43 @@
+Changes for Qt/CE 4.3.x "SweetAndSour" release.
+
+****************************************************************************
+*                           Features                                       *
+****************************************************************************
+
+- Added QtScript
+
+- Added cetest/QtRemote
+
+- Added MIPS/SH4 compilation support
+
+****************************************************************************
+*                           Bug fixes                                      *
+****************************************************************************
+
+- configure.exe
+   * Added c-runtime deployment options.
+   * Added cetest installation option.
+
+- qmake
+   * Fixed DEPLOYMENT rule to allow recursive directory deployment.
+
+- QProcess
+   * Fixed usage of DuplicateHandle, which got implemented for CE 6.
+
+- libpng
+   * Fixed crash bug concerning strtod which exists on CE 5 by default.
+
+- QFSFileEngine
+   * Fixed bug to access file size of POSIX opened file.
+
+- QWidget
+   * Fixed maximization bug.
+   * Fixed deadlock bug caused by invalid state.
+
+- QDateTimeEdit
+   * Fixed support for QT_KEYPAD_NAVIGATION
+
+- QPixmap
+   * Fixed toWinHBITMAP
+   * Fixed fromWinHBITMAP
+   * Fixed icon handling
+\ No newline at end of file
diff --git a/dist/changes-4.4.0 b/dist/changes-4.4.0
new file mode 100644
index 0000000..7875f2c
--- /dev/null
+++ b/dist/changes-4.4.0
@@ -0,0 +1,2419 @@
+Qt 4.4 introduces many new features as well as many improvements and
+bugfixes over the 4.3.x series. For more details, see the online
+documentation which is included in this distribution. The
+documentation is also available at http://doc.trolltech.com/4.4
+
+The Qt version 4.4 series is binary compatible with the 4.3.x series.
+The Qt for Embedded Linux version 4.4 series is binary compatible with the
+Qtopia Core 4.3.x series. Applications compiled for 4.3 will continue to
+run with 4.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.trolltech.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain
+more information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Legal
+    * This version introduces the GPL version 3 as an alternative
+      license for the Open Source Edition of Qt, in addition to the
+      existing licenses.
+    * Updated the GPL Exception to version 1.2, which grants additional
+      rights to developers using the LGPL version 3.0 and other licenses
+      for their software.
+
+- Configuration/Compilation
+    * [102113, 151125] Make it possible to use Qt headers with MSVC's
+      warning level 4.
+    * [129841] Make Qt compile with Intel C++ 9.0 and Intel C++ 10 compilers
+      on Windows.
+    * [168868] Add experimental support for the Blackfin processor.
+    * [188167] Fixed a bug in the solaris-cc mkspec that would cause
+      it to always use RPATH, even when configured with -no-rpath.
+    * [176029] Added qmalloc.cpp with qMalloc() and qFree() implementation
+      to make it easier to replace the default container allocators with
+      custom allocators (by providing your own qmalloc.o(bj) file).
+    * Enable -reduce-exports automatically on linux-icc* mkspecs when
+      using version 10.1 of the Intel C++ Compiler for Linux.
+    * Add experimental support for the AVR32 processor.
+    * Allow building Qt with -release and the Intel C++ Compiler for
+      Linux. This required working around several compiler bugs by
+      turning optimizations off for certain modules. See the compiler
+      notes for more details.
+    * Add support for MSVC 2008, and add separate mkspecs for MSVC 2002 &
+      2003.
+    * [189185] Avoid quoting the the include and library paths for iconv.
+
+- Documentation and Examples
+    * The Qt Designer Manual was updated to include new Qt Designer features.
+    * QtScript module overview was updated with more examples and reference
+      material.
+    * [161404] The 40000 Chips demo no longer shifts when clicking the OpenGL
+      button.
+    * [188676] Fixed text item moving in Diagram Scene example.
+    * New demo: Embedded Dialogs
+    * New demo: Browser
+    * New example: Graphics View / Pad Navigator
+    * New example: Item Views / Address Book
+    * New example: WebKit / Previewer
+    * New Example: XmlPatterns / Recipes
+    * New tutorial: Address Book
+    * Multiple bug fixes for the Torrent Client example.
+    * Speed-ups in the Ported Asteroids Example.
+    * [164223] All examples that use resources now include
+      Q_INIT_RESOURCES to avoid breakage in static builds.
+
+- Translations
+    * Added a Traditional Chinese translation of the Qt and tools courtesy
+      of Franklin.
+    * Added a Spanish translation of Qt courtesy of Enrique Matias Sanchez.
+
+- Signals and slots
+    * [147681] Added support for 'long long' and 'unsigned long long'
+      in queued connections.
+    * [125987] Optimized QMetaObject::activate(), the function that
+      actually delivers signals to all connected slots.
+    * [164558] Fixed a bug that caused queued signals to be delivered out
+      of order (not in the order they are emitted).
+    * [169554] Added Q_EMIT, to correspond to Q_SIGNAL and Q_SLOT.
+
+- Multithreaded painting
+    * [66358, 142031] Added support for painting on QImage, QPicture,
+      and QPrinter in multiple threads. See the Multithreaded
+      Programming documentation for more details on supported features
+      and known limitations.
+
+- Embedded QWidget support for Graphics View
+    * [177204] Added support for using layouts, styles, palettes and fonts,
+      as well as embedding QWidgets into a QGraphicsScene.
+
+- XML support in QtCore
+    * The QXmlStreamReader, QXmlStreamWriter and supporting classes
+      have moved from the QtXml module to the QtCore module. This change is
+      both source- and binary-compatible with previous versions. New
+      applications can opt to not link to QtXml when using these classes.
+
+- Printing
+      Made a number of improvements to printing in Qt 4.4, including
+      support for setting custom page sizes and custom margins as well as
+      the ability to programatically enumerate printers via the new
+      QPrinterInfo class. A couple of new classes, QPrintPreviewWidget
+      and QPrintPreviewDialog, have been added to make it easy to add a
+      print preview to an application. The QPrintDialog and QPageSetupDialog
+      for X11 have been redesigned and are hopefully easier to use.
+
+New features
+------------
+
+- XQuery 1.0 and XPath 2.0 support provided through the new QtXmlPatterns
+  module.
+
+- Qt Help module for embedding documentation into applications.
+
+- QSystemSemaphore provides a general counting system semaphore.
+
+- QSharedMemory provides access to a shared memory segment between multiple
+  threads and processes.
+
+- QLocalServer class provides a local socket-based server with a matching
+  new QLocalSocket class.
+
+- QFileSystemModel provides a data model for the local file system. Unlike
+  QDirModel, QFileSystemModel will fetch directory listings in a background
+  thread to prevent any locking in the GUI. QFileSystemModel is also much
+  faster and has a few more features then QDirModel.
+
+- QCommandLinkButton to support Vista style command links on all platforms.
+
+- QFormLayout provides a layout designed for convenient form creation with
+  the appropriate appearance on different platforms. This class previously
+  appeared in Qtopia/4.3, but has been integrated into Qt.
+
+- QtConcurrent provides a high level multi-threading API.
+
+- QPlainTextEdit provides a highly scalable plain text editor. It uses
+  similar technology and concepts as QTextEdit, but is optimized for plain
+  text handling; e.g. as a log viewer.
+
+- QTextBoundaryFinder is a new class implementing the Unicode text
+  boundaries specification.
+
+
+Third party components
+----------------------
+
+- Updated Qt's SQLite version to 3.5.4.
+
+- Updated Qt's libpng version to 1.2.25.
+
+- Added CLucene version 0.9.17.
+
+- Added WebKit (see the src/3rdparty/webkit/VERSION file for the version).
+
+- Added Phonon version 4.1.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+- General Fixes
+    * [147201] Assert in debug mode when using QReadLocker, QWriteLocker,
+    or QMutexLocker with unaligned pointers.
+
+- QAbstractButton
+    * [190739] Ensure button with the TabFocus policy doesn't receive focus
+      through others ways.
+    * [192074] Disable key navigation for buttons in a item view.
+
+- QAbstractItemModel
+    * [171469] Speed up insertion of rows into a model.
+
+- QAbstractItemView
+    * [162487] Check canFetchMore() on the model before calling fetchMore().
+    * [179163] The virtual selectAll() is now called when the user types
+      "Ctrl+A"
+    * [181413] Fixed InternalMove for MoveAction-only models.
+    * [181988, 192114] Made mouse wheel smarter on ScrollPerPixel mode.
+    * [182248] Trasparent background for the dragged visual.
+    * [184507] setVerticalScrollMode(ScrollPerItem) can cause the view to
+      scroll to the bottom.
+    * Add autoScrollMargin property.
+    * [162547] Make the current index stay in the viewport when sorting.
+    * [165404] Make the drop indicator stylable.
+    * [160611] Ensured that the hover item is updated when dragging over the view.
+    * [162497] Allow key events to be propagated.
+    * [186052] Mac: The alternatingRowColors property now honors the
+      Graphite color setting.
+    * [202276] Fixed crash when pressing Ctrl+C in a view with no model.
+    * [202034] Ensured that the editor's geometry is kept up to date when rows
+      are inserted.
+    * [204403] Only scroll to the current index on reset if the view is
+      editing.
+
+- QAbstractProxyModel
+    * [156789] Fixed a crash when deleting the source model.
+    * [194765] Made headerData() call mapToSource() when asking for data.
+    * [195023] Added setData() and setHeaderData() implementation.
+
+- QAbstractScrollArea
+    * [159949] Fixed a bug where setting the horizontal scroll had no effect.
+
+- QAbstractSpinBox
+    * [183108] Allowed a spin box to be cleared before it is visible.
+    * [198687] Always reset modified and undo states of the line edit upon
+      pressing Enter.
+
+- QAccessible
+    * [177706] Windows narrator will now read Tooltips properly.
+    * [182437] Tooltips are now read aloud once instead of twice.
+
+- QAction
+    * [200823] Fixed regression that caused the tool tip of an action not to
+      show the shortcut by default.
+    * [97238] Introduced the iconVisibleInMenu.
+
+- QApplication
+    * [100630, 153895] Fixed a bug where key press events were always
+      sent as non-spontaneous events, while the key release event was
+      spontaneous.
+    * [194454, 196062] Fixed QApplication::quitOnLastWindowClosed to
+      work as documented.
+    * [97238] Introduce an attribute (AA_DontShowIconsInMenus) to control
+      the default behavior of icons in menus. This obsoletes the
+      qt_mac_set_menubar_icons() function.
+    * [201218] Fix bug on Mac OS X where Qt::WA_DeleteOnClose failed to
+      delete on close.
+
+- QAtomicInt
+
+- QAtomicPointer
+    * [168853] Introduced QAtomicInt and QAtomicPointer into the public API.
+      These classes provide a cross-platform API for doing atomic operations.
+    * Optimized testAndSet*() on PowerPC to not branch in the best case
+      (when value == expectedValue).
+    * [197244] Fixed the gcc inline assembler constraints for the PowerPC
+      implementation.
+    * [198399] Applied patch from SUSE to add S390(x) support.
+
+- QBoxLayout
+    * [103626] Added insertSpacerItem() and addSpacerItem().
+    * [127621] Made setStretchFactor() behave correctly if widget == 0.
+
+- QBrush
+    * [179308] Fixed a bug which caused QBrush to forget the color if it was
+      passed in the constructor along with Qt::NoBrush.
+    * [169502] Fixed a threading issue with setTextureImage().
+
+- QBuffer
+    * [184730] A TIFF image can now be stored correctly in a QByteArray.
+
+- QByteArray
+    * [193870] Copy the data of a QByteArray that is taken from
+      QByteArray::fromRawData() when appending more data.
+    * [82509] Added QT_NO_CAST_FROM_BYTEARRAY to disable "operator const
+      char *" and "operator const void *".
+
+- QCalendarWidget
+    * [181388] Added support for updating the cell of a particular QDate.
+    * [172053] Fixed palette bug for calendar's buttons.
+
+- QChar
+
+- QCleanlooksStyle
+    * [194082] Fixed disabled checkbox painted as unchecked.
+    * [189609] Fixed an issue where QMdiSubWindow could have incorrect
+      buttons.
+    * [182806] Retain hover appearance on slider while dragging.
+    * [180105] Fixed gradient backgrounds shown as black on a pressed
+      QPushButton.
+    * [176674] Fixed combobox drop down ignoring custom icon sizes.
+    * [197691] Made the style work better on older X11 servers without
+      XRender support.
+
+- QColorDialog
+    * [142706] use QDialogButtonBox to conform with the style it is running
+      in.
+
+- QColumnView
+    * [167408] Added createColumn() to help make subclassing easier.
+
+- QComboBox
+    * [155578] Improved calculation of size hint for combo box pop-up.
+    * [183982] Fix bug where the combobox width was not wide enough in some
+      styles.
+    * [187744] Made QComboBox behave slightly better when the view is a tree.
+    * [189444] Allowed separators in the list.
+    * [190332] Made the popup respect the view's selection behavior.
+    * Made setEditable(false) explicitly hide the lineEdit, otherwise it may
+      remain visible when executing a modal dialog immediately afterwards.
+    * [154884] Fixed a bug where the popup was hidden without calling
+      QComboBox::hidePopup().
+    * [169848] Fixed a bug where the combo box did not open as expected when
+      using a touch screen.
+    * [153975] Mac OS X: Improved the visual appearance (flash selected item
+      and fade away when hiding the menu).
+    * [190351] Fixed setView() for style using SH_ComboBox_Popup.
+    * [191329] Fixed the height calculation of the popup for custom view.
+
+- QCommonStyle
+    * [173539] Make the combo label draw according to the combo box's layout
+      direction and not the application's.
+
+- QCompleter
+    * [189564] Prevented unselectable items from appearing in the completion
+      list.
+    * [180785] Ensured that QCompleter emits activated() after pressing the
+      Return key.
+
+- QCoreApplication
+    * [157435] Fixed the posted event implementation to prevent the pending
+      queue from growing endlessly while a modal event loop is running.
+    * [132395] Sent DeferredDelete events at the right time. Specifying the
+      QEventLoop::DeferredDeletion flag (now deprecated) to processEvents()
+      is no longer necessary.
+    * [131235] Added QCoreApplication::applicationPid().
+    * [132859] Don't explicitly set the LC_NUMBERIC locale to "C" on UNIX
+      systems.
+    * [187044] Fixed a crash when addLibraryPath() or setLibraryPaths()
+      is invoked before creating QCoreApplication.
+    * [161049, 171670] Don't leak the single QThread instance that Qt creates
+      to represent the main() thread.
+    * [143743] Added the QCoreApplication::applicationVersion property.
+
+- QCryptographicHash
+    * [190062] Ensured that calling result() twice returns the same value.
+
+- QDataWidgetMapper
+    * [194784] Allowed setting NULL values for editors.
+
+- QDataStream
+    * [196100] Fixed compatibility issue with QCString in Qt3.x streams.
+    * [196415] Fixed compatibility issue with invalid colors in Qt 3.x
+      streams.
+
+- QDateTime, QDate, QTime
+    * [189882] Optimized {QDate,QTime,QDateTime}::fromString() so that it
+      is about 40% faster than before.
+    * [193079] Have {QDate,QTime,QDateTime}::fromString() understand
+      locale-dependent string formats.
+    * Added enum values to distinguish between short and long formats.
+
+- QDateTimeEdit
+    * Added properties minimumDateTime/maximumDateTime
+    * [169916] Added a timeSpec property for QDateTimeEdit
+    * [178027] Make QDateTimeEdit respect the locale property
+    * [158950] Disable QCalendarWidget popup when the dateTimeEdit is
+      read-only.
+    * [145872] Added a getter and setter for the QCalendarWidget popup.
+
+- QDateEdit
+    * Don't interpret time-specific formats as special fields in a QDateEdit
+      and vice versa for QTimeEdit.
+
+- QDesktopServices
+    * [89584] Added a way to get users Documents, Desktop, Movies
+      directories.
+    * [105740] Added a way to determine the location to store data files.
+
+- QDialog
+    * [174842] Ignore the close event if the reimplementation of reject()
+      doesn't close the dialog.
+
+- QDialogButtonBox
+    * [191642] Don't steal the default button if there is one already.
+    * [196352] Fixed roles of QDialogButtonBox::Abort and
+      QDialogButtonBox::Ignore.
+
+- QDir
+    * [172057] Fixed bug when sorting directories containing files larger
+      than 2GB.
+    * [177904] Fixed a problem with QDir::tempPath() and QDir::homePath()
+      returning trailing slashes inconsistently. Now it returns the
+      absolute path name, without the trailing slash.
+
+- QDirModel
+    * [176323] Fixed display of files moved by drag and drop (on a QTreeView).
+    * [196768] Fixed sorting.
+
+- QDockWidget
+    * [171661] Fixed setTitlebarWidget(0) to reset the native decoration.
+    * [169808] SizeHint is now taken into account.
+    * [188583] Fixed a bug making dockLocationChanged signal not always
+      emitted.
+    * [193613] Highlighted splitters between QDockWidgets, now go back to
+      inactive state when the cursor have passed over it.
+
+- QDoubleSpinBox
+    * [164696] QWidget::locale() is now used for all string-to-number
+      conversions.
+
+- QErrorMessage
+    * [189429] Fixed "do not show again" with rich text message.
+
+- QEvent
+    * [37536] Add QEvent:registerEventType() for obtaining a unique
+      event type ID.
+    * [161940] Fix QContextMenuEvent::modifiers() on X11 and Qt for Embedded
+      Linux to behave like the Windows and Mac OS X. Previously, this
+    * [166605] A drop event's drop action is now initialized to the drag
+      manager's current default action.
+
+- QFile
+    * [107448] Fixed bug where QFile::write() would fail to report an error
+      on disk full.
+    * Added map() and unmap() to map files into memory.
+
+- QFileDialog
+    * [71645] Added a property to hide filter details.
+    * [174510] Ensured that when multiple files are selected, all of them
+      will be deleted, not just the current one.
+    * [172254] selectFile should also set the current directory.
+    * [185930] getExistingDirectory directory file not updated after
+      renaming the new directory.
+    * [164591] Provided a way to set the QDir::filter on the model.
+    * [180459] Native OS X file dialog forgets last visited directory.
+    * [184508] Improved speed when showing a lot of files.
+    * [184508] Improved launch speed.
+
+- QFont
+    * Add Capitalize font-capitalization feature including small caps.
+    * [191756] Do not crash when font config finds no fonts on the system.
+    * [145015] Don't replace '-' characters in font names anymore.
+    * Fixed a bug where glyphs sometimes showed up in italic for a non italic
+      font (X11/Embedded Linux only).
+    * Fixed a bug where xHeight() sometimes returned a wrong number
+      (X11/Embedded Linux only).
+    * Added support for word- and letter-spacing.
+
+- QFontComboBox
+    * Fixed a bug where font name would not be displayed in some cases.
+
+- QFontMetrics
+    * [179946] Fixed averageCharWidth() to change return value after adding
+      text to a QPainterPath.
+
+- QFSFileEngine
+    * [200220] Fixed a potential crash and removed some potential resource
+      leaks.
+    * [190377] Fixed a reentrancy bug on all platforms; querying the canonical
+      path no longer relies on chdir() and realpath().
+    * [155284] Fixed uninitialized memory problem when calling realpath()
+      with an empty name on Solaris.
+
+- QGL
+    * [137573] Fixed drawing of images/pixmaps larger than the maximum texture
+      size in the OpenGL paint engine.
+    * [175853] Added new drawTexture member functions for convenient drawing
+      of textures in QGLWidget, QGLContext, QGLFramebufferObject, and
+      QGLPixelBuffer.
+    * [187954] Fixed an issue with missing corner pixels when drawing
+      rectangles in the OpenGL paint engine.
+
+- QGLContext
+    * [184996] Made isSharing() return something useful after a QGLWidget has
+      been reparented under Windows.
+
+- QGLPixelBuffer
+    * [195317] Make QGLPixelBuffer::hasOpenGLPbuffers() preserve the current
+      GL context when called.
+
+- QGLWidget
+    * [128157] QPixmap::grabWidget() now works on a QGLWidget.
+    * Added support for syncing drawing to QGLWidgets under X11 via the
+      QGLFormat::setSwapInterval() mechanism. This requires the
+      GLX_SGI_video_sync extension to be present.
+    * [183472] Made renderText() respect the currently set GL scissor box
+      and GL viewport.
+    * [182849] Fixed a crash on the Mac when renderPixmap() was called on a
+      multisampled GL context.
+    * [176618] Don't require depth testing to be enabled for the 3D version
+      of renderText() to work.
+
+- QGradient
+    * [178299] Fixed an issue where calling setColorAt twice with the same
+      position would not replace the existing color at that position.
+
+- QGraphicsItem
+    * [161160] Speedup when removing children from an item.
+    * [158799] QGraphicsItem now returns a different scene from 
+      itemChange(ItemSceneChange).
+    * [127051] Added support for item caching in local and device
+      coordinates.
+    * [183996] Fixed a bug caused when items are moved by pressing many mouse
+      buttons at the same time.
+    * [192983] Added QGraphicsItem::boundingRegion(), which allows updating
+      items based on their shape instead of their bounding rect.
+    * Improved QGraphicsItem::isObscured() and QGraphicsItem::opaqueArea()
+      speed and accuracy.
+    * [195916] Fixed crash when deleting an item as it receives a
+      contextMenuEvent().
+    * [202476] DeviceCoordinateCache now works with perspective
+      transformations.
+    * [202718] DeviceCoordinateCache performance improved greatly when
+      the cached item does minimal updates.
+    * [202689] Scrolling works (but is slow) for cached items.
+
+- QGraphicsItemAnimation
+    * [164587] QGraphicsItemAnimation::reset() has been marked as obsolete.
+
+- QGraphicsLineItem
+    * [177918] Lines with the same start and end point are now valid, and
+      rendered as a point.
+
+- QGraphicsScene
+    * [160463] QGraphicsScene::clearSelection() is now a slot.
+    * [161284] Added Q_DISABLE_COPY.
+    * [163854] QGraphicsScene no longer sends events to a disabled mouse
+    grabber item.
+    * [176902] Add support for context menu event propagation.
+    * [176178] QGraphicsScene::sceneRect() now auto-updates also with NoIndex
+      set.
+    * [186398] Added a fast QGraphicsScene::clear(), and massive speed-up in
+      recursive scene destruction.
+    * [180663] Fixed miscalculated expose rects in QGraphicsScene::render().
+    * [176124] Ensure that all mouse events that should have a widget assigned
+      do have a widget assigned.
+    * [174238] The selectionChanged() signal is no longer emitted twice when
+      replacing one selection with another.
+    * [160653] selectionChanged is now emitted when reselecting an already
+    selected item.
+    * QGraphicsScene::mouseMoveEvent now receives all mouse move events from
+    the views, and translates them into hover events for the items. This
+    allows you to track all mouse move events for the entire scene, without
+    having to reimplement QGraphicsScene::event() and duplicating the
+    QGraphicsScene implementation.
+
+- QGraphicsSceneHoverEvent
+    * [151155] Added support for keyboard modifiers.
+    * [157222] Added support for lastPos, lastScenePos, and lastScreenPos.
+
+- QGraphicsSceneWheelEvent
+
+- QGraphicsSvgItem
+    * [171131] Fixed painting error caused by using obsolete pixmap cache
+      entry.
+
+- QGraphicsView
+    * [152477] Fix to QGraphicsView's scroll bar range calculation.
+    * [161284] Added Q_DISABLE_COPY.
+    * [164025] Mouse press events now propagate through the view if ignored
+      by the scene.
+    * New ViewportUpdateMode: QGraphicsView::BoundingRectViewportUpdate
+    * [180429] Mouse release events propagate properly in RubberBandDrag
+      mode.
+    * [176902] Add support for context menu event propagation.
+    * [180663] Fixed miscalculated expose rects in QGraphicsView::render().
+    * [187791] QGraphicsView::setScene() now always updates the view
+      properly.
+    * [186827] Fixed an infinite loop caused by mouse replay after deleting
+      items in response to receiving mouse move events.
+    * [172231] Fixed erroneous clipping of untransformable items by scaled
+      graphics view.
+    * Fixed redraw bugs in QGraphicsView background rendering when using an
+      OpenGL viewport.
+
+- QGridLayout
+    * [121549] Added itemAtPosition(int, int).
+
+- QGroupBox
+    * [159480] QGroupBox's clicked() behavior is now the same as QCheckBox.
+    * [186297] Right-clicking a checkable group box now has no effect, which
+      is consistent with the behavior of QCheckBox.
+    * [178797] A checkable group box now correctly updates the sunken state
+      of its check box.
+    * Don't call updateGeometry() needlessly from resizeEvent().
+
+- QHash
+    * [171909] Don't rehash in operator[] and insert() when the key already
+      exists -- to avoid subtle bugs when iterating on a QHash. (This is
+      documented as being undefined, since these functions are non-const,
+      but it's easy to avoid the rehashing.)
+
+- QHeaderView
+    * [173773] QHeaderView now updates properly upon sorting a column.
+    * [192884] When the model emits layout changed unhide old hidden rows
+      and hide new hidden rows.
+    * [170935] QHeaderView now updates properly when swapping columns.
+    * [157081] Made headerviews semi-transparent while dragged.
+    * [148198] Optimize hiding sections when the resize mode is ResizeToContents.
+    * [168128] Fixed problem where the last section was resized when the last two sections are swapped.
+    * [168209] Update the header section when the font size changes.
+
+- QHostInfo
+    * [194539] Fixed the ordering of IP addresses returned by the
+      host-lookup procedures. Qt respects the order supplied by the
+      system libraries.
+    * [176527] Fixed a problem in QHostInfo that would cause it to
+      print warnings if it was used before QCoreApplication is created
+
+- QHttpHeaders
+    * [104648] Fixed QHttpHeaders to not change the order or
+      capitalisation of headers received or sent. QHttpHeaders is now
+      case-insensitive but case-preserving
+
+- QHttp
+    * [181506] Fixed a bug that would cause QHttp to emit a warning
+      from QIODevice when connecting to some servers.
+    * [190605] Fixed a memory leak.
+    * [175357] Fixed a deadlock when trying to parse an empty HTTP
+      reply which did not contain Content-Length: 0 (such as those
+      found in 304 replies)
+    * [170860] Fixed a problem which would make QHttp emit the done()
+      signal too soon (before it was finished).
+
+- QIcon
+    * [168488] Reduce memory usage if you call addPixmap severals times with the same arguments.
+
+- QImage
+    * [176566] Fixed problem in scale() which would cause downscaled images to
+      become darker due to precision loss in the image scaling.
+    * [181265] Fixed crash in scale() when downscaling very large images.
+    * Added new image formats: QImage::Format_ARGB8565_Premultiplied,
+      QImage::Format_RGB666, QImage::Format_ARGB6666_Premultiplied,
+      QImage::Format_RGB555, QImage::Format_ARGB8555_Premultiplied,
+      QImage::Format_RGB444, QImage::Format_ARGB4444_Premultiplied,
+      and QImage::Format_RGB888.
+    * Added support for the ICO image format (from Qt Solutions)
+    * Fix drawing of text into a QImage on the Mac so that the native
+      CoreGraphics engine is used. This makes aliased text, or text with
+      a small point size, look much better.
+    * [188102] For Indexed image, fixed setColor() to expand the
+      colortable if necessary. Made colortable manipulation more robust.
+
+- QImageReader
+
+- QImageWriter
+
+- QInputDialog
+
+- QIntValidator
+    * [179131] Reverted QIntValidator's out-of-range semantics to Qt 4.2
+      behavior, at popular demand.
+
+- QItemDelegate
+    * [175982] Escape did not close the editor if the application had registered
+      escape as a shortcut.
+    * [177039] Handle double precision properly.
+    * Don't finish editing if the validator is still in intermediate mode.
+
+- QItemSelectionModel
+    * [169285] Items are now deselected properly.
+    * [192147] Fix an off-by-one bug in QItemSelectionModel
+
+- QLabel
+
+- QLayout
+    * Cache sizeHint() and minimumSizeHint() of widgets in a layout using
+      the internal class QWidgetItemV2, leading to significant performance
+      gains for widgets that have an expensive size hint implementation.
+
+- QLibrary
+    * [155884] Fixed QPluginLoader to not load plugins with unresolved symbols.
+    * [170013] Make sure that libraries are opened with RTLD_LOCAL by default
+      on *all* platforms.  (On Mac it was RTLD_GLOBAL by default). This should
+      make plugin loading more consistent.
+    * [190831] Fixed crash when calling loadHints on a default constructed
+      QLibrary.
+    * [155109] The real error message was discarded if the library existed,
+      but failed for another reason.
+
+- QLineF
+    * [170170] Introduce new member function angleTo() which returns the angle
+      between two lines, also taking the direction into account.
+    * [174122] Added new member functions in QLineF for setting and getting
+      the angle of the line, as well as translating a line, and constructing
+      a line from polar coordinates.
+
+- QLineEdit
+    * [151414] Add protected function to access the cursor rectangle.
+    * [153563] Don't show blinking cursor on read only line edit with input mask
+    * [174640] Emit editingFinished() when the user open a menu.
+    * [178752] Reverted to Qt3's behavior of using an arrow cursor instead of
+      a beam cursor when the QLineEdit is read only.
+    * [180999] Old selection now cleared upon activating a window.
+    * [188877] Fixed painting error resulting from pasting into a selection.
+
+- QLinkedList
+    * Add QLinkedList::removeOne(), which removes the first occurrence of a
+    value from the list.
+
+- QList
+    * Add QList::removeOne(), which removes the first occurrence of a value
+    from the list.
+
+- QListView
+    * [158122] Wordwrap in ListMode
+    * [177028] Make sure that the scrollbars is automatically removed when the
+      model has less than two items.
+    * [186050] Make sure the content size is updated when moving item.
+    * [182816] Combine wordwrap and text eliding.
+
+- QListWidget
+   * [199503] Fixed a crash when calling clear inside a slot connected to
+              currentItemChanged.
+   * [159792, 184946] Keyboard navigation fixed with non uniform item sizes.
+    * [255512] Add function to allow setting the current item without selecting it.
+
+- QLocale
+    * [161049] Fixed a couple of static memory leaks in QLocale.
+    * Added the following functions to QLocale:
+        QString toString(const QDateTime &dateTime, FormatType format = LongFormat) const;
+        QString toString(const QDateTime &dateTime, const QString &format) const;
+        QString dateTimeFormat(FormatType format = LongFormat) const;
+    * Added the following enum values to QLocale::QueryType:
+        DateTimeFormatLong
+        DateTimeFormatShort
+        DateTimeToStringLong
+        DateTimeToStringShort
+
+- QMacStyle
+    * [142746] Now respects the QComboBox::iconSize property.
+    * [184566] Make sure we pick up changes to QPushButton::setDefault().
+    * [174284] Don't truncate text on tabs in the small and mini size.
+    * [170971] Don't try to draw a mini scrollbar as it doesn't exist, draw a small one instead.
+    * [170977] Correct checkmarks for small and mini non-editable comboboxes.
+    * [170978] Prevent mini push buttons from being clipped.
+    * [202959] Draw the correct number of tickmarks for sliders.
+
+- QMainWindow
+   * [178510] Context menu is not shown if all toggle view actions are invisible.
+   * [195945] Fixed resizing of QDockWidgets in QMainWindow without using any
+              central widget.
+   * [196569] Don't override the cursor set by the user with setCursor when hovering dock widgets.
+
+- QMdiArea
+    * [155815] Fixed a bug causing sub-windows to overlap when tiling them.
+    * [148183] Added support activation order.
+    * [153175] Added support for tabbed workspace.
+    * [182852] Don't overwrite mainwindow title.
+    * [189758] Fixed a bug causing sub-windows to be squeezed when tiling them.
+    * [202657] Fixed focus issue on dockwidget when activating the main window.
+
+- QMdiSubWindow
+    * [198638] Fixed so that minimumSize() and minimumSizeHint() was respected (it was
+               possible to resize the window to a smaller size earlier).
+    * [171207] Added tooltips for the buttons in the title bar.
+    * [169874, 47106] Added support for switching between sub-windows using Ctrl-Tab.
+    * [169734] Added an access function to QMdiArea.
+    * [192794] Fixed a bug causing installed event filters to be removed after maximizing a sub-window.
+
+- QMenu
+    * [165457] Fixed torn-off QMenus to have the correct stacking order.
+    * [167894] Fixed focus management when activating an action from the keyboard.
+    * [167954] Increased the size of the tear-off handle.
+    * [172423] Mac OS X: Improved the visual appearance (flash selected item and fade away when hiding the menu).
+    * [183777] Fixed a bug with tear off menu making impossible to tear some menu off.
+
+- QMenuBar
+    * [193355] Fied bug with action plugged in menu which did not return to their normal state
+      after being clicked
+    * [194677] Fixed a bug causing the corner widgets to be laid out incorrectly when adding them right
+      before the menu bar was shown.
+
+- QMessageBox
+    * [176281] By default, if there is exactly one button with the RejectRole or
+      MessageBox::NoRole, it is now made the escape button.
+    * [181688] Better look with setInformativeText.
+
+- QMetaObject
+    * [197741] Fixed a memory leak in QMetaObject::invokeMethod() when
+      called with unregistered data types.
+    * [171723] Support for 'unsigned' type in the meta-object system.
+
+- QMetaType
+   * [179191] Added QMetaType::unregisterType() for unregistering a metatype.
+
+- QMimeData
+   * Added a removeFormat() method.
+
+- QMngHandler
+    * [155269] QMngHandler now initializes image backgrounds properly.
+
+- QModelIndex
+    * [176068] optimize QModelIndex operator<
+
+- QMotifStyle
+    * [185649] Fixed incorrect positioning of itemview frames in reverse mode.
+
+- QMutex
+    * [151077] Optimized QMutex locking path to be comparable to Win32
+      CRITICAL_SECTIONs.
+    * [186088] Clarify documentation of lock() and tryLock() to be
+      more explicit about the behavior of these functions in recursive
+      vs. non-recursive mode.
+
+- QNetworkInterface
+
+- QNetworkProxy
+
+- QObject
+    * [144976] Fix QObject::property() to return a QVariant that can be
+      converted to an enum if the enum is known to QMetaType.
+    * [171612] Fix QObject::removeEventFilter() to work as documented.
+    * [172061] convert() now return false if the result is invalid for date types.
+    * [184003] Fix a crash in QObject::queryList() when called from an
+      object's destructor.
+    * [173218] Document deleteLater()'s behavior when called before
+      QCoreApplication::exec().
+
+- QOpenGLPaintEngine
+    * [183995] Reset the GL_TEXTURE_ENV attribute and pixel transfer modes to the
+      default values when QPainter::begin() is called.
+    * [174273] Fixed the annoying "Unable to compile fragment programs" problem
+      by adding a GL program cache, and compiling the programs on demand.
+
+- QPainter
+    * [121105] Added drawEllipse overload that takes a center point and two
+      radii.
+    * [124248] Fixed some rounding issues causing inconsistencies between
+      text and line drawing.
+    * [142470] Fixed performance issue with non-cleartype text drawing on
+      Windows when doing several calls to QPainter::drawText().
+    * [142514] Fixed bug in X11 paint engine where a pixmap drawn
+      at non-integer coordinates would be drawn at different offsets depending
+      on whether opacity was set or not.
+    * [156787] Fixed problem with SmoothPixmapTransform and source rects in
+      drawImage and drawPixmap which would cause color bleeding from pixels
+      outside the source rect at the image borders.
+    * [156964] Improved accuracy of arc drawing, ensuring that arcs drawn
+      with same control rect but different sweeps are still coinciding.
+    * [162153] Fixed bug caused by integer overflow in QPainter::boundingBox
+      when passing a very large rectangle.
+    * [163605] Introduced new drawRoundedRect API with support for absolute
+      coordinates for the corner radii.
+    * [166702] Fixed some potential floating point exceptions in raster
+      paint engine line drawing.
+    * [167890] Prevent crash when drawing zero-length lines; these are now
+      drawn as points.
+    * [169711] Ensured that calling setClipRect with negative width/height
+      is treated as an empty clip region.
+    * [170208, 170213] Fixed some bugs with dashed line drawing and dash
+      dash offsets in the mac paint engine.
+    * [175912, 176386, 194360] Fixed some precision issues with projective
+      transformed pixmaps and images.
+    * [179507] Ensure that the final stop color is always used beyond the
+      radius when using a QRadialGradient.
+    * [180245] Fixed bug which caused setOpacity to be ignored when drawing
+      transformed RGB32 images.
+    * [182658] Fixed a problem with drawPoint in X11 paint engine which would
+      cause a one-pixel point to sometimes be drawn as two pixels.
+    * [184746] Fixed performance regression in drawEllipse() with raster paint
+      engine.
+    * [188012] Fixed stroking of empty rectangles in X11 paint engine.
+    * [190336] Fixed text drawing performance issue on Windows when using
+      setPixelSize to draw large fonts.
+    * [190394] setOpacity() now correctly paints transparent regions when
+      outputting to PDF.
+    * [190634] Fixed bug where drawLine would fill part of the paint device
+      instead of just drawing a line.
+    * [190733] Fixed some precision problems with miter joins and curve
+      segments which could cause ugly painting artifacts.
+    * [191531] Fixed a bug with alpha or pattern brush drawing to mono images.
+    * [191761] Fixed rendering of transformed ObjectBoundingMode gradients.
+    * [199234] Fixed a bug causing fillRect with a gradient fill to not work
+      with ObjectBoundingMode gradients in the raster paint engine.
+    * Introduced a new rasterizer for aliased drawing to address performance
+      and precision issues in the existing rasterizer.
+    * Remove warnings emitted when setting Source or SourceOver composition
+      modes on certain paint devices.
+    * [192820] Fix drawImage()/drawPixmap() with a source rect parameter outside
+      of the range of the source image dimensions.
+    * [183745] Fixed setting font point sizes < .5, would in some cases cause
+      the font size to default back to 12 points.
+    * [157547] Fixed inconsistent pen styles for DashLine, DotLine, DashDotLine
+      and DashDotDotLine across Win/Linux.
+    * [143526] Fixed a problem with drawing text or shapes that were drawn
+      with a very large scale factor. Typically you would get a crash after
+      memory was exhausted.
+    * [186070] Fixed potential integer overflow when drawing texture or pattern
+      brushes with a transform that has a small scale.
+    * [200616] Fixed bug causing transformed cosmetic pens with width > 0 and a
+      dash pattern to be partially or completely clipped (raster engine).
+    * [206050] Fixed QImage::scale with a SmoothTransformation to handle alpha
+      channel correctly when scaling.
+
+
+- QPainterPath
+    * [121105] Added addEllipse overload that takes a center point and two
+      radii.
+    * [181774] Remove assert that could occur when calling pointAtPercent()
+      with parameters close to 0 or 1.
+    * [189695] Fixed bug relating to 360-degree arcs and winding fill.
+    * [187779, 187780] Fixed some bugs in intersects() and contains() when
+      dealing with paths with multiple subpaths.
+    * [191706] Fixed intersects(QRectF) for paths that represent vertical or
+      horizontal lines.
+    * [193367] Introduced simplified() to simplify paths with multiple
+      subpaths and/or self-intersections.
+    * [206160] Modify QPainterPath::operator== to do point comparisons with
+      an epsilon relative to the painter path's bounding rect size.
+
+- QPainterPathStroker
+    * [174436] Fixed some bugs relating to dash offsets and dashing of
+      paths with multiple subpaths.
+
+- QPalette
+    * [170106] Added QPalette::ToolTipBase and QPalette::ToolTipText.
+
+- QPicture
+
+- QPixmap
+    * [164116] QPixmap::x11Info() didn't report the correct depth when
+      the pixmap depth and the desktop depth was different.
+
+- QPixmapCache
+
+- QPlastiqueStyle
+    * More native appearance of button, combobox, spinbox and slider.
+
+- QPolygon
+    * [163219] Added missing datastream operators to QPolygon.
+
+- QPrintDialog
+    * [182255] Don't ask whice to overwrite axisting file.
+    * [183028] Changed to default for maxPage() to INT_MAX.
+
+
+- QPrinter
+    * PDF engine now supports hyperlinks.
+    * [180313] Fixed a bug where QPrinter could not be used more than once
+      per instantiation.
+    * [121907] Change begin() to properly return 'false' when the file we
+      want to write to can not be written to.
+    * [189604] Make the pdf printer capable of having a different page size
+      and orientation for each page.
+    * [99441] Add setPaperSize(const QSizeF &paperSize, Unit unit).
+    * [182245] Make pageRect() return consistent values across
+      Mac/Win/Linux when fullPage() is set, and fix an off by one error in
+      the width()/height() functions on the Mac.
+    * [156508] PS/PDF generators: Correctly generate grayscale output when
+      requested.
+
+- QPrintEngine
+    * [193986] Fixed the Trolltech copyright date on PDF files
+
+- QProcess
+    * [162522] QProcess now emits stateChanged() consistently for all state
+      changes.
+    * [153565] Add define to make it compile with QNX RTOS.
+    * [196323] Try to unregister SIGCHLD while Qt is unloaded.
+
+- QProgressBar
+    * [189512] sizeHint() doesn't depends anymore on PM_ProgressBarChunkWidth
+
+- QProgressDialog
+    * [190318] Use the size of the label if setMinimumSize() and setLabel()
+      are called.
+    * [198202] Wixed crash when calling setLabel(0).
+
+- QPushButton
+
+- QReadWriteLock
+    * [131880, 170085] Add support for recursive read-lock
+      support. See the not below in the Important Behavior Changes
+      section.
+
+- QRect
+    * Fixed a bug in normalized() when width() == 0 and height() < 0
+      or vice versa.
+
+- QRectF
+
+- QRegion
+    * Added numRects() which returns the number of rectangles in the region.
+    * [193612] Various optimizations for regions consisting of only one
+      rectangle.
+
+- QResource
+
+- QScriptEngine
+    * [200225] Made uncaughtExceptionBacktrace() return a correct backtrace
+      in the case where the value thrown is not an Error object.
+    * [202454] Made QScriptContext::isCalledAsConstructor() return the right
+      result for constructors registered with newQMetaObject().
+    * [198166] Made canEvaluate() handle C-style comments correctly.
+    * [202606] Made it possible to invoke slots with const QObject* arguments.
+    * [200599] Removed the need to register the metatype-id of QObject-derived types
+               before they can be used as arguments to slots where the type occurs
+               in the signature.
+    * [185580] Fixed a bug with automatic semi-colon insertion that caused the
+               prefix ++ operator to behave incorrectly.
+    * [190991] Implemented iteration for arguments objects.
+    * [175697] Made conditional function declarations have the same semantics as in
+               other popular ECMAScript implementations.
+    * [176020] Fixed a crash that occurred when the left-hand side of an assignment
+               was an object literal.
+    * [176020] Fixed a crash that occurred when an if-statement inside a function
+               contained a return statement in the false-branch but not in the
+               true-branch, and the function didn't contain any more statements.
+    * [182578] Fixed a bug that caused automatic QList<int>-to-QScriptValue
+               conversion to fail.
+    * [163318] Added abortEvaluation() function.
+    * [167711] Added qScriptConnect() and qScriptDisconnect() functions, so that
+               a signal can be connected to a script function from C++.
+
+- QScrollArea
+    * Fixed an issue with child widgets with heightForWidth sizing behavior.
+
+- QScrollBar
+    * [178919] Fixed a bug where the slider kept moving after the mouse button was released.
+
+- QSemaphore
+
+- QSettings
+    * [199061] Don't use more permissions than we have to, when opening the registry.
+    * [142457] Preserve the order of keys in .ini files when regenerating them.
+    * [186232] Unix and Mac OS X: OR the needed permissions flags with the
+      default flags (instead of overriding them).
+    * [184754] Hande out-of-disk-space condition more smoothly, by keeping the
+      old .ini/.conf file if possible (instead of trashing it).
+    * [189589] Don't create empty directories when accessing QSettings read-only.
+    * [182712] Added QSettings::setDefaultFormat(), defaultFormat(), and
+      format() to give more control over the format of QSettings objects
+      created using the default constructor.
+    * [183068] Added QSettings::scope(), applicationName(), and
+      organizationName() for retrieving the values passed to the constructor.
+
+- QShortcut
+    * [141646] Add ShortcutContext::WidgetWithChildrenShortcut context, for shortcuts
+      which are valid for a widget and all it's children.
+- QSize
+    * [172712] Fixed bug in QSize::scale() when passing INT_MAX as height and
+      KeepAspectRatio as mode.
+    * [191533] Fixed bug in QSize::scale() where scaling a size with zero
+      width or height would cause a division by zero.
+
+- QSizeGrip
+    * [193199] Made the size grip always respect height-for-width on all
+      platforms.
+    * [161173] Fixed a bug causing the size grip to be visible when it shouldn't be.
+    * [184528] Windows: Fixed a bug causing a mouse press event not to be sent.
+    * [193350] Fixed a bug with QVBoxLayout.
+
+- QSlider
+    * [180474] Fixed regression causing a tick mark not to be shown at the max value for
+      certain common cases.
+
+- QSocketNotifier
+
+- QSortFilterProxyModel
+    * [162503] Call mapToSource when mapping from proxy to source indexes.
+    * [146684] Allow the original order of the source model to be restored.
+    * [199518] Don't assert if the source model emits unbalanced change signals.
+    * [202908] dropMimeData incorrectly maps when row is rowCount(parent).
+
+- QSpinBox
+    * [157520] Adopt the special value text when the value is explicitly set to the
+      minimum value with the keyboard
+    * [164696] QWidget::locale() is now used for all string-to-number conversions.
+
+- QSplashScreen
+
+- QSplitter
+    * [169702] Respect the minimum size of widgets.
+    * [187373] Ensure that widgets are properly initialized before being added to a QSplitter.
+
+- QSql
+
+- QSqlDatabase
+    * [129992] Make it possible to retrieve the connection name from a connection.
+      Use the connectionName() function.
+
+    * [143878] Give a warning if there is no QCoreApplication instance (required
+      when using a plug-in driver).
+
+- QSqlDriver
+    * [141269] Add support for asynchronous database event notifications.
+
+- QSqlQuery
+    * [157397] Set an error if QSqlQuery is used with an invalid database
+      connection.
+
+    * [122336] Support queries returning multiple result sets. Use the
+      nextResult() function.
+
+    * [149743] Fixed bug where seek() to a record which was not the next one
+      returned true, but the data could not be retrieved.
+
+    * [186812] Improved error handling for exec().
+
+- QSqlQueryModel
+
+- QSqlRelationalTableModel
+
+- QSqlTableModel
+    * [160135] Emit headerDataChanged when removing rows when using the
+      OnManualSubmit edit strategy.
+
+- QSslCertificate
+    * [186791] Fixed wildcard support in QSslCertificate::fromPath().
+
+- QSslCipher
+- QSslError
+- QSslKey
+
+- QSslSocket
+    * [190133] Fixed security hole in certificate verification.
+    * [186077] Fixed bug in ASN1 time parsing.
+    * [177375] Added support for peer verification.
+    * [191705] Fixed crash on remote disconnect.
+    * [177285, 170458] Enabled run-time resolving of OpenSSL libs also in
+      static Qt builds. Enabled by default, with configure option to force
+      (static) linkage.
+
+- QStackedLayout
+- QStackedWidget
+    * [124966] Honor QSizePolicy::Ignored in pages like we did in Qt 3.
+
+- QStandardItemModel
+    * Improved general performance
+    * [133449] Improved setData() performance
+
+- QStatusBar
+    * [194017] Ensure that explicitly hidden Widget in the status bar stay invisible.
+
+- QString
+    * [202871] QString::sprintf() crashed with size_t format.
+    * [193684] Optimized common case in QString::replace(int, int, QString).
+    * [190186] Handle multiple-digit %n args in QString::arg(QString,
+      QString, ...) gracefully.
+
+- QStringListModel
+    * [158908] Add MoveAction to the default supportedDropActions
+    * [180184] sort() was not updating the persistant model index's
+
+- QStyle
+    * [127923] All implementations of QStyle::subControlRect() now respect QStyleOption::rect for
+      spin boxes.
+    * Added SH_SpinBox_ClickAutoRepeatThreshold which used to be hardcoded in QAbstractSpinBox
+
+- QStyleOption
+
+- QSvg
+    * [185844] Fixed parsing of the gradientUnits attribute to support
+      objectBoundingBox for gradients.
+    * [161275] Fixed parsing of repeatCount attribute for animateColor
+      and animateTransform tags.
+    * [176835] Fixed a memory leak in QSvgGenerator.
+    * [182196] Fixed problem in QSvgGenerator which would cause gradient
+      fills to be stored as images instead of using native SVG gradients.
+    * [187994] Always encode generated SVGs in UTF-8, and specify that
+      in the xml tag.
+    * [188847] Fixed a crash when an SVG file contains empty url keywords.
+    * [190936] Ensure properly sized viewport and viewbox, even when
+      the paint device does not have a size (such as QPicture).
+    * [191353, 192220] Fixed a couple of floating point exceptions occuring
+      when rendering certain SVGs containing curved paths.
+    * Added correct default attribute values for SVG gradients.
+
+- QSyntaxHighligher
+
+- QSystemTrayIcon
+
+- QTabBar
+    * [182473] Fixed a bug causing the tabs to stay unchanged after calling setElideMode().
+
+- QTableView
+    * [192919] Drag-selection from QTableView now respects single-selection mode.
+    * [172201] Painting errors when there are multiple regions that overlap that need to be painted.
+    * [148565] setSpan() and other spanning operations is slow when there are a lot of spans.
+    * [186431] Fix bug in wrapping to the next/previous line while doing cursor navigation.
+    * [189251] corner widget is hidden with header, but not unhidden
+    * [196532] Fixed bad repaint with hidden header and scrollPerItem.
+    * [158258] Add clearSpanns() function.
+
+- QTableWidget
+    * [255512] Add function to allow setting the current item without selecting it.
+
+- QTabWidget
+    * [159433] Emit currentChanged() when the first tab is created.
+    * [171464] QTabWidget::minimumSizeHint() now respects the orientation.
+    * [188357] Fixed a bug causing the corner widget to be displayed incorrectly.
+
+- QtAlgorithms
+    * [304394] qBinaryFind() can potentially end up in an infinite loop with large collections
+
+- QTcpSocket
+    * [149200] Fixed crash when using QTcpSocket without constructing
+      Q(Core)Application.
+
+- QTemporaryFile
+    * [192890] Fixed resize bug on Windows.
+    * [194130] Fixed creation of temp files in toplevel directories on
+      Windows.
+
+- QTextBrowser
+    * [166040] Detects the right format when calling setText() severals times.
+    * [177036] Fix handling of encoded urls.
+    * [169621] Fixes clearHistory() removes all history items except the first,
+      while it should keep the last entry.
+    * [176042] Fix selectAll to sometimes show focus frames instead of selected
+      text.
+
+- QTextCodec
+    * [169065] Make calling QTextCodec::setCodecForLocale() with NULL
+      reset codecForLocale() to the default, instead of causing a crash.
+    * [167709] Improved support for cp932 codec.
+    * [185085] Make sure every codec has a unique mibEnum
+    * Added UTF-32 codecs
+
+- QTextCursor
+    * [179634] Fixes loosing of x position when using vertical navigation
+      in a not yet fully layed out document.
+    * [178499] Add functionality to interpolate inside the glyph size if it
+      takes multiple characters to decide on the position.
+    * [182914] '/' is now considered a word separator.
+    * Faster QTextCursor::blockNumber().
+
+- QTextDecoder
+
+- QTextDocument
+    * [135133] Add proper support for the background attribute of HTML
+      tags, which enables specifying background images.
+    * [148847] Add support for padding-left, padding-right, padding-top,
+      and padding-bottom for table cells in the HTML import.
+    * [169724] Added API for changing the indent width in a QTextDocument.
+    * [173258] Fixed bug in text layout of tables with row spans and
+      empty cells.
+    * [174405] Added support for the border-width css property in the HTML
+      import.
+    * [176162] Fixed bug in HTML import which would cause block properties
+      of empty paragraphs to be transfered to following paragraphs.
+    * [179330] Fixed performance problem when a maximum block count is reached
+      which caused the whole document to be relayouted.
+    * Numerous fixes in the import of malformed HTML.
+    * QTextDocument::print() now preserves formats set by a syntax highlighter.
+    * Added QTextDocument::firstBlock() and lastBlock() for convenient iteration
+    * Added QTextDocument::undoCommandAdded() signal.
+    * [189691] Fixed bug in HTML image tags showing in incorrect width/height
+      when only one was provided.
+    * [193122] QTextTable::removeRows() correctly removes one row after a
+      mergeCells()
+    * [55520] Fix bi-directional text showing correctly when mixed with tabs.
+    * [170376] Fixes text layout QTextLine::setNumColumns(1) combined with
+      alignment not left
+    * [177024] Fixed bug in definition of &current; entity.
+    * [176898] QTextDocument loses UndoRedo stack when setting it on QTextEdit by
+      calling QTextEdit::setDocument()
+    * [180657] QTextDocument::documentSize() returns an incorrect width when there
+      is a long line with only spaces.
+    * [180430] Stop compression of space after an image tag.
+    * [154330] Implement Right, Justified and Center tabs and make Left tabs
+      behave as expected in all cases.
+    * [196744] Fixes colspan making a table cell multiply given user width.
+    * [197769] Fixed wrong modified state while undo/redo.
+    * Added QTextDocument::findBlockByNumber() and QTextBlock::blockNumber().
+    * Added QTextDocument::revision() and QTextBlock::setRevision()/revision().
+    * Added QTextBlock::setVisible()/visible() and QTextCursor::setVisualNavigation()/
+      visualNavigation().
+
+- QTextDocumentFragment
+
+- QTextEdit
+    * [80240] Fixed text color bug when creating a text edit with a disabled
+      parent widget that is then reenabled.
+    * [104778] Added convenience functions for getting/setting the background
+      color of text.
+    * [150562] Wrap correctly the text in a <table> when the flag
+      WrapAtWordBoundaryOrAnywhere is set.
+    * [165610] Fixed bug where a text fragment's underline would be drawn
+      too long.
+    * [166486] Fixed bug which caused the cursor to not be shown when
+      setting the cursor flash time to 0.
+    * [190852] Fixed a bug which caused the font sizes in tables to be wrong
+      in QTextEdit documents exported to HTML.
+    * Many performance improvements
+    * [190723] Fix problem where the bullet might disappear if there was an
+      extra selection selecting the word next to the bullet.
+    * [182200] Make the selectionChanged signal be emitted when pressing
+      "Ctrl+A" and there is already a selection present.
+    * [188589] Fixes regression in QTextEdit::keyReleaseEvent where it makes
+      the release events not be ignored when unused.
+    * [175825] Allow stopping auto-scrolling feature by moving the cursor
+      to a position other then the last position.
+    * [177151] Fix the "Copy Link Location" is always disabled in context
+      menus created with createStandardContextMenu()
+    * [182180] The value of cursor width desktop settings on windows is now
+      respected.
+    * [108739] Added DnD scrolling and made selection scrolling smoother.
+    * [202319] More precise QTextEdit::cursorRect().
+    * [181572] Accept Key_Up and Key_Down ShortcutOverride events.
+
+- QTextFormat
+    * Fixed bug which caused QTextCharFormat::font() to return a wrong font
+      after changing font-unrelated properties in QTextCharFormat.
+    * [181177] Fix text directionality changing.
+
+- QTextLayout
+    * Support WrapAtWordBoundaryOrAnywhere with QTextLine::setColumns.
+    * [188594] Make nextword and previous word be more synchronous by making
+      them stop at the same word boundaries.
+
+- QTextStream
+    * [178772] setCodec() take effect immediatly even on open stream.
+    * [180679] Implemented AlignAccountingStyle.
+    * Add UTF-32 autodetection
+
+- QTextTable
+
+- QtGlobal
+    * [186969] Fixed theQT_NO_WARNING_OUTPUT define to work properly.
+    * qFuzzyCompare() is now part of Qt's API and is public.
+
+- QThread
+    * QThread is no longer abstract. The default implementation of
+      QThread::run() function now calls QThread::exec().
+
+- QThreadStorage
+
+- QTimeEdit
+
+- QTimeLine
+    * Add CosineShape.
+
+- QTimer
+
+- QToolBar
+    * [159715] If the main window is to small to contains the extension, show it in a menu.
+    * [179202] Toolbars can be resized by dragging them with the mouse.
+    * [175325] Changing toolButtonStyle on floating toolbars is handled correctly.
+    * [187996] Ensure that invisible action are invisible in the toolbar.
+    * [191727] Fix layouting issue with widgets on the toolbar.
+
+- QToolBox
+
+- QToolButton
+    * [QToolButton] Emit triggered(QAction*) on the activation of the default action even if
+      triggered from the menu.
+
+- QToolTip
+    * [183679] Fixed problem of tool tip being closed when pressing certain keys.
+    * [191550] Fixed a regression causing the palette not to be updated after calling
+       QToolTip::setPalette.
+    * Added functions text() and isVisible().
+    * Fixed QToolTip::showText() with rectangle, it always created a new tip.
+
+- QTransform
+    * [178609] Fixed division by zero in QTransform::mapRect when passing an
+      invalid QRect.
+    * Fixed problem with QTransform::inverted() returning the identity matrix
+      for transforms with a low scale factor.
+
+- QTranslator
+    * [168416] Make it possible for QTranlator to open qm files generated with msgfmt.
+      (regression from Qt3)
+
+- QTreeView
+    * [41004] Deleting a directory will delete all of its children.
+    * [174627] Moving left towards a custom root index now works correctly.
+    * [154742] Add property to hide the header
+    * [166175] Improve the performance of hide() and isHidden()
+    * [166175] Improve the performance of expanded() and isExpanded()
+    * [181508] adding a row to a item that is visible and not expanded wont update the '+'
+    * [179635] Incorrect row height if column with a multi-line item is not visible when tree is first shown.
+    * [187745] When the context key is pressed first check for a micro focus, but if that isn't valid then go to the mouse cursor position.
+    * [188862] Crash if a parent index of the root index in the view is removed
+    * Improving performance by reduce the number of calls to model->parent()
+    * [167811] Improve insertion speed
+    * [192104] scrollTo(PositionAtCenter) can scroll beyond the item if item is at 0
+    * [168237] Fixed selection when using SelectItems selection behavior and ExtendedSelection selection mode.
+    * [171902] Expansion is not managed correctly when the 1st column is hidden.
+    * [130628] Add expandsOnDoubleClick property.
+    * [189956] Make scrollTo() scroll correctly when the scrollHint is PositionAtBottom.
+    * [185068] Update editor geometries when columns are moved.
+    * [120922] Mac OS X: Improved the selection behavior.
+    * [197650] Fixed spanning items in "right to left" layouts, or if the first column is
+      moved in another position.
+    * [204726] Don't assert when sorting an unchanged tree.
+    * [185994] Introduce a style hint that describes how the view should treat empty areas.
+
+- QTreeWidget
+    * [172685] When setting flags don't do anything if the new flag is the same as the old.
+    * [162736] Fixed potential slowness in QTreeWidget::isItemSelected()
+    * [167811] Improve insertion speed
+    * [255512] Add funtion to allow setting the current item without selecting it.
+    * [183566] Make rows containing widgets resize correctly.
+    * [189071] Make it possible to disable drop dirrectly on the viewport.
+    * [192840] Only paint disabled cells as disabled, not the entire row.
+    * [191329] The checkable items are now checkable even in RightToLeft mode.
+
+- QTreeWidgetItemIterator
+    * [172275] Optimize QTreeWidgetItemIterator to not query various states
+      unless the user explictly specified the corresponding flags.
+
+- QUdpSocket
+
+- QUndoStack
+   * [143285] Added API to access individual commands in the undo stack.
+
+- QUrl
+    * [162669] Fixed bug in QUrl::setAuthority() when input ends with a digit.
+    * [199967] Fixed a regression from Qt 4.4.0 Technical Preview 1
+      that caused isEmpty() to return true on non-empty URLs in some cases.
+
+- QValidator
+
+- QExplicitlySharedDataPointer
+    * A new reference counting pointer which doesn't perform copy on write.
+
+- QVariant
+    * [186447] Do not call qFatal() when QVariant::load() enconters a UserType
+      that's unknown to the meta object system.
+    * [170901] Compare values _and_ keys in QVariant::operator==() when
+      applied to maps.
+
+- QVarLengthArray
+    * [177708] Fix crash in QVarLengthArray::append() for types with a
+      non-trivial constructor (e.g., QString).
+
+- QVector
+    * [161376] Fix unitialized read reported by Valgrind in QVector<T> for
+      sizeof(T) < 4.
+
+- QWaitCondition
+    * [106086] Add support for QReadWriteLock to QWaitCondition::wait().
+
+- QWidget
+    * [323] Add the Qt::WA_ShowWithoutActivating attribute, which can
+      be used to show a window without activating it.
+    * [176809] When using the Qt::PreventContextMenu policy, the
+      context menu key should be sent to the widget (instead of
+      consuming the event).
+    * [83698] Introduce QWidget::setWindowFilePath() that allows setting a
+      proxy icon on the mac and sets the window title if the window title
+      hasn't been set previously.
+    * X11/Win: Added support for non-native child widgets.
+    * [173044] Added support for rendering widgets before they are shown.
+    * [152962] Fixed a bug causing the widget to repaint itself twice when calling show().
+    * Added a render() overload taking an arbitrary QPainter.
+    * [183466] Fixed a bug where the mouse button release event was sent to wrong widget
+      when having a mouse grabber.
+    * [177605, 171333] Windows: Fixed a bug causing painting artifacts when using the
+      Qt::WA_PaintOnScreen attribute.
+    * [141857] Fixed a bug causing painting artifacts when using the Qt::WA_OpaquePaintEvent attribute.
+    * [198794] Fixed wrong calculation of the target offset in render().
+    * [180009] Fixed order dependency of setWindowFlags() and setWindowTitle() on Windows.
+    * [155297] Avoid crash in QWidget::setLayout() if the layout already has
+      a parent.
+
+- QWidgetAction
+    * [193061] Fixed setEnabled that has no effect.
+
+- QWindowsStyle
+    * [162326] Removed a warning when rendering to small rectangles.
+
+- QWindowsXPStyle
+    * [189527] Fixed incorrect tab indentation on XP/Vista styles.
+    * [177846] Fixed setAutoRaise beeing ignored for tool buttons.
+    * [168515] Allow changing the background color of a disabled spinbox.
+    * [165124] Fixed context help button beeing ignored for QMdiSubWindows.
+
+- QWindowsVistaStyle
+    * [164016] More native menu borders on Vista.
+    * [168611] Allow progress bar animation to complete after reaching 100%.
+
+- QWizard
+    * [177022] Respect the minimum and maximum size.
+    * [189333] The (re)size behavior is now correct for Windows Me.
+    * [183550] Fixed wrong stretch factor for a wizard page in the interal layout.
+    * [166559] Honor isAcceptableInput().
+    * [170447] Make sure that the virtual QWizard::nextId() function is
+      called from QWizardPage::isFinalPage().
+
+- QWizardPage
+
+- QXmlStreamReader
+    * Added convenience function prefix() to the reader and the attributes, previously
+      we only had name() and qualifiedName().
+    * Added more DTD reporting.
+    * Added QXmlStreamEntityResolver for undeclared entities.
+    * [179320] Fixed wrongly reported premature end of document for non-recoverable errors
+    * [192810] Fixed namespace declarations in DTD attribute lists.
+    * Add UTF-32 autodetection
+
+- QXmlStreamWriter
+    * Improvements to conformance to XML 1.0
+    * Added autoFormattingIndent property to customize the auto-formatted output.
+    * [18911] Fixed auto formatting for XML comments.
+
+- QXmlStreamWriter
+    * Added autoFormatting() property which controls whether the output should be indented
+      for readability.
+
+- QXmlSimpleReader
+    * [201459] That the class is not reentrant, has been documented.
+    * Add UTF-32 autodetection
+
+- Q3ButtonGroup
+    * [198864] Fixed bug that caused Q3ButtonGroup::insert() to generate wrong
+      (typically non-unique) ids.
+
+- Q3DateEdit
+
+- Q3DockWindow
+    * [173255] When docked, relayout improved when the content is changed.
+
+- Q3FileDialog
+    * [200264] Fixed the "QObject: Do not delete object, 'unnamed',
+      during its event handler!" warning found in the 4.4.0 beta.
+
+- Q3GroupBox
+
+- Q3ImageDrag
+    * [184521] Q3ImageDrag::canDecode() will now return true for image data that can be decoded.
+
+- Q3ListView
+    * [127037] Q3ListView::paintCell() now uses the viewport's background role.
+
+- Q3MainWindow
+    * [176544] Q3MainWindow::setDockEnabled() no longer adds dock windows that are already there.
+    * [176129] Q3MainWindow::setUsesBigPixmap now works.
+
+- Q3PopupMenu
+    * [177490] Fixed regression causing activated and highlighted signals to be
+      emitted multiple times.
+
+- Q3ScrollView
+
+- Q3SqlCursor
+
+- Q3Table
+    * [171801] Fixed a graphical error in Q3CheckTableItem.
+    * [196074] Fixed a crash when using Q3Table and Q3ComboTableItem together
+      with stylesheets.
+
+- Q3TextEdit
+    * [197033] Fixed "select-and-copy" on X11
+
+- Q3Toolbar
+    * [171843] QComboBox in a Q3Toolbar was generating warnings
+
+- QSvgWidget
+    * Support for xml:space
+
+- QWhatsThis
+    [177416] Fix sizing hints when using rich-text.
+
+- Qt Style Sheets
+    * [163429] Stylesheet backgrounds now work on Mac. Note that there are
+      still issues with stylesheets on that platform.
+    * [169855] Setting a style sheet with gridline-color on QTableView now
+      works correctly.
+    * [182917] :hover no longer applies to disabled widgets.
+    * [184867] Several speedups to stylesheet parsing.
+    * [188344] Style sheets no longer reset font settings. They now
+      take precedence over manually set font settings, and will leave other
+      settings alone. The font is restored to the manual settings if
+      the style sheet is removed.
+    * [188702] Fixed a bug where QLineEdit would not react to the :focus
+      pseudo state.
+    * [190422] Fixed a bug where the width of QSpinBox subcontrols would not
+      be properly respected.
+    * [190423] Fixed a bug where gradient backgrounds were not shown correctly
+      in QComboBox.
+    * [191189] Fixed a bug where classes derived from QDialog by more than two
+      levels (QDialog -> MySubClass -> MySubSubClass) would not receive the
+      styled background.
+    * [191216] Menus with a background color will now be rendered using the
+      native style.
+    * [191822] Fixed a crash in subElementRect when widget pointer is null.
+    * [192374] An offset ::tab-bar element no longer offsets scroll buttons.
+    * [192535] Fixed a bug where a QComboBox would not always draw its
+      dropdown button when styled.
+    * [192655] Fixed a bug where it was sometimes impossible to toggle a
+      styled, checkable menu item.
+    * [199912] QHeaderView no longer collapses to zero contentsRect if size
+      is not specified.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+- Interbase driver
+    * [185482] Fixed bug where data corruption occurred when inserting data into
+      numeric fields on some platforms.
+
+    * [156090] Fixed bug where the connection information was always assumed to
+      be Latin1 encoded.
+
+- MySQL driver
+    * [190311] Fixed bug where fetching BLOBs with a prepared query would fail
+      if the second BLOB was larger than the first.
+
+    * [184354] Implement QSqlDriver::escapeIdentifier() allowing reserved words and
+      white spaces in table and column names.
+
+    * [129925] Communicate with the database using UTF8 encoding for MySQL
+      versions >= 4.1.13 and < 5.0.0. This makes the behavior consistent with MySQL
+      versions >= 5.0.7.
+
+- OCI driver
+    * [167644] Set an error when failing to start a transaction in addition to
+      printing an error.
+
+    * [177054] Fixed bug that caused QSqlField::length() to always return 38 for
+      non-numeric fields.
+
+    * [141706] Added support for the using the hostname and port number provided by
+      QSqlDatabase. This makes it possible to connect to Oracle databases without
+      a tnsnames.ora file on the client.
+
+- ODBC driver
+    * [164680] Don't crash when updating a view displaying a model after the
+      database connection has been closed.
+
+    * [166003] Use SQLFetch() if SQLFetchScroll() isn't supported in the driver.
+
+    * [116534] Allow closing cursor without destruction of QSqlQuery object. Use
+      QSqlQuery::finish().
+
+    * [181039] Added support for a connection option to instruct the driver to
+      connect as an ODBC 3 application; SQL_OV_ODBC3. This is needed in order to
+      make the QODBC driver work with some ODBC drivers.
+
+    * [176233] Connection options are no longer case-sensitive (according to the
+      ODBC standard).
+
+    * [178532] Fixed bug where binding bools would fail.
+
+    * [176231] Support passing the username and password as part of a connection string
+      instead of using QSqlDatabase::setUserName() and QSqlDatabase::setPassword().
+
+    * [141822] Support the SQL_GUID type.
+
+    * [187936] Improved support for the Linux Easysoft ODBC driver.
+
+    * [165923] Improved error handling.
+
+- SQLite driver
+    * [174340] Bind QVariant::UInt as int64 instead of string.
+
+- PostgreSQL driver
+    * [152770] Support prepared queries natively for PostgreSQL 8.2.
+
+    * [164233] Fixed bug where QSqlDatabase::primaryIndex() would fail if the
+      table name was used in multiple schemas.
+
+    * [168934] Make a real error message available when failing to connect to a
+      database.
+
+    * [150373] Added support for NumericalPrecisionPolicy, allowing the user to
+      instruct the driver not to return NUMERICs as strings.
+
+- DB2 driver
+    * [189727] Fixed bug where fetching the fields in a row multiple time would
+      fail unless the fields were fetched in order.
+
+
+****************************************************************************
+*                             QTestLib                                     *
+****************************************************************************
+* The display is now enabled on Mac OS X just before a test in run and qtestlib will ensure
+  the application under test is the "front process" if it is a GUI application.
+
+****************************************************************************
+*                               QDBus                                      *
+****************************************************************************
+
+- Library
+    * [195515] Fixed a bug where the Qt application would crash if it
+      tried to send some types of messages after the connection to the
+      bus was broken.
+    * [188728] Fixed a freeze caused by connecting to a slot that did
+      not exist
+
+- Viewer
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+MIPS Linux
+    * [188320] Build Qt/X11 with FPU support, breaking binary
+      compatibility; see "Important Behavior Changes" below.
+
+X11
+---
+    * Improved GNOME platform detection.
+    * [193845] Improved support for KDE palette settings.
+    * [179200] Fixed an issue where Qt would print "QProcess: Destroyed
+      while process is still running." when using Cleanlooks.
+    * [155704] Fixed a bug where widgets with MSWindowsFixedSizeDialogHint
+      flag would be minimized when their parent QMainWindow was minimized.
+      The MSWindowsFixedSizeDialogHint is now ignored on X11.
+    * [153155] Make it possible to bypass g_thread_init() and have the
+      Unix event dispatcher be used in threads instead by setting the
+      QT_NO_THREADED_GLIB environment variable.
+    * [157807] Fix an inefficiency in the Glib dispatcher's
+      timerSourcePrepare() implementation.
+    * [158332] Fix a bug where text/uri-list drops from Qt 3 would
+      append a single, empty url to the uri-list.
+    * [166097] QWidget::show() no longer resets the WM_TRANSIENT_FOR
+      property if the Qt::WA_X11BybassTransientForHint attribute is
+      set.
+    * [166097] QWidget::show() no longer resets the _NET_WM_STATE
+      property. Qt now merges its own state with any previous state
+      set by the application programmer.
+    * [168285] Fixed QDrag to correctly reset the override cursor.
+    * [17566] Don't impose FD_SETSIZE limit when using the Glib event
+      dispatcher.
+    * [171513] Fixed a bug where an application would take up 100% CPU
+      after starting a QDrag.
+    * [184482] Fixed QApplication::setOverrideCursor() to not change
+      the cursor for the root window.
+    * [185048] Fixed a bug where calling QClipboard::set*()
+      immediately after QClipboard::clear() would result in the
+      clipboard staying cleared.
+    * [182840] Fixed a bug where QApplication::mouseButtons() would
+      sometimes report the wrong state.
+    * [173328] Fixed QEventLoop::exec(ExcludeUserInputEvents) to not
+      consume 100% when using the Glib event dispatcher.
+    * [179536] Make QEventLoop::X11ExcludeTimers work as expected with
+      the Glib event dispatcher.
+    * [182913] Qt will now always look for the _MOTIF_DRAG_WINDOW
+      property on screen 0 (instead of the default screen).
+    * [187752] Fixed a bug where calling show() and hide() on a window
+      before the event loop starts would prevent the window from ever
+      being shown.
+    * [189045] Reset the keyboard and mouse grabs to the current
+      grabber when the last popup is closed.
+    * [167707] Add support for all known _NET_WM_WINDOW_TYPE_* types
+      via QWidget::setAttribute(). The attributes follow the
+      Qt::WA_X11NetWmWindowType* naming scheme.
+    * [172623] Don't create a pipe in the Glib event dispatcher (as it
+      is not necessary).
+    * [192871] Fixed a regression found in the 4.4.0 snapshots that
+      broke QX11EmbedContainer.
+    * [192526] Similar to 170768 below, fixed the spin locking in the
+      QAtomic* implementation for 32-bit SPARC processors to yield
+      instead of busy waiting.
+    * [194566] Fixed a bug found in the 4.4.0 snapshots that would
+      always cause the cursor to change when QWidget::setCursor() was
+      called on a widget that was not under the mouse.
+    * [173746] Fixed a bug in QDialog that would cause the "What's
+      This?" popup menu to appear on the wrong X11 screen.
+    * [187965] Fixed a bug where moving a widget that is hidden could
+      cause the positioning to be incorrect.
+    * [160206] Fixed some bugs in QX11EmbedWidget and
+      QX11EmbedContainer to provide minimal support for multiple
+      containers and multiple embedded widgets in the same
+      application.
+    * [182898] Fixed a crash in Motif Drag-and-Drop support when the
+      _MOTIF_DRAG_WINDOW property is missing.
+    * [183477] Fixed a bug that would cause a window to disappear
+      after restoring it with QWidget::restoreGeometry().
+    * [163507] Fixed a couple of memory errors reported by valgrind.
+    * [192654] Fixed drag-and-drop of more than one URL (using the
+      text/uri-list mime type) between applications.
+    * [198709] Fix QDesktopWidget to not report overlapping screens on
+      servers with Xrandr 1.2.
+    * [146336] On UNIX systems without CUPS support, the
+      $HOME/.printers is now checked for a default printer.
+    * [185864] Allow Qt to find the OpenSSL libraries dynamically even
+      if the libssl.so file is not present.
+    * [168283] Set WM_WINDOW_ROLE directly from QWidget's windowRole() property.
+    * [187660] Implemented rotation for tablets on non-Irix X11 platforms.
+    * [192818] Fixed drawing shapes with a textured brush that had an offset.
+    * [133291] Fixed slow line drawing when using dashing under X11.
+    * [183070] Make it possible to filter events for overlay widgets in OpenGL
+      under X11.
+    * [176485] Make drawing text through FreeType beyond the SHORT_MIN/MAX
+      coordinate range work. Note that this won't work for XLFD based fonts.
+    * [182264] Fixed a crash in QClipboard::setMimeData() when several
+      clipboards share the same QMimeData instance.
+    * [182264] Copying rich-text contents of a QTextEdit and pasting
+      them to an editor that accepts rich text didn't work.
+
+- QPrintDialog
+    * [128956] Fixed a bug which caused the print dialog to become hidden
+      while the overwrite dialog was shown.
+    * [192764] /etc/printcap with blank lines is now correctly parsed.
+    * Redesigned the print dialog and pagesetup dialog to be much nicer.
+
+- QPrinter
+    * [148125] Switched to printing through the CUPS API. This should fix the
+      problem where the wrong lp/lpr command was picked up, and therefore
+      printed through the wrong print system. If CUPS is enabled at compile
+      time, it will always be used if available.
+    * [161936] lp no longer outputs job ID to the console when printing.
+    * [180669] QPrinter no longer crashes if the CUPS library cannot be found.
+
+Windows
+-------
+    * [185702] Fixed qatomic_windows.h to properly forward declare the
+      _Interlocked*() functions to avoid conflicts with other headers
+      that also use these functions.
+    * [183547] Replaced scalar delete with array delete in windows socket engine.
+    * [190066] Fixed setting spinbox and combobox bgcolor with stylesheets on Vista.
+    * [197055] Fixed a stylesheet background issue with TextEdit on Vista.
+    * Black regions are no longer exposed when resizing windows on Vista using Aero.
+    * [172757] Respect system font changes on Windows.
+    * [194803] Pass the keyboard modifiers in QTabletEvent on Windows.
+    * [194089] Avoid adding the current screen point when translating tablet events on Windows.
+    * [187712] Fixed QT_WA() macros to use correct windows version in static builds.
+    * [183975] Handle 'Win+M' key while showing modal dialogs.
+    * [187729] Fixed incorrect focus behavior when main-window is shown minimized.
+    * [187900] Increased area for scrolbar thumb dragging.
+    * [180416] Fixed incorrect command line parsing on windows.
+    * [169703] Fixed Drag & Drop returning Invalid data.
+    * [181816] Fixed drawing ClearType text into a QImage with the Format_ARGB32 format.
+    * [123455] Make QWidget::numColors() return something useful for widgets that's not
+      been shown yet.
+
+- QApplication
+    * [167897] Fixed a bug where QApplication would treat single quotes
+      as a quote to signify the end of an argument.
+
+- QFileDialog
+    * [173402] Fixed wrong sort order if cou reopen a file dialog.
+    * [178279] Be more smart for enabling or disabling the open button.
+    * [178897] Fixed QFileDialog minimym size while very long path are in the history.
+    * [181912] Not following folders that are symlinks.
+    * [187959] Change the button caption from "save" to "open" when selecting a folder
+      in a save dialog.
+    * [196062] HANDLEs are now freed when searching the paths.
+    * [198049] Selecting a file in the completer would display the full path rather then just the file name if it was in the current directory.
+
+- QDesktopServices
+    * [194046] Fixed support for percentage encoded URL strings with openUrl().
+    * [172914] Fixed an issue where openUrl() would incorrectly return true
+      after failing to open on Windows.
+
+- QFileSystemWatcher
+    * [170021] Make it possible to monitor FAT32 directories.
+
+- QFont
+    * Use Harfbuzz instead of Uniscribe for complex text shaping enabling support of a broader
+      range of writing systems on all Windows versions.
+
+- QKeySequence
+    * [187917] Fixed incorrect standard shortcut for PreviousChild.
+
+- QListView
+    * [183299] More native appearance on list view selection backgrounds.
+
+- QLocale
+    * [139582] An unrecognized LANG environment variable will now make QLocale
+      fall back to the Windows locale, instead of the C locale.
+
+- QMenu
+    * [140954] Fixed an issue where pressing the Alt-key would not correctly
+      show and hide menu accelerators.
+
+- QMutex
+    * [179050] Fixed a bug that cause a warning on startup from QMutex
+      running an application build with MinGW on Windows 9x.
+
+- QPrintDialog
+    * [183448] Fixed a bug where the print-to-file setting would remain stuck
+      even after disabling it in the dialog.
+
+- QPrinter
+    * [185751] Fixed a crash in QPrinter if QPainter.begin() failed.
+    * [191316] Fixed a crash when using certain nonstandard printer drivers.
+
+- QScriptEngine
+    * [182241] Fixed a bug that caused qScriptValueFromQMetaObject() to generate
+      the wrong script constructor function with VC6.
+
+- QSyntaxHighlighter
+    * Added QSyntaxHighlighter::currentBlock().
+
+- QSystemTrayIcon
+    * [189196] Fixed showMessage timeout interval being ignored on windows.
+
+- QTimer
+    * [179238] Make QTimer behavior consistent with UNIX by not
+      allowing them to fire recursively.
+    * [188820] Fixed a bug found in the 4.4.0 snapshots that caused
+      menu effects to "freeze."
+
+- QWizard
+    * [180397] Fixed crash resulting from AeroStyle being assumed even when some of the required
+      symbols were unresolved.
+
+- ActiveQt
+    * [198021] Optimized QAxHostWidget::paintEvent(), the painting code is required only when the
+      widget is being grabbed.
+    * [191314] Support browsing of ActiveQt controls in Microsoft Visual Studio.
+    * [190584] Support for large strings in code generated by dumpcpp.
+    * [190538] Fixed incomplete function declarations generated by dumpcpp.
+    * [90634]  Support for 2D safe arrays.
+    * [158785] Support for ActiveX control initialization using stored data.
+
+Mac OS X
+--------
+    * [168290] Input Methods can now be used on windows of type Qt::Popup.
+    * [195099] Fixed a problem with posted an event to quit in one thread to
+      another thread would not quit the other threads loop.
+    * [193047] Extend support for all the function keys on a standard Apple keyboard.
+    * [193096] QtUiTools_debug.a is now included in the debuglibraries binary package.
+    * [141602] pixeltool is also included in the binary package.
+    * [188580] Respect the LSUIElements key in an application's Info.plist.
+    * [188267] Ensure that qAppName() checks CFBundleName before using the executable name.
+    * [183464] Fix "wrong clippboard content" issue.
+    * [189587] Prevent triggering menu shortcuts when showing native dialogs.
+    * [174769] Add separator above the "Preferences" menu item in the application menu.
+    * Some fixes to color space handling to ensure that the display color space is used when
+      drawing items to the screen (and printer). This works even if the display has a non-standard colorspace.
+    * Apply a fix so that programs using the sqlite plugin and built on Mac OS X 10.5 will run on older versions of Mac OS X.
+
+- QAction
+    * [196332] Make actions with ApplicationSpecificRole get merged in all cases.
+
+- QApplication
+    * [180466] Ensure that non Qt Windows get an activate.
+    * [171181] QApplication no longer send key events to disabled widgets.
+
+- QContextMenuEvent
+    * [161940] Implement support for QContextMenuEvent::modifiers()
+
+- QImage
+    * [182655] Switch off antialiasing when drawng to 1bpp images on Mac
+
+- QMainWindow
+    * [171931] Fix crash when calling addToolBar while the user is dragging toolbars.
+    * [191544] Fix unified toolbar size constraint issues.
+
+- QMime
+    Implement text/html for cutting and pasting.
+
+- QPixmap
+    * QPixmap no longer breaks CGImageRef's immutability.
+
+- QPushButton
+    * [183084] QPushButton will no longer change appearance between mini, small, and large
+      according to the size of it's contents. This behaviour can be switched on by using
+      WA_MacVariableSize.
+    * [172108] Unset the mnemonic if setText() is called with no &.
+
+- QPrinter
+    * [189182, 194085] Querying printer properties on Mac now works after QPainter::end().
+
+- QSettings
+    * Fixed QSettings::sync() spurious error on Mac OS X 10.5.
+    * Improved the Mac .plist serialization so that it doesn't generate
+      needless one-element CFArrays.
+
+- QTextCodec
+    * Fixed "System" locale codec on little-endian Mac OS X (Intel).
+
+- QTextEdit
+    * [176378] Make selections be shown full-width.
+    * [182243] Fix a regression where text editing widgets would insert command-keys that weren't shortcuts.
+
+- QWidget
+    * [197087] Make masks work correctly for splashscreens and popups on Leopard.
+    * [167974] Fix offset issue when seMask() was used in combinatiojn with Qt::FramelessWindowHint.
+    * [192527] Fix a regression where Cmd+MouseButton on a window icon no longer sent a QIconDragEvent.
+    * [179073] WA_MacMiniSize and MA_MacSmallSize have an effect on the default fonts for a widget.
+    * [175199] Ensure sheets that later become normal windows have the correct opacity.
+    * [139002] Ensure macEvent() is called.
+
+- QCoreGraphicsPaintEngine
+    * Implement Porter-Duff operations.
+
+- QPageSetupDialog
+- QPrintDialog
+    * Make both these dialogs sheets if they are given a parent.
+
+- Q3ComboBox
+    * Make up/down arrows work when the popup is closed.
+
+
+Qt for Embedded Linux
+---------------------
+
+ - Screen drivers
+   * LinuxFB: Improved support for BGR framebuffers
+   * LinuxFB: Added 12, 15, 18 and 24 bit pixel depth detection.
+   * AHI: New driver using the ATI Handheld Interface library.
+   * DirectFB: New driver using the DirectFB library.
+   * SVGAlib: Add support for 4 and 8 bit mode.
+   * SVGAlib: Fixed the background color for 16 bit mode.
+   * Transformed: Fix bug preventing driver to load as a plugin
+   * VNC: Added support for the client cursor pseudo encoding.
+   * Added QProxyScreen, a class for simplifying proxy based screen drivers.
+     Currently used by the VNC and Transformed screen driver.
+   * Added framework for letting the screen driver control the QPixmap
+     implementation.
+   * [194139] Fixed background initialization in a multiscreen environment.
+   * [195661] Fixed disappearing mouse cursor in a multiscreen environment.
+
+ - Mouse drivers
+   * Made the Yopy, VR41xx, PC, LinuxTP, and Bus drivers available as plugins.
+   * [194413] Fixed missing newline when writing the calibration file.
+   * Configurable double-click jitter sensitivity through the
+     QWS_DBLCLICK_DISTANCE environment variable.
+
+ - Keyboard drivers
+   * Made the SL5000, USB, VR41xx and Yopy drivers available as plugins.
+
+ - Decoration drivers
+   * Made the Styled, Windows and Default decorations avaiable as plugins
+
+ - Demo applications
+   * Added embeddedsvgviewer, styledemo & fluidlauncher applications to
+     demos/embedded to demonstrate Qt/Embedded on small screens (QVGA/VGA).
+     Fluidlauncher is used to launch the demos.
+   * Modified the existing pathstroke & deform demos to add a -small-screen
+     command line option to optimize layout for small screens (QVGA/VGA).
+
+ - Windowing system
+   * Removed redundant blits to the screen.
+   * Fixed a bug in QWSWindowSurface preventing the Opaque property to be used.
+   * Fixed a bug making the window surface valid when the
+     windowEvent(QWSServer::Hide) signal is emitted.
+   * Fixed a crash when no mouse driver is installed.
+   * Fixed bug where QWSWindow::name() would be incorrect unless
+     setWindowTitle() was called.
+   * Allow normal windows to be raised above full screen windows.
+   * [179884] Fixed bug when calling showMaximized() on a FramelessWindowHint
+     window.
+   * Fixed bug where children of a StaysOnTop window would be shown below the
+     parent.
+   * Fixed painting bug when configuring with -opengl and resizing/showing
+     child widget of visible window.
+
+ - QDirectPainter
+   * [100114] Implemented lock() and unlock().
+   * default parameter bug fixed for startPainting(); see "Important Behavior Changes" below.
+
+ - QScreen
+   * Added classId() to enable safe casting to specific subclasses.
+
+ - QPixmap
+   * Fixed grabWindow() on 12, 15, 18 and 24 bit screens.
+   * Fixed grabWindow() on BGR framebuffers.
+   * Fixed grabWindow() on rotated screens.
+
+ - QVFb
+   * Fixed 12-bit support.
+   * Added 15-bit support.
+   * Added support for 32-bit ARGB
+   * [127623] Tab key presses are now passed to the embedded application.
+
+ - General fixes
+   * [181906] Fixed case insensitive key comparisions in the keyboard, mouse
+     and screen plugin factory.
+   * [170768] For ARM processors, fixed the spin lock protecting the
+   * QAtomic* implementations to yield instead busy waiting.
+   * Reduced number of double precision floating point operations as an
+     optimization for platforms without a floating point processor.
+   * Reduced memory usage in the backing store.
+   * [177057] Fixed use of the modifier window title tag.
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+- ICC
+   * [169196] Use -fpic instead of deprecated -KPIC option.
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- Build System
+    * Make it possible to use QT+=dbus and QT+=testlib to enable
+      compiling against the QtDBus and QtTestLib libraries.
+
+- Assistant
+    * Renamed the existing Assistant to Assistant_adp and adjusted the QtAssistantClient library accordingly.
+
+    * Added the new Assistant based on the Qt Help module.
+
+    * Introduced qhelpconverter to convert adp or dcf files to the new file formats.
+
+    * Added the qhelpgenerator tool to create qch documentation files.
+
+    * Introduced qcollectiongenerator to create help collections.
+
+- Designer
+    * [191493] Fixed issues with small widgets in grid layouts on Mac
+
+    * [177564] Fixed autoFillBackground being reverted when setting a stylesheet on a QLabel.
+
+    * [171900] Made Qt3Support functions visually different (signals and slots, widget icons)
+
+    * [182037] Fixed a bug which made it possible to resize QFrame-based containers to arbitrarily small sizes
+
+    * [176678] Made "Current Widget Help" work
+
+    * [193885] Fixed a crash caused by a widget box widget not having a geometry nor a valid sizeHint.
+
+    * [122185] Added support for QMdiArea, QWorkspace
+
+    * [173873] Made pasted widgets appear at mouse position
+
+    * [191789] Added QtDesigner.pc for pkg-config
+
+    * [157152] Added a context menu to the buddy editor
+
+    * [189739] Fixed a crash caused by internal layouts of custom widget plugins
+
+    * [133687] Fixed QDesignerContainerExtension; provided way to specify a method to add pages in domXML
+
+    * [161643] Changed rich text editor to detect plain text and store it as such
+
+    * [183110] Added a dialog for setting the tab order by sorting the list of widgets
+
+    * [188548] Added support for static custom widget plugins to QUiLoader
+
+    * [157164] Made QStackedWidget context menu available on browse buttons
+
+    * [157217] Fixed default size of spacers
+
+    * [182448] Fixed a bug that caused additional spacing between toolbar's last action and consecutive toolbar
+
+    * [84089]  Added containers and custom containers to the "New Form" dialog
+
+    * [165443] Grey out the geometry property in Designer when it has no functionality
+
+    * [119506] Made comments available for shortcut properties
+
+    * [161480] Added detailed view to action editor
+
+    * [175146] Improved the signal/slot editor; do not reset the column sizes when switching forms
+
+    * [176121] Added "Save As" to code preview
+
+    * [176122] Added code preview
+
+    * [79138]  Added support for QLayout::sizeConstraint
+
+    * [156718] Made it possible to copy actions between forms
+
+    * [168648] Improved object inspector selection
+
+    * [166406] Fixed a selection bug affecting custom subclasses of QTabBar
+
+    * [151323] Made it possible to use subclasses of QTabWidget, QToolBox or QStackedWidget as custom widgets
+
+    * [168564] Fixed a bug in table widget editor
+
+    * [132874] Added support for user-defined signals and slots of promoted widgets and main container
+
+    * [202256] Made header section size of the action editor persist when switching forms
+
+    * [201505] Extended the QDesignerIntegration::objectNameChanged() signal to carry the previous object name
+
+    * [196304] Exclude C++ and java keywords as names for objects
+
+    * [199838] Breaking layout didn't update properly minimumSize of a form
+
+    * [118874] Added spacing property for the QToolBox
+
+    * [120274] Q3Wizard - "currentPageText" property added, "caption" properly converted to "windowTitle"
+
+    * [181567] Added support for loading and saving items for Q3ListBox and Q3ListView
+
+    * [187593] Fixed issue with dynamic properties
+
+    * [107935] Actions provided by task menu extension are appended to the list of actions of superclass
+
+    * [188823] Compress margin/spacing properties in case all values are the same, for legacy reasons
+
+    * [160635] Make Z-order working properly
+
+    * [171900] Signals and slots from compat layer marked with red italic
+
+    * [177398] Added notr="true" attribite to styleSheet property - in this way styleSheet string will not appear in linguist
+
+    * [180367] Greyed out X and Y properties of geometry in case of main container
+
+    * [118393] Collapsing property groups in property editor allowed
+
+    * [190703] Fixed in-place editor behaviour
+
+    * [154745] Guidelines provided for grid layout
+
+    * [173516] New resource system integrated
+
+    * [142477] Improved rich text editor and added HTML editing
+
+    * Gradient editor added to stylesheet editor
+
+    * Resetting font and palette subproperties handled properly
+
+    * uint, qlonglong, qulonglong and QByteArray properties supported
+
+    * Property Browser Solution integrated
+
+    * Property Editor - added toolbar with object and class name, and some actions
+
+    * Property Editor - remember expansion state
+
+    * Property Editor - style sheet editor added
+
+    * Property Editor - sorting and coloring added
+
+    * Added basic fixup for URL properties to prevent data loss when the
+      user enters an intermediate URL (such as www.google.com).
+
+- Linguist
+    * [39078] Added shortcut for adding an entry to a phrase book.
+
+    * [116913] Added tooltips to messages view and phrases view to be able to see the full text as well as to see a preview of HTML rendering.
+
+    * [142628] Fix a "What's this?" message in Linguist.
+
+    * [170053], [183645] Split the context / items tree up into a contexts window and a messages window.
+
+    * [171829] Added support for syntax highlighting in source/translation strings.
+
+    * [179415] When previewing a dialog via Qt Linguist that has the window
+      modality set to ApplicationModal do not block linguist.
+
+    * [181411] Make xliff utf-8 export use non-ascii characters, too.
+
+    * [183713] Identify the line number in the code for strings.
+
+    * [184586] Added ability to show multiple auxiliary (read-only) translations.
+
+    * [194325] Fixed an error with loading XLIFF files containing consecutive internal whitespace.
+
+    * Added a source code window. It shows the source file when available and highlights the line on which the source text was found.
+
+    * Added a window for showing warnings.
+
+    * Allow a translation to be marked as done when there are still warnings.
+
+    * Fixed undo/redo functionality.
+
+    * Show obsolete entries in grey.
+
+    * Ask whether modified phrase books should be saved on quit.
+
+    * Re-open phrasebooks at startup.
+
+- lupdate
+    * [80235]  Introduce QT_TRANSLATE_NOOP3 as a QT_TRANSLATE_NOOP3 variant
+      taking a comments parameter.
+
+    * [161106] When specifying ::QObject::tr() lupdate will no more take
+      the previous word as namespace.
+
+    * [165460] Make lupdate work with relative paths.
+
+    * [165679] Prevent lupdate from crashing on special string patterns.
+
+    * [179506] Handle the case of a class in a namespace inheriting from
+      another class in a different namespace correctly.
+
+    * [180318] Make lupdate work properly on deeply nested directories.
+
+    * Added an option (-pluralonly) that will only extract strings which
+      require a plural form, to ease adding plural translations for the same
+      language as the source messages.
+
+    * Do not require administrative privileges to run lupdate on Windows Vista.
+
+- lrelease
+    * [187375] Allow lrelease to be run from a directory outside the .pro file.
+
+    * Added an option (-removeidentical) that omits translated strings that
+      are exactly the same as the source string, to reduce file size.
+
+- rcc
+    * [105595] Add QT_NO_CAST_TO_ASCII define to tools by default.
+
+    * [188891] Fix crash when QResource is loaded from stream that was
+      rcc'd from an empty qrc file.
+    * [164840] Allow use of chinese characters in commandline arguments to rcc.
+
+- moc
+    * Treat -DFOO as -DFOO=1 for macros defined on the commandline.
+
+- uic
+    * [189327] Added support for QT_NO_ACCESSIBILITY
+
+    * [170919] Fixed a bug that caused nonsensical includes to appear in
+      conjunction with Qt support classes
+
+    * [171228] Fixed a bug that caused nonsensical includes to appear in
+      conjunction with Qt support classes
+
+    * [105595] Add QT_NO_CAST_TO_ASCII define to tools by default.
+
+    * [186989, 158836] Fixed invalid code generation in some cases when
+      cross-compiling.
+
+- uic3
+    * [179540] Added support for QPushButton's "on"-property
+
+    * [170919] Fixed a bug regarding includes for classes in namespaces
+
+    * [299175] Transform Qt3's QSlider property tickmarks to Qt4's
+      tickPosition
+
+- qmake
+    * [187938] Fix a bug that would cause Xcode projects generated by qmake to fail to link in Xcode 3.
+    * The pkgconfig files generated for the frameworks on Mac OS X are now correct.
+    * Makefiles for Mac OS X now always set QMAKE_MACOSX_DEPLOYMENT_TARGET=10.3
+      unless it is overridden in the .pro file, this will solves linking errors
+      on Leopard.
+    * [189409] The default Xcode generator format is now Xcode 2.2.
+    * Added an unsupported mkspec for LLVM on Mac OS X.
+    * [198562, 201942] Added support for overriding bundle extentions for Mac
+    * [152932] Specify the /MANIFEST option when embedding manifests into the application/library.
+    * Avoid adding silencing echos to the compiler when generating XCode projects.
+    * [191267] Only include the -L$$QT_PLUGINPATH option once in a project.
+    * Avoid memmoving data from outside a memory block.
+    * Generate proper MSVC 2008 VCPROJ and SLN files.
+    * [168308] Avoid double dir separators in subdir Makefiles.
+    * [168075] Make distcc work on Mac.
+
+- configure
+
+    * [180315] Implement -qtlibinfix configure option to allow renaming of Qt
+      libraries.
+    * [180315] Implement -qtnamespace configure option to allow compiling all
+      Qt symbols in a user-defined namespace.
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+- QTiffPlugin
+    * [187169] Return an error if loading fails instead of empty image.
+
+- QSvgIconEngine
+    The qsvg icon engine plugin has been renamed to qsvgicon to disambiguate
+    it from the qsvg image format plugin.
+    * Now allows multiple SVG files and/or other images to be added to
+      QIcon for different modes.
+    * Streaming of SVG icons is fixed.
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
+- Event filters
+
+        The behavior of event filters has changed starting with
+        4.4. Previously, thread affinity was ignored when adding,
+        removing, and activating an object's event filters. Now, event
+        filters must have the same thread affinity as the object they
+        are filtering. Qt will warn when it detects a filter that is
+        in a different thread from the object being filtered.
+
+- QFont
+        Starting with Qt 4.4, the '-' characters in the raw font names
+        are no longer substituted with a ' ' (space character). This
+        may impact your application if you use fonts that have '-'
+        characters in their raw font names.
+
+- QReadWriteLock
+        Starting with Qt 4.4, recursive lock support is disabled by
+        default in QReadWriteLock. Code that relies on recursive write
+        locking will need to be changed to construct the
+        QReadWriteLock with recursive lock support enabled. Previously,
+        recursive write-lock support (introduced in 4.3) was enabled by
+        default, but QReadWriteLock did not properly support recursive
+        read-lock support. QReadWriteLock now supports both and needs to
+        be constructed explicitly with recurive lock support enabled
+        (QMutex works in the same way).
+
+- QPainterPath
+        We have changed QPainterPath::angleAtPercent() to use the same
+        angle definition as in the rest of Qt. This means that the angle
+        returned will be from 0 to but not including 360, specifying
+        the degrees from the 3 o'clock position in the counter-clockwise
+        direction.
+
+- QDirectPainter [Qt for Embedded Linux-specific class]
+        startPainting() in Qt 4.3 had a default parameter lock=false,
+        the value of which was not used. The function would lock for
+        client processes, but not for the server process. From Qt 4.4,
+        the default value is changed to true, and startPainting() will
+        lock if lock == true, and not lock if lock == false. This means
+        that client processes running code that has not been recompiled
+        with Qt 4.4 may show flicker and/or painting problems. To get
+        exactly the same behaviour as for Qt 4.3, change startPainting()
+        to startPainting(QApplication::type() == QApplication::GuiClient).
+
+- QPrinter
+        QPrinter::pageRect() did not return consistent values on
+        Linux/Mac/Windows when QPrinter::fullPage() was set to true. On
+        Mac and Windows pageRect() was not influenced by the fullPage()
+        setting. This has now been changed so that pageRect() returns
+        the same as paperRect() when fullPage() is true on all
+        platforms.
+
+- QPixmap
+        Using QPixmap outside of the GUI thread is dangerous and error
+        prone. Because of this, starting with 4.4, any QPixmap created
+        outside of the GUI thread will always be a null pixmap.
+
+- QDateTime
+        When using QDateTime::fromString() to parse dates, QDateTime
+        no longer tries to use English month names because that would
+        cause some dates to become unparseable. If you need to parse
+        date times in the English locale, use QLocale::toDateTime (in
+        specific, the QLocale::c() locale).
+
+- Qt/Mac
+        Starting a Qt application no longer makes it the front process. This is
+        more in-line with other applications on Mac OS X. What this means is
+        that you can start a Qt application, do something else and not have the
+        Qt application steal your focus. If you desire for the Qt application
+        to become the front process, you can call QWidget::raise()
+        programmatically or launch the application with open(1) or using
+        QDesktopServices.  This should not have any affect if launched from
+        double-clicking in Finder or run in a debugger.
+
+- Qt/X11 on MIPS Linux
+        qreal is changed from float to double, breaking binary compatibility.
+        This change fixes a bug introduced in Qt 4.3.0 when qreal was
+        changed from double to float for embedded MIPS processors.
diff --git a/dist/changes-4.4.1 b/dist/changes-4.4.1
new file mode 100644
index 0000000..4995a86
--- /dev/null
+++ b/dist/changes-4.4.1
@@ -0,0 +1,619 @@
+Qt 4.4.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.4.0.
+
+The Qt version 4.4 series is binary compatible with the 4.3.x series.
+The Qt for Embedded Linux version 4.4 series is binary compatible with
+the Qtopia Core 4.3.x series. Applications compiled for 4.0, 4.1, 4.2,
+and 4.3 will continue to run with 4.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.trolltech.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain
+more information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Documentation and Examples
+   * [202630] Fixed a problem in the network/http example: it couldn't
+   download anything if the URL had a space.
+
+Third party components
+----------------------
+
+- Updated Qt's libpng version to 1.2.29.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+- QAbstractItemView
+    * [199822] Fixed issue with broken extended selections.
+
+- QButtonGroup
+    * [209485] Prevented a crash caused by removing a button from its button
+      group while inside a slot triggered by the button's clicked() signal.
+
+- QDirModel
+    * [213519] Fix crashes when drag'n'dropping files into a subdirectory
+
+- QFtp
+    * [189374] Fixed a bug that would cause QFtp to fail to parse
+    dates if the application was being run on some locales, like fr_FR.
+
+- QGraphicsProxyWidget
+    * [208773] Input methods now work properly for embedded widgets.
+    * [207644] Fixed a bug where the painter was restored incorrectly.
+
+- QGraphicsScene
+    * [209125] QGraphicsScene::style() and QGraphicsWidget::style() fixes.
+    * [202774] [207076] Focus and activation fixes for embedded widgets.
+    * [212950] The scene no longer removes focus from the focus item if a
+      mouse press propagates to the scene (and then to the view). This was
+      a behavior regression to QWidget.
+
+- QString
+    * [205093] Printing QString after using replace()followed by truncate(-1) crashes
+    * [209078] Problem in QString::resize
+
+- QGraphicsView
+    * [209154] Mouse replay regressions since 4.3 have been fixed.
+
+- QObject
+    * Fixed a regression from 4.3 to 4.4 in QObject::receivers() where
+      the function would return >0 even after disconnection all
+      signals.
+
+- QScriptEngine
+    * [208489] Made the instanceof operator work when used with
+      QMetaObject wrappers created by newQMetaObject().
+    * [206188] Fixed a bug that caused scripts to hang when using
+      "continue;" inside a switch-case block.
+    * [205473] Fixed a bug that caused slots to be called even when
+      argument conversion failed.
+
+- QSslSocket
+    * [212177] QSslSocket::peerVerifyError() supports all errors now.
+    * [212022] Fixed a bug that would cause no default CA certificates
+    to be present in static Qt builds.
+    * [212412] Fixed a bug that could cause a deadlock in
+    waitForReadyRead() in encrypted mode.
+
+- QtWebKit
+    * Ensured that relative URLs are converted to absolute URLs.
+    * Ensured that the cursor is changed into a resize cursor when hovering
+      over and dragging the resizeable frame borders.
+    * [206999] Fixed a problem which would make an empty URL being passed to
+      QWebPluginFactory::create()
+    * [208215] Fixed a bug that prevents linkClicked signal to be emitted
+      when opening a local HTML file.
+    * [208342] Ensured that the cursor is updated after a web frame or page
+      has finished loading.
+    * [210920] Fixed showing/hiding of the Web Inspector.
+    * [207050] Fixed input of characters into form elements using AltGr on Windows.
+    * Fixed a crash related to XML HTTP requests.
+    * Fixed QWebPage::acceptNavigationRequest not being called when opening new Windows.
+    * Fixed emission of linkClicked() signal when clicking on target=_blank links.
+    * Fixed painting artifacts when scrolling embedded widgets.
+    * Fixed logic errors in QWebHitTestResult::isNull() and QWebHistory::forward().
+    * Fixed encoding of [ and ] in the host part of URLs
+    * Fixed a crash related to QWebPage::unsupportedContent.
+    * Fixed a memory leak on application shutdown.
+    * Fixed painting errors when scrolling embedded widgets.
+    * Fixed support for custom cursors set on a QWebView.
+    * Fixed various build problems on Mac OS X, Windows and Solaris
+    * Fixed crash with CSS text transformations.
+    * Fixed infinite recursion when converting DOM objects with cyclic references to QVariants.
+
+- QVariant
+    * [201918] QVariant convert to QDateTime warnings
+
+- QWidget
+    * Fixed a regression when setting masks for splashscreens on Mac OS X Tiger.
+    * [210544] Fixed a regression where Qt::WA_PaintOnScreen widgets were painted on
+      top of overlapping siblings.
+    * [211796] Fixed a crash occurring when calling render() from a resize event.
+    * [210960] Fixed a regression where an invisible top-level widget was resized when calling render().
+    * [210822] Fixed a bug causing QGLWidgets to not behave correctly when setting window title.
+    * [208413] Fixed issues when creating a child widget of Qt::WA_PaintOnScreen widgets.
+  
+- QWidgetAction
+    * [207433] Fix enabling and disabling toolbar containings actions widget.
+
+- QWorkspace
+    * [206368] Fixed a crash occurring when deleting a QWorkspaceChild.
+
+- QPainter
+    * [186327] Fixed inconsistent outline and fill drawing for drawPolygon in
+      raster paint engine, where the fill would be visible outside the outlines
+      or there would be missing pixels between outline and fill.
+    * [208530] Fixed some drawing issues with projective transform related to
+      near-plane clipping.
+    * [209095] Fixed infinite loop that could occur on certain architectures on
+      rare occasions when drawing outlines.
+    * [208090] Fixed issue with outline drawing where subsequent points on a
+      path or polygon are equal according to qFuzzyCompare, but treated as
+      different, causing stroke artifacts.
+    * [206785] Fixed potential pixmap drawing artifacts when drawing stretched
+      pixmaps at non-integer coordinates.
+    * Fixed potential rect/line drawing issue when drawing on non-integer
+      offsets in raster paint engine.
+    * [209462] Fixed regression when redirecting widgets to another paint device.
+
+- QPainterPath
+    * [209056] Fixes potential assert in the boolean operations (difference,
+      intersect, and union).
+
+- QRasterPaintEngine
+    * [208644] Fixed a crash in qt_intersect_spans.
+
+- QApplication
+    * [213116] Fixd a regression on Mac OS X where you could not access the
+    menu bar after minimizing a window with no click through.
+
+- QColor
+    * [193671] Fixed a problem with QColor::setNamedColor() not returning the correct
+    alpha value for the "transparent" color.
+
+- QMacStyle
+    * [212037] Adjusted the size of text in an editable combo box on Mac OS X Panther.
+    * [216905] Fix a regression when drawing table headers on Mac OS X Panther.
+
+- QMainWindow
+    * [210216] Calling setCentralWidget, setMenuBar, setMenuWidget or setStatusBar
+    several times could cause a crash.
+    * [206870] Fixed a bug causing dual screen layouts to not restore correctly.
+
+- QMdiArea
+    * [202657] Fixed focus issue when navigating between window with focus on the DockWidget
+    * [211302] Fixed a bug where the activation order was not respected when tiling and cascading.
+
+- QOpengGLPaintEngine
+    * [208419] Fixed wrong clipping of widgets.
+
+- QDockWidget
+    * [179989] Maximum size is now taken into account by the dock widget.
+
+- QCommonStyle
+    * [204016] Fixed west tab positions.
+
+- QCryptographicHash
+    * [206712] Fixed a bug that would make QCryptographicHash return
+    invalid results if you called result() before the last addData()
+    call.
+
+- QTcpSocket
+    * [208948] Fixed a bug that would cause QTcpSocket and QSslSocket
+    not to flush all of their buffers if the socket disconnects and
+    reconnects.
+    * [182669/192445] Fixed a bug that would cause QTcpSocket to stop
+    emitting readyRead() if a previous waitForReadyRead() timed out.
+
+- QDataStream
+    * [211301] Fixed an issue where Qt 2 and Qt 3 applications might
+    crash or hang when run under KDE 4.
+
+- QDateTime
+    * [137698] Fixed a bug that caused QDateTime to perform weird
+    1-hour jumps when dealing with dates in Daylight Savings Time.
+
+- QSslCertificate
+    * [185067/186087] Fixed a bug that would cause QSslCertificate
+    parsing of certificate timestamps to be off by a few hours
+    (timezone issue).
+
+- QFile
+    * [192752] Fixed a bug that would make QFile leak file descriptors
+    if QFile::handle() was called.
+
+- QFileDialog
+    * [208383] Crash when a proxy model is set and multiple files are selected.
+    * [165503] DirectoryEntered not emitted when go-to-parent button is clicked.
+
+- QFileInfo
+    * [212291] Fixed a bug that would cause QFileInfo to return empty
+    group or owner names for files under MacOS X and maybe some other
+    Unix platforms.
+
+- QFuture
+    * [214874] Fixed possible deadlock when using nested calls to QtConcurrent::run().
+
+- QGLContext
+    * [210427] In 4.4.0 we removed the automatic mipmap generation for
+    textures bound with QGLContext::bindTexture(). This change has been
+    reverted for compatibility reasons.
+    * [214078] Fixed a problem that caused OpenGL textures to always be
+    downscaled to 64x64 in size on Intel graphics hardware. This caused,
+    among other things, the Qt Demo to look utterly broken on these systems.
+
+- QOpenGLPaintEngine
+    * [191777] Set default values for GL_PACK_*/GL_UNPACK_* values with
+    glPixelStore() when QPainter::begin() is called.
+    * [201167] Don't assume the GL error state is cleared when QPainter::begin()
+    is called. Clear the state explicitly before we make internal state checks.
+    * [204578] Fixed a problem where the GL error state was set on
+    some system because an extension enum was used unprotected.
+
+- QHostInfo
+    * [213187] Made QHostInfo not issue IPv6 name lookups if the
+    machine does not have any IPv6 addresses configured (Unix change
+    only).
+
+- QHttp
+    * [213220] Fixed a bug that could make QHttp open unencrypted
+    connections if HTTPS mode was requested but SSL support was not
+    present in Qt.
+    * [193738] Fixed a bug that would make QHttp continue reading the
+    HTTP server's response and emit a readyRead() signal even if
+    abort() had already been called.
+
+- QNetworkAccessManager
+    *  When a http 302 location url is not an encoded url try QUrl's human readable parsing for more compatibility with websites.
+
+- QPainter
+    * [211403] Fixed handling of negative target rect offsets and negative
+    source offsets in QPainter::drawPixmap()/drawImage().
+
+- QPixmap
+    * [202903] Fix an infinite recursion in QPixmap::fromImage() that occured
+    when converting mono images.
+    * [206174] Reverse the order of the tests done in QPixmap::hasAlpha()
+    in order to speed it up.
+    * [210275] Fixed a crash in QPixmap::resize().
+
+- QSharedMemory
+    * Compile fix on QNX when QT_NO_SHAREDMEMORY was defined
+
+- QStyleSheetStyle
+   * [179629] Fixed SpinBox with gradient background.
+   * [188305] Respect the max-with property for more elements (such as QTabBar::tab)
+   * [189951] Fixed the align: property for QTabBar
+   * [194149] Fixed the background:transparent property
+   * [198926] Fixed the background:none property on some component of the scrollbar
+   * [206238] Fixed inconsistency with rules without selector applied to widget. They
+     now always applies to all childs
+   * [207420] Fixed the ~= attribute selector.
+   * [207819] Fixed few performences issues.
+   * [208001] Fixed crash crash with QMenu[title=...] in the stylesheet.
+
+- QHeaderView
+    * [207869] Fixed possible division by zero.
+
+- QTableView
+    * [207270] Painting errors in reverse mode and when there was spans.
+    * [210608] Fixed regression in the handling of spanning cells.
+
+- QTableWidget
+    * [213118] Fixed a bug where moving the first or the last row triggered an assert.
+
+- QTreeView
+    * [213737] Fixed regression where ctrl+a would select all items regardless of the selection mode.
+    * [202355] Fixed issue where items inserted in a view with all header sections hidden did not show
+      themselves properly later.
+    * [211296] When a column is hidden QItemSelectionModel::selectedRows and QItemSelectionModel::selectedColumns returns the wrong values.
+
+- QTreeWidget
+    * [305084] Fixed duplicate items that may appears when programaticaly
+      expanding items.
+    * [209590] itemSelectionChanged was being emited before item selection was updated
+
+- Q3DragObject
+    * [203288] Fixed regression against Qt 3 so that the drag() function now correctly uses
+      MoveAction (and not CopyAction) as the default action.
+
+- Q3TextBrowser
+    * [197836] Fix assert when zooming out.
+
+- QTextDocument
+    * [204965] Fix html export to use indent as textIndent
+
+- QTextBrowser
+    * [192803] Fix loading of files from resources with a resource prefix.
+
+- QTextEdit
+    * [211617] Fixed crash when moving the first paragraph by drag and Drop
+
+- QTextTable
+    * [194229] Fix removing of a row with merged cells causing a crash.
+    * [194253] Fix calling removeColumn on a Column with selectedCell causing an assert.
+    * Fix assert on selecting the whole table after an insert/remove of column.
+    * [175676] Fix calling of resize() making updates in layouting fail.
+
+- QSpinBox
+    * [213137] Fixed thousand-delimiters to not show for value = INT_MIN.
+
+- QScrollArea
+    * [210567] Fixed issues when scrolling a native widget.
+
+- QScrollBar
+    * [209492] Fixed a bug causing the scroll bar actions to be invoked twice.
+
+- QToolbBarLayout
+    * [207946] Prevented a crash caused by assuming that the parent widget always exists.
+
+- QThreadPool
+    * Fixed issues with thread termination during dll unloading on windows. QThreadPool::
+      waitForDone() now completely stops all threads, on all platforms. In addition, the
+      QCoreApplication destructor now calls waitForDone() to make sure all threads are 
+      stopped before the Qt dlls are unloaded.
+      
+- QNetworkReply
+    * [207283] Fixed support for HTTP 101 responses.
+    * Fixed parsing of cookies with special timezone specifiers.
+
+- QWebHistory
+    * Fixed a bug where calling forward() would go backwards and not forwards.
+
+- QFontMetrics
+    * [212485] Fixed boundingRect() returning the proper size when there is a tab.
+
+- QItemDelegate
+    * [206762] Fixed painting when using a QBrush() for the text.
+
+- QtXmlPatterns
+    * [207584] When using the same QXmlQuery for a new query then evaluateTo()
+      can return false even if the query is valid.
+    * [214180] Fixed fn:replace fails when inside function.
+    * Fixed crash when unary operator has empty sequence as operand.
+    * Fixed that axis preceding or descendant-or-self when combined with
+      function last() on a custom node model crashes.
+    * Fixed that xml:id is not whitespace normalized.
+    * Fixed that QXmlFormatter produces no output on single top-level text nodes.
+    * Fixed infinite loop triggered by fn:matches().
+    * Fixed crash when compiling one of the FunctX queries.
+
+- VideoPlayer
+    * [210170] Fixed an issue that prevented VideoPlayer::play to start when 
+      called with an argument. 
+
+- Accessibility
+    * [199241] Fix an issue where the screen reader would read the content of
+      a password line edit. The screen reader will now only read it if its Normal.
+
+- QLocalSocket
+    * [210886] Fixed a bug that would cause QLocalSocket to overrun
+    its buffers on very long socket names.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+    * [208354] Fixed a crash in Qt's XIM implementation when exiting
+      applications after using the skim input method.
+    * [207800] Fixed a regression from 4.3 to 4.4 where putting a
+      QX11EmbedContainer into a QWidgetStack would case the container
+      stay visible permanently.
+    * [207423] In QDesktopWidget, workaround a change in behavior in
+      newer X.Org X servers where Xinerama would always be used even
+      when using a multi-screen setup.
+    * [206139] Fixed a bug where Qt could incorrectly recurse into the
+      Xlib error handler (causing Xlib to assert).
+    * [207057] Fixed a regression from 4.3 to 4.4 where
+      QX11EmbedContainer would sometimes destroy the embedded client's
+      window.
+    * [209057] Fixed a Q3Process which triggered a "Do not delete
+      object" warning.
+    * QPrintDialog crashed on unix in some cases.
+    * [214103] Fixed a regression with string to double conversion
+      becoming locale-aware in QTextStream.
+    * [210922] Fix crash in input methods when toggling the InputMethodEnabled
+      attribute.
+    * [210831] Fixed a problem where preview pages in the QPrintPreviewDialog
+      would not appear or be drawn correctly on X servers without
+      Xrender support.
+    * [206165],[213457] Fixed bugs which show the wrong cursor on some widget.
+	* Fixed bug regarding the usage of encoded URLs in Phonon
+
+
+Windows
+-------
+
+    * [207888] Fixed a regression from 4.3 which caused crashes in
+      Assistant and Designer when an accessibility client is running
+      (this includes applications that query for accessibility
+      features, like Notepad++).
+    * Several fixes related to crashes and hangs when the user has an
+      accessibility client running in the background.
+    * [208782] Fixed a problem with non-cosmetic lines with widths < 2
+      not being printed correctly with certain printer drivers.
+    * [208859] Fixed a problem with strokes not being printed correctly. Both
+      the stroke offsets and thinkness of the stroke were sometimes printed
+      incorrectly.
+    * [206473] Entering UNC paths is slow in the Qt file dialog.
+    * [309241] Trying to stream mp3 content with phonon would cause a crash.
+    * [210115] Fixed a problem causing "mailto" links not to work when the
+      mail application path contains unexpanded environment variables.
+    * [203012] Fixed a problem where "WriteOnly named pipes" failed to
+      open using QFile.
+    * [205685] Fixed the handling of TranslateAccelerator for windows key messages.
+    * Add support for (not) embedding manifests in plugins, on Windows.
+    * [211893] Fixed a crash related to using QtDotNetStyle.
+
+
+Mac OS X
+--------
+    * Fix a regression where inserting widgets into native menus would cause
+      the program to crash.
+    * [209785] Fixed a regression from 4.3 to 4.4 in DeferredDelete
+      event handling.
+    * The "debuglibraries" binary package now includes dSYM bundles, which
+      makes it possible to debug with them.
+    * [207371] The CoreGraphics paint engine ignored the transform set
+      on a QBrush with QBrush::setTransform().
+    * Fixed insertation of 'space' char in QLineEdit when EISU key is being held down
+    * Fixed fullscreen widget not regaining full focus after a dialog has been shown
+    * Fixed bug regarding the usage of encoded URLs in Phonon
+    * [212719] Fixed a bug that could cause text drawn into a QImage to be clipped
+      incorrectly.
+    * [216563] Fixed a case where failing to get the display's colorspace
+      would result in many widget being painted all black.
+    * [216544, 213316] Fixed several accessibility-related crashes.
+    * [210401] Fixed memory leak in QWidget::setWindowIcon().
+    * [211195] Fixed problem that caused crashes with the Mac binary package
+      when entering long licensee names during the installation.
+
+Qt for Embedded Linux
+---------------------
+
+- QWSEmbedWidget
+   * Fixed propagation of the Qt::WindowStaysOnTopHint window property.
+
+- QDirectPainter
+   * [209068] Fixed region coordinates for QDirectPainter when used on a
+     rotated screen.
+
+- DirectFB screen driver
+   * Fixed window placements of windows with initial top-left coordinate (0,0).
+   * Improved deallocation of resources when an application exits unexpectedly.
+   * Fixed bug in QPixmap::rotate().
+   * Fixed QPixmap::fromImage() with an image of format QImage::Format_Indexed8
+     when compiling with QT_NO_DIRECTFB_PALETTE.
+   * Fixed small memory leak in QPainter::drawImage()
+
+- LinuxFB screen driver
+   * Added a workaround screen driver when the kernel fails to report the
+     length of the color components.
+   * Improved performance of the non-accelerated screen cursor.
+   * Disable the console cursor in graphics mode.
+
+- Tslib mouse driver
+   * [200995] Fixed crash when initialization fails.
+   * [207117] Improved filtering during calibration.
+
+- Ahi screen driver
+   * Fixed link issue.
+   * Fixed QScreen::setMode().
+   * Improved support for different screen modes.
+
+Qt for Windows CE
+-----------------
+
+   * Support for Visual Studio 2008 added
+   * Improved QRegion to perform faster
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+- [212852] Fixed GCC 4.3 compiler warnings.
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- Build System
+    * [209866, 213084] Fix compilation errors in QtWebKit when using
+      GCC 3.4 with precompiled headers. Precompiled header support is
+      documented as experimental in the GCC 3.4 documentation, and as
+      such, precompiled header support is disabled by default with
+      this compiler.
+    * [212330] Correct Makefile generation for src/corelib, which
+      would sometimes include multiple qatomic.o targets.
+    * [210016] Fix a build failure on 64-bit Linux when using the
+      linux-*-32 mkspecs.
+    * [206966] Fixed compilation errors on Linux when building for the
+      MIPS architecture.
+    * [212132] Workaround compiler crash bug for Linux on
+      SPARC64. This is a generalization of a similar change done for
+      Solaris in the 4.3 series.
+    * [211326, 211703] Fixed compilation errors when using the Intel
+      C++ Compiler for Linux on IA-64 (Itanium) hardware.
+    * [171222] Ignore duplicate -L<path> options
+
+- Assistant
+    * [212875] Don't sort the entries in the contents view according to the
+      help files names.
+    * [212444] Use the default help collection when registering or unregistering
+      help files without having a collection file specified.
+    * [210704] Make sure the sql-plugin is correctly used when building
+      Qt statically.
+    * [208834] When highlighting a find result, ensure that the active
+      highlighting color is used.
+    * Introduced the -assistant-webkit configure flag to make use of WebKit as
+      html renderer in Qt Assistant.
+
+
+- Designer
+
+    * [213481] Fixed crash that occurs when encountering an invalid .ui file.
+    * [211422] Fixed a crash resulting from a conflict between the newly added
+      support for QScrollArea and custom widgets derived from QScrollArea.
+    * [209995] Fixed a bug in the property editor that caused it not to
+      select values in spin boxes on editing.
+    * [205448] Fixed a bug related to drag and drop and Windows accessibility.
+    * [205899] Removed the windowModality property for non-form children to
+      prevent it from locking up the form preview.
+    * [212077] Fixed retranslateUi call in case of combo box items
+    * [210866] Dynamic properties of type QByteArray are not converted anymore to type QString when reloading the form
+    * [207187] Designer's property editor has better colors in case of inverted color scheme
+    * [202257] The geometry of the resource dialog is saved in settings
+    * [211677] Remove a crash in case of reloading resources
+
+- Linguist
+
+- lupdate
+    * [209122] Fixed same-text heuristic missing existing plurals
+    * [212465] Standardize on the default context being empty, not "@default"
+
+- lrelease
+
+
+- rcc
+
+
+- moc
+
+   * [189996] Fixed a bug that caused inline slots with throw()
+     declarations to be parsed incorrectly.
+   * [192552] Fixed a bug that caused "< ::" to be parsed incorrectly
+     (e.g. "QList< ::Foo>").
+   * [199427] Fixed the code generator so that it generates normal
+     spaces everywhere, no tabs.
+   * [204730] Fixed a skipt token after Q_PRIVATE_SLOT
+
+- uic
+
+   * [205439] Added a warning that is  printed when encountering
+   non-obvious Qt3 dependencies (qPixmapFromMimeSource).
+
+- uic3
+
+   * [205834] Process non-ASCII filenames correctly.
+
+- qmake
+
+
+- configure
+
+    * Fixed auto-detection of the XKB library on old Unix systems
+    * Fixed auto-detection of getaddrinfo on old Unix systems
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
+Unix
+----
+    * [203063] Changed the behaviour of qFatal and Q_ASSERT to always
+    produce a SIGABRT signal in all build modes of Qt. (Previous
+    versions called the exit function if Qt was built in release mode)
diff --git a/dist/changes-4.4.2 b/dist/changes-4.4.2
new file mode 100644
index 0000000..192bbd1
--- /dev/null
+++ b/dist/changes-4.4.2
@@ -0,0 +1,512 @@
+Qt 4.4.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.4.1 and 4.4.0.
+
+The Qt version 4.4 series is binary compatible with the 4.3.x series.
+The Qt for Embedded Linux version 4.4 series is binary compatible with
+the Qtopia Core 4.3.x series. Applications compiled for 4.0, 4.1, 4.2,
+and 4.3 will continue to run with 4.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.trolltech.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain
+more information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+Third party components
+----------------------
+
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtCore
+------
+
+- QVariant
+    * [220112] correct documentation with respect to conversions
+    involving QTime.
+
+- QHash
+    * [215348] Document that uniqueKeys() doesn't sort its keys.
+
+- QFlags
+    * [221702] Fix QFlags::testFlag gives a surprising result on enums with
+    many bits.
+
+- QLibrary
+    * [219456] Fix QLibrary problems on Windows, loading the C runtime library
+    without a manifest.
+
+- QDataStream
+    * Fixed storing a QPalette into a stream with a version older than Qt_2_1
+
+- QtConcurrent
+    * [221671] Fixed filtered() compile error when using filter functions that
+      takes its argument by const reference.
+    * [220804] Fix several compile errors with STL containers.
+    
+- QThreadPool
+    * [215365] The Q[Core]Application destructor now waits for all QThreadPool
+      threads to finish. This fixes ussues when unloading the Qt dlls on windows
+      as well as when using Qt features that need on a QApplication instance
+      in a worker thread.
+QtGui
+-------------
+
+   * [215794] setWindowFilePath() didn't update window title until the
+     window is resized.
+   * [212316] Window position changed when setWindowFlags was called.
+   * [223814] Fixed a crash in QDockWidget when the docking window was
+     closed during the dock animation.
+   * [223339] Fixed a crash when a pop-up widget had the
+     WA_DeleteOnClose attribute.
+
+   * [214742, 205222] QFormLayout - fix nested QFormLayouts expanding
+     unnecessarily.
+   * [217123] Fixed a regression in QWidgetItem::setGeometry() that made an item
+     with both an Alignment and QSizePolicy::Ignored set got squeezed down to
+     a size of 0.
+
+- QCDEStyle
+   * [220803] Improved the contrast of CE_RubberBand when painted on top of a dark background.
+
+- QPlastiqueStyle
+   * [312723] Fixed broken painting on QSpinBox when using NoButtons.
+
+- QGraphicsEllipseItem
+   * [207826] setStartAngle() and setSpanAngle() now call
+     prepareGeometryChange(), removing rendering artifacts.
+
+- QGraphicsLinearLayout
+   * [218400] Fix crash when assigning a layout with stretches to a widget.
+
+- QGraphicsView
+   * [216741] Fix QGraphicsView::DontSavePainterState (regression to 4.3)
+
+- QGraphicsWidget
+   * [215417] Fixed setting the correct layoutDirection on the painter before
+     we called QGraphicsWidget::paint.
+
+- QMdiArea
+   * [221527] Fixed a bug where the [*] placeholder was not updated correctly in tabbed view mode.
+
+- QMdiSubWindow
+   * [214964] Tooltips in children of the subwindow closed too fast
+
+- QMessageBox
+   * [221721] Fix crash when trying to obtain the default value for QMessageBox::iconPixmap().
+
+- QSplitter
+   * [214480] Improve docs on how the effective stretch facors are calculated.
+
+- QTextEdit
+   * [214956] Fix painting problems with text in floating frames
+   * [215192] Fix HTML alignment in QLabels with RTL
+   * [213259] Fix to handle ShortcutOverride for Ctrl+Shift+Right
+
+- QTextCursor
+   * [214457] Fix assert when deleting empty cells
+   * [210496] Fix the usecase that  QTextCursor::select( QTextCursor::LineUnderCursor )
+     doesn't work when the text has not been layed out yet
+
+- QTextDocument
+   * [207779] Fix HTML import of page-breaks on empty lines to not get lost
+   * [212848] Fix  FullWidthSelection to work if LineWrapMode set to NoWrap
+   * Fixes the positioning of bullets to always honor the text direction
+
+- QWidget
+   * [219446] Fixed a bug where calling repaint() before QApplication::exec() did not
+     invoke a paintEvent().
+
+QtScript
+--------
+
+    * [219126] Fixed bug that caused the decimal point to appear in
+    the wrong position when converting a number with a negative
+    exponent to a string.
+
+QtGui
+-----
+
+- QDateTimeEdit
+    * [220926] QDateTimeEdit::textFromDateTime: valueFromText vs. date
+    TimeFromText -- clarify documentation
+
+- QTimeEdit
+    * [215426] Fixed a typo in the declaration of a Q_PROPERTY
+
+- QPainter
+    * [216948] Fix one-pixel shifting of integer lines in raster paint
+      engine when current matrix has negative dx or dy.
+    * [218682] Fixed bug in QBitmap::fromData that could cause the bitmaps
+      to turn completely black on Windows and Embedded Linux.
+    * [220544] Fix issue in Freetype font engine where painting text using
+      the same font and transform on both images and pixmaps would result in
+      text not being transformed or not shown at all.
+    * [222520] Fixed issue in raster paint engine where StretchToDevice
+      mode for gradients wasn't respected.
+    * [222848] Prevent potential crash on NaN in qt_curves_for_arc()
+      when drawing squiggly underlined text.
+
+- QBrush
+   * [215090] Avoid "QPixmap created outside the GUI thread" warning when
+     creating a QImage based brush.
+
+- QFileDialog
+    * [223813] Prevent an assert when "Shift + C" was pressed if the directory
+      set was "C:/".
+- QImage
+    * [215985] Reduce memory usage in TIFF import/export to avoid failing
+      due to out-of-memory errors on large images.
+    * [217101] Make sure QImage::setPixel() doesn't call detach twice, to
+      improve the performance a bit.
+
+- QPicture
+    * [215227] Fixed a problem that could occur when drawing a QPicture to a
+      QImage or QPixmap due to differing device DPIs.
+
+- QPixmap
+    * [214340] Prevent QPixmap::scaled() from leaving white lines at right/lower
+      edges in some cases.
+    * [214344] Make QPixmap::transformed() work correctly with perspective
+      transforms.
+    * [214855] Make sure QPixmap::transformed with a 90-degree rotation transform
+      doesn't increase the size of the pixmap.
+    * [215190] Fixed crash on Windows and Embedded Linux due to QPixmap::detach()
+      not detaching the underlying QImage.
+    * [216648] QPixmap turned a QBitmap into a 32 bit QPixmap
+      when QPixmap::resize() was called on the QBitmap.
+
+- QMatrix
+    * [198791] Fixed bug in QMatrix::map(const QPolygon &) causing a behavioral
+      difference from Qt 3's QWMatrix.
+
+* Fixed bugs in QPolygon to QRegion conversion causing to many rectangles to be
+  generated.
+
+* [206138] Fix unaligned double access in src/corelib/global/qnumeric_p.h
+
+* [216189] Fix a crash when calling QObject::dumpObjectInfo() after
+  disconnecting a signal.
+
+* [216910] Use the 'eieio' instruction instead of 'lwsync' in the
+  PowerPC implementation of QAtomicInt and QAtomicPointer since the
+  latter is not available in all hardware implementations. The 'eieio'
+  instruction was used successfully in Qt 4.3 and earlier.
+
+- QDockWidget
+    * [222222] The sizeHint for dockwidget is now respected when it is redocked
+    * [222030] The minimum size and minimum size hint are now respected
+
+- QToolBar
+    * [216929] Fixed the extension when the orientation is vertical
+
+- QTabBar
+    * [214527] Fixed the geometry of QTabBarnot being correctly updated when
+               adding a tab.
+
+- QMainWindow
+    * [218288] Fixed save/restore that would not work correctly if the window
+               was not yet shown on screen.
+
+- QStyleSheetStyle
+    * [158984] Fixed crash while using stylesheet in combinaison with a proxy style
+    * [217470] Fixed setting a stylesheet on a QDockWidget remove its border
+
+- QTreeView
+    * [220298] Fixed regression where clicking outside of the first column doesn't
+               always select the item.
+    * [224598] Fixed item not always appearing when QStandardItemModel::appendColumns
+               was used
+    * [212056,216390] Fixed bug where hidden items in the treeview got visible after
+      a sort.
+    * [209473] Fixed assert/crash when selectAll were called on a treeview with no
+      items.
+
+- QTableView
+    * [314519] Fixed crash with very big models.
+    * [211039] Fixed assert when moving a header section in a vertical header.
+
+QtGui
+-----
+* [214146, 215170] Fix a regression with multiple screens on
+  X11. Multiple screens are now reported with their correct size
+  regardless of how X11 is configured.
+
+QtOpenGL
+--------
+
+* [217429] Fixed issue on certain Intel drivers causing a GL error to be
+  generated when computing the max texture size in qt_gl_maxTextureSize().
+
+QtWebKit
+--------
+* Fixed potential crash when deleting QWebView instances.
+* Fixed blurry widgets in the web page due to antialiased painting.
+* [221518] Fixed using modifiers to type special symbols (e.g '@','$')
+           does not work on Mac OS X.
+* [216179] Fixed potential crash on Windows, when performing JavaScript
+           date conversion.
+* Fix rendering of scrollbars with some styles
+* Fix state of web actions when showing the context menu
+* Fix parsing of stylesheets and JavaScripts to not depend on the current locale
+* Fix return value of QWebPage::isModified()
+* Fix QWebFrame::setHtml() not setting the contents immediately
+* [218789] Fix WebKit not displaying content on 403 HTTP responses
+
+QtXml
+-----
+
+- QDomElement
+    * [220115] Document QDomElement::setAttribute(double)'s behavior with
+    respect to locale.
+
+QtXmlPatterns
+-------------
+
+- QXmlQuery
+    * [219070] Fix after the QXmlQuery object is deleted it doesn't
+    seem to be cleaning up afterwards.
+
+QtNetwork
+---------
+
+- QNetworkReply & QNetworkAccessManager
+    * [223580] Fixed the handling of HTTP replies with code 400.
+    * [215010] Fixed a bug that made SOCKSv5 proxies not be used.
+    * [217091] Fixed a bug that made the HTTP backend issue CONNECT
+    commands for HTTP (not HTTPS) requests to proxy servers
+
+- QHttp
+    * [197694] Fixed a bug that prevented QHttp from uploading data of
+    length 0 when reading from a QIODevice.
+
+
+QtTest
+------
+
+- QCOMPARE
+    * [219067] Document behavior of qFuzzyCompare/QCOMPARE when
+    comparing with 0.0.
+
+QtDBus
+------
+
+- QDBusConnection
+    * [220140] Fixed a bug that would make objects registered with
+    ExportSlots not have interfaces inherited from parent classes
+    callable.
+    * [218733] Fixed the delivery of errors resulting of an outgoing
+    method call timing out.
+
+- QDBusReply
+    * [190546] Improved the error messages generated by QDBusReply in
+    case of mismatched signatures.
+
+QtHelp
+------
+
+   * [219454] Index also .htm and .txt files for the full text search.
+   * [233415] Use the proper encoding when parsing the title of a html
+   document.
+
+Qt3Support
+----------
+
+    * [216806] Fixed a crash in Q3ScrollView when setting a null corner widget
+    * [215041] Fixed a crash in Q3Table when using a Q3TextEdit as the editor
+    * [217218] Fix support for images in Q3TextBrowser
+
+Phonon
+------
+    * [214080] Fixed a failure on path reconnections between VideoWidget and MediaObject
+
+
+Accessibility
+-------------
+    * [222660] Made it possible to navigate from the application through the menubar,
+      toolbars etc, and down to the textedit without ending up on a QRubberBand or QMenu.
+      This left the AT client in a confused state.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+   * [211678] Fixed a problem where using widgets and pixmaps on two different
+     X11 screens resulted in X11 errors.
+   * [217250] Fixed a problem where QGLWidgets on some older X servers would
+     not get the correct colormaps set, resulting in distorted colors.
+   * [214713] Fixed a problem where text would get clipped incorrectly
+     when using QPainter::drawText() on a QGLWidget, or QGLWidget::renderText().
+   * [223085] Fixed a regression where creating a style before QApplications could
+    result in incorrect font metrics.
+
+Windows
+-------
+   * [207506] Fixed a bug that causes input widgets to switch the text alignment
+     when pressing 'Ctrl+Shift' on Vista platforms (regardless of supported
+     keyboard layouts).
+   * [223951] Fixed a crash while accessing 'QAxObject*' for methods returning a
+     VARIANT with IDispatch inside.
+   * [223145] Fixed a regression which prevented use of Qt::WindowSystemMenuHint
+     together with flags like Qt::FramelessWindowHint.
+   * [224063] Fixed a crash in QFile when QFile::handle() was called.
+   * [221924] Fixed the binary installer for Visual Studio 2005 Express.
+   * [218215] Fix custom paper sizes for printing under Windows.
+   * [210830] Fixed incorrect tooltip text color on Vista.
+
+Mac OS X
+--------
+   * [216650] Fix a regression from 4.4 in the handling of DeferredDelete
+     events. This solves the reported problem that using Cmd+W does not
+     close a form properly in the Designer.
+   * Fix an error in the qconfig.h header file that occurred on Mac OS X
+     during configure when not using Terminal.app.
+   * [222349] Fix a potential out-of-bounds read when getting data from the clipboard.
+   * [213116] Fix a regression where minimizing a window would cause a window
+     with widgets that had no click through enabled to never get enabled.
+   * [215985] Fixed QPixmap::fromImage() to not do an extra copy of the image data
+     which could cause a lot of memory to be used.
+   * [217197] Fix crash when dragging text with object replacement characters on the Mac.
+   * [212884] Fixed a crash that could occur when printing images on the Mac.
+   * [215909] Fixed a problem where text drawn into a QGLWidget on the Mac would appear
+     to be drawn with a bold type, when it shouldn't have.
+   * [215761] Fixed a problem that could make top part of text drawn
+     into a QGLWidget appear cropped.
+   * [214960] Fixed a problem where custom page margins were not taken
+     into account, unless QPrinter::fullPage() was set to true. Also,
+     margins from the QPageSetupDialog should now update the internal
+     QPrinter margins correctly.
+   * [216563] Fix "black widgets" regression from 4.4.
+   * [214681] Fixed bug that the menu bar and other parts of the application
+     responds to the same shortcuts.
+   * [312012] Fixed support for secondary shortcuts on menu bar.
+   * [315450] Fixed build issue for Phonon on OS 10.4/Macbooks regarding OpenGL headers.
+
+Qt for Embedded Linux
+---------------------
+
+- Raster paint engine
+   * Fixed pixel errors when drawing pixmaps into a semi-transparent window.
+   * Fixed an assert when drawing an 16-bit image onto an image of format
+     QImage::Format_ARGB8565_Premultiplied.
+   * [217400] Fixed painting errors with Qt::WA_NoSystemBackground used on
+     a 16bit screen.
+   * Fixed CompositionMode_Source with new QImage formats introduced in 4.4.0.
+
+- QWSServer
+   * [210865] Fixed crash due to missing null-pointer check in
+     QWSServer::sendIMEvent().
+
+- DirectFB screen driver
+   * Fixed a cache corruption which randomly resulting in painting errors
+     when using QPainter::drawImage().
+   * Fixed use of Qt::SmoothTransformation with QPixmap::scaled().
+   * Fixed painting errors when drawing transparent windows and compiled
+     width QT_NO_DIRECTFB_VM.
+   * Added QT_NO_DIRECTFB_PREALLOCATED to work around issues with drivers
+     not properly implementing blitting to/from preallocated surfaces.
+
+- VNC screen driver
+   * Fixed a crash when used on top of a screen with a non-standard line step.
+   * Fixed remote cursor when used on top of a hardware accelerated cursor.
+
+Qt for Windows CE
+-----------------
+   * [219644] Maximized MDI windows had a double title bar on Windows Mobile.
+   * [223975] Qt version displayed wrong in Windows Explorer.
+   * [217576] QLocale always displayed "C" as language.
+   * [215020] Windows with parent were always embedded into the parent window
+     instead of being toplevel itself.
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- Build System
+
+- Assistant
+   * [221298] When triggering the sync contents action, activate the contents
+   widget.
+   * [171654] Use the title of the .html file as the about dialog window title.
+   * [219939] When specifying a .html file for the about dialog contents,
+   ensure that the referenced image files are displayed as well.
+   * [219936] When a collection file has been changed, make sure to syncronize
+   all relavant settings with the cached collection file.
+   * [206321] Display .svg files in Assistant.
+   * [219176] Escape '&' characters in the title of a document.
+
+
+- Designer
+    * [219670] Fixed a bug related to layout handling of form classes generated
+      by the Visual Studio integration.
+    * [220299] Fixed a crash that occurred when breaking a layout containing
+      zero-sized spacers.
+    * [217464] Fixed a bug related to using resource-dependent properties
+      for QDialog-based forms.
+    * [215188] Stabilized reading of corrupted ui files.
+    * [215648] Don't show the rich text editor for iconText property of QAction
+    * [214854] Fix displaying of icons in the VS integration
+    * [217093] Make non-letter shortcuts with Shift modifier working
+    * [223114] Fixed a crash when removing a dynamic url property
+    * [220998] Default precision of float property in property editor changed to 6
+
+- Linguist
+
+- lupdate
+
+- lrelease
+
+
+- rcc
+
+
+- moc
+
+
+- uic
+
+
+- uic3
+
+
+- qmake
+
+
+- configure
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
diff --git a/dist/changes-4.4.3 b/dist/changes-4.4.3
new file mode 100644
index 0000000..f33cede
--- /dev/null
+++ b/dist/changes-4.4.3
@@ -0,0 +1,31 @@
+Qt 4.4.3 is a rebranding-only release. In all other aspects, it is the
+same release as Qt 4.4.2. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.4.2, 4.4.1 and 4.4.0.
+
+The Qt version 4.4 series is binary compatible with the 4.3.x series.
+The Qt for Embedded Linux version 4.4 series is binary compatible with
+the Qtopia Core 4.3.x series. Applications compiled for 4.0, 4.1, 4.2,
+and 4.3 will continue to run with 4.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.trolltech.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain
+more information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+ - Updated application icons and other graphics to reflect the look
+   and feel of the new Qt brand.
+
+Legal
+-----
+
+ - Copyright of Qt has been transferred to Nokia Corporation.
diff --git a/dist/changes-4.5.0 b/dist/changes-4.5.0
new file mode 100644
index 0000000..3fc075f
--- /dev/null
+++ b/dist/changes-4.5.0
@@ -0,0 +1,1496 @@
+Qt 4.5 introduces many new features and improvements as well as bugfixes
+over the 4.4.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://doc.trolltech.com/4.5
+
+The Qt version 4.5 series is binary compatible with the 4.4.x series.
+Applications compiled for 4.4 will continue to run with 4.5.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.qtsoftware.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+New features
+------------
+
+- Disk Caching in QtNetwork
+    * Added support for http caching in QNetworkAccessManager.
+    * New classes:  QAbstractNetworkCache, QNetworkDiskCache.
+    * QNetworkDiskCache is a simple disk-based cache.
+
+- QDate
+    * [207690] Added QDate::getDate().
+
+- QDateTimeEdit
+    * [196924] Improved QDateTimeEdit's usability. It now skips ahead to the
+      next field when input can't be valid for the current section.
+
+- QDateTime
+    * [178738] Fixed QDateTime::secsTo() to return the correct value.
+
+- QDBusPendingCall / QDBusPendingCallWatcher / QDBusPendingReply
+    * New classes to make calls whose replies can be received later.
+
+- QDesktopServices
+    * Added the ability to determine the proper location to store cache files.
+
+- QGraphicsItem
+    * Added the QGraphicsItem::itemTransform() function.
+    * [209357] Added the QGraphicsItem::opacity() function.
+    * [209978] Added the QGraphicsItem::ItemStacksBehindParent flag to allow
+      children to be stacked behind their parent item.
+    * Added QGraphicsItem::mapRect() functions.
+
+- QGraphicsScene
+    * Added the QGraphicsScene::sortCacheEnabled property.
+    * Added the QGraphicsScene::stickyFocus property.
+
+- QGraphicsTextItem
+    * [242331] Added the QGraphicsTextItem::tabChangesFocus() function.
+
+- QGraphicsView
+    * [210121] Added action, shortcut and shortcut override support to
+      QGraphicsView and QGraphicsItem.
+
+- QLineEdit
+    * Added the ability to set the text margin size.
+
+- QMainWindow
+    * Added API to detect which dock widget is tabified together with another
+      dock widget.
+
+- QMessageBox
+    * It is now possible to create categories in QErrorMessage to avoid error
+      messages from the same category popping up repeatedly.
+
+- QMetaObject
+    * Added introspection of constructors, including the ability to invoke a
+      constructor.
+
+- QMetaProperty
+    * [217531] Added the notifySignalIndex() function, which can be used to
+      introspect which signal (if any) is emitted when a property is changed.
+
+- QNetworkCookie
+    * [206125] Added support for HTTP-only cookies.
+
+- QNetworkProxyFactory
+    * Added support for a factory of QNetworkProxy whose result can
+      change depending on the connection being attempted.
+    * Added support for querying system proxy settings on Mac OS X and
+      Windows.
+
+- QSharedPointer / QWeakPointer
+    * Added two new classes for sharing pointers with support for atomic
+      reference counting and custom destructors.
+
+- QStringRef
+  * [191369] Added QStringRef::localeAwareCompare() functions.
+
+- QTabBar
+    * Added the ability to place close buttons and widgets on tabs.
+    * Added the ability to choose the selection behavior after a tab is
+      removed.
+    * Added a document mode which, on Mac OS X, paints the widget like
+      Safari's tabs.
+    * Added the movable property so that the user can move tabs easily.
+    * Added mouse wheel support so that the mouse wheel can be used to change
+      tabs.
+
+- QTabWidget
+    * Added a document mode that removes the tab widget border.
+
+- QTcpSocket
+    * [183743] Added support for requesting connections via proxies by
+      hostname (no DNS resolution made on the client machine).
+
+- QTextDocument / QTextDocumentWriter
+    * Added the QTextDocumentWriter class which allows exporting of
+      QTextDocument text and images to the OpenDocument format
+      (ISO/IEC 26300).
+
+- QtScriptTools
+    * Added a new module to provide a debugger for Qt Script.
+
+- Qt::WA_TranslucentBackground
+    * Added this new window attribute to be able to have per-pixel
+      translucency for top-level windows.
+
+- Qt::WindowCloseButtonHint
+    * Added a new window hint to control the visibility of the window close
+      button.
+
+- Qt::WindowStaysOnBottomHint
+    * Added a new window hint to allow the window to stay below all other
+      windows.
+
+- Q_SIGNAL and Q_SLOT
+    * Added new keywords to allow a single function to be marked as a signal
+      or slot.
+
+- QT4_IM_MODULE
+    * [227849] Added a new environment variable that specifies the input
+      method module to use and takes precedence over the QT_IM_MODULE
+      enviroment variable. This environment variable allows the user to
+      configure the environment to use different input methods for Qt 3 and
+      Qt 4-based applications.
+
+- QXmlQuery
+    * Added a number of overloads to the bindVariable(), setFocus(), and
+      evaluateTo() functions.
+    * Added a property for controlling the network access manager.
+    * Partial support for XSL-T has been added. See the main documentation for
+      the QtXmlPatterns module for details.
+
+Optimizations
+-------------
+
+- The backing store has been re-factored and optimized
+    * Significant improvement in overall performance of painting for widgets.
+    * Reduced the number of QRegion operations.
+    * Improved update handling.
+    * Improved the performance of clipping.
+    * Support for full static contents.
+
+- QGraphicsView has been optimized in several areas
+    * Reduced the number of floating point operations.
+    * Improved update handling.
+    * Improved handling of deeply nested item trees.
+    * Improved the performance of clipping for ItemClipChildrenToShape.
+    * Improved sorting speed, so scenes with deeply nested item hierarchies do
+      not affect the performance as compared to Qt 4.4.
+
+- Widget style sheets optimisations
+    * Improved the speed of style sheet initialization.
+
+- QAbstractItemModel
+    * Optimized QPersistantModelIndex creation and deletion.
+    * Optimized adding and removing rows and columns.
+
+- QFileSystemModel
+    * Ensured that the model is always sorted when required.
+
+- QTreeView
+    * Optimized expanding and collapsing items.
+    * Optimized expanding animations with large views.
+
+- QRect and QRectF
+    * Improves on functions like intersect(), contains(), etc.
+
+- QTransform
+    * Reduced the number of multiplications used for simple matrix types.
+
+- QRasterPaintEngine
+    * Reduced overhead of state changes; e.g., setPen() and setBrush().
+    * Introduced a cache scheme for Windows glyphs, thus improving text
+      drawing performance significantly.
+    * Reduced the cost of doing rectangular clipping.
+    * Improved pixmap drawing.
+    * Improved pixmap scaling.
+    * Optimized drawing of anti-aliased lines.
+    * Optimized drawing of anti-aliased dashed lines.
+
+Third party components
+----------------------
+
+- Updated Qt's SQLite version to 3.5.9.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+- General Fixes
+    * [217988] Fixed a thread safety issue in QFontPrivate::engineForScript
+      which could lead to buggy text rendering when rendering text from
+      several threads.
+    * [233703] Fixed a crash that occured when the input method (for example
+      SCIM) was destroyed while the application is still running.
+    * [233634] When there are several input method plugins available, they are
+      now initialized only when the user switches to them.
+    * [231089] Fixed an issue which caused HTTP GET to fail for chunk
+      transfers.
+    * [193475] Consumer tablet devices (like Wacom Graphite and Bamboo) now
+      work on Windows and Mac OS X.
+    * [203864] Do not warn when deleting objects in their event handler except
+      for Qt Jambi.
+
+- QAbstractItemModel
+    * [233058] Fixed the sorting algorithm used in rowsRemoved().
+
+- QAbstractItemView
+    * [221955] Fixed a bug that allowed rows to be selected even if the
+      selection mode was NoSelection.
+    * [244716] Fixed a possible crash when an edited cell was moved.
+    * [239642] Ensured that a rubber band selection is clear if the selection
+      ends on the viewport.
+    * [239121] Ensured that the old selection is clear when starting a
+      selection on the viewport.
+    * [219380] Fixed an update issue when removing rows.
+
+- QAbstractSpinBox
+    * [221221] Fixed a usability issue with QAbstractSpinBox subclasses in
+      itemviews.
+
+- QBitmap
+    * [216648] Fixed a problem where QBitmaps were being converted to 32-bit
+      QPixmaps when QPixmap::resize() was called.
+
+- QByteArray and QString
+    * [239351] Fixed a bug in QCharRef and QByteRef that would cause them to
+      fail to detach properly in some cases. Applications need to be
+      recompiled to use the fix.
+    * [212140] Added repeated() functions to these classes.
+    * [82509] Added QT_NO_CAST_FROM_BYTEARRAY to disable "operator const
+      char *" and "operator const void *" in QByteArray.
+
+- QCalendarWidget
+    * [206017] Fixed minimumSize to be calculated correctly in the case where
+      the vertical header has a different text format set.
+    * [206282] Added support for browsing months using the mouse wheel.
+    * [238384] A click on the date cell will now be ignored if the year
+      spin box is opened.
+
+- QCleanlooksStyle
+    * [195446] Skip disabled menu and menu bar items when using keyboard
+      navigation.
+    * Fixed a problem with wrapped text eliding on titlebars.
+    * [204269] Fixed a sizing problem with push buttons having mnemonics.
+    * [216172] Fixed a problem with check box on inverted color schemes.
+
+- QColor
+    * [196704] Fixed a problem where the QColor::fromHsvF() function could
+      return incorrect values.
+
+- QComboBox
+    * [167106] Fixed a problem where the combobox menu would incorrectly show
+      check boxes after a style change.
+    * [227080] Fixed handling of the style sheet background-color attribute on
+      Windows.
+    * [227080] Adjusted pop-up size when using style sheet border.
+    * [238559] Fixed the completer as it was not using the right column with
+      setModelColumn().
+
+- QCommandLinkButton
+    * [220475] Added support for On/Off icon states.
+
+- QCommonStyle
+    * [211489] Ensured that checkable group boxes with no title are drawn
+      correctly.
+    * [222561] Made more standard icons available.
+
+- QCOMPARE(QtTest)
+    * [183525] Fixed issue that caused QCOMPARE to give incomplete
+      information when comparing two string lists.
+    * [193456] Ensured that nmake install for QTestLib copies the DLL into the
+      bin directory.
+
+- QCoreApplication
+    * [224233] Ensured that QCoreApplication::arguments() skips the
+      -stylesheet argument.
+
+- QDate
+    * [222937] QDate - fixed issue preventing a minimum date of 01-01-01
+      from being set.
+
+- QDataStream
+    * [230777] Fixed a bug that would cause skipRawBytes() to go
+      backwards if the correct resulting position was larger than 2 GB.
+
+- QDateTimeEdit
+    * [196924] Improved QDateTimeEdit's usability. It now skips ahead to the
+      next field when input can't be valid for the current section.
+
+- QDBusConnection
+    * [211797] Added support for the GetAll call in the standard
+      org.freedesktop.DBus.Properties interface.
+    * [229318] Fixed race conditions caused by timers being deleted in
+      the wrong thread.
+
+- QDesktopServices
+    * [237398] Ensured that, on Mac OS X, returned paths do not have a
+      trailing '/'.
+
+- QDesktopWidget
+    * [244004] Fixed a coordinate issue on Mac OS X with multi-screen setups
+      where the screen sizes differ.
+
+- QDialog
+    * [214987] Ensured that maximize buttons are not put on dialogs by default
+      on Mac OS X.
+
+- QDialogButtonBox
+    * [224781] Dialog buttons without icons now get the same height as dialog
+      buttons with icons to maintain the alignment.
+
+- QDockWidget
+    * [237438] Fixed a crash in setFloat() for parentless dock widgets.
+    * [204184] Subclasses are now allowed to handle mouse events.
+    * [173854] Ensured that the size of the dock widget is remembered when it
+      is hidden.
+
+- QDomDocument
+    * [212446] Ensured that a new line inserted after an element that
+      indicates whitespace is preserved.
+
+- QDomAttr
+    * [226681] Fixed issue that caused specified() to return false if the
+      attribute is specified in the XML.
+
+- QEvent
+    * Added more debug operators for common event types.
+
+- QFlags
+    * [221702] Fixed issue with testFlag() that gave a surprising result on
+      enums with many bits.
+
+- QFormLayout
+    * [240759] Fixed crash in QFormLayout that could occur when a layout was
+      alone in a row.
+
+- QFile
+    * [238027] Fixed a bug that would cause QFile not to be able to map a file
+      to memory if QFile::open() was called with extra flags, like
+      QIODevice::Unbuffered.
+
+- QFileInfo
+    * [166546] Fixed QFileInfo operator== bug involving trailing directory
+      separators.
+
+- QFileDialog
+    * [240823] Fixed issues with file paths over 270 characters in length on
+      Windows.
+    * [212102] Fixed ".." directory issue.
+    * [241213] Fixed some problems when renaming files.
+    * [232613] Fixed a usability issue with UNC path on Windows.
+    * [228844] Fixed a wrong insertion in the filesystemModel that caused
+      persistant model index to be broken.
+    * [190145] [203703] Fixed a bug in getExistingDirectory() that returned
+      /home/ instead of /home, or on Windows, returned c:/temp/ instead of
+      c:/temp. We now match the native behavior.
+    * [236402] Fixed warning in the QFileDialog caused by deleting a directory
+      we have previously visited.
+    * [235069] Fixed issue that prevented QFileDialog from being closed on
+      Escape when the list view had focus.
+    * [233037] Fixed issue that caused the "Open" button to be disabled even
+      if we want to enter a directory (in AcceptSave mode).
+    * [223831] Ensured that the "Recent Places" string is translatable.
+    * Fixed crash on Windows caused by typing \\\ (empty UNC Path).
+    * [226366] Fixed issue that prevented the completer of the line edit from
+      being shown when setting a directory with lower case letter.
+    * [228158] Fixed issue that could cause the dialog to be closed when
+      pressing Enter with a directory selected.
+    * [231094] Fixed a hang that could occur when pressing a key.
+    * [227304] Fixed a crash that could occur when the dialog had a completer
+      and a QSortFilterProxyModel set.
+    * [228566] Fixed the layout to avoid cyclically showing and hiding the
+      scroll bars.
+    * [206221] Ensured that the view is updated after editing a value with a
+      custom editor.
+    * [196561] Fixed the static API to return the path of the file instead of
+      the link (.lnk) on Windows.
+    * [239706] Fixed a crash that could occur when adding a name filter from
+      an editable combo box.
+    * [198193] Ensured that directory paths on Windows have a trailing
+      backslash.
+
+- QFrame
+    * [215772] Style sheets: Ensured that the shape of the frame is respected
+      when not styling the border.
+
+- QFont
+    * [223402] QFont's QDataStream operators will now save and restore the
+      letter/word spacing.
+
+- QFontMetrics
+    * [225031] Fixed issue where QFontMetrics::averageCharWidth() could return
+      0 on Mac OS X.
+
+- QFtp
+    * [227271] Added support for old FTP servers that do not recognize the
+      "SIZE" and "MDTM" commands.
+
+- QFuture
+    * [214874] Fixed deadlock issue that could occur when cascading QFutures.
+
+- QGLContext
+    * [231613] Fixed a crash that could occur when trying to create a
+      QGLContext without a valid paint device.
+
+- QGLFramebufferObject
+    * [236979] Fixed a problem with drawing to multiple, non-shared,
+      QGLFramebufferObjects from the same thread using QPainter.
+
+- QGraphicsEllipseItem
+    * [207826] Fixed boundingRect() for spanAngle() != 360.
+
+- QGraphicsGridLayout
+    * [236367] Removed (0, 0) maximum size restriction of a QGraphicsItem by
+      an empty QGridLayout.
+
+- QGraphicsItem
+    * [238655] Fixed slowdown in QGraphicsItem::collidesWithItem() that was
+      present in Qt 4.4.
+    * [198912] ItemClipsChildrenToShape now propagates to descendants.
+    * [200229] Ensured that context menu events respect the
+      ItemIgnoresTransformations flag.
+    * Enabling ItemCoordinateCache with no default size now automatically
+      resizes the item cache if the item's bounding rectangle changes.
+    * [230312] Mac OS X: Fixed a bug where update() issued two paint events.
+
+- QGraphicsLayout
+    * [244402] Fixed issue that could cause a horizontal QGraphicsLinearLayout
+      to stretch line edits vertically.
+
+- QGraphicsLayoutItem
+    * Fixed a crash that could occur with custom layouts which did not delete
+      children.
+
+- QGraphicsScene
+    * [236127] Fixed BSP tree indexing error when setting the geometry of
+      a QGraphicsWidget.
+
+- QGraphicsWidget
+    * [223403] Ensured that QGraphicsWidget(0, Qt::Popup) will close when you
+      click outside it.
+    * [236127] Fixed QGraphicsScene BSP tree indexing error.
+    * Improved rendering of window title bars.
+    * Fixed crash that could occur when a child that previously had the focus
+      died without having the focus anymore.
+
+- QGraphicsProxyWidget
+    * [223616] Ensure that context menus triggered by ActionsContextMenu are
+      embedded.
+    * [227990] Widgets are not longer resized/moved when switching themes on
+      Windows.
+    * [219058] [237237] Fixed scroll artifacts in embedded widgets.
+    * [236545] Ensured that the drag and drop cursor pixmap is not embedded
+      into the scene on X11.
+    * [238224] Fixed a crash that could occur when a proxy widget item was
+      deleted.
+    * [242553] Fixed drag and drop propagation for embedded widgets.
+
+- QGraphicsSvgItem
+    * [241475] Fixed update on geometry change.
+
+- QGraphicsTextItem
+    * [240400] Fixed bugs in mouse press handling.
+    * [242331] Add tabChangesFocus() to let the user control whether the text
+      item should process Tab input as a character, or just switch Tab focus.
+
+- QGraphicsView
+    * [236453] Improved Tab focus handling (propagate Tab and Backtab to items
+      and widgets).
+    * [239047] Improved stability of fitInView() with a very small viewport.
+    * [242178] Fixed rubber band debris left in Windows XP style (potentially
+      any style).
+    * Fixed a crash in QGraphicsView resulting from the non-deletion of
+      sub-proxy widgets.
+    * Fixed issue that caused items() to return an incorrect list with an
+      incorrect sort order when an item in the scene has the
+      IgnoresTransformations flag set to true.
+    * Ensured that the painter properly saves/restores its state after a call
+      to drawBackground().
+    * [197993] Allow any render hint to be set/cleared by the
+      QGraphicsView::renderHints property.
+    * [216741] Fixed handling of QGraphicsView::DontSavePainterState (broken
+      in Qt 4.3).
+    * [235101] [222323] [217819] [209977] Implemented proper font and palette
+      propagation in Graphics View.
+    * [238876] Fixed scroll artifacts in reverse mode.
+    * [153586] Ensured that the text cursor is drawn correctly in transformed
+      text controls in a QGraphicsView.
+    * [224242] Added support for embedding nested graphics views.
+
+- QGroupBox
+    * [204823] Fixed a palette inconsistency when using certain styles.
+
+- QHeaderView
+    * [239684] Fixed sorting that wouldn't happen when clicking unless the
+      sort indicator is shown.
+    * [236907] Fixed bug that could cause hidden columns to become visible.
+    * [215867] Resizing sections after moving sections could resize the wrong
+      columns.
+    * [211697] Fixed ResizeToContents to always show the full content of
+      cells.
+
+- QImage
+    * [240047] Fixed a problem with drawing/transforming sub-images.
+
+- QImageReader
+    * [138500] Added the QImageReader::autoDetectImageFormat() function.
+
+- QKeySequence:
+    * Added QKeySequence::SaveAs which has values for both GNOME and Mac OS X.
+    * [154172] Improved toString(NativeText) to return more native glyphs on
+      Mac OS X.
+
+- QLabel
+    * [226479] Fixed update if showing a QMovie that changes its size.
+    * [233538] Fixed behavior involving changing the color of a label with a
+      style sheet and pseudo-state.
+
+- QLineEdit
+    * [179777] Ensured that PasswordEchoOnEdit shows asterisks correctly.
+    * [229938] Fixed issue that could cause textChanged() to be emitted when
+      there was a maximum length set, even though the text was not changed.
+    * [210502] Fixed case-insensitive inline completion.
+
+- QLineF
+    * [241464] Fixed issue that could cause intersects() to be numerically
+      unstable in corner cases.
+      The function has been rewritten to be faster and more robust.
+
+- QListView
+    * [217070] Fixed issue that could cause scroll bars to appear in adjusted
+      icon mode.
+    * [210733] Made improvements in the way the pagestep is computed.
+    * [197825] Ensured that hidden items are not selectable.
+
+- QLocalServer
+    * Added new removeServer() static method to allow the socket file to be
+      deleted after an application has crashed.
+
+- QMacStyle
+    * [232298] Draw the sort indicators in the correct direction for table
+      headers.
+    * [198372] Give context sub-menus the correct mask.
+    * [209103] [232218] QToolButton::DelayedPopup is now displayed correctly.
+    * [221967] Bold header text now uses the correct color.
+    * [234491] Also the menu's QFont when when drawing menu items.
+    * Ensure the proper pressed look for tabs on Leopard.
+
+- QMainWindow
+    * [192392] Stop excessive updates with unified toolbars when changing the
+      enabled status of an action.
+    * [195259] Ensured that the toolbar button is shown when the unified
+      toolbar is created later.
+
+- QMessageBox
+    * [224094] Fixed crash that could occur when specifying a default button
+      that was not one of the buttons listed.
+    * [223451] Fixed a memory leak on a static pointer when the application
+      exits.
+
+- QMainWindow
+    * [224116] [228995] [228738] save/restoreState() would not always restore
+      the toolbars in the correct positions.
+    * [215430] Fixed issue that meant that the user could dock widgets and
+      they wouldn't be tabbed even if ForceTabbedDocks was set.
+    * [240184] Fixed an issue that caused QDockWidget to get smaller and
+      smaller by docking and undocking.
+    * [186562] Fixed layout when saving the state with an undocked dock widget
+      and then restoring it
+    * [228110] Re-adding a toobar now also re-docks it.
+    * [232431] Fixed a memory leak caused by setting centralWidget multiple
+      times.
+
+- QMenu
+    * [220965] [222978] Style sheets: Made it possible to set border and
+      gradient on items.
+
+- QMenuBar
+    * [228658] Fixed broken activated signal behavior.
+    * [233622] Fixed the repaint when a dialog is invoked
+
+- QMdiArea
+    * [233264] Mac OS X: Improved performance when dragging sub-windows
+      around.
+    * [233267] [234002] [219646] Removed flickering behavior that could occur
+      when switching between maximized sub-windows.
+
+- QNetworkReply:
+    * [235584] Fixed a bug that would cause sslConfiguration() to
+      return a null object if finished() had already been emitted.
+
+- QOpenGLPaintEngine
+    * [244918] Fixed a problem with drawing text and polygons onto software
+      rendering GL contexts.
+
+- QPainterPath
+    * [234220] Fixed crash due to a division by zero function in
+      addRoundedRect().
+
+- QPicture
+    * [226315] Fixed an assert when trying to load picture files created with
+      Qt 3 into Qt 4.
+
+- QPixmap
+    * [223800] Fixed a bug where grabWindow() on a QScrollArea did not work
+      the first time.
+    * [217815] Fixed a bug where grabWidget() did not work properly for
+      resized and hidden widgets.
+    * [229095] Mac OS X: Fixed issue that could cause grabWindow() to grab the
+      wrong parts of the window for child widgets.
+
+- QPlastiqueStyle
+    * [195446] Ensured that the background is now painted on selected but
+      disabled menu items for improved keyboard navigation.
+    * [231660] Fixed support for custom icon size in tab bars.
+    * [211679] drawPartialFrame() now passes the widget pointer.
+
+- QPainter
+    * QPainter::font(), brush(), pen(), background():
+      These functions will return default constructed objects when the
+      painter is inactive.
+    * [242780] Fixed segmentation fault that could occur when setting
+      parameters on an uninitialized QPainter.
+    * [89727] Added support for raster operations.
+    * [197104] More well-defined gradient lookup (linear gradients are now
+      perfectly symmetric if inverting the color stops).
+    * [239817] Fixed bug where overline/strike-out would be drawn with the
+      wrong line width compared to the underline.
+    * [243759] Fixed some off-by-one errors in the extended composition modes
+      in the raster paint engine.
+    * [234891, 229459, 232012] Fixed some corner case bugs in the raster paint
+      engine line/rectangle drawing.
+    * Fixed the "one pixel less" clipping bug caused by precision lost when
+      converting to int.
+    * Fixed the composition mode in QPainter raster which was not properly set.
+    * Fixed an assert when the painter is reused after a previous bad usage
+      (e.g., painting on a null pixmap).
+
+- QPainterPath
+    * Added convenience operators: +, -, &, |, +=, -=, &= and |=.
+
+- QPrinter
+    * [232415] Fixed a problem that caused a an invalid QPrinter
+      object to not update its validity after being passed into a
+      QPrintDialog.
+    * [215401] Fixed the size of the Executive paper format.
+    * [202113] Improved speed when printing to a highres PostScript printer.
+    * [195028] Trying to print to a non-existing file didn't update the validity
+      of the QPrinter object correctly.
+    * [134820] Support CUPS printer instances on Unix systems (Mac and X11).
+    * [201875] Fixed a bug that caused the fill opacity of a brush to be used
+      for the stroke in certain cases.
+    * [222056] Fixed absolute letter spacing when printing.
+    * [234135] Fixed a problem with custom margins for CUPS printers.
+
+- QPrintDialog
+    * [232207] When printing to a Qt .pdf or .ps printer under Windows or
+      Mac OS X, pop up a file dialog instead of the native print dialog.
+
+- QPrintPreviewDialog
+    * [236418] Fixed a problem that caused opening several QPrintPreviewDialogs
+      and printing to them at the same time crash.
+
+- QProcess
+    * [230929] (Unix) Open redirection files in 64-bit mode wherever supported.
+
+- QProgressDialog
+    * [215050] Properly stop internal timer that retriggered for no reason.
+
+- QProgressBar
+    * [216911] stylesheet bug if minimum value != 0
+    * [222872] Use the orientation when determining if we should repaint.
+
+- QRadioButton
+    * [235761] Fixed navigation with arrow keys when buttons are in different layout
+
+- QRegion
+    * [200586] Make QRegion a lot smarter when converting from a QPolygon, to avoid
+      creating a lot of needless rectangles.
+    * For Mac OS X, add QRegion::toQDRgn(), QRegion::toHIMutableShape() and
+      corresponding ::fromQDRgn() and ::fromHIShape(). The ::handle() is still
+      available for 32-bit Mac OS X builds and is the equivalent of ::toQDRgn().
+
+- QScrollArea
+    * [206497] Stylesheet: It's now possible to style the corner with ::corner
+
+- QScrollBar
+    * [230253] Simple stylesheets doesn't break the scrollbar anymore.
+
+- QSettings
+    * [191901] Added methods setIniCodec() and iniCodec() for changing the codec of .ini files.
+
+- QSharedMemory
+    * Don't deadlock when locking an already-held lock.
+
+- QSortFilterProxyModel
+    * [236755] Hidden columns in QTableView could become visible
+    * [234419] Fixed a data corruption when adding child and row is filtered out
+
+- QSslSocket
+    * [189980] Ensure OpenSSL_add_all_algorithms() is called.
+
+- QSslCertificate
+    * [186084] Fixed a bug that would cause timezones in certificate
+      times not to be parsed correctly, leading to valid certificates
+      not being accepted
+
+- QSslConfiguration
+    * [237535] Fixed a bug that would cause QSslConfiguration objects
+      to leak memory and eventually corrupt data due to wrong
+      reference counting.
+
+- QStandardItemModel
+    * [227426] Fixed drag and drop of hierarchy
+    * [242918] Added ability to change flags of the root item.
+
+- QString
+    * [205837] Qt 4.4: format string warnings / small QString conversion
+      clean up.
+
+- QSvgRenderer
+    * [226522] Fixed fill-opacity when fill is a gradient.
+    * [241357] Fixed gradients with two or more stop colors at the same offset.
+    * [180846] Fixed small font sizes.
+    * [192203] Add support for gzip-compressed SVG files.
+    * [172004] Respect the text-anchor attribute for embedded SVG-fonts.
+    * [199176] Ensure QSvgGenerator handles fractional font sizes
+    * [151078] Fix parsing of embedded fonts in files that have <metadata> tags
+
+- QSystemTrayIcon
+    * [195943] QSystemTrayIcon now accepts right mouse clicks on Mac OS X.
+    * [241613] Hide the tooltip when open the menu on Mac OS X.
+    * [237911] Only emit QMenu::triggered once on Mac OS X.
+    * [196024] Make it possible to disable context menus on Mac OS X.
+
+- QTabBar
+    * [213374] Fixed position of label in vertical bar with stylesheet
+
+- QtScript
+    * [177665] Added QScriptEngine::checkSyntax(), which provides information
+      about the syntactical (in)correctness of a program.
+      QScriptEngine::canEvaluate() has been obsoleted.
+    * [192955] Added the ability to exclude the QObject::deleteLater() slot
+      from the dynamic QObject binding, so that scripts can't delete
+      application objects.
+    * [212277] Fixed issue where the wrong prototype object was set when a
+      polymorphic type was returned from a slot.
+    * [213853] Fixed issue that could cause events to be processed less
+      frequently than what's set with QScriptEngine::setProcessEventsInterval().
+    * [217781] Fixed bug that caused the typeof operator to return "function"
+      when applied to a QObject wrapper object.
+    * [219412] Fixed bug that could cause the in operator to produce wrong results
+      for properties of Array objects.
+    * [227063] Fixed issue where a break statement caused an infinite loop.
+    * [231741] Fixed bug that could cause the implementation of the delete
+      operator to assert.
+    * [232987] QtScript now calls QObject::connectNotify() and
+      QObject::disconnectNotify().
+    * [233346] Fixed issue where the garbage collector would not be triggered when
+      very long strings were created, causing excessive memory usage.
+    * [233624] Fixed bug that caused enums in namespaces to be handled incorrectly.
+    * [235675] Fixed issue where creating a QScriptEngine would interfere with
+      ActiveQt's QVariant handling.
+    * [236467] Fixed bug that caused QtScript to treat a virtual slot redeclared by
+      a subclass as an overload of the base class's slot.
+    * [240331] Fixed bug that caused QtScript to crash when one of the unary
+      operators ++ and -- was applied to an undefined variable.
+    * If a signal has overloads, an error will now be thrown if you try to connect
+      to the signal only by name; the full signature of a specific overload must
+      be used.
+    * Added support for multi-line string literals.
+    * Added QScriptEngine::setGlobalObject().
+    * Made it possible to use reserved identifiers as property names in
+      contexts where there is no ambiguity.
+
+- QTcpSocket
+    * [235173] Fixed a bug that would cause QTcpSocket re-enter
+    select(2) with an uninitialized timer (when the first call got
+    interrupted by a signal).
+
+- QTextCursor
+    * [244408] Fixed regression in QTextCursor::WordUnderCursor behavior.
+
+- QTextCodec
+    * [227865] QTextCodec::codecForIndex(int) broken in Qt3Support
+
+- QTextEdit
+    * [164503, 232857] Fixed issues where using NoWrap caused
+      selection/background colors to not cover full width of text control.
+    * [186044] Fixed whitespace handling when copying text from Microsoft Word
+      or Firefox.
+    * [228406] Fixed parenthesis characters with RTL layout direction on
+      Embedded Linux.
+    * [189989] Fixed QTextEdit update after layout direction change.
+
+- QTextStream
+    * [210933] It is now possible to specify a locale which
+      QTextStream should use for text conversions.
+
+- QToolBar
+    * [193511] Fixed stylesheet on undocked toolbar
+    * [226487] Fixed the layout when the QMainWindow as a central widget with
+      fixed size.
+    * [220177] Fixed the layout not taking the spacing into account
+
+- QToolButton
+    * [222578] Fixed issues with checked and disabled tool buttons in some
+      styles.
+    * Tool button now allows independent hover styling on it's subcontrols.
+    * [167075] [220448] [216715] Polished stylesheet color, background, and
+      border.
+    * [229397] Fixed regression against Qt3 where setPopupDelay(0) did not
+      work as expected.
+
+- QToolTip
+    * [228416] Fixed style sheet tooltips on windows.
+
+- QTreeView
+    * [220494] scrollTo() didn't scroll horizontally if the vertical bar was
+      already at the correct position.
+    * [216717] Fixed update when children are added.
+    * [225029] Fixed bug that prevented focus from being shown for
+      non-selectable items when allColumnsShowFocus is set to true.
+    * [226160] Fixed hit detection when first column is moved.
+    * [225539] Fixed a crash when deleting the model.
+    * [241208] Fixed animation when using persistent editors.
+    * [202073] Fixed visualRect which would not take the indentation into
+      account when 1st column is moved.
+    * [230123] Item can no more be expanded with keyboard if
+      setItemsExpandable has been set to false.
+
+- QTreeWidget
+    * [243165] selectAll didn't work before the widget was shown
+    * [238003] setCurrentItem would not expand the parent item
+    * [223130] Fixed drag&drop when sort is enabled that would only drop the
+      first column.
+    * [223950] Only allow to drag items when they have the
+      Qt::ItemIsDragEnabled flag set.
+    * [218661] Made sure our internal model can pass the "modeltest" test
+      suite.
+    * [217309] Fixed issue that caused data() for CheckStateRole to return
+      Checked even if some children were partially checked.
+    * [229807] Fix a redrawing problem when scrolling with a different palette
+      role set on Mac OS X.
+    * [236868] Prevent a crash when dragging an item hidden by a tooltip on
+      Mac OS X.
+
+- QLocale
+    * Added support for narrow format for day and month names.
+    * Day and month names can now also be fetched as a standalone text.
+
+- QDebug
+    * Values of type QBool are now properly outputted with QDebug.
+
+- QUndoStack
+    * [227714] Don't crash when owner group is deleted.
+
+- QUrl
+    * [204981] Made the QUrl tolerant parser more tolerant
+    * Fixed a bug in QUrl's tolerant parsing of stray % characters
+      (not part of %HH sequences), which would cause it to make the
+      URL even worse
+    * [227069] Fixed a bug that would cause QUrl to not parse URLs
+      whose hostnames start with an IP address (like
+      http://1.2.3.4.example.com)
+    * [230642] Fixed a bug that made QUrl not properly produce proper
+      URLs with relative paths
+    * Modified QUrl to not normalize %HH in URLs unless strictly
+      necessary. QUrl now keeps the original %-encoding of the input
+      unless some operation is executed in the QString
+      components. This also allows for %2f to exist in path components.
+
+- QVariant
+    * [215610] prevented assertion when reading from an invalid QDataStream.
+
+- QWidget
+    * [222323] [217819] [209977] Improve Qt's font and palette propagation.
+    * [218568] Revert and reopen task 176809 ("when using
+      Qt::PreventContextMenu policy, the context key menu is still not sent to
+      the widget").
+    * [220502] Ensure that setWindowFilePath() when called with an empty
+      string clears the proxy icon in Mac OS X.
+    * [240147] Enforce exclusivity between the Qt::WA_(Normal|Small|Mini)Size
+    * [168641] Ensure that tablet releases go to the correct widget on X11 and
+      Carbon (i.e., the widget that received the press).
+    * [192565] Fixed a problem with calling QWidget::render(), using a
+      QPrinter as a paint device.
+    * [236565] [168570] Fix regression on X11 where QWidget::restoreGeometry()
+      would restore incorrect geometry if the window was maximized when saved.
+    * [201655] Fix QWidget::scroll() acceleration issue with child widgets on
+      Mac OS X.
+    * [210734] [210734] Fixed a bug where changing the visibility of alien
+      widgets did not generate proper enter/leave events.
+    * [228764] Major improvement of scroll performance.
+    * [238258] [229067] [239678] Flickering with widgets larger than
+      4096x4096 pixels in size.
+    * [141091] Added full support for Qt::WA_StaticContents.
+    * [238709] Fixed a bug where calling clearMask() did not update the view
+      properly.
+    * [213512] Fixed clipping issue with Qt::WA_PaintOutsidePaintEvent widgets.
+    * [230175] Added support for calling render() recursively.
+    * [238115] Fixed painting issues after calling winId().
+
+- QWindowsStyle
+    * [210069] Fixed a bug in the drawing of comboboxes.
+
+- QWindowsVistaStyle
+    * [221668] Respect background color role for item views.
+    * [227360] Current item now gets focus for multiselection views.
+    * [224251] Fixed incorrect painting of inverted and reversed progress
+      bars.
+    * [207836] Fixed a problem with vertical toolbar separators.
+    * [202895] Fixed problem where indeterminate progress bars were not
+      animated when Vista animations were explicitly disabled.
+    * [200899] Message box buttons are now right aligned.
+
+- QWindowsXPStyle
+    * [207242] Fixed a static memleak.
+    * [206418] Fixed missing focus rect on tool buttons.
+    * [188850] Fixed a problem with offsets for sliders.
+    * [110091] Tool buttons with arrows are not styled using black
+      windows arrows due to consistency issues with the native theme.
+
+- QWizard
+    * [204643] Make sure the maximum size of QWizard is computed properly.
+
+- QWorkspace
+    * [125281] fixed active child to be the same when minimizing and restoring
+      the main window.
+
+- QtWebKit
+    * ACID3 score 100 out of 100.
+    * Added support for plugins using Netscape Plugin API (NPAPI) for Windows,
+      Mac OS X, and X11.
+    * [211228] Fixed invisible focus rectangle on push buttons.
+    * [211256] Fixed dragging an image from the web view.
+    * [211273] Fixed static build of Qt with QtWebKit.
+    * [213966] Fixed wrong placement of native widget plugins after scrolling.
+    * [214946] Ensured native plugin instances are deleted properly.
+    * [217574] Fixed cursor problem on text input field after focus change.
+    * [218957] Fixed rendering of form elements when using Windows style.
+    * [219344] Added a remark that some web actions have an effect only
+      when contentEditable is true.
+    * [220127] Fixed mouse right click still allowed for disabled view.
+    * [222544] Added an option to print background elements.
+    * [222558] Fixed input method does not work after changing the focus.
+    * [222710, 222713] Fixed issues with TinyMCE editor.
+    * [223447] Ensured that CSS with relative path works on Windows.
+    * [224539] Fixed linkClicked() emitted only once for local anchor URLs.
+    * [225062] Fixed links do not work for QWebView embedded in QGraphicsScene.
+    * [227053] Fixed problem with percent encoded URLs.
+    * [230175] Fixed video rendering when embedded in Graphics View.
+    * [235270] Showed module name when plugin loading fails.
+    * [238330] Prevented multiple instantiation of native widget plugin.
+    * [238391] Prevented crash when printing to file is cancelled.
+    * [238662] Fixed function keys are not mapped.
+    * [241050] Implemented proper painting of CSS gradient.
+    * [241144] Ensured proper actions for some web action types.
+    * [241239] Ensured plugins are not loaded when disabled.
+    * [231301] Fixed an issue on Windows mobile when switching between input
+      modes.
+
+- Q3ButtonGroup
+    * [238902] Q3ButtonGroup now looks for children recursively rather than
+      just the direct children like it did in Qt 3.
+    * [200764] Fixed insertion of buttons with IDs in arbitrary order.
+
+- Q3FileDialog
+    * [230979] Fixed a crash after a resize and drag on scroll bars.
+
+- Q3MainWindow
+    * [240766] Crash while resizing the window while updating layouts.
+
+- Q3ListView
+    * [225648] Fixes infinite update.
+
+- Q3ProgressBar
+    * [132254] Fixed incorrect painting when totalSteps = 0.
+    * [231137] Fixes progress bar disappearing if you set a style sheet to the
+      application.
+
+- StyleSheets
+    * [224095] Fixed white space inside palette().
+    * Fixed setting style on the application may change the appearance of some
+      widgets.
+    * [209123] Fixed Stylesheets causing unnecessary paint events on
+      enterEvent() and leaveEvent().
+    * [209123] Fixed setting gradient background to custom widget.
+
+- QXmlQuery
+    * [223539] Summary: "node" and other typekind keywords are not allowed as
+      an element name when part of for loop.
+
+- QXmlStreamReader
+    * [207024] Added the QXmlStreamAttribute::hasAttribute() function.
+    * [231516] Regression: QXmlStreamWriter produces garbage in "version"
+      attribute of XMLDeclaration.
+
+****************************************************************************
+*                          Examples and demos                              *
+****************************************************************************
+
+- Pad Navigator example
+    * [236416] Provide a minimum window size for this example.
+    * [208616] No longer builds in console mode on Windows.
+
+- Diagram Scene example
+    * [244996] Fix crash when changing the font of a text item and then
+      select other items.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+- Interbase driver
+
+- MySQL driver
+
+****************************************************************************
+*                             QTestLib                                     *
+****************************************************************************
+
+ - QTestLib now supports writing benchmarks.
+ - Fixed an issue where tests returned exit code 0, even though tests
+   failed in some rare cases.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Unix
+    * Made the iconv-based QTextCodec class (the "System" codec on
+      Unix systems that support it) stateful. So it's now possible to
+      feed incomplete multibyte sequences to the toUnicode function,
+      as well as the first character in a UTF-16 surrogate pair.
+
+X11
+    * Added a QGtkStyle to integrate with GTK+ based desktop environments.
+    * If font config is used the default font-substitutions will no longer be
+      used instead we rely on fontconfig to determine font substitutions as
+      required.
+    * Improved support for KDE4 desktop settings.
+    * [214071] Improved support for custom freedesktop icon themes.
+    * [195256] Use FreeType's subpixel filtering if available, thus honoring
+      Font Config's LCD filter settings.
+    * Added supported for XFIXES X11 extension for proper clipboard
+      support when non-Qt application owns the clipboard.
+    * Icon support for top level windows (_NET_WM_ICON) was improved
+      to support several icons with different sizes.
+    * [211240] In some cases QFileSystemWatcher didn't notify about
+      files that were moved over another files.
+    * [238743] Added support for the _NET_SYSTEM_TRAY_VISUAL property
+      to use the same visual the system tray manager asks us to use.
+    * [229593] Fix font matching with old fontconfig versions.
+    * [167873] Proper event compression for mouse events when using tablets.
+    * [208181] Fix averageCharWidth to be consistent for y!=x ppem
+    * [229070] Fix QPrintDialog assertion
+    * [211678] Fixed a problem with drawing a QPixmaps on different X11
+      screens.
+    * [221362] Fixed a problem where pixmaps only appeared on the first page
+      in a print preview.
+    * [232666] Fixed a problem with custom page sizes for CUPS printers.
+    * [228770] Fixed a problem that caused the .ps and .pdf filename
+      extensions
+      to not update in the CUPS printer dialog when printing to file.
+    * [230372] Fixed a problem where the number of copies set on a QPrinter
+      object wasn't picked up and updated properly in a QPrintDialog.
+
+Windows
+    * Cleartype rendering was previously supported onto QImages with
+      an ARGB32 channel. For performance reasons, cleartype is now
+      only supported on opaque images using the RGB32 or
+      ARGB32_Premultipled format. Widget and pixmap rendering is
+      unchanged
+    * [175075] Antialiased font rendering quality has been greatly improved
+      by taking gamma correction into account. We should now match the native
+      Windows font rendering better, and the fonts look better in general when
+      drawing fonts on different backgrounds.
+    * [221132] Fixed a problem with System Tray menu visibility.
+    * [221653] Fixed a problem incorrectly causing a Task Bar status change.
+    * [202890] Improved platform consistency with spacing in menus.
+    * [157323] QCombobox now slides to open on relevant platforms.
+    * [237067] Calling showMessage on QSystemTrayIcon with empty arguments
+      now hides the current message.
+    * [145612] Setting an object name for a QThread sets the name that
+      is visible in the debugger for more easy debugging
+      multi-threaded application.
+    * [216664] QLocale now follows the current system locale when the
+      user changes it in the Windows Control Panel.
+    * [223921] Fix writing system detection of TrueType fonts added
+      via a QByteArray in QFontDatabase::addApplicationFont on Windows.
+    * [205455] 'mailto:' links works properly with QDesktopServices::openUrl().
+    * [205516] standardPalette() now returns the system palette for XP and
+      Vista styles.
+    * [207506] Fixed an issue which switches the alignment for input widgets
+      on Vista.
+    * [223951] Added support for VARIANT with IDispatch in ActiveQt.
+    * [224910] Fixed a crash when using the Hierarchy ActiveQt example.
+    * [201223] 'dumpcpp' now prepends the 'classname_' to resolve conflicts.
+    * [198556] QAxServer registering now takes care of '.' before MIME
+      extension.
+    * [223973] Fixed a deadlock in QLocalSocket.
+    * [193077] Fixed activation of ActiveQt widgets in MFC MDI applications.
+    * [238273] Fixed a crash while editing QTableView using japanese IME.
+    * [238672] Fixed a crash when deleting a widget while dragging.
+    * [241901] ActiveQt now supports [out VARIANT*] parameters.
+    * Fix a GDI object leak on the qfileiconprovider.
+    * [200269] Application and systray icons on Windows that had an alpha
+      channel were not drawn correctly.
+    * [239558] Fix a possible crash when reading XPM data containing trigraphs
+      with the Microsoft compilers.
+    * [204440] Fixed a problem with software rendering contexts on Windows,
+      which might have caused rendering errors due to to unresolved extension
+      pointers.
+    * [232263] Fixed a problem with binding textures to a software context
+      under Windows.
+    * [238715] Fixed a problem with alpha-blended cursors under Windows.
+    * [227297] and [232666] Fixed some problems with custom paper
+      sizes under Windows.
+    * [217259] The default printer wasn't correcly detected with some versions
+      of Windows.
+    * [212886] Fixed a problem with network printers not being listed by
+      the QPrinterInfo::availablePrinters() function under Windows.
+    * [205985] Fixed a problem with reusing a QPrinter object to print several
+      jobs with the Microsoft XPS printer driver.
+    * [196281] Fixed QPrinter::setPrintRange() to work under Windows.
+
+Windows CE
+    * Support for QLocalSocket and QLocalServer added.
+    * QtWebKit and Phonon are now supported.
+    * One can mark a widget with the attribute WA_ExpectsKeyboardInput
+      to automatically display / hide the standard input panel on focus
+      events.
+    * [223523] Reimplementations of standard library functions filled the
+      global namespace causing problems when linking statically to other third
+      party libraries using the same attempt.
+    * Support for using OpenSSL with Qt on Windows CE
+
+Mac OS X
+    * Added the macdeployqt tool that simplifies application deployment.
+    * Improved support of widget stylesheet in Mac.
+    * [218980] - Stacking order of windows and dialogs is fixed, such that
+      dialogs always floats above normal windows, even when the dialog is told
+      to behave as a window.
+    * [219844] - A crash that occurred when using the search buttons on a
+      native file dialog is fixed.
+    * [225705] - FileDialog filters not displaying correctly is fixed.
+    * [239155] - Pop-ups will now close when clicking on a window other than
+      the modal window that opened the pop-up.
+    * [210912] - Show event not sent when reshowing a window from minimized
+      state is fixed.
+    * [228017] - QMenu will now close when expanding a system menu.
+    * Added support for Qt to use Cocoa as its backend instead of Carbon. This
+      is primarily for 64-bit applications, but is also available for 32-bit
+      frameworks as well. 32-bit is still Carbon by default. Passing a 64-bit
+      architecture or -cocoa on the command-line will build Qt against Cocoa.
+      Using Cocoa requires Mac OS X 10.5 (or higher) and cannot be used with
+      the -static nor -no-frameworks option. The define QT_MAC_USE_COCOA is
+      available when Qt is built against Cocoa.
+    * Fix a bug that would prevent a window that had been maximized via
+      setMaximized() to go back to normal size when clicking on the window's
+      maximize button.
+    * Added QMacCocoaViewContainer for embedding Cocoa (NSView) controls into
+      a Qt hierarchy. This feature works for either Carbon or Cocoa, but
+      requires Mac OS X 10.5 or greater.
+    * Added QMacNativeWidget for embedding Qt widgets into non-Qt windows
+      (Carbon or Cocoa).
+    * Added MacWindowToolBarButtonHint for controlling whether or not the
+      toolbar button is shown in Qt windows.
+    * QEvents posted via QEventLoop::postEvent() are now treated as a standard
+      event loop source, like timers and normal input events. This means that
+      is should no longer be necessary to run a busy loop to sendPostedEvents()
+      when QApplication is not the main event loop (e.g. when using Qt in a
+      plugin).
+    * [239646] Shortcuts for sub-menu are now disabled when the menu item is
+      disabled.
+    * [241434] Honor the LSBackgroundOnly attribute if it exists in the
+      application's Info.plist.
+    * [239908] More robustness when encountering different types in reading
+      LSUIElement value.
+    * [234742] Add support Qt::XButton1 and Qt::XButton2.
+    * [236203] Much better support for loading multiple Qt's with different
+      namespaces.
+    * Add Qt::AA_MacPluginApplication that allows bypassing some native menu
+      bar initialization that is usually not desired when running Qt in a
+      plugin.
+    * [205297] Applications Dialogs are now marked as application modal in
+      Carbon.
+    * Tooltip base is now set correctly in the application palette.
+    * [222912] [241603] Qt applications no longer reset their palette back to
+      the system palette on every application activate. Only if the values
+      from the system are different from the last time. This should result in
+      custom palette colors/brushes being kept across application activations.
+    * [211758] Fixed a clipping problem when printing multiple pages on a Mac
+      OS X printer.
+    * [212884] Fixed a crash when printing images on Mac OS X.
+    * [219877] Fixed a problem with a QPrinter object not being valid after
+      setting the output format to PDF or PostScript.
+    * [229406] Fixed crash when display mirroring gets enabled.
+    * [189588] Fixed a bug where QColorDialog::getColor(...) always returned a
+      valid color.
+
+Qt for Embedded Linux
+ - Screen drivers
+   * The SVGAlib driver is no longer supported, due to architectural changes.
+   * [235785] Detect VGA16 video mode and warn that it is not supported.
+
+ - Mouse and keyboard drivers
+   * [243374] Fixed bug where PC mouse driver could not be loaded when
+     configured as loadable plugins.
+   * Added Linux Input Subsystem mouse and keypad drivers
+
+ - General fixes
+   * [242922] Run as server by default when compiled with the
+     QT_NO_QWS_MULTIPROCESS macro defined.
+   * Fixed bugs where wrong cursor would be shown in some cases.
+   * Respect min/max size on initial show also for windows without a layout.
+   * Fixed loading of font plugins when QT_NO_FREETYPE is defined.
+   * Autodetect PowerPC in configure.
+   * Add support for precompiled headers.
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- Build System
+    * [218795] add support for -nomake configure option on Windows to
+      exclude build parts like on other platforms
+    * The -tablet configure option on X11 was renamed to -xinput
+    * [136723] Have moc issue a warning if a Q_PROPERTY declaration does not
+      contain a READ accessor function.
+    * [188529] Fixed bug that caused moc to get stuck in an infinite loop if
+      two files included eachother and the include path had the prefix "./".
+    * [203379] Changed moc code generator so that lint no longer reports
+      problems with the generated code.
+    * [210879] moc no longer generates any implementation for pure virtual
+       signals.
+    * [234909] Fixed bug that caused moc to treat /*/ as a full C comment.
+
+- Assistant
+
+- Designer
+    * Added filter widgets in Widget Box and Property Editor.
+    * Added layout state display to Object Inspector.
+    * Enabled changing the layout type of laid-out containers.
+    * Added handling of spanning QFormLayout columns.
+    * Added convenience dialog to quickly populate QFormLayouts.
+    * Added support for embedded device design profiles.
+    * Changed the selection modifiers to comply to standards; enabled
+      rectangle selection using the middle mouse button; added
+      shift-click-modifier to cycle parents when selecting.
+    * Added "translatable" flag and disambiguation comment to string
+      properties.
+    * Added attribute editors to item-based widgets.
+    * Changed QUiLoader to use QXmlStreamReader instead of QDom.
+    * Ui files with unknown elements are now rejected.
+    * [123592] While dropping a dock widget a main window - make the dock
+      "docked".
+    * [126269] Added the ability to morph widgets into compatible widgets.
+    * [126997] Added support for QButtonGroup.
+    * [145813] Added a listing function to obtain the available layouts to
+      QUiLoader.
+    * [155837] Added support for QWizard.
+    * [164520] Added automatic detection of changes to the qrc resource files
+      from external sources.
+    * [166501] Added "translatable" checkbox to string properties making it
+      possible to exclude it from the translation.
+    * [171900] Indicate Qt 3 compatibility signals and slots using a different
+      color.
+    * [173873] Position pasted widgets at mouse position if possible.
+    * [183637] Introduced Widget Box "Icon view" mode to reduce scrolling,
+      available via context menu.
+    * [183671] Added automatic retranslation upon language change of UIs
+      loaded via QUiLoader.
+    * [185283] Added incremental search facility to Object Inspector.
+    * [191789] Added pkgconfig-Files for Qt Designer libraries.
+    * [198414] Enabled promotion of QMenu/QMenuBar by object inspector context
+      menu.
+    * [201505] Extended QDesignerIntegration::objectNameChanged() to pass on
+      old object name.
+    * [202256] Fixed action editor and object inspector not to resize header
+      when switching forms.
+    * [211422] Fixed QScrollArea support to handle custom QScrollArea widgets
+      with internal children.
+    * [211906] Enable promotion of unmanaged widgets by object inspector
+      context menu.
+    * [211962] Enabled widgets to span columns in a QFormLayout.
+    * [212378] Made the rich text editor dialog, the plain text editor dialog
+      and the style sheet editor dialog remember their geometry.
+    * [213481] Fixed a crash while form loading by preventing it from
+      adding layouts to unknown layout types.
+    * [219381] Fixed Action editor to reflect changing the shortcut in the
+      property editor.
+    * [219382] Added tooltip, checkable and shortcut properties to the action
+      editor dialog.
+    * [219405] Added support for the stretch and minimum size properties of
+      QBoxLayout and QGridLayout.
+    * [219492] Added an icon preview to the resource image file dialog on X11.
+    * [220148] Fixed handling of the QMainWindow::unifiedTitleAndToolBarOnMac
+      property.
+    * [223114] Fixed a crash on removing a dynamic QUrl property.
+    * [229568] Added Q3ComboBox.
+    * [230818] Fixed a bug which caused duplicate names to occur when
+      copying & pasting spacers.
+    * [233403] Fixed a painting bug which caused red line layout markers to
+      disappear depending on grid settings.
+    * [233711] Added a warning when saving a container-extension-type
+      container with unmanaged pages.
+    * [234222] Fixed a bug which caused the autoFillBackground property to be
+      reset during Drag and Drop operations.
+    * [234326] Fixed the QDesignerIntegration::objectNameChanged() signal to
+      work correctly.
+    * [236193] Fixed a crash caused by invalid QSizePolicy values resulting
+      from Qt 3 conversion.
+    * [238524] Ignore constructor-added items of custom widgets inheriting
+      QComboBox.
+    * [238707] Fixed pkgconfig file generation to honour -qt-libinfix.
+    * [238907] Disabled reordering of Spacers and Layouts causing uic to
+      warn "<name> isn't a valid widget".
+    * [232811] Correctly show empty string values in preview.
+    * [214637] Single click expands/collapses classes in property editor
+    * [241949] Update the object inspector properly in case of undoing a
+      reparent widget command.
+
+- uic
+  * Ui files with unknown XML elements are now rejected.
+  * [220796] Added code for adding items to widgets of class Q3ComboBox.
+
+- uic3
+
+  * [231911] Fixed the conversion of boolean font attributes.
+  * [233802] Fixed -extract option on Windows.
+  * [236193] Fixed the conversion of QSizePolicy's "Ignored" value.
+
+- Linguist
+
+  - Linguist GUI
+
+    * Much improved form preview tool
+    * Removed translations column from message index for it being useless.
+    * Phrasebooks have language settings now
+    * [141788] Support translating into multiple languages simultaneously.
+    * [183210] Whitespace is now visualized
+    * [182866] Font resizing in translation textedits
+    * [187765] Support opening files via Drag & Drop
+
+  - Entire Linguist toolchain
+
+   - [201713] Add support for specifying the source language.
+
+    - file formats
+
+      * The .qm files now can be read back by the toolchain, not only Qt.
+      * Added support for GNU Gettext .po files.
+
+      - Qt's own .ts format
+
+        * New element <extracomment> to store purely informative comments
+        * New element <translatorcomment> to store comments from translators
+        * New element wildcard <extra:*> to support user extensions
+        * New elements <oldsource> and <oldcomment> to store values from
+          before the last heuristic merge by lupdate
+
+  - lupdate
+
+    * Parse //: and /*: */ comments as extra comments for translations.
+    * Added support for new QT_TR*() macros.
+    * Added support for QtScript.
+    * Better error reporting.
+    * More accurate processing of .pro files.
+    * Added options -disable-heuristic, -nosort, -target-language,
+      -source-language.
+    * [197391] Support for storing source code references with relative
+      line numbers or no references at all. Omit line numbers from .ui file
+      references at all. These reduce the size of patches and avoid merge
+      conflicts. Option -locations.
+    * [197818] Add support for UTF-16 encoded sources.
+    * [209778, 222637] Somewhat improved C++ parser, in particular with
+      respect to namespaces.
+    * [218671] Accept Q_DECLARE_TR_FUNCTIONS.
+    * [212465] Default context is now the empty string, not "@default".
+      This codifies what previously was an intermittent bug.
+    * [220459] Collect all source code references for each message.
+
+  - lconvert
+
+    * New tool for converting between file formats and filtering file contents.
+
+- configure
+
+- qtconfig
+  * Added option to set style and palette settings back to system defaults.
+
+- qt3to4
+  * [218928] [219127] [219132] [219482] Misc. updates to the porting replacement rules.
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+- QTiffPlugin
+- QSvgIconEngine
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
+- Event filters
+
+- QFileDialog
+        On Mac, native dialogs are now used when calling show, open, or exec
+        on a QFileDialog, QColorDialog, QPrintDialog, or QFontDialog (i.e not
+        only when using the static functions)
+
+        QFileDialog/QFileSystemModel always return Qt separators ("/")
+        regardless of the platform. It can still handle native separators for
+        Windows. To convert the Qt separators to native separators use
+        QDir::toNativeSeparators().
+
+- QGraphicsTextItem
+        Tab input is send to the document by default, inserting a <tab>
+        character. You can get the old behavior of switching Tab focus by
+        setting setTabChangesFocus(true) (QGraphicsTextItem's Tab handling now
+        behaves identically to QTextEdit and QTextBrowser).
+
+- QGraphicsView
+        QGraphicsView now propagates Qt::Key_Tab and Qt::Key_Backtab to the
+        scene, which sends this to the items. Similar to how QWidget works,
+        this event is caught in QGraphicsItem::sceneEvent() and
+        QGraphicsWidget::event() to handle tab input. Tab input is also
+        proxied to embedded widgets. This allows and item or widget to handle
+        Tab keys (e.g., text input).
+
+- QLocale
+        The locale database was updated to the Unicode CLDR database
+        version 1.6.1
+
+        When the system locale is changed, the LocaleChange event will
+        be sent to all widgets that don't have a locale explicitely
+        set.
+
+- QWebPage
+        Starting with Qt 4.5, the base brush is used for the default
+        background color of the web page. Before, it was the background
+        brush.
+
+- QWidget
+        Font and palette settings assigned to QWidget directly take
+        precedence over application fonts and palettes.
+
+        Focus policies that are set on a widget are now propagated to
+        a focus proxy widget if there is one.
+
+        Windows with fixed size (that are set with QWidget::setFixedSize()
+        function or Qt::MSWindowsFixedSizeDialogHint window hint) might
+        not have a maximize button on the titlebar.
+
+        The behaviour of the window hints was changed to follow the
+        documentation. When the Qt::CustomizeWindowHint is set, the
+        window will not have a titlebar, system menu and titlebar
+        buttons unless the corresponding window hints were explicitely
+        set.
+
+        Setting Qt::WA_PaintOnScreen no longer has any effect on
+        normal widgets. The flag can still be used in conjuction with
+        reimplementing paintEngine() to return 0 so that GDI or
+        DirectX can be used, as previously documented.
diff --git a/doc/doc.pri b/doc/doc.pri
new file mode 100644
index 0000000..6b77f88
--- /dev/null
+++ b/doc/doc.pri
@@ -0,0 +1,72 @@
+#####################################################################
+# Qt documentation build
+#####################################################################
+
+win32 {
+    QT_WINCONFIG = release/
+    CONFIG(debug, debug|release) {
+        QT_WINCONFIG = debug/
+    }
+}
+
+DOCS_GENERATION_DEFINES = -Dopensourceedition
+GENERATOR = $$QT_BUILD_TREE/bin/qhelpgenerator
+
+win32:!win32-g++ {
+    unixstyle = false
+} else :win32-g++:isEmpty(QMAKE_SH) {
+    unixstyle = false
+} else {
+    unixstyle = true
+}
+
+$$unixstyle {
+    QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/tools/qdoc3/$${QT_WINCONFIG}qdoc3 $$DOCS_GENERATION_DEFINES
+} else {
+    QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/tools/qdoc3/$${QT_WINCONFIG}qdoc3.exe $$DOCS_GENERATION_DEFINES
+    QDOC = $$replace(QDOC, "/", "\\\\")
+}
+macx {
+    ADP_DOCS_QDOCCONF_FILE = qt-build-docs-with-xcode.qdocconf
+} else {
+    ADP_DOCS_QDOCCONF_FILE = qt-build-docs.qdocconf
+}
+QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
+                    linguist.qdocconf qmake.qdocconf) && \
+               (cd $$QT_BUILD_TREE && \
+                    $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \
+                    $$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \
+                    $$GENERATOR doc-build/html-designer/designer.qhp -o doc/qch/designer.qch && \
+                    $$GENERATOR doc-build/html-linguist/linguist.qhp -o doc/qch/linguist.qch && \
+                    $$GENERATOR doc-build/html-qmake/qmake.qhp -o doc/qch/qmake.qch \
+               )
+
+win32-g++:isEmpty(QMAKE_SH) {
+	QT_DOCUMENTATION = $$replace(QT_DOCUMENTATION, "/", "\\\\")
+}
+
+
+!wince*:!cross_compile:SUBDIRS += tools/qdoc3
+
+# Build rules:
+adp_docs.commands = ($$QDOC $$ADP_DOCS_QDOCCONF_FILE)
+adp_docs.depends += sub-tools-qdoc3
+qch_docs.commands = $$QT_DOCUMENTATION
+qch_docs.depends += sub-tools
+
+docs.depends = adp_docs qch_docs
+
+# Install rules
+htmldocs.files = $$QT_BUILD_TREE/doc/html
+htmldocs.path = $$[QT_INSTALL_DOCS]
+htmldocs.CONFIG += no_check_exist
+
+qchdocs.files= $$QT_BUILD_TREE/doc/qch
+qchdocs.path = $$[QT_INSTALL_DOCS]
+qchdocs.CONFIG += no_check_exist
+
+docimages.files = $$QT_BUILD_TREE/doc/src/images
+docimages.path = $$[QT_INSTALL_DOCS]/src
+
+QMAKE_EXTRA_TARGETS += qdoc adp_docs qch_docs docs
+INSTALLS += htmldocs qchdocs docimages
diff --git a/doc/src/3rdparty.qdoc b/doc/src/3rdparty.qdoc
new file mode 100644
author	Raymond Lu <songyulu@hdfgroup.org>	2008-09-26 18:55:32 (GMT)
committer	Raymond Lu <songyulu@hdfgroup.org>	2008-09-26 18:55:32 (GMT)
commit	6f5d0e22f344efc95167f6eee34c788a791bc1bb (patch)
tree	294301199f01015d4aab27e9f1e28c1df48ea56c
parent	f9f71a001ba65fbc515b440bf5cbace452947800 (diff)
download	hdf5-6f5d0e22f344efc95167f6eee34c788a791bc1bb.zip hdf5-6f5d0e22f344efc95167f6eee34c788a791bc1bb.tar.gz hdf5-6f5d0e22f344efc95167f6eee34c788a791bc1bb.tar.bz2