Changeset 846 for trunk/mkspecs/linux-icc

Timestamp:

May 5, 2011, 5:36:53 AM (15 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-icc/qmake.conf (modified) (5 diffs)
• mkspecs/linux-icc/qplatformdefs.h (modified) (1 diff)

trunk/mkspecs/linux-icc/qmake.conf

@@ -12 +12 @@
 
 MAKEFILE_GENERATOR      = UNIX
+
 TEMPLATE                = app
 CONFIG                  += qt warn_on release link_prl
@@ -21 +22 @@
 QMAKE_YACC              = yacc
 QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = -wd654,1572
+QMAKE_CFLAGS            = -
 QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    =
+QMAKE_CFLAGS_WARN_ON    =
 QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O2
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = -fPIC
+QMAKE_CFLAGS_RELEASE    = -O2
+QMAKE_CFLAGS_DEBUG      = -g
+QMAKE_CFLAGS_SHLIB      = -fPIC
 QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
 QMAKE_CFLAGS_YACC       =
@@ -58 +59 @@
 QMAKE_LFLAGS_RELEASE    =
 QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -shared
+QMAKE_LFLAGS_SHLIB      = -shared
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Qoption,ld,-soname,
+QMAKE_LFLAGS_SONAME     = -,-soname,
 QMAKE_LFLAGS_THREAD     =
-QMAKE_RPATH             = -Qoption,ld,-rpath,
+QMAKE_LFLAGS_NOUNDEF    = -Wl,-z,defs
+QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
 
 QMAKE_LIBS              =
@@ -76 +78 @@
 QMAKE_UIC               = $$[QT_INSTALL_BINS]/uic
 
-QMAKE_AR                = ar cqs
+QMAKE_AR                = ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB            =
@@ -99 +101 @@
 
 # -Bsymbolic-functions (ld) support
-QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Qoption,ld,-Bsymbolic-functions
-QMAKE_LFLAGS_DYNAMIC_LIST = -Qoption,ld,--dynamic-list,
+QMAKE_LFLAGS_BSYMBOLIC_FUNC = -,-Bsymbolic-functions
+QMAKE_LFLAGS_DYNAMIC_LIST = -,--dynamic-list,
 
 # Symbol visibility control

trunk/mkspecs/linux-icc/qplatformdefs.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])