Changeset 769 for trunk/src/plugins/s60


Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk

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

    r561 r769  
    11include(../s60pluginbase.pri)
    22
    3 TARGET  = qts60plugin_3_1
     3TARGET  = qts60plugin_3_1$${QT_LIBINFIX}
    44
    55SOURCES += ../src/qlocale_3_1.cpp \

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

    r561 r769  
    11include(../s60pluginbase.pri)
    22
    3 TARGET  = qts60plugin_3_2
     3TARGET  = qts60plugin_3_2$${QT_LIBINFIX}
    44
    55contains(S60_VERSION, 3.1) {
    … …  
    1111        ../src/qdesktopservices_3_2.cpp \
    1212        ../src/qcoreapplication_3_2.cpp
    13     LIBS += -ldirectorylocalizer -lefsrv
     13    LIBS += -lDirectoryLocalizer -lefsrv
    1414    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
    1515}

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

    r561 r769  
    11include(../s60pluginbase.pri)
    22
    3 TARGET  = qts60plugin_5_0
     3TARGET  = qts60plugin_5_0$${QT_LIBINFIX}
    44
    55contains(S60_VERSION, 3.1) {
    … …  
    1111        ../src/qdesktopservices_3_2.cpp \
    1212        ../src/qcoreapplication_3_2.cpp
    13     LIBS += -ldirectorylocalizer -lefsrv
     13    LIBS += -lDirectoryLocalizer -lefsrv
    1414    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
    1515}

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

    r651 r769  
    4646#ifdef Q_WS_S60
    4747#include <e32base.h>                 // CBase -> Required by cdirectorylocalizer.h
    48 #include <cdirectorylocalizer.h>     // CDirectoryLocalizer
     48#include <CDirectoryLocalizer.h>     // CDirectoryLocalizer
    4949
    5050EXPORT_C QString localizedDirectoryName(QString& rawPath)
Note: See TracChangeset for help on using the changeset viewer.