From 36d6dc5666b102d8401daa01243b4736203f8848 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Fri, 26 Jun 2009 10:56:13 +0200 Subject: Fix bad merges --- src/gui/graphicsview/qgraphicsview_p.h | 7 ------- src/network/kernel/qauthenticator.cpp | 2 +- 2 files changed, 1 insertion(+), 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 findItems(const QRegion &exposedRegion, bool *allItems) const; - void generateStyleOptions(const QList &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); -- cgit v0.12