From 0e78e5080262b8fa7a86f7cd0c8716839db048f6 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 5 Sep 2012 18:29:19 +0200 Subject: port qmake to qt creator's qmake language evaluator this is a monster commit which does the following things: - import the evaluator as-is from qt creator into qmake/library/ - integrate it into qmake's makefiles - overwrite proitems.h with actual special types - remove the parts of Option which are redundant with QMakeGlobals - make QMakeProperty a singleton owned by Option::globals. the dynamic handling so far made no sense. - make QMakeProject a subclass of QMakeEvaluator, with relatively few extensions the changes to existing qmake code outside project.* and option.* are minor. implementing the changes gradually would mean changing a lot of code which will be just replaced in the next commit, so i'm not wasting my time on it. Change-Id: I9746650423b8c5b3fbd8c3979a73228982a46195 Reviewed-by: Qt Doc Bot Reviewed-by: Joerg Bornemann --- qmake/meta.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qmake/meta.cpp') diff --git a/qmake/meta.cpp b/qmake/meta.cpp index 93e7ed14a5..49dcdc03b5 100644 --- a/qmake/meta.cpp +++ b/qmake/meta.cpp @@ -76,7 +76,7 @@ QMakeMetaInfo::readLib(QString lib) meta_type = "libtool"; } else if(meta_file.endsWith(Option::prl_ext)) { QMakeProject proj; - if(!proj.read(Option::normalizePath(meta_file), QMakeProject::ReadProFile)) + if (!proj.read(Option::normalizePath(meta_file), QMakeEvaluator::LoadProOnly)) return false; meta_type = "qmake"; vars = proj.variables(); @@ -136,7 +136,7 @@ QMakeMetaInfo::readLibtoolFile(const QString &f) /* I can just run the .la through the .pro parser since they are compatible.. */ QMakeProject proj; QString nf = Option::normalizePath(f); - if(!proj.read(nf, QMakeProject::ReadProFile)) + if (!proj.read(nf, QMakeEvaluator::LoadProOnly)) return false; QString dirf = nf.section(QLatin1Char('/'), 0, -2); if(dirf == nf) -- cgit v1.2.3