diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-04 02:34:18 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-04 02:34:18 +0200 |
| commit | c3f891552693204e49db8e7d461c55aea804016e (patch) | |
| tree | 77840815d9f6619f691c9d835de5b43c1c12b733 /tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt | |
| parent | 58c591974bf34577e27638f1328a04c4f7c698f8 (diff) | |
| parent | 068177288001c46896d6b04c520731adb56ed288 (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:
remove spurious empty lines in the linguist tools' output
don't use qWarning() - or even qFatal()! - gratuitously.
Styled item view backgrounds in Gtk+
Ensure that we only have one QLayoutStruct struct by renaming the other
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt')
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt index e3543c958d..195c0e65c5 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt @@ -1,8 +1,4 @@ .*/lupdate/testdata/good/parsecpp2/main.cpp:51: Excess closing brace .* - .*/lupdate/testdata/good/parsecpp2/main.cpp:55: Excess closing brace .* - .*/lupdate/testdata/good/parsecpp2/main.cpp:61: Excess closing brace .* - .*/lupdate/testdata/good/parsecpp2/main.cpp:65: Excess closing brace .* - |