From d6fa81cd95391d456b7151f0bdfa9326569ca11c Mon Sep 17 00:00:00 2001
From: Daniel Molkentin
Date: Thu, 27 Oct 2011 18:32:31 +0200
Subject: [PATCH 01/32] Do not try to evaluate examples or demos for Qt 5.
There is no good plan on how to expose examples and demos
of Qt 5 other than using XML manifests. Thus, it's best
to disable the fallback mechanism, as it can only break
(see e.g. QTCREATORBUG-5472).
Change-Id: I4cc1fa875297c3d368ae261f5404fa61301f172f
Reviewed-by: Eike Ziller
---
src/plugins/qtsupport/exampleslistmodel.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp
index ee143ea0b7a..4a19d0d06dc 100644
--- a/src/plugins/qtsupport/exampleslistmodel.cpp
+++ b/src/plugins/qtsupport/exampleslistmodel.cpp
@@ -275,6 +275,9 @@ QStringList ExamplesListModel::exampleSources() const
// Try to get dir from first Qt Version
QtVersionManager *versionManager = QtVersionManager::instance();
foreach (BaseQtVersion *version, versionManager->validVersions()) {
+ // There is no good solution for Qt 5 yet
+ if (version->qtVersion().majorVersion != 4)
+ continue;
QDir examplesDir(version->examplesPath());
if (examplesDir.exists()) {
From fb6d940485771a7e61508d2860e840f20daa062f Mon Sep 17 00:00:00 2001
From: Christian Kandeler
Date: Fri, 28 Oct 2011 09:41:32 +0200
Subject: [PATCH 02/32] Harmattan: Use "mad" wrapper to call dh_clean.
Change-Id: Iddfc6de1e34ce08bbc5fe6601195b3206b120c27
Reviewed-by: Christian Kandeler
---
src/plugins/madde/maemopackagecreationstep.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/plugins/madde/maemopackagecreationstep.cpp b/src/plugins/madde/maemopackagecreationstep.cpp
index 44248631b2f..b6e15b5b9d2 100644
--- a/src/plugins/madde/maemopackagecreationstep.cpp
+++ b/src/plugins/madde/maemopackagecreationstep.cpp
@@ -307,11 +307,8 @@ bool MaemoDebianPackageCreationStep::createPackage(QProcess *buildProc,
}
}
- if (inSourceBuild) {
- buildProc->start(packagingCommand(qt4BuildConfiguration(), QLatin1String("dh_clean")));
- buildProc->waitForFinished();
- buildProc->terminate();
- }
+ if (inSourceBuild)
+ callPackagingCommand(buildProc, QStringList() << QLatin1String("dh_clean"));
return true;
}
From 49e56cdd2c554bbe19508ad39a300f633839d9f2 Mon Sep 17 00:00:00 2001
From: hjk
Date: Fri, 28 Oct 2011 10:36:02 +0200
Subject: [PATCH 03/32] debugger: re-enable sorting of source files, modules,
and thread views
Change-Id: I5610be7e78593d345c1f79fff6b2a61b105f8fbc
Reviewed-by: Eike Ziller
---
src/plugins/debugger/moduleswindow.cpp | 1 +
src/plugins/debugger/sourcefileswindow.cpp | 1 +
src/plugins/debugger/threadswindow.cpp | 1 +
3 files changed, 3 insertions(+)
diff --git a/src/plugins/debugger/moduleswindow.cpp b/src/plugins/debugger/moduleswindow.cpp
index 900cc28e0be..b089b2aa25d 100644
--- a/src/plugins/debugger/moduleswindow.cpp
+++ b/src/plugins/debugger/moduleswindow.cpp
@@ -61,6 +61,7 @@ ModulesWindow::ModulesWindow(QWidget *parent)
: BaseWindow(parent)
{
setWindowTitle(tr("Modules"));
+ setSortingEnabled(true);
setAlwaysAdjustColumnsAction(debuggerCore()->action(AlwaysAdjustModulesColumnWidths));
connect(this, SIGNAL(activated(QModelIndex)),
diff --git a/src/plugins/debugger/sourcefileswindow.cpp b/src/plugins/debugger/sourcefileswindow.cpp
index ffbc5abf697..fc3a67436e0 100644
--- a/src/plugins/debugger/sourcefileswindow.cpp
+++ b/src/plugins/debugger/sourcefileswindow.cpp
@@ -60,6 +60,7 @@ SourceFilesWindow::SourceFilesWindow(QWidget *parent)
: BaseWindow(parent)
{
setWindowTitle(tr("Source Files"));
+ setSortingEnabled(true);
}
void SourceFilesWindow::rowActivated(const QModelIndex &index)
diff --git a/src/plugins/debugger/threadswindow.cpp b/src/plugins/debugger/threadswindow.cpp
index 55924f6ea0d..7be6b8b14bf 100644
--- a/src/plugins/debugger/threadswindow.cpp
+++ b/src/plugins/debugger/threadswindow.cpp
@@ -52,6 +52,7 @@ ThreadsWindow::ThreadsWindow(QWidget *parent)
: BaseWindow(parent)
{
setWindowTitle(tr("Thread"));
+ setSortingEnabled(true);
setAlwaysAdjustColumnsAction(debuggerCore()->action(AlwaysAdjustThreadsColumnWidths));
setObjectName(QLatin1String("ThreadsWindow"));
}
From ecfef3c2e1d92e78e33bdb351554278c25ddcc52 Mon Sep 17 00:00:00 2001
From: Leena Miettinen
Date: Fri, 28 Oct 2011 09:56:42 +0200
Subject: [PATCH 04/32] Doc: fix security issue in HTML template
Change-Id: I2fbcb030195a9104eeba8b83037623103efdb5c0
Reviewed-by: Casper van Donderen
---
doc/config/qt-html-templates-online.qdocconf | 13 -------------
doc/templates/scripts/functions.js | 5 -----
2 files changed, 18 deletions(-)
diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf
index b6ff0509fee..874a2c7229a 100644
--- a/doc/config/qt-html-templates-online.qdocconf
+++ b/doc/config/qt-html-templates-online.qdocconf
@@ -96,8 +96,6 @@ HTML.postpostheader = \
" \n"
HTML.footer = \
- "
\n" \
- " [+] Documentation Feedback
\n" \
"
\n" \
" \n" \
" \n" \
@@ -123,17 +121,6 @@ HTML.footer = \
" Free Documentation License version 1.3\n" \
" as published by the Free Software Foundation.
\n" \
" \n" \
- " \n" \
- "
X
\n" \
- "
\n" \
- "
\n" \
- " \n" \
- "
\n" \
"\n" \
" \n" \
"