Update headers

1 files changed, 19 insertions, 13 deletions

diff --git a/configure b/configure
index bd42c6e6c8..676efe1d4c 100755
--- a/configure
+++ b/configure
@@ -8,11 +8,11 @@
 ## This file is part of the Qt Mobility Components.
 ##
 ## $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
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Solutions Commercial License Agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,22 @@
 ## rights.  These rights are described in the Nokia Qt LGPL Exception
 ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 ##
-## If you have questions regarding the use of this file, please contact
-## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
 ##
+## Please note Third Party Software included with Qt Solutions may impose
+## additional restrictions and it is the user's responsibility to ensure
+## that they have met the licensing requirements of the GPL, LGPL, or Qt
+## Solutions Commercial license and the relevant license of the Third
+## Party Software they are using.
 ##
+## If you are unsure which license is appropriate for your use, please
+## contact the sales department at qt-sales@nokia.com.
 ## $QT_END_LICENSE$
 ##
 #############################################################################