summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/qtreeview-dnd
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-12 09:42:00 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-12 09:42:00 (GMT)
commit10a0134c5a3b40d3fc5e6d43a753eca62c008166 (patch)
treed4c191e9e25505c2b083bc0eefc3f571f9d4f9c5 /doc/src/snippets/qtreeview-dnd
parentbf71ab63e805e49e59fbe25265104a414ab7d039 (diff)
parent2efba0002d26b584c771aa9260e6d699e5ff8da3 (diff)
downloadQt-10a0134c5a3b40d3fc5e6d43a753eca62c008166.zip
Qt-10a0134c5a3b40d3fc5e6d43a753eca62c008166.tar.gz
Qt-10a0134c5a3b40d3fc5e6d43a753eca62c008166.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (73 commits) doc: update snippets for QtScript function expressions Prevent a crash when creating an inputContext from the QApplication dtor. QNAM HTTP Code: Cache socket state inside ensureConnection() tst_qhttpnetworkconnection: Test also HEAD in some tests tst_qhttpnetworkconnection: Relax condition in getMultipleWithPriorities QNAM HTTP Code: When starting new request, prefer connected sockets. typo fix Added the 'framecapture' WebKit example to the default build. Fix code example fix typo in qreadwritelock's documentation QNAM HTTP: Don't call d_func() so often QNAM HTTP: Fix readBuffer maximum size. QNAM HTTP: Optimize eatWhitespace() QNAM HTTP: Check if socket already tries to connect. network internals: fix build on S60 [syncqt] Make -separate-module work with WebKit's directory structure doc: Corrected explanation of when append() does nothing. doc: Added clarification about allocating space for the 0 terminator. Add a way to access the normalised URL in QUrl. [syncqt] Make it possible to synchronize headers for a separate module ...
Diffstat (limited to 'doc/src/snippets/qtreeview-dnd')
-rw-r--r--doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp4
-rw-r--r--doc/src/snippets/qtreeview-dnd/dragdropmodel.h4
-rw-r--r--doc/src/snippets/qtreeview-dnd/main.cpp2
-rw-r--r--doc/src/snippets/qtreeview-dnd/mainwindow.cpp2
-rw-r--r--doc/src/snippets/qtreeview-dnd/mainwindow.h2
-rw-r--r--doc/src/snippets/qtreeview-dnd/treeitem.cpp2
-rw-r--r--doc/src/snippets/qtreeview-dnd/treeitem.h2
-rw-r--r--doc/src/snippets/qtreeview-dnd/treemodel.cpp2
-rw-r--r--doc/src/snippets/qtreeview-dnd/treemodel.h2
9 files changed, 11 insertions, 11 deletions
diff --git a/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp b/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp
index 35447be..3dd5cec 100644
--- a/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp
+++ b/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -41,7 +41,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/doc/src/snippets/qtreeview-dnd/dragdropmodel.h b/doc/src/snippets/qtreeview-dnd/dragdropmodel.h
index 6376d97..adeccff 100644
--- a/doc/src/snippets/qtreeview-dnd/dragdropmodel.h
+++ b/doc/src/snippets/qtreeview-dnd/dragdropmodel.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -41,7 +41,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/doc/src/snippets/qtreeview-dnd/main.cpp b/doc/src/snippets/qtreeview-dnd/main.cpp
index c32f8c8..f11fd88 100644
--- a/doc/src/snippets/qtreeview-dnd/main.cpp
+++ b/doc/src/snippets/qtreeview-dnd/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/doc/src/snippets/qtreeview-dnd/mainwindow.cpp b/doc/src/snippets/qtreeview-dnd/mainwindow.cpp
index 42baad9..9712ef1 100644
--- a/doc/src/snippets/qtreeview-dnd/mainwindow.cpp
+++ b/doc/src/snippets/qtreeview-dnd/mainwindow.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/doc/src/snippets/qtreeview-dnd/mainwindow.h b/doc/src/snippets/qtreeview-dnd/mainwindow.h
index bf876fe..43bd34f 100644
--- a/doc/src/snippets/qtreeview-dnd/mainwindow.h
+++ b/doc/src/snippets/qtreeview-dnd/mainwindow.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/doc/src/snippets/qtreeview-dnd/treeitem.cpp b/doc/src/snippets/qtreeview-dnd/treeitem.cpp
index 2be0d4a..840e82e 100644
--- a/doc/src/snippets/qtreeview-dnd/treeitem.cpp
+++ b/doc/src/snippets/qtreeview-dnd/treeitem.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/doc/src/snippets/qtreeview-dnd/treeitem.h b/doc/src/snippets/qtreeview-dnd/treeitem.h
index d506501..a7e562c 100644
--- a/doc/src/snippets/qtreeview-dnd/treeitem.h
+++ b/doc/src/snippets/qtreeview-dnd/treeitem.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/doc/src/snippets/qtreeview-dnd/treemodel.cpp b/doc/src/snippets/qtreeview-dnd/treemodel.cpp
index 92ffebe..5043f21 100644
--- a/doc/src/snippets/qtreeview-dnd/treemodel.cpp
+++ b/doc/src/snippets/qtreeview-dnd/treemodel.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/doc/src/snippets/qtreeview-dnd/treemodel.h b/doc/src/snippets/qtreeview-dnd/treemodel.h
index 03399e8..6f19e9e 100644
--- a/doc/src/snippets/qtreeview-dnd/treemodel.h
+++ b/doc/src/snippets/qtreeview-dnd/treemodel.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**