Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv

Conflicts:
	examples/itemviews/frozencolumn/main.cpp
	src/declarative/canvas/qsimplecanvas.cpp
	src/declarative/canvas/qsimplecanvas_p.h
	src/declarative/canvas/qsimplecanvasitem.h
	src/declarative/extra/qfxparticles.cpp
	src/declarative/fx/fx.pri
	src/declarative/fx/qfxblurfilter.h
	src/declarative/fx/qfxcontentwrapper.cpp
	src/declarative/fx/qfxflickable.cpp
	src/declarative/fx/qfxfocuspanel.h
	src/declarative/fx/qfxfocusrealm.h
	src/declarative/fx/qfxhighlightfilter.cpp
	src/declarative/fx/qfxhighlightfilter.h
	src/declarative/fx/qfximage.cpp
	src/declarative/fx/qfxitem.cpp
	src/declarative/fx/qfxitem.h
	src/declarative/fx/qfxrect.cpp
	src/declarative/fx/qfxreflectionfilter.h
	src/declarative/fx/qfxshadowfilter.cpp
	src/declarative/fx/qfxshadowfilter.h
	src/declarative/fx/qfxtext.cpp
	src/declarative/fx/qfxtext.h
	src/declarative/fx/qfxtextedit.cpp
	src/declarative/opengl/glbasicshaders.h
	src/declarative/test/qfxtestengine.cpp
	src/declarative/test/qfxtestengine.h
	src/declarative/test/qfxtestobjects.cpp
	src/declarative/test/qfxtestobjects.h
	src/declarative/test/qfxtestview.h
	src/declarative/util/qfxglobal.h
	src/declarative/util/qfxview.cpp
	src/gui/graphicsview/qgraphicsitem_p.h
	tools/qmlviewer/qmlviewer.cpp

1 files changed, 54 insertions, 0 deletions

diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejava/main.java b/tests/auto/linguist/lupdate/testdata/good/parsejava/main.java
new file mode 100644
index 0000000..07681d2
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejava/main.java
@@ -0,0 +1,54 @@
+// IMPORTANT!!!! If you want to add testdata to this file,
+// always add it to the end in order to not change the linenumbers of translations!!!
+
+package com.trolltech.examples;
+
+public class I18N extends QDialog {
+
+    private class MainWindow extends QMainWindow {
+        private String foo = tr("pack class class");
+
+        //: extra comment for t-tor
+        private String bar = tr("pack class class extra");
+
+        public MainWindow(QWidget parent) {
+            super(parent);
+
+            listWidget = new QListWidget();
+            listWidget.addItem(tr("pack class class method"));
+
+        }
+    }
+
+    public I18N(QWidget parent) {
+        super(parent, new Qt.WindowFlags(Qt.WindowType.WindowStaysOnTopHint));
+
+        tr("pack class method");
+
+        tr("QT_LAYOUT_DIRECTION",
+           "Translate this string to the string 'LTR' in left-to-right" +
+           " languages or to 'RTL' in right-to-left languages (such as Hebrew" +
+           " and Arabic) to get proper widget layout.");
+
+        tr("%n files", "plural form", n);
+        tr("%n cars", null, n);
+        tr("Age: %1");
+        tr("There are %n house(s)", "Plurals and function call", getCount());
+
+        QTranslator trans;
+        trans.translate("QTranslator", "Simple");
+        trans.translate("QTranslator", "Simple", null);
+        trans.translate("QTranslator", "Simple with comment", "with comment");
+        trans.translate("QTranslator", "Plural without comment", null, 1);
+        trans.translate("QTranslator", "Plural with comment", "comment 1", n);
+        trans.translate("QTranslator", "Plural with comment", "comment 2", getCount());
+
+        /*: with extra comment! */
+        QCoreApplication.translate("Plurals, QCoreApplication", "%n house(s)", "Plurals and identifier", n);
+
+        // FIXME: This will fail.
+        //QApplication.tr("QT_LAYOUT_DIRECTION", "scoped to qapp");
+
+    }
+
+}