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:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/tools/designer/src/components/lib/lib.pro

    r561 r846  
    4040
    4141INCLUDEPATH += . .. \
    42     $$QT_SOURCE_TREE/tools/designer/src/lib/components \
    43     $$QT_SOURCE_TREE/tools/designer/src/lib/sdk \
    44     $$QT_SOURCE_TREE/tools/designer/src/lib/extension \
    45     $$QT_SOURCE_TREE/tools/designer/src/lib/uilib \
    46     $$QT_SOURCE_TREE/tools/designer/src/lib/shared
     42    $$PWD/../../lib/components \
     43    $$PWD/../../lib/sdk \
     44    $$PWD/../../lib/extension \
     45    $$PWD/../../lib/uilib \
     46    $$PWD/../../lib/shared
    4747
    4848include(../propertyeditor/propertyeditor.pri)

  • trunk/tools/designer/src/components/lib/lib_pch.h

    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/tools/designer/src/components/lib/qdesigner_components.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.