Changeset 651 for trunk/qmake/project.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• qmake/project.cpp (modified) (5 diffs)

trunk/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])
@@ -82 +82 @@
                   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()
 {
@@ -114 +114 @@
         qmake_expand_functions->insert("replace", E_REPLACE);
         qmake_expand_functions->insert("size", E_SIZE);
+
     }
     return *qmake_expand_functions;
@@ -1869 +1870 @@
 }
 
+
+
+
 QStringList
 QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
@@ -2308 +2312 @@
         }
         break; }
+
+
+
+
+
+
+
+
     default: {
         fprintf(stderr, "%s:%d: Unknown replace function: %s\n",