Changeset 649 for branches/vendor/nokia/qt/current/qmake/project.cpp

Timestamp:

Mar 7, 2010, 11:52:24 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

vendor: Merged in qt-everywhere-opensource-src-4.6.2 from Nokia.

File:

• branches/vendor/nokia/qt/current/qmake/project.cpp (modified) (5 diffs)

branches/vendor/nokia/qt/current/qmake/project.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -80 +80 @@
                   E_FIND, E_SYSTEM, E_UNIQUE, E_QUOTE, E_ESCAPE_EXPAND,
                   E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE,
-                  E_SIZE };
+                  E_SIZE };
 QMap<QString, ExpandFunc> qmake_expandFunctions()
 {
@@ -112 +112 @@
         qmake_expand_functions->insert("replace", E_REPLACE);
         qmake_expand_functions->insert("size", E_SIZE);
+
     }
     return *qmake_expand_functions;
@@ -1865 +1866 @@
 }
 
+
+
+
 QStringList
 QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
@@ -2302 +2306 @@
         }
         break; }
+
+
+
+
+
+
+
+
     default: {
         fprintf(stderr, "%s:%d: Unknown replace function: %s\n",