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

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/network/access/qnetworkrequest.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])
     
    7979        HttpPipeliningAllowedAttribute,
    8080        HttpPipeliningWasUsedAttribute,
     81
     82
     83
     84
     85
     86
     87
     88
     89
    8190
    8291        User = 1000,
     
    8897        PreferCache,
    8998        AlwaysCache
     99
     100
     101
     102
     103
     104
     105
     106
     107
     108
    90109    };
    91110
     
    124143    QObject *originatingObject() const;
    125144
     145
     146
     147
    126148private:
    127149    QSharedDataPointer<QNetworkRequestPrivate> d;
Note: See TracChangeset for help on using the changeset viewer.