diff options
| author | Morten Sorvig <msorvig@trolltech.com> | 2009-09-10 09:53:31 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2009-09-10 09:53:31 (GMT) |
| commit | 106d7a210be1e6d52946b575a262e2c76c5e51e6 (patch) | |
| tree | 7fee1ec1c5616fcc19bba71a3cfe08222b62cd88 /src/qt3support/dialogs | |
| parent | 199ef040b29953a1f0ca694b1430564571e744fe (diff) | |
| download | Qt-106d7a210be1e6d52946b575a262e2c76c5e51e6.zip Qt-106d7a210be1e6d52946b575a262e2c76c5e51e6.tar.gz Qt-106d7a210be1e6d52946b575a262e2c76c5e51e6.tar.bz2 | |
Enable Qt3Support for Qt/Cocoa on Mac OS X.
Qt on Mac OS X should not be the only desktop platform
without Qt3Support once the Carpon port is dropped. This
will also make the switch from Carbon to Cocoa-based Qt
as smooth as possible.
This is a minimal port, with some code removed:
Q3FileDialog is gone.
Q3MainWindow won't get the "hide toolbar" button.
Q3ScrollView might to more updates than structly neccesary.
The rest is there, including the QT3_SUPPORT functions
in QtCore and QtGui.
Diffstat (limited to 'src/qt3support/dialogs')
| -rw-r--r-- | src/qt3support/dialogs/q3filedialog.cpp | 5 | ||||
| -rw-r--r-- | src/qt3support/dialogs/q3filedialog.h | 4 | ||||
| -rw-r--r-- | src/qt3support/dialogs/q3filedialog_mac.cpp | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/qt3support/dialogs/q3filedialog.cpp b/src/qt3support/dialogs/q3filedialog.cpp index 66ace5d..c14ff5c 100644 --- a/src/qt3support/dialogs/q3filedialog.cpp +++ b/src/qt3support/dialogs/q3filedialog.cpp @@ -116,6 +116,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_MAC_USE_COCOA + /* XPM */ static const char * const start_xpm[]={ "16 15 8 1", @@ -6051,7 +6053,8 @@ Q3FilePreview::Q3FilePreview() function to provide file previewing. */ - +#endif // QT_MAC_USE_COCOA + QT_END_NAMESPACE #include "moc_q3filedialog.cpp" diff --git a/src/qt3support/dialogs/q3filedialog.h b/src/qt3support/dialogs/q3filedialog.h index f6a7950..8644b4c 100644 --- a/src/qt3support/dialogs/q3filedialog.h +++ b/src/qt3support/dialogs/q3filedialog.h @@ -69,6 +69,8 @@ class QUrlInfo; #ifndef QT_NO_FILEDIALOG +#ifndef QT_MAC_USE_COCOA + class Q_COMPAT_EXPORT Q3FileIconProvider : public QObject { Q_OBJECT @@ -337,6 +339,8 @@ private: #endif }; +#endif // QT_MAC_USE_COCOA + #endif // QT_NO_FILEDIALOG QT_END_NAMESPACE diff --git a/src/qt3support/dialogs/q3filedialog_mac.cpp b/src/qt3support/dialogs/q3filedialog_mac.cpp index a36274dd..585fa8f 100644 --- a/src/qt3support/dialogs/q3filedialog_mac.cpp +++ b/src/qt3support/dialogs/q3filedialog_mac.cpp @@ -60,6 +60,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_MAC_USE_COCOA + /***************************************************************************** Externals *****************************************************************************/ @@ -564,6 +566,8 @@ QString Q3FileDialog::macGetSaveFileName(const QString &start, const QString &fi return retstr; } +#endif // QT_MAC_USE_COCOA + QT_END_NAMESPACE #endif |