path: root/qmake/meta.cpp
diff options
authorOswald Buddenhagen <>2012-09-05 18:29:19 +0200
committerQt by Nokia <>2012-09-11 00:13:01 +0200
commit0e78e5080262b8fa7a86f7cd0c8716839db048f6 (patch)
tree83ca3f608a6c9a359ba783d496ffdbc9ef7a6073 /qmake/meta.cpp
parented7594db5db7b28ce4c4646624de97b52fbf16d5 (diff)
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 <>
Diffstat (limited to 'qmake/meta.cpp')
1 files changed, 2 insertions, 2 deletions
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(!, QMakeProject::ReadProFile))
+ if (!, 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(!, QMakeProject::ReadProFile))
+ if (!, QMakeEvaluator::LoadProOnly))
return false;
QString dirf = nf.section(QLatin1Char('/'), 0, -2);
if(dirf == nf)