diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-21 14:42:46 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-21 14:42:46 +0200 |
| commit | 7b3b6b5afaaf1db1bfbfa9b56fa7b955a61344bd (patch) | |
| tree | 8be0d601853d021434e03cef9a9cfd64b3708e92 /src/corelib/global/qglobal.cpp | |
| parent | 070fc2f694beaa56fc191f1a3f6a1b9812f4ed35 (diff) | |
| parent | 56defa4725508608a85e2813b85af3a7fcefefa0 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
examples/opengl/cube/main.cpp
examples/widgets/applicationicon/main.cpp
examples/widgets/orientation/main.cpp
src/gui/image/qicon.cpp
src/gui/image/qimage.h
src/gui/image/qpixmap.h
src/gui/image/qpixmap_mac.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qpalette.cpp
src/gui/kernel/qwidget.cpp
src/gui/styles/qmacstyle_mac.mm
src/gui/widgets/qmenubar.cpp
src/gui/widgets/qslider.cpp
src/opengl/qwindowsurface_gl.cpp
tests/auto/qvariant/qvariant.pro
tests/benchmarks/corelib/kernel/qobject/qobject.pro
tests/benchmarks/gui/animation/qanimation/qanimation.pro
tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro
tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
tests/benchmarks/gui/image/qimagereader/qimagereader.pro
tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
tests/benchmarks/gui/kernel/qapplication/qapplication.pro
tests/benchmarks/gui/kernel/qwidget/qwidget.pro
tests/benchmarks/gui/painting/qpainter/qpainter.pro
tests/benchmarks/gui/painting/qtbench/qtbench.pro
tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
tests/benchmarks/gui/text/qtext/qtext.pro
Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 120 |
1 files changed, 0 insertions, 120 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index bbc9a15e74..a59cbf9382 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -833,126 +833,6 @@ QT_BEGIN_NAMESPACE */ /*! - \typedef Q_INT8 - \relates <QtGlobal> - \compat - - Use \l qint8 instead. -*/ - -/*! - \typedef Q_UINT8 - \relates <QtGlobal> - \compat - - Use \l quint8 instead. -*/ - -/*! - \typedef Q_INT16 - \relates <QtGlobal> - \compat - - Use \l qint16 instead. -*/ - -/*! - \typedef Q_UINT16 - \relates <QtGlobal> - \compat - - Use \l quint16 instead. -*/ - -/*! - \typedef Q_INT32 - \relates <QtGlobal> - \compat - - Use \l qint32 instead. -*/ - -/*! - \typedef Q_UINT32 - \relates <QtGlobal> - \compat - - Use \l quint32 instead. -*/ - -/*! - \typedef Q_INT64 - \relates <QtGlobal> - \compat - - Use \l qint64 instead. -*/ - -/*! - \typedef Q_UINT64 - \relates <QtGlobal> - \compat - - Use \l quint64 instead. -*/ - -/*! - \typedef Q_LLONG - \relates <QtGlobal> - \compat - - Use \l qint64 instead. -*/ - -/*! - \typedef Q_ULLONG - \relates <QtGlobal> - \compat - - Use \l quint64 instead. -*/ - -/*! - \typedef Q_LONG - \relates <QtGlobal> - \compat - - Use \c{void *} instead. -*/ - -/*! - \typedef Q_ULONG - \relates <QtGlobal> - \compat - - Use \c{void *} instead. -*/ - -/*! \fn bool qSysInfo(int *wordSize, bool *bigEndian) - \relates <QtGlobal> - - Use QSysInfo::WordSize and QSysInfo::ByteOrder instead. -*/ - -/*! - \fn bool qt_winUnicode() - \relates <QtGlobal> - - This function always returns true. - - \sa QSysInfo -*/ - -/*! - \fn int qWinVersion() - \relates <QtGlobal> - - Use QSysInfo::WindowsVersion instead. - - \sa QSysInfo -*/ - -/*! \fn int qMacVersion() \relates <QtGlobal> |