diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-07 14:16:05 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-08 11:57:09 +0100 |
| commit | ca3f2da3161737adf20b288efbb098bc1735e862 (patch) | |
| tree | 62a1e1814c4585dde00c7a0d4bbb584da2b0143d /src/layouts | |
| parent | cef46a339b28300ffd87b874df86912dae3f05fa (diff) | |
Fix build with latest qtbase
QT_NO_QWARNING_MACRO got removed in favor of QT_NO_QDEBUG_MACRO.
Change-Id: Iadae92933921191fe1e1c736b9fb3798eca63472
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/layouts')
| -rw-r--r-- | src/layouts/qquicklayout_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/layouts/qquicklayout_p.h b/src/layouts/qquicklayout_p.h index 8c17ac6fb..a92fea7bf 100644 --- a/src/layouts/qquicklayout_p.h +++ b/src/layouts/qquicklayout_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Layouts module of the Qt Toolkit. @@ -45,7 +45,7 @@ class QQuickLayoutAttached; #if 0 && !defined(QT_NO_DEBUG) && !defined(QT_NO_DEBUG_OUTPUT) # define quickLayoutDebug QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).debug #else -# define quickLayoutDebug QT_NO_QWARNING_MACRO +# define quickLayoutDebug QT_NO_QDEBUG_MACRO #endif class QQuickLayoutPrivate; |