diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-12-08 16:55:42 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-12-08 16:55:42 (GMT) |
| commit | 33418800a5c78e06182bc0b41a2eabaf8aafc0fc (patch) | |
| tree | a5e30275f88c6f473b1e3d09f42c94799f7ac21e /tools | |
| parent | 74b0c482b1edf606e1326c9053c612a7e514dee4 (diff) | |
| parent | 971acc6d34559a2c5035888a5891ea29ad8628af (diff) | |
| download | Qt-33418800a5c78e06182bc0b41a2eabaf8aafc0fc.zip Qt-33418800a5c78e06182bc0b41a2eabaf8aafc0fc.tar.gz Qt-33418800a5c78e06182bc0b41a2eabaf8aafc0fc.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp | 1 | ||||
| -rw-r--r-- | tools/assistant/lib/qhelpsearchindexwriter_default.cpp | 1 | ||||
| -rw-r--r-- | tools/xmlpatterns/main.cpp | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp index ab32537..b9aedbe 100644 --- a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp +++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp @@ -578,6 +578,7 @@ void QHelpSearchIndexWriter::cancelIndexing() void QHelpSearchIndexWriter::updateIndex(const QString &collectionFile, const QString &indexFilesFolder, bool reindex) { + wait(); mutex.lock(); this->m_cancel = false; this->m_reindex = reindex; diff --git a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp index 06deb85..60b9642 100644 --- a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp +++ b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp @@ -184,6 +184,7 @@ void QHelpSearchIndexWriter::updateIndex(const QString &collectionFile, const QString &indexFilesFolder, bool reindex) { + wait(); QMutexLocker lock(&mutex); this->m_cancel = false; diff --git a/tools/xmlpatterns/main.cpp b/tools/xmlpatterns/main.cpp index a930b70..604523b 100644 --- a/tools/xmlpatterns/main.cpp +++ b/tools/xmlpatterns/main.cpp @@ -80,14 +80,14 @@ QT_USE_NAMESPACE Represents the name and value found in "-param name=value". */ typedef QPair<QString, QString> Parameter; -Q_DECLARE_METATYPE(Parameter); +Q_DECLARE_METATYPE(Parameter) /*! \internal \since 4.4 For the -output switch. */ -Q_DECLARE_METATYPE(QIODevice *); +Q_DECLARE_METATYPE(QIODevice *) /*! \class PatternistApplicationParser |