diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-29 01:01:07 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-29 01:01:07 (GMT) |
| commit | b3d030df07ba59059e3d6ecf6e1967cbf1f30d49 (patch) | |
| tree | e0a939a1381c2b983c7fdc79c5f116f87b3a3bc6 /tools/linguist | |
| parent | 93ad359f93de72ef8c4d5f0073dc20ba22b9023c (diff) | |
| parent | a6ea9ce6990003856ecadcca8ce9ddf37949363d (diff) | |
| download | Qt-b3d030df07ba59059e3d6ecf6e1967cbf1f30d49.zip Qt-b3d030df07ba59059e3d6ecf6e1967cbf1f30d49.tar.gz Qt-b3d030df07ba59059e3d6ecf6e1967cbf1f30d49.tar.bz2 | |
Merge branch 'master' of ../qt into kinetic-declarativeui
Conflicts:
configure.exe
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/widgets/qlineedit.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 e2acbbb..414dfb7 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -521,7 +521,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)) |