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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/mkspecs/common/wince/qmake.conf

    r561 r846  
    6767QMAKE_LIBS_EGL          = libEGL.lib
    6868QMAKE_LIBS_OPENGL_ES1 = libGLES_CM.lib
    69 QMAKE_LIBS_OPENGL_ES1CL = libGLES_CL.lib
    7069QMAKE_LIBS_OPENGL_ES2 = libGLESv2.lib
    7170
    7271QMAKE_LIBS_QT_ENTRY     = -lqtmain
    7372
    74 QMAKE_MOC               = $$[QT_INSTALL_BINS]\moc.exe
    75 QMAKE_UIC               = $$[QT_INSTALL_BINS]\uic.exe
    76 QMAKE_IDC               = $$[QT_INSTALL_BINS]\idc.exe
     73QMAKE_MOC               = $$[QT_INSTALL_BINS]\moc.exe
     74QMAKE_UIC               = $$[QT_INSTALL_BINS]\uic.exe
     75QMAKE_IDC               = $$[QT_INSTALL_BINS]\idc.exe
    7776
    7877QMAKE_IDL               = midl

  • trunk/mkspecs/common/wince/qplatformdefs.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
Note: See TracChangeset for help on using the changeset viewer.