1 files changed, 9 insertions, 8 deletions

diff --git a/qmake/option.cpp b/qmake/option.cpp
index f0e6c50341..0e2d199232 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -12,6 +12,7 @@
 #include <stdarg.h>
 
 #include <qmakelibraryinfo.h>
+#include <qtversion.h>
 #include <private/qlibraryinfo_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -76,7 +77,7 @@ static Option::QMAKE_MODE default_mode(QString progname)
 {
     int s = progname.lastIndexOf(QDir::separator());
     if(s != -1)
-        progname = progname.right(progname.length() - (s + 1));
+        progname = progname.right(progname.size() - (s + 1));
     if(progname == "qmakegen")
         return Option::QMAKE_GENERATE_PROJECT;
     else if(progname == "qt-config")
@@ -95,7 +96,7 @@ static QString detectProjectFile(const QString &path, QString *singleProFileCand
         ret = candidate;
     } else { //last try..
         QStringList profiles = dir.entryList(QStringList("*" + Option::pro_ext));
-        if(profiles.count() == 1)
+        if(profiles.size() == 1)
             ret = dir.filePath(profiles.at(0));
     }
     return ret;
@@ -173,7 +174,7 @@ Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state)
 {
     enum { ArgNone, ArgOutput } argState = ArgNone;
     int x = 0;
-    while (x < args.count()) {
+    while (x < args.size()) {
         switch (argState) {
         case ArgOutput:
             Option::output.setFileName(args.at(x--));
@@ -187,7 +188,7 @@ Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state)
                 return Option::QMAKE_CMDLINE_SHOW_USAGE | Option::QMAKE_CMDLINE_ERROR;
             }
             if (!globals->qtconf.isEmpty())
-                QLibraryInfoPrivate::qtconfManualPath = &globals->qtconf;
+                QLibraryInfoPrivate::setQtconfManualPath(&globals->qtconf);
             if (cmdRet == QMakeGlobals::ArgumentsOk)
                 break;
             Q_ASSERT(cmdRet == QMakeGlobals::ArgumentUnknown);
@@ -199,7 +200,7 @@ Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state)
                     fprintf(stdout,
                             "QMake version %s\n"
                             "Using Qt version %s in %s\n",
-                            QMAKE_VERSION_STR, qVersion(),
+                            QMAKE_VERSION_STR, QT_VERSION_STR,
                             QMakeLibraryInfo::path(QLibraryInfo::LibrariesPath)
                                     .toLatin1()
                                     .constData());
@@ -389,7 +390,7 @@ Option::init(int argc, char **argv)
             } else if (opt == "-qtconf") {
                 // Skip "-qtconf <file>" and proceed.
                 ++idx;
-                if (idx + 1 < args.length())
+                if (idx + 1 < args.size())
                     ++idx;
                 continue;
             } else {
@@ -464,7 +465,7 @@ bool Option::postProcessProject(QMakeProject *project)
 
     if (!project->buildRoot().isEmpty() && Option::output_dir.startsWith(project->buildRoot()))
         Option::mkfile::cachefile_depth =
-                Option::output_dir.mid(project->buildRoot().length()).count('/');
+                Option::output_dir.mid(project->buildRoot().size()).count('/');
 
     return true;
 }
@@ -527,7 +528,7 @@ Option::fixString(QString string, uchar flags)
 
     if ((string.startsWith("\"") && string.endsWith("\"")) ||
         (string.startsWith("\'") && string.endsWith("\'")))
-        string = string.mid(1, string.length()-2);
+        string = string.mid(1, string.size()-2);
 
     //cache
     //qDebug() << "Fix" << orig_string << "->" << string;