diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-12 13:03:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-12 13:03:17 (GMT) |
| commit | 3a2cedde7c5d706cf21e088856f5477e9b038347 (patch) | |
| tree | ad4b6179d1c39c3dab0dd3fc0f7d0229d32175c2 /tools | |
| parent | a8f3c39659b4859039da9bfc1383a5fac7d30d65 (diff) | |
| parent | 84d51bff971607e2e32680841a355209d97a2235 (diff) | |
| download | Qt-3a2cedde7c5d706cf21e088856f5477e9b038347.zip Qt-3a2cedde7c5d706cf21e088856f5477e9b038347.tar.gz Qt-3a2cedde7c5d706cf21e088856f5477e9b038347.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Fix files that don't end with a newline character
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/macdeployqt/tests/tst_deployment_mac.cpp | 2 | ||||
| -rw-r--r-- | tools/qtconcurrent/codegenerator/src/codegenerator.cpp | 4 | ||||
| -rw-r--r-- | tools/qtestlib/wince/cetest/deployment.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/macdeployqt/tests/tst_deployment_mac.cpp b/tools/macdeployqt/tests/tst_deployment_mac.cpp index 858dc45..5921199 100644 --- a/tools/macdeployqt/tests/tst_deployment_mac.cpp +++ b/tools/macdeployqt/tests/tst_deployment_mac.cpp @@ -230,4 +230,4 @@ void tst_deployment_mac::testFindAppBinarty() QTEST_MAIN(tst_deployment_mac) -#include "tst_deployment_mac.moc"
\ No newline at end of file +#include "tst_deployment_mac.moc" diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp index b8436b9..c81fe97 100644 --- a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp +++ b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp @@ -134,7 +134,7 @@ const Compound operator+(const Item &a, const char * const text) const Compound operator+(const char * const text, const Item &b) { - return Compound(Text(text), b); + return Compound(Text(text), b); } -}
\ No newline at end of file +} diff --git a/tools/qtestlib/wince/cetest/deployment.h b/tools/qtestlib/wince/cetest/deployment.h index f3645e0..a5ef32d 100644 --- a/tools/qtestlib/wince/cetest/deployment.h +++ b/tools/qtestlib/wince/cetest/deployment.h @@ -72,4 +72,4 @@ private: inline void DeploymentHandler::setConnection(AbstractRemoteConnection *connection) { m_connection = connection; } inline AbstractRemoteConnection* DeploymentHandler::connection() const { return m_connection; } -#endif
\ No newline at end of file +#endif |