diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-24 08:52:29 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-24 08:52:29 (GMT) |
| commit | d32922a417f20fed56f6f4837d8bfdf2899e3d3c (patch) | |
| tree | 07aa5662fc96454a3ec0d0c2d85a2d061010675e /tools/linguist | |
| parent | b4f2e138422076ed5d615181fc336dbb90279935 (diff) | |
| parent | 9dadc219814cd9baaa4be4cee6ee2b3cf7df4a19 (diff) | |
| download | Qt-d32922a417f20fed56f6f4837d8bfdf2899e3d3c.zip Qt-d32922a417f20fed56f6f4837d8bfdf2899e3d3c.tar.gz Qt-d32922a417f20fed56f6f4837d8bfdf2899e3d3c.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h
src/3rdparty/webkit/WebCore/page/DragController.cpp
src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
src/gui/painting/qpaintengineex_p.h
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'tools/linguist')
| -rw-r--r-- | tools/linguist/lupdate/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index 6a1edc4..5a26774 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -520,7 +520,8 @@ int main(int argc, char **argv) for (QStringList::iterator it = sourceFiles.begin(); it != sourceFiles.end(); ++it) { if (it->endsWith(QLatin1String(".java"), Qt::CaseInsensitive)) loadJava(fetchedTor, *it, cd); - else if (it->endsWith(QLatin1String(".ui"), Qt::CaseInsensitive)) + else if (it->endsWith(QLatin1String(".ui"), Qt::CaseInsensitive) + || it->endsWith(QLatin1String(".jui"), Qt::CaseInsensitive)) loadUI(fetchedTor, *it, cd); else if (it->endsWith(QLatin1String(".js"), Qt::CaseInsensitive) || it->endsWith(QLatin1String(".qs"), Qt::CaseInsensitive)) |