Changeset 561 for trunk/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/designer/src/lib/shared/qdesigner_formbuilder.cpp (modified) (10 diffs)

trunk/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the Qt Designer of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -84 +84 @@
 QT_BEGIN_NAMESPACE
 
+
 static QString summarizeScriptErrors(const QFormScriptRunner::Errors &errors)
 {
@@ -93 +94 @@
     return rc;
 }
+
 
 namespace qdesigner_internal {
@@ -109 +111 @@
 {
     Q_ASSERT(m_core);
+
     // Disable scripting in the editors.
     QFormScriptRunner::Options options = formScriptRunner()->options();
@@ -121 +124 @@
     }
     formScriptRunner()-> setOptions(options);
+
 }
 
@@ -401 +405 @@
         }
     }
+
     // Check for script errors
     *scriptErrors = builder.formScriptRunner()->errors();
@@ -408 +413 @@
         return  0;
     }
+
     // Fake application style sheet by prepending. (If this doesn't work, fake by nesting
     // into parent widget).
@@ -474 +480 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 } // namespace qdesigner_internal