diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-09 17:09:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-09 17:09:24 (GMT) |
| commit | 98072ecf6a6dc07ac82038adf66048a1c17dbbb5 (patch) | |
| tree | b8e78d73667f919c9ccd55f8cc93f542f7f2fff5 /tools | |
| parent | 8c836fa76043c55432dd4b2a1669a895e0758925 (diff) | |
| parent | 7190c7be34fe0dbcfbb10b232b40977c758d251a (diff) | |
| download | Qt-98072ecf6a6dc07ac82038adf66048a1c17dbbb5.zip Qt-98072ecf6a6dc07ac82038adf66048a1c17dbbb5.tar.gz Qt-98072ecf6a6dc07ac82038adf66048a1c17dbbb5.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
[QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
HTTP cacheing: do not store the date header with the resource
Let's not write to the source buffer when blending argb32 on rgb16.
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 7b30643..0b4bd9e 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 2b4c6a0..69d7e28 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 |