diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-06 14:02:59 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-06 14:02:59 (GMT) |
| commit | 443a7b6f3eb1191b20240b5068da386d669045fc (patch) | |
| tree | 07afdc117ce952f61d325111b55e2796f2b0ee2c | |
| parent | b4264b12a51ecea93517a84f94c15f8e97b2f50f (diff) | |
| download | Qt-443a7b6f3eb1191b20240b5068da386d669045fc.zip Qt-443a7b6f3eb1191b20240b5068da386d669045fc.tar.gz Qt-443a7b6f3eb1191b20240b5068da386d669045fc.tar.bz2 | |
Fix warnings on MSVC
| -rw-r--r-- | src/corelib/kernel/qobject_p.h | 2 | ||||
| -rw-r--r-- | src/gui/dialogs/qcolordialog.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 056dee3..5d17bfd 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE class QVariant; class QThreadData; class QObjectConnectionListVector; -namespace QtSharedPointer { class ExternalRefCountData; } +namespace QtSharedPointer { struct ExternalRefCountData; } /* mirrored in QtTestLib, DON'T CHANGE without prior warning */ struct QSignalSpyCallbackSet diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp index aee592c..0357a7a 100644 --- a/src/gui/dialogs/qcolordialog.cpp +++ b/src/gui/dialogs/qcolordialog.cpp @@ -1836,8 +1836,8 @@ QRgb QColorDialog::getRgba(QRgb initial, bool *ok, QWidget *parent) QColorDialog::~QColorDialog() { - Q_D(QColorDialog); #if defined(Q_WS_MAC) + Q_D(QColorDialog); if (d->delegate) { d->releaseCocoaColorPanelDelegate(); QColorDialogPrivate::sharedColorPanelAvailable = true; |