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/script/api/qscriptprogram_p.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])
     
    3838#include <QtCore/qobjectdefs.h>
    3939
     40
     41
    4042namespace JSC
    4143{
     
    6062    JSC::EvalExecutable *executable(JSC::ExecState *exec,
    6163                                    QScriptEnginePrivate *engine);
     64
    6265
    6366    QBasicAtomicInt ref;
     
    6871
    6972    QScriptEnginePrivate *engine;
    70     JSC::EvalExecutable *_executable;
     73    _executable;
    7174    intptr_t sourceId;
    7275    bool isCompiled;
Note: See TracChangeset for help on using the changeset viewer.