diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-26 08:56:13 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-26 08:56:13 (GMT) |
| commit | 36d6dc5666b102d8401daa01243b4736203f8848 (patch) | |
| tree | ef9207337aaeb90d6c9c3dd37e32a76406a994f7 | |
| parent | 386c9f0cc7234169dd128aa0b54be99fa38ef694 (diff) | |
| download | Qt-36d6dc5666b102d8401daa01243b4736203f8848.zip Qt-36d6dc5666b102d8401daa01243b4736203f8848.tar.gz Qt-36d6dc5666b102d8401daa01243b4736203f8848.tar.bz2 | |
Fix bad merges
| -rw-r--r-- | src/gui/graphicsview/qgraphicsview_p.h | 7 | ||||
| -rw-r--r-- | src/network/kernel/qauthenticator.cpp | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/gui/graphicsview/qgraphicsview_p.h b/src/gui/graphicsview/qgraphicsview_p.h index 5682138..8c62f73 100644 --- a/src/gui/graphicsview/qgraphicsview_p.h +++ b/src/gui/graphicsview/qgraphicsview_p.h @@ -178,13 +178,6 @@ public: QList<QGraphicsItem *> findItems(const QRegion &exposedRegion, bool *allItems) const; - void generateStyleOptions(const QList<QGraphicsItem *> &itemList, - QGraphicsItem **itemArray, - QStyleOptionGraphicsItem *styleOptionArray, - const QTransform &worldTransform, - bool allItems, - const QRegion &exposedRegion) const; - QPointF mapToScene(const QPointF &point) const; QRectF mapToScene(const QRectF &rect) const; static void translateTouchEvent(QGraphicsViewPrivate *d, QTouchEvent *touchEvent); diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index fed0c4d..a26a1fc 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -#include <../../3rdparty/des/des.cpp> +#include "../../3rdparty/des/des.cpp" static QByteArray qNtlmPhase1(); static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phase2data); |