diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-11-29 12:59:51 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-11-29 13:36:14 +0100 |
| commit | 29c9f8080d2e2ad6ad9573612b0ea171c22d737a (patch) | |
| tree | 7d811167b3992eb5c35f09599c27faa8e225f2d6 /tests/manual | |
| parent | ba4c43421126c02e34d5cf3ed25bb290c79e6343 (diff) | |
| parent | 9eb66a806f098b84c22654da5aeb62a9db8e8c59 (diff) | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/android/androidrunnerworker.cpp
Change-Id: Ibd8b99435365fb7e7d488313fd1d2b3a75adad1b
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/clang-format-for-qtc/test.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/manual/clang-format-for-qtc/test.cpp b/tests/manual/clang-format-for-qtc/test.cpp index e5afaff130..b3cf22eaca 100644 --- a/tests/manual/clang-format-for-qtc/test.cpp +++ b/tests/manual/clang-format-for-qtc/test.cpp @@ -656,7 +656,11 @@ void extremeFunction( ++uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuunbelievableLongValue; extremeFunction( - "some super duper super duper super duper super duper super duper super duper super duper long"); + "some super duper super duper super duper super duper super duper super duper long"); + + // BreakStringLiterals splits the string. + extremeFunction("some super duper super duper super duper super duper super duper super duper " + "super duper long"); } void extremeFunction2(int parameter1, |