diff options
| author | Bill King <bill.king@nokia.com> | 2010-03-02 05:23:38 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2010-03-02 05:23:38 (GMT) |
| commit | a6aaaff7d09e6a1bd5d09a4c15272bf25f53ac19 (patch) | |
| tree | 6ad6e9236db0f5f3698c723ce0e214480c6946c0 | |
| parent | 618ca0234b626fc454f74b3d98bb8f82927c16e8 (diff) | |
| parent | 67971d081f3dd70f9aa0427bb41bd810f08020b4 (diff) | |
| download | Qt-a6aaaff7d09e6a1bd5d09a4c15272bf25f53ac19.zip Qt-a6aaaff7d09e6a1bd5d09a4c15272bf25f53ac19.tar.gz Qt-a6aaaff7d09e6a1bd5d09a4c15272bf25f53ac19.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 4 | ||||
| -rw-r--r-- | src/network/kernel/qhostinfo.cpp | 5 | ||||
| -rw-r--r-- | tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp | 2 | ||||
| -rw-r--r-- | tools/assistant/lib/qhelpsearchindexwriter_default.cpp | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 9d3b4c6..c36cc9c 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -150,6 +150,10 @@ Win32MakefileGenerator::findLibraries(const QString &where) if(QMakeMetaInfo::libExists((*it).local() + Option::dir_sep + lib) || exists((*it).local() + Option::dir_sep + lib + extension)) { out = (*it).real() + Option::dir_sep + lib + extension; + if (out.contains(QLatin1Char(' '))) { + out.prepend(QLatin1Char('\"')); + out.append(QLatin1Char('\"')); + } break; } } diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 9de499e..b23f6db 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -451,6 +451,11 @@ QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), was QHostInfoLookupManager::~QHostInfoLookupManager() { wasDeleted = true; + + // don't qDeleteAll currentLookups, the QThreadPool has ownership + qDeleteAll(postponedLookups); + qDeleteAll(scheduledLookups); + qDeleteAll(finishedLookups); } void QHostInfoLookupManager::work() diff --git a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp index 59067cf..4f9fa3f 100644 --- a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp +++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp @@ -585,7 +585,7 @@ void QHelpSearchIndexWriter::updateIndex(const QString &collectionFile, this->m_indexFilesFolder = indexFilesFolder; mutex.unlock(); - start(QThread::NormalPriority); + start(QThread::LowestPriority); } void QHelpSearchIndexWriter::optimizeIndex() diff --git a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp index cb3e49c..827d145 100644 --- a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp +++ b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp @@ -191,7 +191,7 @@ void QHelpSearchIndexWriter::updateIndex(const QString &collectionFile, this->m_collectionFile = collectionFile; this->m_indexFilesFolder = indexFilesFolder; - start(QThread::NormalPriority); + start(QThread::LowestPriority); } void QHelpSearchIndexWriter::run() |