Changeset 846 for trunk/src/plugins/s60


Ignore:
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:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/plugins/s60/3_2/3_2.pro

    r769 r846  
    1111        ../src/qdesktopservices_3_2.cpp \
    1212        ../src/qcoreapplication_3_2.cpp
    13     LIBS += -lDirectoryLocalizer -lefsrv
     13    contains(CONFIG, is_using_gnupoc) {
     14        LIBS += -ldirectorylocalizer
     15    } else {
     16        LIBS += -lDirectoryLocalizer
     17    }
     18    LIBS += -lefsrv
    1419    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
    1520}

  • trunk/src/plugins/s60/5_0/5_0.pro

    r769 r846  
    1111        ../src/qdesktopservices_3_2.cpp \
    1212        ../src/qcoreapplication_3_2.cpp
    13     LIBS += -lDirectoryLocalizer -lefsrv
     13    contains(CONFIG, is_using_gnupoc) {
     14        LIBS += -ldirectorylocalizer
     15    } else {
     16        LIBS += -lDirectoryLocalizer
     17    }
     18    LIBS += -lefsrv
    1419    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
    1520}

  • trunk/src/plugins/s60/s60.pro

    r561 r846  
    11TEMPLATE = subdirs
    22
    3 symbian:SUBDIRS = 3_1 3_2 5_0
     3
     4symbian {
     5    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
     6        SUBDIRS += 3_1 3_2
     7    }
     8
     9    # 5.0 is used also for Symbian3 and later
     10    SUBDIRS += 5_0
     11}

  • trunk/src/plugins/s60/s60pluginbase.pri

    r561 r846  
    55CONFIG  -= plugin
    66
     7QTDIR_build:DESTDIR      = $$QT_BUILD_TREE/plugins/s60
     8
    79MMP_RULES += NOEXPORTLIBRARY
    810
    9 defBlock = \
    10     "$${LITERAL_HASH}ifdef WINSCW" \
    11     "DEFFILE ../bwins/qts60plugin.def" \
    12     "$${LITERAL_HASH}else" \
    13     "DEFFILE ../eabi/qts60plugin.def" \
    14     "$${LITERAL_HASH}endif"
     11symbian-abld|symbian-sbsv2 {
     12    defBlock = \
     13        "$${LITERAL_HASH}ifdef WINSCW" \
     14        "DEFFILE ../bwins/qts60plugin.def" \
     15        "$${LITERAL_HASH}else" \
     16        "DEFFILE ../eabi/qts60plugin.def" \
     17        "$${LITERAL_HASH}endif"
     18} else {
     19    CONFIG *= def_files
     20    DEF_FILE = ../eabi/qts60pluginu.def
     21}
    1522
    1623MMP_RULES += defBlock

  • trunk/src/plugins/s60/src/qcoreapplication_3_1.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/s60/src/qcoreapplication_3_2.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/s60/src/qdesktopservices_3_1.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/s60/src/qdesktopservices_3_2.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/s60/src/qlocale_3_1.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/s60/src/qlocale_3_2.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
Note: See TracChangeset for help on using the changeset viewer.