Changeset 844 for branches/vendor/nokia/qt/current/demos/mainwindow

Timestamp:

May 3, 2011, 4:49:08 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

vendor: Imported qt-everywhere-opensource-src-4.7.2 from Nokia (excluding doc/html and doc/qch dirs generated from doc/src, and imports and templates dirs which are emtpy).

Location:

branches/vendor/nokia/qt/current/demos/mainwindow

Files:

• colorswatch.cpp (modified) (1 diff)
• colorswatch.h (modified) (1 diff)
• main.cpp (modified) (1 diff)
• mainwindow.cpp (modified) (4 diffs)
• mainwindow.h (modified) (1 diff)
• toolbar.cpp (modified) (1 diff)
• toolbar.h (modified) (1 diff)

branches/vendor/nokia/qt/current/demos/mainwindow/colorswatch.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/demos/mainwindow/colorswatch.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/demos/mainwindow/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/demos/mainwindow/mainwindow.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -82 +82 @@
     ;
 
+
+
 MainWindow::MainWindow(const QMap<QString, QSize> &customSizeHints,
                         QWidget *parent, Qt::WindowFlags flags)
@@ -275 +277 @@
 void MainWindow::setupDockWidgets(const QMap<QString, QSize> &customSizeHints)
 {
+
+
     mapper = new QSignalMapper(this);
     connect(mapper, SIGNAL(mapped(int)), this, SLOT(setCorner(int)));
@@ -330 +334 @@
             swatch->setTitleBarWidget(titlebar);
             connect(swatch, SIGNAL(topLevelChanged(bool)), titlebar, SLOT(updateMask()));
-            connect(swatch, SIGNAL(featuresChanged(QDockWidget::DockWidgetFeatures)), titlebar, SLOT(updateMask()));
+            connect(swatch, SIGNAL(featuresChanged(QDockWidget::DockWidgetFeatures)), titlebar, SLOT(updateMask()));
 
 #ifdef Q_WS_QWS

branches/vendor/nokia/qt/current/demos/mainwindow/mainwindow.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/demos/mainwindow/toolbar.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/demos/mainwindow/toolbar.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])