diff options
| -rw-r--r-- | dist/known-issues | 2 | ||||
| -rw-r--r-- | qtcreator.pri | 2 | ||||
| -rw-r--r-- | src/shared/qtlockedfile/namespace.patch | 2 | ||||
| -rwxr-xr-x | tests/manual/distribution/elflint | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/dist/known-issues b/dist/known-issues index b694c2b6494..dfeb6078c8e 100644 --- a/dist/known-issues +++ b/dist/known-issues @@ -6,7 +6,7 @@ For a complete list of reported issues, see the Qt Bug Tracker: https://bugreports.qt-project.org/ -For a list of fixed issues and added features, see the changelog file in the qtcreator\dist folder or the Qt Bug Tracker. +For a list of fixed issues and added features, see the changelog file in the qtcreator\dist folder or the Qt Bug Tracker. diff --git a/qtcreator.pri b/qtcreator.pri index 837ea18ebbd..49ccc1e8779 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -201,7 +201,7 @@ unix { UI_DIR = $${OUT_PWD}/.uic } -win32-msvc* { +win32-msvc* { #Don't warn about sprintf, fopen etc being 'unsafe' DEFINES += _CRT_SECURE_NO_WARNINGS # Speed up startup time when debugging with cdb diff --git a/src/shared/qtlockedfile/namespace.patch b/src/shared/qtlockedfile/namespace.patch index eb894a37004..301cae8cff7 100644 --- a/src/shared/qtlockedfile/namespace.patch +++ b/src/shared/qtlockedfile/namespace.patch @@ -26,7 +26,7 @@ + class QT_QTLOCKEDFILE_EXPORT QtLockedFile : public QFile { - public: + public: @@ -41,4 +43,6 @@ LockMode m_lock_mode; }; diff --git a/tests/manual/distribution/elflint b/tests/manual/distribution/elflint index 9f709a77c78..bbba62c3605 100755 --- a/tests/manual/distribution/elflint +++ b/tests/manual/distribution/elflint @@ -9,7 +9,7 @@ find "${rootdir}" -type f -a -executable | while read file ; do #echo "${file}" result=`eu-elflint --gnu-ld --strict "${file}" | grep -v RPATH` if test -n "${result}" ; then - echo "${file}: ${result}" + echo "${file}: ${result}" fi fi done |