summaryrefslogtreecommitdiff
path: root/qmake/option.h
authorzecke <zecke>2004-07-15 17:36:57 (UTC)
committer zecke <zecke>2004-07-15 17:36:57 (UTC)
commit323e9a7472a110b4befba7320540263147505bae (patch) (side-by-side diff)
tree14c810bdb9c0603a30356b17b4bdf9ccb72741c6 /qmake/option.h
parentaa292b322f1ecb43dd8f4e3cd295855730dd9f59 (diff)
downloadopie-323e9a7472a110b4befba7320540263147505bae.zip
opie-323e9a7472a110b4befba7320540263147505bae.tar.gz
opie-323e9a7472a110b4befba7320540263147505bae.tar.bz2
Manually updatet to qmake1.06a which includes support for precompiled
headers. Opies 'PRO' keyword was already reintroduced
Diffstat (limited to 'qmake/option.h') (more/less context) (ignore whitespace changes)
-rw-r--r--qmake/option.h31
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,14 +1,12 @@
/****************************************************************************
-** $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.
**
** 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.
@@ -33,8 +31,9 @@
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
+
#ifndef __OPTION_H__
#define __OPTION_H__
#include "project.h"
@@ -42,9 +41,9 @@
#include <qstringlist.h>
#include <qfile.h>
#define QMAKE_VERSION_MAJOR 1
-#define QMAKE_VERSION_MINOR 5
+#define QMAKE_VERSION_MINOR 7
#define QMAKE_VERSION_PATCH 0
const char *qmake_version();
void fixEnvVariables(QString &x);
@@ -59,18 +58,22 @@ void warn_msg(QMakeWarn t, const char *fmt, ...);
struct Option
{
//simply global convenience
+ static QString libtool_ext;
+ static QString pkgcfg_ext;
static QString prf_ext;
static QString prl_ext;
static QString ui_ext;
static QStringList h_ext;
static QStringList cpp_ext;
- static QString moc_ext;
+ static QString h_moc_ext;
+ static QString cpp_moc_ext;
static QString obj_ext;
static QString lex_ext;
static QString yacc_ext;
- static QString moc_mod;
+ static QString h_moc_mod;
+ static QString cpp_moc_mod;
static QString lex_mod;
static QString yacc_mod;
static QString dir_sep;
//both of these must be called..
@@ -82,9 +85,9 @@ struct Option
static QString fixPathToTargetOS(const QString& in, bool fix_env=TRUE, bool canonical=TRUE);
//global qmake mode, can only be in one mode per invocation!
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;
//all modes
static QFile output;
@@ -95,8 +98,14 @@ struct Option
enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE, TARG_QNX6_MODE };
static TARG_MODE target_mode;
static QString user_template, user_template_prefix;
+
+ //QMAKE_*_PROPERTY options
+ struct prop {
+ static QStringList properties;
+ };
+
//QMAKE_GENERATE_PROJECT options
struct projfile {
static bool do_pwd;
static bool do_recursive;
@@ -117,9 +126,9 @@ struct Option
static QString qmakespec_commandline;
};
private:
- static bool internalParseCommandLine(int, char **, int=0);
+ static int internalParseCommandLine(int, char **, int=0);
};
#endif /* __OPTION_H__ */