Changeset 651 for trunk/mkspecs/linux-g++-maemo

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)
• mkspecs/linux-g++-maemo/qmake.conf (modified) (2 diffs)
• mkspecs/linux-g++-maemo/qplatformdefs.h (modified) (1 diff)

trunk/mkspecs/linux-g++-maemo/qmake.conf

@@ -6 +6 @@
 TEMPLATE                = app
 CONFIG                 += qt warn_on release incremental link_prl
+CONFIG                 += nostrip
 QT                     += core gui
 QMAKE_INCREMENTAL_STYLE = sublib
@@ -29 +30 @@
 DEFINES += QT_GL_NO_SCISSOR_TEST
 
+# Work round SGX 1.4 driver bug (text corrupted), modify glyph cache width:
+DEFINES += QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024
 
 load(qt_config)

trunk/mkspecs/linux-g++-maemo/qplatformdefs.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)