diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 13:10:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 13:10:42 (GMT) |
| commit | e2abcf0d8e83a9403c57b1504a663310e888e2dd (patch) | |
| tree | d620066a4449a95ded03078be6f901e9fd212224 /demos | |
| parent | 86fb4d8754b0d01e88238c3d2af4c28e3624d702 (diff) | |
| parent | 06ef461b5374c42370fc350f53dba76a5d4c62f4 (diff) | |
| download | Qt-e2abcf0d8e83a9403c57b1504a663310e888e2dd.zip Qt-e2abcf0d8e83a9403c57b1504a663310e888e2dd.tar.gz Qt-e2abcf0d8e83a9403c57b1504a663310e888e2dd.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
test: Fix `tst_qfiledialog' in a namespaced build
Fix files that don't end with a newline character
tests: Skip `qaudioinput' tests if there is no audio backend available
tests: fixed crash of tst_qdialog
tests: fixed crash of tst_qdialog
Fix QString compares to ""
Add test case name and drop parentheses for -datatags option.
Adding QTDIR validation in tst_symbols autotest
Disabled benchmarks referring to private headers.
Fixed compile of tst_qscriptextensionplugin on some Windows configurations
Add license header to printdatatags autotests
Compile on symbian^3
Compile on Symbian^3.
Added -datatags option to QTestLib
Fixed failure of tst_qxmlquery::evaluateToReceiver
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/embedded/lightmaps/lightmaps.h | 2 | ||||
| -rw-r--r-- | demos/embedded/lightmaps/mapzoom.h | 2 | ||||
| -rw-r--r-- | demos/embedded/lightmaps/slippymap.h | 2 | ||||
| -rw-r--r-- | demos/mobile/guitartuner/src/guitartuner.rc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/demos/embedded/lightmaps/lightmaps.h b/demos/embedded/lightmaps/lightmaps.h index 45b5c18..0e458ea 100644 --- a/demos/embedded/lightmaps/lightmaps.h +++ b/demos/embedded/lightmaps/lightmaps.h @@ -85,4 +85,4 @@ private: bool invert; }; -#endif
\ No newline at end of file +#endif diff --git a/demos/embedded/lightmaps/mapzoom.h b/demos/embedded/lightmaps/mapzoom.h index ac70a23..935660c 100644 --- a/demos/embedded/lightmaps/mapzoom.h +++ b/demos/embedded/lightmaps/mapzoom.h @@ -66,4 +66,4 @@ private: QNetworkSession *networkSession; }; -#endif
\ No newline at end of file +#endif diff --git a/demos/embedded/lightmaps/slippymap.h b/demos/embedded/lightmaps/slippymap.h index 64ba5c3..480dc81 100644 --- a/demos/embedded/lightmaps/slippymap.h +++ b/demos/embedded/lightmaps/slippymap.h @@ -84,4 +84,4 @@ private: QUrl m_url; }; -#endif
\ No newline at end of file +#endif diff --git a/demos/mobile/guitartuner/src/guitartuner.rc b/demos/mobile/guitartuner/src/guitartuner.rc index 85cee0b..b4f7a11 100644 --- a/demos/mobile/guitartuner/src/guitartuner.rc +++ b/demos/mobile/guitartuner/src/guitartuner.rc @@ -20,4 +20,4 @@ BEGIN BEGIN VALUE "Translation", 0x409, 1252 END -END
\ No newline at end of file +END |