Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6

6 files changed, 8 insertions, 8 deletions

diff --git a/examples/assistant/simpletextviewer/findfiledialog.cpp b/examples/assistant/simpletextviewer/findfiledialog.cpp
index 939d90a..1f11f69 100644
--- a/examples/assistant/simpletextviewer/findfiledialog.cpp
+++ b/examples/assistant/simpletextviewer/findfiledialog.cpp
@@ -102,7 +102,7 @@ void FindFileDialog::openFile(QTreeWidgetItem *item)
     if (file.open(QIODevice::ReadOnly)) {
         QString data(file.readAll());
 
-        if (fileName.endsWith(".html"))
+        if (fileName.endsWith(QLatin1String(".html")))
             currentEditor->setHtml(data);
         else
             currentEditor->setPlainText(data);
@@ -119,7 +119,7 @@ void FindFileDialog::update()
 
 void FindFileDialog::findFiles()
 {
-    QRegExp filePattern(fileNameComboBox->currentText() + "*");
+    QRegExp filePattern(fileNameComboBox->currentText() + '*');
     filePattern.setPatternSyntax(QRegExp::Wildcard);
 
     QDir directory(directoryComboBox->currentText());
@@ -127,7 +127,7 @@ void FindFileDialog::findFiles()
     QStringList allFiles = directory.entryList(QDir::Files | QDir::NoSymLinks);
     QStringList matchingFiles;
 
-    foreach (QString file, allFiles) {
+    foreach (const QString &file, allFiles) {
         if (filePattern.exactMatch(file))
             matchingFiles << file;
     }
diff --git a/examples/designer/taskmenuextension/tictactoedialog.h b/examples/designer/taskmenuextension/tictactoedialog.h
index aeaaaf4..3d810dd 100644
--- a/examples/designer/taskmenuextension/tictactoedialog.h
+++ b/examples/designer/taskmenuextension/tictactoedialog.h
@@ -55,7 +55,7 @@ class TicTacToeDialog : public QDialog
     Q_OBJECT
 
 public:
-    TicTacToeDialog(TicTacToe *plugin = 0, QWidget *parent = 0);
+    explicit TicTacToeDialog(TicTacToe *plugin = 0, QWidget *parent = 0);
 
     QSize sizeHint() const;
 
diff --git a/examples/network/qftp/sym_iap_util.h b/examples/network/qftp/sym_iap_util.h
index 8079d2c..41e43a9 100644
--- a/examples/network/qftp/sym_iap_util.h
+++ b/examples/network/qftp/sym_iap_util.h
@@ -298,7 +298,7 @@ QString qt_TDesC2QStringL(const TDesC& aDescriptor)
 #ifdef QT_NO_UNICODE
     return QString::fromLocal8Bit(aDescriptor.Ptr(), aDescriptor.Length());
 #else
-    return QString::fromUtf16(aDescriptor.Ptr(), aDescriptor.Length());
+    return QString((const QChar *)aDescriptor.Ptr(), aDescriptor.Length());
 #endif
 }
 
diff --git a/examples/uitools/textfinder/textfinder.cpp b/examples/uitools/textfinder/textfinder.cpp
index 855f11f..1b7c14b 100644
--- a/examples/uitools/textfinder/textfinder.cpp
+++ b/examples/uitools/textfinder/textfinder.cpp
@@ -116,7 +116,7 @@ void TextFinder::on_findButton_clicked()
     if (isFirstTime == false)
         document->undo();
 
-    if (searchString == "") {
+    if (searchString.isEmpty()) {
         QMessageBox::information(this, tr("Empty Search Field"),
                 "The search field is empty. Please enter a word and click Find.");
     } else {
diff --git a/examples/webkit/framecapture/framecapture.pro b/examples/webkit/framecapture/framecapture.pro
index 6f2f093..11960b9 100644
--- a/examples/webkit/framecapture/framecapture.pro
+++ b/examples/webkit/framecapture/framecapture.pro
@@ -1,4 +1,4 @@
-QT      += webkit
+QT      += webkit network
 
 HEADERS = framecapture.h
 SOURCES = main.cpp \
diff --git a/examples/webkit/simpleselector/simpleselector.pro b/examples/webkit/simpleselector/simpleselector.pro
index acd0ae7..3ddd6db 100644
--- a/examples/webkit/simpleselector/simpleselector.pro
+++ b/examples/webkit/simpleselector/simpleselector.pro
@@ -1,4 +1,4 @@
-QT       += webkit
+QT       += webkit network
 FORMS     = window.ui
 HEADERS   = window.h
 SOURCES   = main.cpp \