Ignore:
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/examples/sql/drilldown/view.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 examples 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**
     
    6464    logo->setPos(30, 515);
    6565
     66
    6667    setMinimumSize(470, 620);
    6768    setMaximumSize(470, 620);
    68     setWindowTitle(tr("Offices World Wide"));
     69#else
     70    setDragMode(QGraphicsView::ScrollHandDrag);
     71#endif
     72
     73   setWindowTitle(tr("Offices World Wide"));
    6974}
    7075//! [1]
     
    127132        window->activateWindow();
    128133    } else if (window && !window->isVisible()) {
     134
    129135        window->show();
     136
     137
     138
    130139    } else {
    131140        InformationWindow *window;
    132141        window = new InformationWindow(id, officeTable, this);
    133142
    134         connect(window, SIGNAL(imageChanged(int, QString)),
    135                 this, SLOT(updateImage(int, QString)));
     143        connect(window, SIGNAL(imageChanged(int,QString)),
     144                this, SLOT(updateImage(int,QString)));
    136145
     146
    137147        window->move(pos() + QPoint(20, 40));
    138148        window->show();
     149
     150
     151
    139152        informationWindows.append(window);
    140153    }
Note: See TracChangeset for help on using the changeset viewer.