diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:01:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 03:54:56 +0200 |
| commit | cb72077e562a5a53e52f7ac94b0c3c26320c6242 (patch) | |
| tree | 24327b6aa3234e1b3d0865204a455a0ebb3e3cb8 /tests | |
| parent | e2bb989e237da8479a2dca647e3420861ad526e2 (diff) | |
| parent | bda7ece99a8162118a91e9f475c149be39846ecd (diff) | |
| download | qttools-cb72077e562a5a53e52f7ac94b0c3c26320c6242.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/designer/src/designer/qdesigner.cpp
One side changed Q_OS_MAC -> Q_OS_MACOS;
the other changed it to Q_OS_OSX and combined with Q_OS_WIN.
Kept the latter.
tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
One side added some XML next to where another made a local change.
Change-Id: I812b55fbaccc85baa9856aedf90f9258428dfcab
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result | 10 |
2 files changed, 18 insertions, 0 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp index 869ea6105..3f3a99c48 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp @@ -639,3 +639,11 @@ class TranslatedAfterPrivate tr("Must be in context TranslatedAfterPrivate"); } }; + +#include<QObject> + +QObject::tr("message after system include without space"); + +#include"qobject.h" + +QObject::tr("message after local include without space"); diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result index 136c50e97..683c2aef3 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result @@ -387,6 +387,16 @@ backslashed \ stuff.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="main.cpp" line="645"/> + <source>message after system include without space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="649"/> + <source>message after local include without space</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="included.cpp" line="29"/> <source>message from #included .cpp file</source> <translation type="unfinished"></translation> |