| -rw-r--r-- | qmake/option.h | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/qmake/option.h b/qmake/option.h index 8bd348e..6197605 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -1,11 +1,9 @@ /**************************************************************************** -** $Id$ +** ** -** Definition of ________ class. +** Definition of Option class. ** -** Created : 970521 +** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. ** -** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. -** -** This file is part of the network module of the Qt GUI Toolkit. +** This file is part of qmake. ** @@ -36,2 +34,3 @@ **********************************************************************/ + #ifndef __OPTION_H__ @@ -45,3 +44,3 @@ #define QMAKE_VERSION_MAJOR 1 -#define QMAKE_VERSION_MINOR 5 +#define QMAKE_VERSION_MINOR 7 #define QMAKE_VERSION_PATCH 0 @@ -62,2 +61,4 @@ struct Option //simply global convenience + static QString libtool_ext; + static QString pkgcfg_ext; static QString prf_ext; @@ -67,3 +68,4 @@ struct Option static QStringList cpp_ext; - static QString moc_ext; + static QString h_moc_ext; + static QString cpp_moc_ext; static QString obj_ext; @@ -71,3 +73,4 @@ struct Option static QString yacc_ext; - static QString moc_mod; + static QString h_moc_mod; + static QString cpp_moc_mod; static QString lex_mod; @@ -85,3 +88,3 @@ struct Option enum QMAKE_MODE { QMAKE_GENERATE_NOTHING, QMAKE_GENERATE_PROJECT, QMAKE_GENERATE_MAKEFILE, - QMAKE_GENERATE_PRL }; + QMAKE_GENERATE_PRL, QMAKE_SET_PROPERTY, QMAKE_QUERY_PROPERTY }; static QMAKE_MODE qmake_mode; @@ -98,2 +101,8 @@ struct Option + + //QMAKE_*_PROPERTY options + struct prop { + static QStringList properties; + }; + //QMAKE_GENERATE_PROJECT options @@ -120,3 +129,3 @@ struct Option private: - static bool internalParseCommandLine(int, char **, int=0); + static int internalParseCommandLine(int, char **, int=0); }; |