diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 22:32:31 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 22:32:31 +1000 |
| commit | c392cb990ea27e4fa81683b3b2bcae844fad3039 (patch) | |
| tree | 049be4a7846a88a77a365d9e1f62e995698990fd /tools | |
| parent | 75fd46451cabd680d16913d5dfd4733c09db3459 (diff) | |
| parent | 688d6db785af821e76b9e436ef9d9cbea95ef5ad (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
make -markuntranslated work without -idbased
fix conditional on shell type
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/linguist/shared/qm.cpp | 2 | ||||
| -rw-r--r-- | tools/qdoc3/qdoc3.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/shared/qm.cpp b/tools/linguist/shared/qm.cpp index 7b30643b1c..0b4bd9e324 100644 --- a/tools/linguist/shared/qm.cpp +++ b/tools/linguist/shared/qm.cpp @@ -723,7 +723,7 @@ static bool saveQM(const Translator &translator, QIODevice &dev, ConversionData continue; } if (typ == TranslatorMessage::Unfinished) { - if (!cd.m_idBased && msg.translation().isEmpty()) { + if (msg.translation().isEmpty() && !cd.m_idBased && cd.m_unTrPrefix.isEmpty()) { ++untranslated; continue; } else { diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index 2b4c6a075d..69d7e289bb 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -95,7 +95,7 @@ include(declarativeparser/parser.pri) qtPrepareTool(QDOC, qdoc3) qtPrepareTool(QHELPGENERATOR, qhelpgenerator) -$$unixstyle { +equals(QMAKE_DIR_SEP, /) { QDOC = QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QDOC } else { QDOC = set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QDOC |