Changeset 846 for trunk/tools/configure/configureapp.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/configureapp.h (modified) (4 diffs)

trunk/tools/configure/configureapp.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)
@@ -123 +123 @@
     QStringList qmakeStylePlugins;
 
-    QStringList qmakeFormatPlugins;
-
     QStringList qmakeVars;
     QStringList qmakeDefines;
@@ -134 +132 @@
     QStringList qmakeLibs;
     QString opensslLibs;
+    QString psqlLibs;
+    QString sybase;
+    QString sybaseLibs;
 
     QMap<QString,QString> licenseInfo;
@@ -148 +149 @@
 
     bool useUnixSeparators;
-    QString fixSeparators(QString somePath);
+    QString fixSeparators(const QString &somePath, bool escape = false);
+    QString escapeSeparators(const QString &somePath);
     bool filesDiffer(const QString &file1, const QString &file2);