Changeset 363 for trunk/qmake

Timestamp:

Nov 30, 2009, 6:52:30 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

global: Reverted r355, r356, r361, r362 (see #78).

Location:

trunk/qmake

Files:

• cachekeys.h (modified) (3 diffs)
• generators/makefile.cpp (modified) (11 diffs)
• generators/makefiledeps.cpp (modified) (2 diffs)
• generators/metamakefile.cpp (modified) (1 diff)
• generators/win32/winmakefile.cpp (modified) (1 diff)
• main.cpp (modified) (1 diff)
• meta.cpp (modified) (1 diff)
• project.cpp (modified) (2 diffs)

trunk/qmake/cachekeys.h

@@ -48 +48 @@
 #include <qfile.h>
 #include <qfileinfo.h>
-#include <qdir.h>
 #include <qhash.h>
 
@@ -108 +107 @@
             return true;
 
-#ifdef Q_OS_OS2
-        return QDir::isRelativePath(file);
-#else
         const QChar c0 = file.at(0);
         const QChar c1 = length >= 2 ? file.at(1) : QChar(0);
@@ -118 +114 @@
                 || (c0 == QLatin1Char('/') && c1 == QLatin1Char('/'))
                 || (c0 == QLatin1Char('\\') && c1 == QLatin1Char('\\')));
-#endif    
     }
 };

trunk/qmake/generators/makefile.cpp

@@ -125 +125 @@
     }
     bool ret = true;
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN)
     bool driveExists = true;
     if(!QDir::isRelativePath(path)) {
@@ -138 +138 @@
     }
     if(driveExists)
-#elif defined(Q_OS_OS2)
-    path = QFileInfo(path).absoluteFilePath();
-    QString drv = path.left(3);
-    if (!QFile::exists(drv))
-        warn_msg(WarnLogic, "Cannot access drive '%s' (%s)",
-                 drv.toLocal8Bit().data(), path.toLocal8Bit().data());
-    else
 #endif
     {
@@ -348 +341 @@
                         vpath += Option::output_dir;
                 }
-                foreach(const QString &vp, vpath) {
-                    QString real_val = QDir(vp).absoluteFilePath(val);
-                    if (exists(real_val)) {
-                        val = real_val;
+                for(QStringList::Iterator vpath_it = vpath.begin();
+                    vpath_it != vpath.end(); ++vpath_it) {
+                    QString real_dir = Option::fixPathToLocalOS((*vpath_it));
+                    if(exists(real_dir + QDir::separator() + val)) {
+                        QString dir = (*vpath_it);
+                        if(dir.right(Option::dir_sep.length()) != Option::dir_sep)
+                            dir += Option::dir_sep;
+                        val = dir + val;
                         if(!(flags & VPATH_NoFixify))
                             val = fileFixify(val);
@@ -853 +850 @@
                     file = libinfo.first("QMAKE_PRL_TARGET");
                     if(QDir::isRelativePath(file))
-                        file = QDir(dir).absoluteFilePath(file);
+                        file);
                 }
             }
@@ -2737 +2734 @@
 }
 
-inline static bool pathEquals(const QString &path1, const QString &path2)
-{
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
-    return path1.compare(path2, Qt::CaseInsensitive) == 0;
-#else
-    return path1 == path2;
-#endif
-}
-
-inline static bool pathStartsWith(const QString &path1, const QString &path2)
-{
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
-    return path1.toLower().startsWith(path2.toLower());
-#else
-    return path1.startsWith(path2);
-#endif
-}
-
 QString
 MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const QString &in_d,
@@ -2785 +2764 @@
     if(fix == FileFixifyAbsolute || (fix == FileFixifyDefault && project->isActiveConfig("no_fixpath"))) {
         if(fix == FileFixifyAbsolute && QDir::isRelativePath(ret)) //already absolute
-            ret = QDir(pwd).absoluteFilePath(ret);
+            ret);
         ret = Option::fixPathToTargetOS(ret, false, canon);
     } else { //fix it..
@@ -2803 +2782 @@
         if(out_dir != in_dir || !qfileinfo.isRelative()) {
             if(qfileinfo.isRelative()) {
-                ret = QDir(in_dir).absoluteFilePath(qfile);
+                ret = ;
                 qfileinfo.setFile(ret);
             }
             ret = Option::fixPathToTargetOS(ret, false, canon);
             if(canon && qfileinfo.exists() &&
-               pathEquals(file, Option::fixPathToTargetOS(ret, true, canon)))
+               ))
                 ret = Option::fixPathToTargetOS(qfileinfo.canonicalFilePath());
             QString match_dir = Option::fixPathToTargetOS(out_dir, false, canon);
-            if(pathEquals(ret, match_dir)) {
+            if() {
                 ret = "";
-            } else if(pathStartsWith(ret, match_dir + Option::dir_sep)) {
+            } else if(match_dir + Option::dir_sep)) {
                 ret = ret.mid(match_dir.length() + Option::dir_sep.length());
             } else {
@@ -2834 +2813 @@
                     if(match_dir.isEmpty())
                         break;
-                    if(pathStartsWith(ret, match_dir + Option::dir_sep)) {
+                    if(match_dir + Option::dir_sep)) {
                         //concat
                         int remlen = ret.length() - (match_dir.length() + 1);
@@ -3025 +3004 @@
         if(!file.fileName().isEmpty()) {
             if(QDir::isRelativePath(file.fileName()))
-                file.setFileName(QDir(Option::output_dir).absoluteFilePath(file.fileName())); //pwd when qmake was run
+                file.setFileName()); //pwd when qmake was run
             QFileInfo fi(fileInfo(file.fileName()));
             if(fi.isDir())
@@ -3038 +3017 @@
     }
     if(QDir::isRelativePath(file.fileName())) {
-        file.setFileName(QDir(Option::output_dir).absoluteFilePath(file.fileName())); //pwd when qmake was run
+        QString fname = Option::output_dir;  //pwd when qmake was run
+        if(!fname.endsWith("/"))
+            fname += "/";
+        fname += file.fileName();
+        file.setFileName(fname);
     }
     if(!build.isEmpty())