diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-18 13:02:53 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-18 13:06:43 (GMT) |
| commit | e59d974ddf2f2a413611ba4d8594c6413499a645 (patch) | |
| tree | f3179b0c2d918fcdd02943da2be231bae6977703 /src/qt3support/dialogs/q3filedialog.h | |
| parent | 1a96fe7943fa691499432fe17dfe1ee294695c9e (diff) | |
| download | Qt-e59d974ddf2f2a413611ba4d8594c6413499a645.zip Qt-e59d974ddf2f2a413611ba4d8594c6413499a645.tar.gz Qt-e59d974ddf2f2a413611ba4d8594c6413499a645.tar.bz2 | |
Compile with mixed carbon/cocoa universal builds.
Moc got confused when Q3FileDialog was there
in the carbon build but not in the cocoa build.
(QT_MAC_USE_COCOA is defined by macros which moc
does not evaluate)
Fix this by porting Q3FileDialog to cocoa by using
the compat functions in QFileDialog.
revby:Prasanth Ullattil
Diffstat (limited to 'src/qt3support/dialogs/q3filedialog.h')
| -rw-r--r-- | src/qt3support/dialogs/q3filedialog.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/qt3support/dialogs/q3filedialog.h b/src/qt3support/dialogs/q3filedialog.h index 8644b4c..f6a7950 100644 --- a/src/qt3support/dialogs/q3filedialog.h +++ b/src/qt3support/dialogs/q3filedialog.h @@ -69,8 +69,6 @@ class QUrlInfo; #ifndef QT_NO_FILEDIALOG -#ifndef QT_MAC_USE_COCOA - class Q_COMPAT_EXPORT Q3FileIconProvider : public QObject { Q_OBJECT @@ -339,8 +337,6 @@ private: #endif }; -#endif // QT_MAC_USE_COCOA - #endif // QT_NO_FILEDIALOG QT_END_NAMESPACE |