aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-09-17 14:57:02 +0200
committerJ-P Nurmi <jpnurmi@digia.com>2014-09-19 13:21:53 +0200
commitd0c58e6ad2fa188c96788575b13fede151ab98bd (patch)
tree76e7faccd5bbcf5e55743d4da5de08cf3f736ca6
parent3f1156ee5f6c49e4f8d7881e73760b936975e1b2 (diff)
Cleanup remaining QtQuick.Dialogs leftovers
QtQuick.Dialogs was moved to the qtquickcontrols module in Qt 5.3 Change-Id: I16d03dc1c342d396963c5bec3125b3d11d0d9bed Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--.gitignore1
-rw-r--r--src/quick/doc/qtquick.qdocconf4
2 files changed, 1 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 3995091983..b0854aab2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,7 +105,6 @@ tools/activeqt/testcon/testcon.tlb
translations/*.qm
translations/*_untranslated.ts
qrc_*.cpp
-src/imports/dialogs/dialogs.qrc
# Test generated files
QObject.log
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index b0d1f1e0de..d54e5feecb 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -62,9 +62,7 @@ headerdirs += ../../plugins
sourcedirs += ../../plugins
#exclude certain directories
-excludedirs += ../../imports/dialogs \
- ../../imports/models \
- ../../../examples/quick/dialogs
+excludedirs += ../../imports/models
examples.fileextensions += "*.qm"