diff options
| author | Anders Bakken <anders.bakken@nokia.com> | 2010-03-26 15:23:58 (GMT) |
|---|---|---|
| committer | Anders Bakken <anders.bakken@nokia.com> | 2010-03-26 15:25:36 (GMT) |
| commit | a8af0e05b30cc4ec26f58378cd5a4e11b20cf9bd (patch) | |
| tree | 5d29fcc7f4ac1564deb5dc248487c73cc1a09860 /src | |
| parent | 9ca30bd3ab50c48d0cddfa7265a3514d288845f4 (diff) | |
| download | Qt-a8af0e05b30cc4ec26f58378cd5a4e11b20cf9bd.zip Qt-a8af0e05b30cc4ec26f58378cd5a4e11b20cf9bd.tar.gz Qt-a8af0e05b30cc4ec26f58378cd5a4e11b20cf9bd.tar.bz2 | |
Fix linking error
The #include "moc_qgraphicswidget.cpp" is superfluous and caused these
link errors:
.obj/debug-shared-emb-x86_64/moc_qgraphicswidget.o:(.data.rel.ro+0x0): multiple definition of `QGraphicsWidget::staticMetaObject'
.obj/debug-shared-emb-x86_64/qgraphicswidget.o:(.data.rel.ro+0x0): first defined here
.obj/debug-shared-emb-x86_64/moc_qgraphicswidget.o: In function `QGraphicsWidget::metaObject() const':
Presumably this only happens when you have a stale moc file sitting
around but it's a bug none-the-less.
Reviewed-by: TrustMe
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/graphicsview/qgraphicswidget.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index a091347..131ee87 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -342,7 +342,7 @@ void QGraphicsWidget::resize(const QSizeF &size) A side effect of calling this function is that the widget will receive a move event and a resize event. Also, if the widget has a layout assigned, the layout will activate. - + \sa geometry(), resize() */ void QGraphicsWidget::setGeometry(const QRectF &rect) @@ -574,7 +574,7 @@ void QGraphicsWidget::getWindowFrameMargins(qreal *left, qreal *top, qreal *righ void QGraphicsWidget::unsetWindowFrameMargins() { Q_D(QGraphicsWidget); - if ((d->windowFlags & Qt::Window) && (d->windowFlags & Qt::WindowType_Mask) != Qt::Popup && + if ((d->windowFlags & Qt::Window) && (d->windowFlags & Qt::WindowType_Mask) != Qt::Popup && (d->windowFlags & Qt::WindowType_Mask) != Qt::ToolTip && !(d->windowFlags & Qt::FramelessWindowHint)) { QStyleOptionTitleBar bar; d->initStyleOptionTitleBar(&bar); @@ -1151,7 +1151,7 @@ bool QGraphicsWidget::sceneEvent(QEvent *event) Returns true if \a event has been recognized and processed; otherwise, returns false. - + \sa event() */ bool QGraphicsWidget::windowFrameEvent(QEvent *event) @@ -1208,7 +1208,7 @@ Qt::WindowFrameSection QGraphicsWidget::windowFrameSectionAt(const QPointF &pos) const QRectF r = windowFrameRect(); if (!r.contains(pos)) return Qt::NoSection; - + const qreal left = r.left(); const qreal top = r.top(); const qreal right = r.right(); @@ -2335,6 +2335,4 @@ void QGraphicsWidget::dumpFocusChain() QT_END_NAMESPACE -#include "moc_qgraphicswidget.cpp" - #endif //QT_NO_GRAPHICSVIEW |