Changeset 1156 for branches/vendor/nokia/qt/current/src/s60main/qts60main.cpp

Timestamp:

Nov 7, 2014, 5:23:02 PM (11 years ago)

Author:

Dmitry A. Kuminov

Message:

vendor: Import qt-everywhere-opensource-src-4.8.6 from Digia (excluding doc/html and doc/qch dirs generated from doc/src, and imports and templates dirs which are emtpy).

File:

• branches/vendor/nokia/qt/current/src/s60main/qts60main.cpp (modified) (4 diffs)

branches/vendor/nokia/qt/current/src/s60main/qts60main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Symbian application wrapper of the Qt Toolkit.
@@ -19 +18 @@
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of 
+**     
+**     
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -35 +34 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+
 ** $QT_END_LICENSE$
 **
@@ -52 +52 @@
 GLDEF_C TInt E32Main()
 {
-    CTrapCleanup *cleanupStack = q_check_ptr(CTrapCleanup::New());
+    CTrapCleanup *cleanupStack = CTrapCleanup::New();
+    Q_CHECK_PTR(cleanupStack);
     TInt err = 0;
     TRAP(err, err = QtMainWrapper());