Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (25 commits)
  Add convenience function QTextCursor::positionInBlock()
  Fixed URL in Russian translation.
  Designer/Resourceview: Suppress warning about QFileInfo on empty path.
  optimize qstring::simplified()
  Revert optimizations to QString::append
  unbreak QList::append() and co. again
  Implement bookmark manager widget.
  optimization: use QList::reserve() and QVector::reserve()
  amend "purge msvc.net and msvc2002 makespecs"
  Added QPlainTextEditor::anchorAt(const QPoint &pos)
  Fix memmory leak.
  Fix spacing.
  Prevent renaming the bookmarks menu root item, it's just a placeholder.
  Fix broken set last shown pagen when the last page was about:blank.
  Move launch with external app in base class.
  Make sure the bookmarks menu updates on add/ remove as well.
  Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.
  avoid double reallocations in appending operations
  avoid double reallocation in string-growing replace() case
  optimize qHash() some more
  ...

3 files changed, 6 insertions, 6 deletions

diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index 955a880..67dc90c 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
@@ -218,7 +218,7 @@ void QAudioDeviceInfoInternal::updateLists()
 	for(i=0;i<iNumDevs;i++) {
 	    if(waveOutGetDevCaps(i, &woc, sizeof(WAVEOUTCAPS))
 	        == MMSYSERR_NOERROR) {
-		tmp = QString::fromUtf16((const unsigned short*)woc.szPname);
+		tmp = QString((const QChar *)woc.szPname);
 		if(tmp.compare(device) == 0) {
 		    match = true;
 		    fmt = woc.dwFormats;
@@ -238,7 +238,7 @@ void QAudioDeviceInfoInternal::updateLists()
 	for(i=0;i<iNumDevs;i++) {
 	    if(waveInGetDevCaps(i, &woc, sizeof(WAVEINCAPS))
 	        == MMSYSERR_NOERROR) {
-		tmp = QString::fromUtf16((const unsigned short*)woc.szPname);
+		tmp = QString((const QChar *)woc.szPname);
 		if(tmp.compare(device) == 0) {
 		    match = true;
 		    fmt = woc.dwFormats;
@@ -347,7 +347,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
 	for(i=0;i<iNumDevs;i++) {
 	    if(waveOutGetDevCaps(i, &woc, sizeof(WAVEOUTCAPS))
 	        == MMSYSERR_NOERROR) {
-	        devices.append(QString::fromUtf16((const unsigned short*)woc.szPname).toLocal8Bit().constData());
+	        devices.append(QString((const QChar *)woc.szPname).toLocal8Bit().constData());
 	    }
 	}
     } else {
@@ -357,7 +357,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
 	for(i=0;i<iNumDevs;i++) {
 	    if(waveInGetDevCaps(i, &woc, sizeof(WAVEINCAPS))
 	        == MMSYSERR_NOERROR) {
-	        devices.append(QString::fromUtf16((const unsigned short*)woc.szPname).toLocal8Bit().constData());
+	        devices.append(QString((const QChar *)woc.szPname).toLocal8Bit().constData());
 	    }
 	}
 
diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp
index 84fd2a5..cc4fdee 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.cpp
+++ b/src/multimedia/audio/qaudioinput_win32_p.cpp
@@ -255,7 +255,7 @@ bool QAudioInputPrivate::open()
         if(waveInGetDevCaps(ii, &wic, sizeof(WAVEINCAPS))
 	    == MMSYSERR_NOERROR) {
 	    QString tmp;
-	    tmp = QString::fromUtf16((const unsigned short*)wic.szPname);
+	    tmp = QString((const QChar *)wic.szPname);
 	    if(tmp.compare(QLatin1String(m_device)) == 0) {
 	        devId = ii;
 		break;
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp
index c31e048..bce45c1 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp
@@ -250,7 +250,7 @@ bool QAudioOutputPrivate::open()
         if(waveOutGetDevCaps(ii, &woc, sizeof(WAVEOUTCAPS))
 	    == MMSYSERR_NOERROR) {
 	    QString tmp;
-	    tmp = QString::fromUtf16((const unsigned short*)woc.szPname);
+	    tmp = QString((const QChar *)woc.szPname);
             if(tmp.compare(QLatin1String(m_device)) == 0) {
 	        devId = ii;
 		break;