have make_qfeatures_dot_h use QTSRCDIR if defined, update qfeatures.h

Reviewed-by: Paul

2 files changed, 22 insertions, 17 deletions

diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index d925f40..29f46f6 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -446,6 +446,11 @@
 #define QT_NO_SPLITTER
 #endif
 
+// State machine
+#if !defined(QT_NO_STATEMACHINE) && (defined(QT_NO_PROPERTIES))
+#define QT_NO_STATEMACHINE
+#endif
+
 // QCDEStyle
 #if !defined(QT_NO_STYLE_CDE) && (defined(QT_NO_STYLE_MOTIF))
 #define QT_NO_STYLE_CDE
@@ -616,11 +621,6 @@
 #define QT_NO_QWS_SOUNDSERVER
 #endif
 
-// QtScript
-#if !defined(QT_NO_SCRIPT) && (defined(QT_NO_TEXTDATE) || defined(QT_NO_DATESTRING) || defined(QT_NO_PROPERTIES))
-#define QT_NO_SCRIPT
-#endif
-
 // QSvgGenerator
 #if !defined(QT_NO_SVGGENERATOR) && (defined(QT_NO_SVG))
 #define QT_NO_SVGGENERATOR
diff --git a/util/scripts/make_qfeatures_dot_h b/util/scripts/make_qfeatures_dot_h
index 2c919aa..bdd68a3 100755
--- a/util/scripts/make_qfeatures_dot_h
+++ b/util/scripts/make_qfeatures_dot_h
@@ -49,8 +49,14 @@
 # will show them.
 #
 
-open FL, "$ENV{QTDIR}/src/corelib/global/qfeatures.txt"
-    or die "Cannot open $ENV{QTDIR}/src/corelib/global/qfeatures.txt";
+if ($ENV{QTSRCDIR} ne '') {
+    $qtbase=$ENV{QTSRCDIR};
+} else {
+    $qtbase=$ENV{QTDIR};
+}
+
+open FL, "$qtbase/src/corelib/global/qfeatures.txt"
+    or die "Cannot open $qtbase/src/corelib/global/qfeatures.txt";
 
 while (<FL>) {
     if ( /^Feature: (\S*)/ ) {
@@ -120,19 +126,19 @@ for $macro ( @macros ) {
     }
 }
 
-open OUT, ">$ENV{QTDIR}/src/corelib/global/qfeatures.h"
-    or die "Cannot open $ENV{QTDIR}/src/corelib/global/qfeatures.h for writing";
+open OUT, ">$qtbase/src/corelib/global/qfeatures.h"
+    or die "Cannot open $qtbase/src/corelib/global/qfeatures.h for writing";
 
 print OUT
 '/****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info\@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
-** \$QT_BEGIN_LICENSE:LGPL\$
+** $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
@@ -147,13 +153,12 @@ print OUT
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** 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.
+** Nokia at qt-info@nokia.com.
 **
 **
 **
@@ -162,7 +167,7 @@ print OUT
 **
 **
 **
-** \$QT_END_LICENSE\$
+** $QT_END_LICENSE$
 **
 ****************************************************************************/