summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-08-19 13:30:18 +0200
committerFrans Englich <frans.englich@nokia.com>2009-08-19 14:21:45 +0200
commitf50439ac2bd701f88eb7843fccbbf885c3528a54 (patch)
tree74884d43e6ed69d5c596f559a25cbd21bd286548 /qmake
parent215969ea20466a6a7eb78cb94723ed6c9d72a08d (diff)
Make the license test pass.
This is partly done to address a review comment for S60. Reviewed-by: Marius SO Reviewed-by: Paul
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/unix/unixmake.cpp19
1 files changed, 8 insertions, 11 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 626b955a54..dfbf8ee6fc 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -1,11 +1,11 @@
/****************************************************************************
- **
- ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
- **
- ** This file is part of the qmake application of the Qt Toolkit.
- **
- ** $QT_BEGIN_LICENSE:LGPL$
+**
+** This file is part of the qmake application of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
@@ -36,11 +36,8 @@
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
- **
- ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- **
- ****************************************************************************/
+**
+****************************************************************************/
#include "unixmake.h"
#include "option.h"