Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the QtSCriptTools module of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
     
    5050#include <QtGui/qboxlayout.h>
    5151#include <QtGui/qstackedwidget.h>
    52 #include <QtGui/qtooltip.h>
    5352
    5453QT_BEGIN_NAMESPACE
     
    198197    const QPoint &pos, int lineNumber, const QStringList &path)
    199198{
    200     QString tip = toolTipProvider->toolTip(/*frameIndex=*/-1, lineNumber, path);
    201     if (tip.indexOf(QLatin1Char('\n')) != -1) {
    202         QStringList lines = tip.split(QLatin1Char('\n'));
    203         int lineCount = lines.size();
    204         if (lineCount > 5) {
    205             lines = lines.mid(0, 5);
    206             lines.append(QString::fromLatin1("(... %0 more lines ...)").arg(lineCount - 5));
    207         }
    208         tip = lines.join(QLatin1String("\n"));
    209     }
    210     QToolTip::showText(pos, tip);
     199    toolTipProvider->showToolTip(pos, /*frameIndex=*/-1, lineNumber, path);
    211200}
    212201
Note: See TracChangeset for help on using the changeset viewer.