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

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

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

@@ -4 +4 @@
 
 MAKEFILE_GENERATOR      = UNIX
+TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                 += qt warn_on release incremental link_prl
@@ -13 +14 @@
 include(../common/linux.conf)
 
-# Work round scratchbox not having standard paths in it's default search path
-QMAKE_LFLAGS    += -Wl,-rpath-link=/lib
-QMAKE_LFLAGS    += -Wl,-rpath-link=/usr/lib
 
 # Override the default lib/include directories for scratchbox:
@@ -24 +22 @@
 
 # We still need to generate debug symbols in release mode to put into the *-dbg packages:
-QMAKE_CFLAGS_RELEASE    += -g -fno-omit-frame-pointer -fno-optimize-sibling-calls
-QMAKE_CXXFLAGS_RELEASE  += -g -fno-omit-frame-pointer -fno-optimize-sibling-calls
-
-# Work round PowerVR SGX 1.3 driver bug with glScissor & FBOs:
-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
+QMAKE_CFLAGS_RELEASE    += -g -Wno-psabi
+QMAKE_CXXFLAGS_RELEASE  += -g -Wno-psabi
 
 load(qt_config)

trunk/mkspecs/linux-g++-maemo/qplatformdefs.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)
@@ -43 +43 @@
 
 #define QT_GUI_DOUBLE_CLICK_RADIUS 20
+#define QT_GUI_DRAG_DISTANCE 16