[qt/f17: 6/6] Merge branch 'f18' into f17

[Rex Dieter]

commit 3b88888ff0adf3d0ff69998152e24d435b34fb6a
Merge: 12437b2 3c87374
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 22 10:08:09 2012 -0500

    Merge branch 'f18' into f17
    
    Conflicts:
    	qt.spec

 .gitignore                                         |   11 +----
 qt-4.8.1-webkit-no_Werror.patch                    |   12 ----
 ...-cursor-truncate-to-include-line-position.patch |   32 -----------
 ...ere-opensource-src-4.8.0-qtwebkit-glib231.patch |   12 ----
 ...rywhere-opensource-src-4.8.1-icu_no_debug.patch |   23 --------
 qt-everywhere-opensource-src-4.8.1-type.patch      |   26 ---------
 ...rywhere-opensource-src-4.8.3-icu_no_debug.patch |   23 ++++++++
 qt-everywhere-opensource-src-4.8.3-no_Werror.patch |   12 ++++
 ...source-src-4.8.3-qdbusconnection_no_debug.patch |    8 ++--
 ...erywhere-opensource-src-4.8.3-qdevice_pri.patch |   11 ++++
 qt.spec                                            |   57 ++++++++++---------
 sources                                            |    2 +-
 12 files changed, 82 insertions(+), 147 deletions(-)
---