diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-27 09:55:28 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-29 16:00:13 (GMT) |
| commit | d0aa2b8422eea07823caef639a0970b8f2a1fde0 (patch) | |
| tree | 3bf052ab165883cab7a9529bdfa4a977f8f38d73 /src/corelib | |
| parent | c0c9940b371215eea294ae83ed6586a6414957ab (diff) | |
| download | Qt-d0aa2b8422eea07823caef639a0970b8f2a1fde0.zip Qt-d0aa2b8422eea07823caef639a0970b8f2a1fde0.tar.gz Qt-d0aa2b8422eea07823caef639a0970b8f2a1fde0.tar.bz2 | |
Fix PROXYMODEL
Reviewed-by: Trust Me
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qconfig-local.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/global/qconfig-local.h b/src/corelib/global/qconfig-local.h deleted file mode 100644 index b9a5090..0000000 --- a/src/corelib/global/qconfig-local.h +++ /dev/null @@ -1,3 +0,0 @@ -#ifndef QT_NO_TOOLBAR -# define QT_NO_TOOLBAR -#endif diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 455fead..3996180 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -872,7 +872,7 @@ #endif // QFileDialog -#if !defined(QT_NO_FILEDIALOG) && (defined(QT_NO_DIRMODEL) || defined(QT_NO_TREEVIEW) || defined(QT_NO_COMBOBOX) || defined(QT_NO_TOOLBUTTON) || defined(QT_NO_BUTTONGROUP) || defined(QT_NO_TOOLTIP) || defined(QT_NO_SPLITTER) || defined(QT_NO_STACKEDWIDGET)) +#if !defined(QT_NO_FILEDIALOG) && (defined(QT_NO_DIRMODEL) || defined(QT_NO_TREEVIEW) || defined(QT_NO_COMBOBOX) || defined(QT_NO_TOOLBUTTON) || defined(QT_NO_BUTTONGROUP) || defined(QT_NO_TOOLTIP) || defined(QT_NO_SPLITTER) || defined(QT_NO_STACKEDWIDGET) || defined(QT_NO_PROXYMODEL)) #define QT_NO_FILEDIALOG #endif diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index f2b5c20..543056f 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -604,7 +604,7 @@ SeeAlso: ??? Feature: FILEDIALOG Description: Supports a dialog widget for selecting files or directories. Section: Dialogs -Requires: DIRMODEL TREEVIEW COMBOBOX TOOLBUTTON BUTTONGROUP TOOLTIP SPLITTER STACKEDWIDGET +Requires: DIRMODEL TREEVIEW COMBOBOX TOOLBUTTON BUTTONGROUP TOOLTIP SPLITTER STACKEDWIDGET PROXYMODEL Name: QFileDialog SeeAlso: ??? |