Merge branch '4.6'

7 files changed, 4 insertions, 50 deletions

diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.cpp b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
index 7200225..b34595f 100644
--- a/tools/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -262,7 +262,7 @@ PropertyEditor::PropertyEditor(QDesignerFormEditorInterface *core, QWidget *pare
 
     configureMenu->addAction(m_sortingAction);
     configureMenu->addAction(m_coloringAction);
-#if QT_VERSION >= 0x040600
+#if QT_VERSION >= 0x04FF00
     configureMenu->addSeparator();
     configureMenu->addAction(m_treeAction);
     configureMenu->addAction(m_buttonAction);
diff --git a/tools/designer/src/designer/main.cpp b/tools/designer/src/designer/main.cpp
index f76a68a..87f2536 100644
--- a/tools/designer/src/designer/main.cpp
+++ b/tools/designer/src/designer/main.cpp
@@ -51,20 +51,6 @@ int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(designer);
 
-    // report Qt usage for commercial customers with a "metered license" (currently experimental)
-#if QT_EDITION != QT_EDITION_OPENSOURCE
-    QString reporterPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
-    reporterPath += QDir::separator();
-    reporterPath += QLatin1String("qtusagereporter");
-#if defined(Q_OS_WIN)
-    reporterPath += QLatin1String(".exe");
-#endif
-#ifndef Q_OS_WINCE
-    if (QFile::exists(reporterPath))
-        ::system(qPrintable(reporterPath + QLatin1String(" designer")));
-#endif
-#endif
-
     QDesigner app(argc, argv);
     app.setQuitOnLastWindowClosed(false);
 
diff --git a/tools/designer/src/lib/shared/previewmanager.cpp b/tools/designer/src/lib/shared/previewmanager.cpp
index d6e8d9a..a7d6f43 100644
--- a/tools/designer/src/lib/shared/previewmanager.cpp
+++ b/tools/designer/src/lib/shared/previewmanager.cpp
@@ -689,6 +689,7 @@ QWidget *PreviewManager::createPreview(const QDesignerFormWindowInterface *fw,
 
     const QString title = tr("%1 - [Preview]").arg(formWidget->windowTitle());
     formWidget = fakeContainer(formWidget);
+    formWidget->setWindowTitle(title);
 
     // Clear any modality settings, child widget modalities must not be higher than parent's
     formWidget->setWindowModality(Qt::NonModal);
diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
index 8c0d379..a0c88de 100644
--- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -2825,13 +2825,6 @@ QMetaEnum QAbstractFormBuilder::toolBarAreaMetaEnum()
     return metaEnum<QAbstractFormBuilderGadget>("toolBarArea");
 }
 
-namespace {
-    // set forward slashes in image path.
-    inline void fixImagePath(QString &p)    {
-        p.replace(QLatin1Char('\\'), QLatin1Char('/'));
-    }
-}
-
 /*!
     \internal
     Return paths of an icon.
diff --git a/tools/installer/nsis/includes/qtcommon.nsh b/tools/installer/nsis/includes/qtcommon.nsh
index df1ebdf..9c0756a 100644
--- a/tools/installer/nsis/includes/qtcommon.nsh
+++ b/tools/installer/nsis/includes/qtcommon.nsh
@@ -72,28 +72,6 @@ FunctionEnd
 !insertmacro MakeQtDirectory ""
 !insertmacro MakeQtDirectory "un."
 
-Function DeleteFloatingLicenseProgram
-  exch $1
-  push $0
-  
-  StrCmp $LICENSE_KEY "" end
-
-  ClearErrors
-  !ifndef OPENSOURCE_BUILD
-  qtnsisext::IsFloatingLicense $LICENSE_KEY
-  !endif
-  IfErrors end
-  pop $0
-  
-  StrCmp $0 "1" end
-    IfFileExists "$1\bin\qtusagereporter.exe" 0 end
-      Delete "$1\bin\qtusagereporter.exe"
-
-  end:
-  pop $0
-  pop $1
-FunctionEnd
-
 Function AddStartmenuApplication
   exch $0
   IfFileExists "$0\assistant.exe" 0 +2
@@ -571,4 +549,4 @@ directoryOk:
 done:
 FunctionEnd
 
-!endif ;QTCOMMON_INCLUDE
\ No newline at end of file
+!endif ;QTCOMMON_INCLUDE
diff --git a/tools/installer/nsis/modules/mingw.nsh b/tools/installer/nsis/modules/mingw.nsh
index 386d7d7..d294cb8 100644
--- a/tools/installer/nsis/modules/mingw.nsh
+++ b/tools/installer/nsis/modules/mingw.nsh
@@ -107,9 +107,6 @@ Section "${MODULE_MINGW_NAME} ${MODULE_MINGW_VERSION}" MINGW_SEC01
   SetOverwrite ifnewer
   !insertmacro MODULE_MINGW_INSTALLFILES
   
-  push "$MINGW_INSTDIR"
-  call DeleteFloatingLicenseProgram
-
   push "$MINGW_INSTDIR\bin"
   call AddStartmenuApplication
   
diff --git a/tools/linguist/linguist/linguist.pro b/tools/linguist/linguist/linguist.pro
index 890b252..314163c 100644
--- a/tools/linguist/linguist/linguist.pro
+++ b/tools/linguist/linguist/linguist.pro
@@ -2,8 +2,7 @@ TEMPLATE = app
 LANGUAGE = C++
 DESTDIR = ../../../bin
 
-QT += xml \
-    network
+QT += xml
 
 CONFIG += qt \
     warn_on \