diff options
| author | hjk <qtc-committer@nokia.com> | 2012-04-17 08:01:25 +0200 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2012-04-17 09:53:44 +0200 |
| commit | 5b0bf616401624e28ba1c0e94e474c2da2e6350a (patch) | |
| tree | 661e3e7490e2f8b718c77f03f37bccb806ed7b18 /src/plugins/qtsupport | |
| parent | 37e38530905b31607d07bea1ca65618d95c8f380 (diff) | |
| download | qt-creator-5b0bf616401624e28ba1c0e94e474c2da2e6350a.tar.gz | |
qtcassert: move actual printing to separate function and enforce style
This also allows simple setting of breakpoints on failed asserts.
Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/qtsupport')
| -rw-r--r-- | src/plugins/qtsupport/debugginghelperbuildtask.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qtsupport/qtversionmanager.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/qtsupport/debugginghelperbuildtask.cpp b/src/plugins/qtsupport/debugginghelperbuildtask.cpp index 0884933b52..eccf0d37d0 100644 --- a/src/plugins/qtsupport/debugginghelperbuildtask.cpp +++ b/src/plugins/qtsupport/debugginghelperbuildtask.cpp @@ -129,7 +129,7 @@ DebuggingHelperBuildTask::DebuggingHelperBuildTask(const BaseQtVersion *version, DebuggingHelperBuildTask::Tools DebuggingHelperBuildTask::availableTools(const BaseQtVersion *version) { - QTC_ASSERT(version, return 0; ) + QTC_ASSERT(version, return 0); // Check the build requirements of the tools DebuggingHelperBuildTask::Tools tools = 0; // Gdb helpers are needed on Mac/gdb only. diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index b1472aad82..d5c086350b 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -56,12 +56,13 @@ # include <utils/winutils.h> #endif +#include <QDebug> +#include <QDir> #include <QFile> +#include <QMainWindow> #include <QSettings> #include <QTextStream> -#include <QDir> #include <QTimer> -#include <QMainWindow> #include <algorithm> |