diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-20 19:31:18 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-20 19:31:19 +0200 |
| commit | 36c025a8d66b244b6017746b415881ef1814b1e2 (patch) | |
| tree | 419c55a80f161e3882a3060cbcf0762d7a151841 /examples | |
| parent | d55f2b1fb9c910bc118f75967a0e6273f8aa98d1 (diff) | |
| parent | 8e8bd90e4445415df7b7f516444e594d3e678c1a (diff) | |
Merge 5.7 into 5.7.0
Change-Id: I416c79d9afde98efc9e78b3a74e17dfbb2409602
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro | 3 | ||||
| -rw-r--r-- | examples/widgets/itemviews/dirview/main.cpp | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro b/examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro index 3788632c30..806e9cbd14 100644 --- a/examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro +++ b/examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro @@ -11,3 +11,6 @@ SOURCES += \ HEADERS += \ mimetypemodel.h \ mainwindow.h + +target.path = $$[QT_INSTALL_EXAMPLES]/corelib/mimetypes/mimetypebrowser +INSTALLS += target diff --git a/examples/widgets/itemviews/dirview/main.cpp b/examples/widgets/itemviews/dirview/main.cpp index cff65e52df..eefea657f6 100644 --- a/examples/widgets/itemviews/dirview/main.cpp +++ b/examples/widgets/itemviews/dirview/main.cpp @@ -51,6 +51,7 @@ #include <QApplication> #include <QDesktopWidget> #include <QFileSystemModel> +#include <QFileIconProvider> #include <QTreeView> #include <QCommandLineParser> #include <QCommandLineOption> @@ -64,6 +65,8 @@ int main(int argc, char *argv[]) parser.setApplicationDescription("Qt Dir View Example"); parser.addHelpOption(); parser.addVersionOption(); + QCommandLineOption dontUseCustomDirectoryIconsOption("c", "Set QFileIconProvider::DontUseCustomDirectoryIcons"); + parser.addOption(dontUseCustomDirectoryIconsOption); parser.addPositionalArgument("directory", "The directory to start in."); parser.process(app); const QString rootPath = parser.positionalArguments().isEmpty() @@ -71,6 +74,8 @@ int main(int argc, char *argv[]) QFileSystemModel model; model.setRootPath(""); + if (parser.isSet(dontUseCustomDirectoryIconsOption)) + model.iconProvider()->setOptions(QFileIconProvider::DontUseCustomDirectoryIcons); QTreeView tree; tree.setModel(&model); if (!rootPath.isEmpty()) { |