diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/qmake/meta.cpp')
| -rw-r--r-- | experimental/tqtinterface/qt4/qmake/meta.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/experimental/tqtinterface/qt4/qmake/meta.cpp b/experimental/tqtinterface/qt4/qmake/meta.cpp index 21e4e987e..81b8809a9 100644 --- a/experimental/tqtinterface/qt4/qmake/meta.cpp +++ b/experimental/tqtinterface/qt4/qmake/meta.cpp @@ -53,9 +53,9 @@ bool TQMakeMetaInfo::readLib(const TQString &lib) { clear(); - TQString meta_file = tqfindLib(lib); + TQString meta_file = findLib(lib); - if(cache_vars.tqcontains(meta_file)) { + if(cache_vars.contains(meta_file)) { vars = cache_vars[meta_file]; return TRUE; } @@ -94,7 +94,7 @@ TQMakeMetaInfo::clear() TQString -TQMakeMetaInfo::tqfindLib(const TQString &lib) +TQMakeMetaInfo::findLib(const TQString &lib) { TQString ret = TQString::null; TQString extns[] = { Option::prl_ext, /*Option::pkgcfg_ext, Option::libtool_ext,*/ TQString::null }; @@ -136,7 +136,7 @@ TQMakeMetaInfo::readLibtoolFile(const TQString &f) if(lst.count() == 1 && (lst.first().startsWith("'") || lst.first().startsWith("\"")) && lst.first().endsWith(TQString(lst.first()[0]))) lst = TQString(lst.first().mid(1, lst.first().length() - 2)); - if(!vars.tqcontains("TQMAKE_PRL_TARGET") && + if(!vars.contains("TQMAKE_PRL_TARGET") && (it.key() == "dlname" || it.key() == "library_names" || it.key() == "old_library")) { TQString dir = v["libdir"].first(); if((dir.startsWith("'") || dir.startsWith("\"")) && dir.endsWith(TQString(dir[0]))) |