summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativepackage_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-12 03:18:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-12 03:18:17 (GMT)
commited45391e2d846d030b2ebb98c083ffe97f52b2df (patch)
tree8d2735ed4109483f05e6bfbe4fbb03cd84fc5157 /src/declarative/util/qdeclarativepackage_p.h
parenta653056f806a3410b4aa76df78fae736d4f93791 (diff)
parent1628df4ab8f46d23a5c733b1b4f4de47f0691b9a (diff)
downloadQt-ed45391e2d846d030b2ebb98c083ffe97f52b2df.zip
Qt-ed45391e2d846d030b2ebb98c083ffe97f52b2df.tar.gz
Qt-ed45391e2d846d030b2ebb98c083ffe97f52b2df.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (53 commits) ListView.onRemove animation is not played when the list has only one item. Move listview/itemlist.qml to a separate visualitemmodel example Make snapping work properly for highlight ranges > item size Fix test - sizeHint should not change after initial load. Also use Minor doc fixes Doc improvements, including snippet fixes, linking to examples, making Fix qmlviewer test failure on windows Do not keep flush timer running once no pixmaps are detached. Avoid recursive refill() in List/GridView Make snippet compile and pass license test, and add missing snippet file Remove accidentaly added characters. Update on color change. Update on color change. Add go button to webbrowser example. Remove 'XXX Experimental' from VisualItemModel/VisualDataModel and Document attached properties Add 'on' prefix to documentation of signals Stablize qmlviewer test Improve test stability. qmlviewer: ensure that only clicks on the current file list are handled. ...
Diffstat (limited to 'src/declarative/util/qdeclarativepackage_p.h')
-rw-r--r--src/declarative/util/qdeclarativepackage_p.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/declarative/util/qdeclarativepackage_p.h b/src/declarative/util/qdeclarativepackage_p.h
index 57d9c22..6b12ef7 100644
--- a/src/declarative/util/qdeclarativepackage_p.h
+++ b/src/declarative/util/qdeclarativepackage_p.h
@@ -50,12 +50,6 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
-/*****************************************************************************
- *****************************************************************************
- XXX Experimental
- *****************************************************************************
-*****************************************************************************/
-
class QDeclarativePackagePrivate;
class QDeclarativePackageAttached;
class Q_AUTOTEST_EXPORT QDeclarativePackage : public QObject