diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-11 10:35:53 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-11 10:35:53 (GMT) |
| commit | a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc (patch) | |
| tree | 55a19156916f0668770edcec8a479609963d1779 /src/gui/dialogs | |
| parent | 540092f4cc35238c258bb6422912d3eb18b26f33 (diff) | |
| parent | 5299240db14579960358edeebfc72fcef905af13 (diff) | |
| download | Qt-a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc.zip Qt-a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc.tar.gz Qt-a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc.tar.bz2 | |
Merge branch '4.5'
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qfiledialog.cpp | 1 | ||||
| -rw-r--r-- | src/gui/dialogs/qfiledialog_p.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 044aa43..903cd74 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -2142,7 +2142,6 @@ void QFileDialogPrivate::createWidgets() #ifndef QT_NO_COMPLETER completer = new QFSCompletor(model, q); qFileDialogUi->fileNameEdit->setCompleter(completer); - completer->sourceModel = model; QObject::connect(qFileDialogUi->fileNameEdit, SIGNAL(textChanged(QString)), q, SLOT(_q_autoCompleteFileName(QString))); #endif // QT_NO_COMPLETER diff --git a/src/gui/dialogs/qfiledialog_p.h b/src/gui/dialogs/qfiledialog_p.h index dc24390..ab4199e 100644 --- a/src/gui/dialogs/qfiledialog_p.h +++ b/src/gui/dialogs/qfiledialog_p.h @@ -97,7 +97,7 @@ class Ui_QFileDialog; */ class QFSCompletor : public QCompleter { public: - QFSCompletor(QAbstractItemModel *model, QObject *parent = 0) : QCompleter(model, parent), proxyModel(0), sourceModel(0) + QFSCompletor(QFileSystemModel *model, QObject *parent = 0) : QCompleter(model, parent), proxyModel(0), sourceModel(model) { #ifdef Q_OS_WIN setCaseSensitivity(Qt::CaseInsensitive); |