Changeset 846 for trunk/tools/configure/environment.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/configure/environment.h (modified) (3 diffs)

trunk/tools/configure/environment.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -57 +57 @@
     CC_NET2003 = 0x71,
     CC_NET2005 = 0x80,
-    CC_NET2008 = 0x90
+    CC_NET2008 = 0x90,
+    CC_NET2010 = 0x91
 };
 
@@ -69 +70 @@
 
     static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv);
-    static bool cpdir(const QString &srcDir, const QString &destDir);
+    static bool cpdir(const QString &srcDir,
+                      const QString &destDir,
+                      const QString &includeSrcDir = QString());
     static bool rmdir(const QString &name);