1 files changed, 21 insertions, 9 deletions

diff --git a/qmake/include/private/qsettings_p.h b/qmake/include/private/qsettings_p.h
index 095291c..4b76f44 100644
--- a/qmake/include/private/qsettings_p.h
+++ b/qmake/include/private/qsettings_p.h
@@ -1,133 +1,145 @@
 /****************************************************************************
-** $Id$
+** 
 **
 ** Definition of QSettings related classes
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** Created : 990124
 **
-** This file is part of the tools module of the Qt GUI Toolkit.
+** Copyright (C) 1999-2002 Trolltech AS.  All rights reserved.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses for Windows may use this file in accordance with the Qt Commercial
-** License Agreement provided with the Software.
+** This file is part of the kernel module of the Qt GUI Toolkit.
+**
+** This file may be distributed under the terms of the Q Public License
+** as defined by Trolltech AS of Norway and appearing in the file
+** LICENSE.QPL included in the packaging of this file.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
 **
-** This file is not available for use under any other license without
-** express written permission from the copyright holder.
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses may use this file in accordance with the Qt Commercial License
+** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   information about Qt Commercial License Agreements.
+** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef QSETTINGS_P_H
 #define QSETTINGS_P_H
 
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
 // of QSettings. This header file may change from version to 
 // version without notice, or even be removed.
 //
 // We mean it.
 //
 //
 
 #ifndef QT_H
 #include "qstringlist.h"
 #include "qmap.h"
 #include "qvaluestack.h"
 #endif // QT_H
 
+#ifndef QT_NO_SETTINGS
 class QSettingsSysPrivate;
 
 // QSettingsGroup is a map of key/value pairs
 class QSettingsGroup : public QMap<QString,QString>
 {
 public:
     QSettingsGroup();
 
     bool modified;
 };
 
 // QSettingsHeading is a map of heading/group pairs
 class QSettingsHeading : public QMap<QString,QSettingsGroup>
 {
 public:
     QSettingsHeading::Iterator git;
     void read(const QString &);
     void parseLine(QTextStream &);
 };
 
 
 class QSettingsPrivate
 {
 public:
     QSettingsPrivate( QSettings::Format format );
     ~QSettingsPrivate();
 
     QSettingsGroup readGroup();
     void removeGroup(const QString &);
     void writeGroup(const QString &, const QString &);
     QDateTime modificationTime();
 
     QStringList searchPaths;
     QMap<QString,QSettingsHeading> headings;
     QString group;
     QString heading;
 
     /*### static data brings threading trouble
     static QString *defProduct;
     static QString *defDomain;
     */
     QValueStack<QString> groupStack;
     QString groupPrefix;
 
     bool groupDirty :1;
     bool modified :1;
     bool globalScope :1;
 
 #if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     // system dependent implementations to use the 
     // system specific setting database (ie. registry on Windows)
 
     QSettingsSysPrivate *sysd;
             voidsysInit();
             voidsysClear();
 
 #if !defined(Q_NO_BOOL_TYPE)
             boolsysWriteEntry( const QString &, bool );
 #endif
             boolsysWriteEntry( const QString &, double );
             boolsysWriteEntry( const QString &, int );
             boolsysWriteEntry( const QString &, const QString & );
             boolsysWriteEntry( const QString &, const QStringList & );
             boolsysWriteEntry( const QString &, const QStringList &, const QChar& sep );
 
     QStringList sysEntryList(const QString &) const;
     QStringList sysSubkeyList(const QString &) const;
 
     QStringList sysReadListEntry( const QString &, bool * = 0 ) const;
     QStringList sysReadListEntry( const QString &, const QChar& sep, bool * = 0 ) const;
             QStringsysReadEntry( const QString &, const QString &def = QString::null, bool * = 0 ) const;
             int         sysReadNumEntry( const QString &, int def = 0, bool * = 0 ) const;
             doublesysReadDoubleEntry( const QString &, double def = 0, bool * = 0 ) const;
             boolsysReadBoolEntry( const QString &, bool def = 0, bool * = 0 ) const;
 
             boolsysRemoveEntry( const QString & );
 
             boolsysSync();
 
             voidsysInsertSearchPath( QSettings::System, const QString & );
             voidsysRemoveSearchPath( QSettings::System, const QString & );
 #endif
-};
 
+};
+#endif //QT_NO_SETTINGS
 #endif // QSETTINGS_P_H