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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/scripttools/debugging/qscriptbreakpointdata.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptbreakpointdata_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])

  • trunk/src/scripttools/debugging/qscriptbreakpointsmodel.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptbreakpointsmodel_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])

  • trunk/src/scripttools/debugging/qscriptbreakpointswidget.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptbreakpointswidget_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])

  • trunk/src/scripttools/debugging/qscriptbreakpointswidgetinterface.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptbreakpointswidgetinterface_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])

  • trunk/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_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])

  • trunk/src/scripttools/debugging/qscriptcompletionproviderinterface_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])

  • trunk/src/scripttools/debugging/qscriptcompletiontask.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptcompletiontask_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])

  • trunk/src/scripttools/debugging/qscriptcompletiontaskinterface.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptcompletiontaskinterface_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])

  • trunk/src/scripttools/debugging/qscriptcompletiontaskinterface_p_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])

  • trunk/src/scripttools/debugging/qscriptdebugger.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebugger_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])

  • trunk/src/scripttools/debugging/qscriptdebuggeragent.cpp

    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])
    … …  
    117117  Instructs the agent to perform a "step into" operation.  This
    118118  function returns immediately. The agent will report step completion
    119   at a later time, i.e. when script statements are evaluted.
     119  at a later time, i.e. when script statements are evaluted.
    120120*/
    121121void QScriptDebuggerAgent::enterStepIntoMode(int count)
    … …  
    130130  Instructs the agent to perform a "step over" operation.  This
    131131  function returns immediately. The agent will report step completion
    132   at a later time, i.e. when script statements are evaluted.
     132  at a later time, i.e. when script statements are evaluted.
    133133*/
    134134void QScriptDebuggerAgent::enterStepOverMode(int count)
    … …  
    147147  Instructs the agent to perform a "step out" operation.  This
    148148  function returns immediately. The agent will report step completion
    149   at a later time, i.e. when script statements are evaluted.
     149  at a later time, i.e. when script statements are evaluted.
    150150*/
    151151void QScriptDebuggerAgent::enterStepOutMode()

  • trunk/src/scripttools/debugging/qscriptdebuggeragent_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])

  • trunk/src/scripttools/debugging/qscriptdebuggeragent_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerbackend.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerbackend_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerbackend_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodefinderwidget_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodeview.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodeview_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodeviewinterface.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodeviewinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodewidget.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodewidget_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercommand.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggercommand_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggercommandexecutor_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercommandschedulerinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercommandschedulerjob.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_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])

  • trunk/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsole.cpp

    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])
    … …  
    4545#include "qscriptdebuggerscriptedconsolecommand_p.h"
    4646#include "qscriptmessagehandlerinterface_p.h"
     47
     48
     49
     50
    4751
    4852#include <QtCore/qdir.h>
    … …  
    5155#include <QtCore/qstringlist.h>
    5256#include <QtCore/qdebug.h>
     57
    5358#include <QtScript/qscriptengine.h>
    5459
     60
     61
     62
     63
     64
     65
     66
     67
     68
     69
     70
     71
     72
     73
    5574QT_BEGIN_NAMESPACE
     75
     76
     77
     78
     79
     80
     81
     82
     83
     84
     85
     86
     87
     88
     89
     90
     91
     92
     93
     94
     95
     96
     97
     98
     99
     100
     101
     102
     103
     104
     105
     106
     107
     108
     109
     110
     111
     112
     113
     114
     115
     116
     117
     118
     119
     120
     121
     122
     123
     124
     125
     126
     127
     128
     129
     130
     131
     132
     133
     134
     135
     136
     137
     138
     139
     140
     141
     142
     143
     144
     145
     146
     147
     148
     149
     150
     151
     152
     153
     154
     155
     156
     157
     158
     159
     160
     161
     162
     163
     164
     165
     166
     167
     168
     169
     170
     171
     172
     173
     174
     175
     176
     177
     178
     179
     180
     181
     182
     183
     184
     185
     186
     187
     188
     189
     190
     191
     192
     193
     194
     195
     196
     197
     198
     199
     200
     201
     202
     203
     204
     205
     206
     207
     208
     209
     210
     211
     212
     213
     214
     215
     216
     217
     218
     219
     220
     221
     222
     223
     224
     225
     226
     227
     228
     229
     230
     231
     232
     233
     234
     235
     236
     237
     238
     239
     240
     241
     242
     243
     244
     245
     246
     247
     248
     249
     250
     251
     252
     253
     254
     255
    56256
    57257/*!
    … …  
    77277        QScriptDebuggerCommandSchedulerInterface *commandScheduler);
    78278
     279
    79280    QScriptDebuggerConsoleCommandManager *commandManager;
    80281    QString commandPrefix;
    … …  
    100301    commandPrefix = QLatin1String(".");
    101302    commandManager = new QScriptDebuggerConsoleCommandManager();
     303
     304
     305
     306
     307
     308
     309
     310
     311
     312
     313
     314
     315
     316
     317
     318
     319
    102320}
    103321
    … …  
    105323{
    106324    delete commandManager;
     325
    107326}
    108327
    … …  
    127346        QScriptDebuggerScriptedConsoleCommand *command;
    128347        command = QScriptDebuggerScriptedConsoleCommand::parse(
    129             program, fileName, messageHandler);
     348            program, fileName, messageHandler);
    130349        if (!command)
    131350            continue;

  • trunk/src/scripttools/debugging/qscriptdebuggerconsole_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolecommand_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolecommand_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolecommandjob.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolehistorianinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolewidget_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerevent.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerevent_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])

  • trunk/src/scripttools/debugging/qscriptdebuggereventhandlerinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerfrontend.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerfrontend_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerfrontend_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerjob.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerjob_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerjob_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerjobschedulerinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp

    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])
    … …  
    5555#include <QtCore/qdebug.h>
    5656#include <QtCore/qcoreapplication.h>
     57
    5758#include <QtGui/qbrush.h>
    5859#include <QtGui/qfont.h>
    … …  
    371372        if (!m_index.isValid()) {
    372373            // nothing to do, the node has been removed
     374
    373375            return;
    374376        }
    … …  
    476478{
    477479public:
    478     InitModelJob(QScriptDebuggerLocalsModelPrivate *model,
     480    InitModelJob(QScriptDebuggerLocalsModel *model,
    479481                 int frameIndex,
    480482                 QScriptDebuggerCommandSchedulerInterface *scheduler)
    … …  
    485487    void start()
    486488    {
     489
     490
     491
     492
     493
    487494        QScriptDebuggerCommandSchedulerFrontend frontend(commandScheduler(), this);
    488495        frontend.scheduleGetScopeChain(m_frameIndex);
    … …  
    492499                        int)
    493500    {
     501
     502
     503
     504
     505
    494506        QScriptDebuggerCommandSchedulerFrontend frontend(commandScheduler(), this);
     507
    495508        switch (m_state) {
    496509        case 0: {
    … …  
    501514                if (i > 0)
    502515                    name.append(QString::fromLatin1(" (%0)").arg(i));
    503                 QModelIndex index = m_model->addTopLevelObject(name, scopeObject);
     516                QModelIndex index = m->addTopLevelObject(name, scopeObject);
    504517                if (i == 0)
    505                     m_model->emitScopeObjectAvailable(index);
     518                    m->emitScopeObjectAvailable(index);
    506519            }
    507520            frontend.scheduleGetThisObject(m_frameIndex);
    … …  
    510523        case 1: {
    511524            QScriptDebuggerValue thisObject = response.resultAsScriptValue();
    512             m_model->addTopLevelObject(QLatin1String("this"), thisObject);
     525            m->addTopLevelObject(QLatin1String("this"), thisObject);
    513526            finish();
    514527          } break;
    … …  
    517530
    518531private:
    519     QScriptDebuggerLocalsModelPrivate *m_model;
     532    Qm_model;
    520533    int m_frameIndex;
    521534    int m_state;
    … …  
    528541    Q_D(QScriptDebuggerLocalsModel);
    529542    d->frameIndex = frameIndex;
    530     QScriptDebuggerJob *job = new InitModelJob(d, frameIndex, d->commandScheduler);
     543    QScriptDebuggerJob *job = new InitModelJob(, frameIndex, d->commandScheduler);
    531544    d->jobScheduler->scheduleJob(job);
    532545}
    … …  
    537550{
    538551public:
    539     SyncModelJob(QScriptDebuggerLocalsModelPrivate *model,
     552    SyncModelJob(QScriptDebuggerLocalsModel *model,
    540553                 int frameIndex,
    541554                 QScriptDebuggerCommandSchedulerInterface *scheduler)
    … …  
    546559    void start()
    547560    {
     561
     562
     563
     564
     565
    548566        QScriptDebuggerCommandSchedulerFrontend frontend(commandScheduler(), this);
    549567        frontend.scheduleGetScopeChain(m_frameIndex);
    … …  
    553571                        int)
    554572    {
     573
     574
     575
     576
     577
    555578        QScriptDebuggerCommandSchedulerFrontend frontend(commandScheduler(), this);
    556579        switch (m_state) {
    … …  
    562585        }   break;
    563586        case 1: {
     587
    564588            QScriptDebuggerValue thisObject = response.resultAsScriptValue();
    565589            m_topLevelObjects.append(thisObject);
    566             bool equal = (m_topLevelObjects.size() == m_model->invisibleRootNode->children.size());
     590            bool equal = (m_topLevelObjects.size() == m->invisibleRootNode->children.size());
    567591            for (int i = 0; equal && (i < m_topLevelObjects.size()); ++i) {
    568592                const QScriptDebuggerValue &object = m_topLevelObjects.at(i);
    569                 equal = (object == m_model->invisibleRootNode->children.at(i)->property.value());
     593                equal = (object == m->invisibleRootNode->children.at(i)->property.value());
    570594            }
    571595            if (!equal) {
    … …  
    573597                // we could try to be more clever, i.e. figure out
    574598                // exactly which objects were popped/pushed
    575                 m_model->removeTopLevelNodes();
     599                m->removeTopLevelNodes();
    576600                for (int j = 0; j < m_topLevelObjects.size(); ++j) {
    577601                    const QScriptDebuggerValue &object = m_topLevelObjects.at(j);
    … …  
    584608                            name.append(QString::fromLatin1(" (%0)").arg(j));
    585609                    }
    586                     QModelIndex index = m_model->addTopLevelObject(name, object);
     610                    QModelIndex index = m->addTopLevelObject(name, object);
    587611                    if (j == 0)
    588                         m_model->emitScopeObjectAvailable(index);
     612                        m->emitScopeObjectAvailable(index);
    589613                }
    590614            } else {
    591                 m_model->syncTopLevelNodes();
     615                m->syncTopLevelNodes();
    592616            }
    593617            finish();
    … …  
    597621
    598622private:
    599     QScriptDebuggerLocalsModelPrivate *m_model;
     623    Qm_model;
    600624    int m_frameIndex;
    601625    int m_state;
    … …  
    609633    Q_D(QScriptDebuggerLocalsModel);
    610634    d->frameIndex = frameIndex;
    611     QScriptDebuggerJob *job = new SyncModelJob(d, frameIndex, d->commandScheduler);
     635    QScriptDebuggerJob *job = new SyncModelJob(, frameIndex, d->commandScheduler);
    612636    d->jobScheduler->scheduleJob(job);
    613637}
    … …  
    637661        if (!m_index.isValid()) {
    638662            // nothing to do, the node has been removed
     663
    639664            return;
    640665        }

  • trunk/src/scripttools/debugging/qscriptdebuggerlocalsmodel_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp

    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])
    … …  
    7171    bool hasChildren(const QModelIndex &parent) const
    7272    {
     73
     74
    7375        QModelIndex sourceParent = mapToSource(parent);
    7476        if (parent.isValid() && !sourceParent.isValid())
    … …  
    185187void QScriptDebuggerLocalsWidgetPrivate::_q_expandIndex(const QModelIndex &index)
    186188{
    187     view->expand(proxy->mapFromSource(index));
     189    if (view->model() == index.model())
     190        view->expand(proxy->mapFromSource(index));
    188191}
    189192

  • trunk/src/scripttools/debugging/qscriptdebuggerlocalswidget_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerobjectsnapshotdelta_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerresponse.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerresponse_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerresponsehandlerinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp

    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])
    … …  
    4747#include "qscriptdebuggerconsoleglobalobject_p.h"
    4848#include "qscriptdebuggerresponse_p.h"
    49 #include "qscriptdebuggervalue_p.h"
    50 #include "qscriptdebuggervalueproperty_p.h"
    5149#include "qscriptdebuggercommandschedulerinterface_p.h"
    5250
    … …  
    6058
    6159Q_DECLARE_METATYPE(QScriptDebuggerResponse)
    62 Q_DECLARE_METATYPE(QScriptBreakpointData)
    63 Q_DECLARE_METATYPE(QScriptBreakpointMap)
    64 Q_DECLARE_METATYPE(QScriptScriptData)
    65 Q_DECLARE_METATYPE(QScriptScriptMap)
    66 Q_DECLARE_METATYPE(QScriptContextInfo)
    67 Q_DECLARE_METATYPE(QScriptDebuggerValue)
    68 Q_DECLARE_METATYPE(QScriptDebuggerValueProperty)
    69 Q_DECLARE_METATYPE(QScriptDebuggerValuePropertyList)
    70 Q_DECLARE_METATYPE(QScriptDebuggerConsoleCommand*)
    71 Q_DECLARE_METATYPE(QScriptDebuggerConsoleCommandList)
    72 Q_DECLARE_METATYPE(QScriptDebuggerConsoleCommandGroupData)
    73 Q_DECLARE_METATYPE(QScriptDebuggerConsoleCommandGroupMap)
    7460
    7561QT_BEGIN_NAMESPACE
    76 
    77 static QScriptValue debuggerResponseToScriptValue(QScriptEngine *eng, const QScriptDebuggerResponse &in)
    78 {
    79     QScriptValue out = eng->newObject();
    80     out.setProperty(QString::fromLatin1("result"), qScriptValueFromValue(eng, in.result()));
    81     out.setProperty(QString::fromLatin1("error"), QScriptValue(eng, in.error()));
    82     out.setProperty(QString::fromLatin1("async"), QScriptValue(eng, in.async()));
    83     return out;
    84 }
    85 
    86 static void debuggerResponseFromScriptValue(const QScriptValue &, QScriptDebuggerResponse &)
    87 {
    88     Q_ASSERT(0);
    89 }
    90 
    91 static QScriptValue breakpointDataToScriptValue(QScriptEngine *eng, const QScriptBreakpointData &in)
    92 {
    93     QScriptValue out = eng->newObject();
    94     out.setProperty(QString::fromLatin1("scriptId"), QScriptValue(eng, qsreal(in.scriptId())));
    95     out.setProperty(QString::fromLatin1("fileName"), QScriptValue(eng, in.fileName()));
    96     out.setProperty(QString::fromLatin1("lineNumber"), QScriptValue(eng, in.lineNumber()));
    97     out.setProperty(QString::fromLatin1("enabled"), QScriptValue(eng, in.isEnabled()));
    98     out.setProperty(QString::fromLatin1("singleShot"), QScriptValue(eng, in.isSingleShot()));
    99     out.setProperty(QString::fromLatin1("ignoreCount"), QScriptValue(eng, in.ignoreCount()));
    100     out.setProperty(QString::fromLatin1("condition"), QScriptValue(eng, in.condition()));
    101     return out;
    102 }
    103 
    104 static void breakpointDataFromScriptValue(const QScriptValue &in, QScriptBreakpointData &out)
    105 {
    106     QScriptValue scriptId = in.property(QString::fromLatin1("scriptId"));
    107     if (scriptId.isValid())
    108         out.setScriptId((qint64)scriptId.toNumber());
    109     out.setFileName(in.property(QString::fromLatin1("fileName")).toString());
    110     out.setLineNumber(in.property(QString::fromLatin1("lineNumber")).toInt32());
    111     QScriptValue enabled = in.property(QString::fromLatin1("enabled"));
    112     if (enabled.isValid())
    113         out.setEnabled(enabled.toBoolean());
    114     QScriptValue singleShot = in.property(QString::fromLatin1("singleShot"));
    115     if (singleShot.isValid())
    116         out.setSingleShot(singleShot.toBoolean());
    117     out.setIgnoreCount(in.property(QString::fromLatin1("ignoreCount")).toInt32());
    118     out.setCondition(in.property(QString::fromLatin1("condition")).toString());
    119 }
    120 
    121 static QScriptValue breakpointMapToScriptValue(QScriptEngine *eng, const QScriptBreakpointMap &in)
    122 {
    123     QScriptValue out = eng->newObject();
    124     QScriptBreakpointMap::const_iterator it;
    125     for (it = in.constBegin(); it != in.constEnd(); ++it) {
    126         out.setProperty(QString::number(it.key()), qScriptValueFromValue(eng, it.value()));
    127     }
    128     return out;
    129 }
    130 
    131 static void breakpointMapFromScriptValue(const QScriptValue &, QScriptBreakpointMap &)
    132 {
    133     Q_ASSERT(0);
    134 }
    135 
    136 static QScriptValue scriptDataToScriptValue(QScriptEngine *eng, const QScriptScriptData &in)
    137 {
    138     QScriptValue out = eng->newObject();
    139     out.setProperty(QString::fromLatin1("contents"), QScriptValue(eng, in.contents()));
    140     out.setProperty(QString::fromLatin1("fileName"), QScriptValue(eng, in.fileName()));
    141     out.setProperty(QString::fromLatin1("baseLineNumber"), QScriptValue(eng, in.baseLineNumber()));
    142     return out;
    143 }
    144 
    145 static void scriptDataFromScriptValue(const QScriptValue &in, QScriptScriptData &out)
    146 {
    147     QString contents = in.property(QString::fromLatin1("contents")).toString();
    148     QString fileName = in.property(QString::fromLatin1("fileName")).toString();
    149     int baseLineNumber = in.property(QString::fromLatin1("baseLineNumber")).toInt32();
    150     QScriptScriptData tmp(contents, fileName, baseLineNumber);
    151     out = tmp;
    152 }
    153 
    154 static QScriptValue scriptMapToScriptValue(QScriptEngine *eng, const QScriptScriptMap &in)
    155 {
    156     QScriptValue out = eng->newObject();
    157     QScriptScriptMap::const_iterator it;
    158     for (it = in.constBegin(); it != in.constEnd(); ++it) {
    159         out.setProperty(QString::number(it.key()), qScriptValueFromValue(eng, it.value()));
    160     }
    161     return out;
    162 }
    163 
    164 static void scriptMapFromScriptValue(const QScriptValue &, QScriptScriptMap &)
    165 {
    166     Q_ASSERT(0);
    167 }
    168 
    169 static QScriptValue consoleCommandToScriptValue(
    170     QScriptEngine *eng, QScriptDebuggerConsoleCommand* const &in)
    171 {
    172     if (!in)
    173         return eng->undefinedValue();
    174     QScriptValue out = eng->newObject();
    175     out.setProperty(QString::fromLatin1("name"), QScriptValue(eng, in->name()));
    176     out.setProperty(QString::fromLatin1("group"), QScriptValue(eng, in->group()));
    177     out.setProperty(QString::fromLatin1("shortDescription"), QScriptValue(eng, in->shortDescription()));
    178     out.setProperty(QString::fromLatin1("longDescription"), QScriptValue(eng, in->longDescription()));
    179     out.setProperty(QString::fromLatin1("aliases"), qScriptValueFromValue(eng, in->aliases()));
    180     out.setProperty(QString::fromLatin1("seeAlso"), qScriptValueFromValue(eng, in->seeAlso()));
    181     return out;
    182 }
    183 
    184 static void consoleCommandFromScriptValue(
    185     const QScriptValue &, QScriptDebuggerConsoleCommand* &)
    186 {
    187     Q_ASSERT(0);
    188 }
    189 
    190 static QScriptValue consoleCommandGroupDataToScriptValue(
    191     QScriptEngine *eng, const QScriptDebuggerConsoleCommandGroupData &in)
    192 {
    193     QScriptValue out = eng->newObject();
    194     out.setProperty(QString::fromLatin1("longDescription"), QScriptValue(eng, in.longDescription()));
    195     out.setProperty(QString::fromLatin1("shortDescription"), QScriptValue(eng, in.shortDescription()));
    196     return out;
    197 }
    198 
    199 static void consoleCommandGroupDataFromScriptValue(
    200     const QScriptValue &, QScriptDebuggerConsoleCommandGroupData &)
    201 {
    202     Q_ASSERT(0);
    203 }
    204 
    205 static QScriptValue consoleCommandGroupMapToScriptValue(
    206     QScriptEngine *eng, const QScriptDebuggerConsoleCommandGroupMap &in)
    207 {
    208     QScriptValue out = eng->newObject();
    209     QScriptDebuggerConsoleCommandGroupMap::const_iterator it;
    210     for (it = in.constBegin(); it != in.constEnd(); ++it) {
    211         out.setProperty(it.key(), qScriptValueFromValue(eng, it.value()));
    212     }
    213     return out;
    214 }
    215 
    216 static void consoleCommandGroupMapFromScriptValue(
    217     const QScriptValue &, QScriptDebuggerConsoleCommandGroupMap &)
    218 {
    219     Q_ASSERT(0);
    220 }
    221 
    222 static QScriptValue contextInfoToScriptValue(QScriptEngine *eng, const QScriptContextInfo &in)
    223 {
    224     QScriptValue out = eng->newObject();
    225     out.setProperty(QString::fromLatin1("scriptId"), QScriptValue(eng, qsreal(in.scriptId())));
    226     out.setProperty(QString::fromLatin1("fileName"), QScriptValue(eng, in.fileName()));
    227     out.setProperty(QString::fromLatin1("lineNumber"), QScriptValue(eng, in.lineNumber()));
    228     out.setProperty(QString::fromLatin1("columnNumber"), QScriptValue(eng, in.columnNumber()));
    229     out.setProperty(QString::fromLatin1("functionName"), QScriptValue(eng, in.functionName()));
    230     return out;
    231 }
    232 
    233 static void contextInfoFromScriptValue(const QScriptValue &, QScriptContextInfo &)
    234 {
    235     Q_ASSERT(0);
    236 }
    237 
    238 static QScriptValue debuggerScriptValuePropertyToScriptValue(QScriptEngine *eng, const QScriptDebuggerValueProperty &in)
    239 {
    240     QScriptValue out = eng->newObject();
    241     out.setProperty(QString::fromLatin1("name"), QScriptValue(eng, in.name()));
    242     out.setProperty(QString::fromLatin1("value"), qScriptValueFromValue(eng, in.value()));
    243     out.setProperty(QString::fromLatin1("valueAsString"), QScriptValue(eng, in.valueAsString()));
    244     out.setProperty(QString::fromLatin1("flags"), QScriptValue(eng, static_cast<int>(in.flags())));
    245     return out;
    246 }
    247 
    248 static void debuggerScriptValuePropertyFromScriptValue(const QScriptValue &in, QScriptDebuggerValueProperty &out)
    249 {
    250     QString name = in.property(QString::fromLatin1("name")).toString();
    251     QScriptDebuggerValue value = qscriptvalue_cast<QScriptDebuggerValue>(in.property(QString::fromLatin1("value")));
    252     QString valueAsString = in.property(QString::fromLatin1("valueAsString")).toString();
    253     int flags = in.property(QString::fromLatin1("flags")).toInt32();
    254     QScriptDebuggerValueProperty tmp(name, value, valueAsString, QScriptValue::PropertyFlags(flags));
    255     out = tmp;
    256 }
    25762
    25863/*!
    … …  
    28085    QStringList argumentTypes;
    28186    QStringList subCommands;
    282     QScriptEngine *engine;
     87    QScript;
    28388    QScriptValue execFunction;
    28489    QScriptValue responseFunction;
    … …  
    28792QScriptDebuggerScriptedConsoleCommandPrivate::QScriptDebuggerScriptedConsoleCommandPrivate()
    28893{
    289     engine = 0;
    29094}
    29195
    29296QScriptDebuggerScriptedConsoleCommandPrivate::~QScriptDebuggerScriptedConsoleCommandPrivate()
    29397{
    294     delete engine;
    29598}
    29699
    … …  
    300103    const QStringList &aliases, const QStringList &seeAlso,
    301104    const QStringList &argumentTypes, const QStringList &subCommands,
     105
    302106    const QScriptValue &execFunction, const QScriptValue &responseFunction)
    303107    : QScriptDebuggerConsoleCommand(*new QScriptDebuggerScriptedConsoleCommandPrivate)
    … …  
    312116    d->argumentTypes = argumentTypes;
    313117    d->subCommands = subCommands;
     118
    314119    d->execFunction = execFunction;
    315120    d->responseFunction = responseFunction;
    316     d->engine = execFunction.engine();
    317 
    318     qScriptRegisterMetaType<QScriptBreakpointData>(d->engine, breakpointDataToScriptValue, breakpointDataFromScriptValue);
    319     qScriptRegisterMetaType<QScriptBreakpointMap>(d->engine, breakpointMapToScriptValue, breakpointMapFromScriptValue);
    320     qScriptRegisterMetaType<QScriptScriptData>(d->engine, scriptDataToScriptValue, scriptDataFromScriptValue);
    321     qScriptRegisterMetaType<QScriptScriptMap>(d->engine, scriptMapToScriptValue, scriptMapFromScriptValue);
    322     qScriptRegisterMetaType<QScriptContextInfo>(d->engine, contextInfoToScriptValue, contextInfoFromScriptValue);
    323     qScriptRegisterMetaType<QScriptDebuggerValueProperty>(d->engine, debuggerScriptValuePropertyToScriptValue, debuggerScriptValuePropertyFromScriptValue);
    324     qScriptRegisterSequenceMetaType<QScriptDebuggerValuePropertyList>(d->engine);
    325     qScriptRegisterMetaType<QScriptDebuggerResponse>(d->engine, debuggerResponseToScriptValue, debuggerResponseFromScriptValue);
    326     qScriptRegisterMetaType<QScriptDebuggerConsoleCommand*>(d->engine, consoleCommandToScriptValue, consoleCommandFromScriptValue);
    327     qScriptRegisterSequenceMetaType<QScriptDebuggerConsoleCommandList>(d->engine);
    328     qScriptRegisterMetaType<QScriptDebuggerConsoleCommandGroupData>(d->engine, consoleCommandGroupDataToScriptValue, consoleCommandGroupDataFromScriptValue);
    329     qScriptRegisterMetaType<QScriptDebuggerConsoleCommandGroupMap>(d->engine, consoleCommandGroupMapToScriptValue, consoleCommandGroupMapFromScriptValue);
    330 // ### can't do this, if it's an object ID the conversion will be incorrect since
    331 // ### the object ID refers to an object in a different engine!
    332 //    qScriptRegisterMetaType(d->engine, debuggerScriptValueToScriptValue, debuggerScriptValueFromScriptValue);
    333121}
    334122
    … …  
    406194{
    407195    Q_D(QScriptDebuggerScriptedConsoleCommandJob);
    408     QScriptEngine *engine = d->command->engine;
     196    QScriptEngine *engine = d->command->globalObject.engine();
     197    engine->setGlobalObject(d->command->globalObject);
    409198    QScriptValueList args;
    410199    for (int i = 0; i < d->arguments.size(); ++i)
    … …  
    436225    Q_D(QScriptDebuggerScriptedConsoleCommandJob);
    437226    // ### generalize
    438     QScriptEngine *engine = d->command->engine;
     227    QScriptEngine *engine = d->command->globalObject.engine();
     228    engine->setGlobalObject(d->command->globalObject);
    439229    QScriptValueList args;
    440230    args.append(qScriptValueFromValue(engine, response));
    441231    args.append(QScriptValue(engine, commandId));
    442232    QScriptDebuggerConsoleGlobalObject *global;
    443     global = qobject_cast<QScriptDebuggerConsoleGlobalObject*>(engine->globalObject().toQObject());
     233    global = qobject_cast<QScriptDebuggerConsoleGlobalObject*>(.toQObject());
    444234    Q_ASSERT(global != 0);
    445235    global->setScheduler(this);
    … …  
    552342QScriptDebuggerScriptedConsoleCommand *QScriptDebuggerScriptedConsoleCommand::parse(
    553343    const QString &program, const QString &fileName,
    554     QScriptMessageHandlerInterface *messageHandler)
    555 {
    556     QScriptEngine *engine = new QScriptEngine();
     344    QScriptEngine *engine, QScriptMessageHandlerInterface *messageHandler)
     345{
    557346    // create a custom global object
    558347    QScriptDebuggerConsoleGlobalObject *cppGlobal = new QScriptDebuggerConsoleGlobalObject();
    … …  
    575364        messageHandler->message(QtCriticalMsg, ret.toString(), fileName,
    576365                                engine->uncaughtExceptionLineNumber());
    577         delete engine;
    578366        return 0;
    579367    }
    … …  
    582370    if (!name.isString()) {
    583371        messageHandler->message(QtCriticalMsg, QLatin1String("command definition lacks a name"), fileName);
    584         delete engine;
    585372        return 0;
    586373    }
    … …  
    591378        messageHandler->message(QtCriticalMsg, QString::fromLatin1("definition of command \"%0\" lacks a group name")
    592379                                .arg(nameStr), fileName);
    593         delete engine;
    594380        return 0;
    595381    }
    … …  
    600386        messageHandler->message(QtCriticalMsg, QString::fromLatin1("definition of command \"%0\" lacks shortDescription")
    601387                                .arg(nameStr), fileName);
    602         delete engine;
    603388        return 0;
    604389    }
    … …  
    609394        messageHandler->message(QtCriticalMsg, QString::fromLatin1("definition of command \"%0\" lacks longDescription")
    610395                                .arg(nameStr), fileName);
    611         delete engine;
    612396        return 0;
    613397    }
    … …  
    630414        messageHandler->message(QtCriticalMsg, QString::fromLatin1("definition of command \"%0\" lacks execute() function")
    631415                                .arg(nameStr), fileName);
    632         delete engine;
    633416        return 0;
    634417    }
    … …  
    641424        aliases, seeAlso,
    642425        argTypes, subCommands,
    643         execFunction, responseFunction);
     426        execFunction, responseFunction);
    644427    return result;
    645428}

  • trunk/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_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])
    … …  
    5858QT_BEGIN_NAMESPACE
    5959
     60
    6061class QScriptValue;
    6162
    … …  
    7374                                          const QStringList &argumentTypes,
    7475                                          const QStringList &subCommands,
     76
    7577                                          const QScriptValue &execFunction,
    7678                                          const QScriptValue &responseFunction);
    … …  
    8082    static QScriptDebuggerScriptedConsoleCommand *parse(
    8183        const QString &program, const QString &fileName,
    82         QScriptMessageHandlerInterface *messageHandler);
     84        QScriptMessageHandlerInterface *messageHandler);
    8385
    8486    QString name() const;

  • trunk/src/scripttools/debugging/qscriptdebuggerscriptsmodel.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerscriptsmodel_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerscriptswidget_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerstackmodel_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerstackwidget_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory_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])

  • trunk/src/scripttools/debugging/qscriptdebuggervalue.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggervalue_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])

  • trunk/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebuggervalueproperty_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])

  • trunk/src/scripttools/debugging/qscriptdebuggerwidgetfactoryinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebugoutputwidget.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebugoutputwidget_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])

  • trunk/src/scripttools/debugging/qscriptdebugoutputwidgetinterface.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_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])

  • trunk/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_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])

  • trunk/src/scripttools/debugging/qscriptedit.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptedit_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])

  • trunk/src/scripttools/debugging/qscriptenginedebugger.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptenginedebugger.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])

  • trunk/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptenginedebuggerfrontend_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])

  • trunk/src/scripttools/debugging/qscripterrorlogwidget.cpp

    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])

  • trunk/src/scripttools/debugging/qscripterrorlogwidget_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])

  • trunk/src/scripttools/debugging/qscripterrorlogwidgetinterface.cpp

    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])

  • trunk/src/scripttools/debugging/qscripterrorlogwidgetinterface_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])

  • trunk/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_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])

  • trunk/src/scripttools/debugging/qscriptmessagehandlerinterface_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])

  • trunk/src/scripttools/debugging/qscriptobjectsnapshot.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptobjectsnapshot_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])

  • trunk/src/scripttools/debugging/qscriptscriptdata.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptscriptdata_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])

  • trunk/src/scripttools/debugging/qscriptstdmessagehandler.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptstdmessagehandler_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])

  • trunk/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptsyntaxhighlighter_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])

  • trunk/src/scripttools/debugging/qscripttooltipproviderinterface_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])

  • trunk/src/scripttools/debugging/qscriptvalueproperty.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptvalueproperty_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])

  • trunk/src/scripttools/debugging/qscriptxmlparser.cpp

    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])

  • trunk/src/scripttools/debugging/qscriptxmlparser_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])
Note: See TracChangeset for help on using the changeset viewer.