From 9ea8acdf3ff8b7787e59de8c393e12a72b34ddc0 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Tue, 1 Mar 2016 09:34:38 -0800 Subject: Unbust the old debugger AFAICT the recent STL changes have introduced some QT conflicts. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1753813002 Review URL: https://codereview.chromium.org/1753813002 --- debugger/QT/SkCanvasWidget.cpp | 8 ++++---- debugger/QT/SkCanvasWidget.h | 4 ++-- debugger/QT/SkDebuggerGUI.cpp | 2 +- debugger/QT/SkDebuggerGUI.h | 4 ++-- debugger/QT/SkGLWidget.cpp | 2 +- debugger/QT/SkGLWidget.h | 2 +- debugger/QT/SkRasterWidget.cpp | 2 +- debugger/QT/SkRasterWidget.h | 10 +++++----- debugger/QT/SkSettingsWidget.h | 4 ++-- gyp/common.gypi | 1 + gyp/debugger.gyp | 2 +- 11 files changed, 21 insertions(+), 20 deletions(-) diff --git a/debugger/QT/SkCanvasWidget.cpp b/debugger/QT/SkCanvasWidget.cpp index 49b1526531..03ba33ac5f 100644 --- a/debugger/QT/SkCanvasWidget.cpp +++ b/debugger/QT/SkCanvasWidget.cpp @@ -55,7 +55,7 @@ void SkCanvasWidget::drawTo(int index) { #if SK_SUPPORT_GPU fGLWidget.updateImage(); #endif - emit commandChanged(fDebugger->index()); + Q_EMIT commandChanged(fDebugger->index()); } void SkCanvasWidget::mouseMoveEvent(QMouseEvent* event) { @@ -69,7 +69,7 @@ void SkCanvasWidget::mouseMoveEvent(QMouseEvent* event) { void SkCanvasWidget::mousePressEvent(QMouseEvent* event) { fPreviousPoint.set(event->globalX(), event->globalY()); - emit hitChanged(fDebugger->getCommandAtPoint(event->x(), event->y(), + Q_EMIT hitChanged(fDebugger->getCommandAtPoint(event->x(), event->y(), fDebugger->index())); } @@ -117,7 +117,7 @@ void SkCanvasWidget::snapWidgetTransform() { void SkCanvasWidget::resetWidgetTransform() { fUserMatrix.reset(); fDebugger->setUserMatrix(fUserMatrix); - emit scaleFactorChanged(fUserMatrix.getScaleX()); + Q_EMIT scaleFactorChanged(fUserMatrix.getScaleX()); drawTo(fDebugger->index()); } @@ -141,7 +141,7 @@ void SkCanvasWidget::setGLSampleCount(int sampleCount) void SkCanvasWidget::zoom(float scale, int px, int py) { fUserMatrix.postScale(scale, scale, px, py); - emit scaleFactorChanged(fUserMatrix.getScaleX()); + Q_EMIT scaleFactorChanged(fUserMatrix.getScaleX()); fDebugger->setUserMatrix(fUserMatrix); drawTo(fDebugger->index()); } diff --git a/debugger/QT/SkCanvasWidget.h b/debugger/QT/SkCanvasWidget.h index 330861342f..45ab0a4f03 100644 --- a/debugger/QT/SkCanvasWidget.h +++ b/debugger/QT/SkCanvasWidget.h @@ -49,14 +49,14 @@ public: kIn_ZoomCommand, kOut_ZoomCommand, }; -public slots: +public Q_SLOTS: /** * Zooms in or out (see ZoomCommandTypes) by the standard zoom factor * with the transformation centered in the middle of the widget. */ void zoom(int zoomCommand); -signals: +Q_SIGNALS: void scaleFactorChanged(float newScaleFactor); void commandChanged(int newCommand); void hitChanged(int hit); diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp index 0c369f6113..afb5c6dc5f 100644 --- a/debugger/QT/SkDebuggerGUI.cpp +++ b/debugger/QT/SkDebuggerGUI.cpp @@ -662,7 +662,7 @@ void SkDebuggerGUI::populateDirectoryWidget() { } // add any new files - foreach (QString f, files) { + Q_FOREACH (QString f, files) { if (f.contains(r) && fDirectoryWidget.findItems(f, Qt::MatchExactly).size() == 0) { fDirectoryWidget.addItem(f); } diff --git a/debugger/QT/SkDebuggerGUI.h b/debugger/QT/SkDebuggerGUI.h index 9f00efaa9e..871f7974b2 100644 --- a/debugger/QT/SkDebuggerGUI.h +++ b/debugger/QT/SkDebuggerGUI.h @@ -64,10 +64,10 @@ public: */ void openFile(const QString& filename); -signals: +Q_SIGNALS: void commandChanged(int command); -private slots: +private Q_SLOTS: /** Toggles breakpoint view in the list widget. */ diff --git a/debugger/QT/SkGLWidget.cpp b/debugger/QT/SkGLWidget.cpp index 55bf963b1a..dd78db57f3 100644 --- a/debugger/QT/SkGLWidget.cpp +++ b/debugger/QT/SkGLWidget.cpp @@ -79,7 +79,7 @@ void SkGLWidget::paintGL() { fDebugger->draw(fCanvas.get()); // TODO(chudy): Implement an optional flush button in Gui. fCanvas->flush(); - emit drawComplete(); + Q_EMIT drawComplete(); } } diff --git a/debugger/QT/SkGLWidget.h b/debugger/QT/SkGLWidget.h index baef126138..28cbcffd7c 100644 --- a/debugger/QT/SkGLWidget.h +++ b/debugger/QT/SkGLWidget.h @@ -35,7 +35,7 @@ public: } void setSampleCount(int sampleCount); -signals: +Q_SIGNALS: void drawComplete(); protected: diff --git a/debugger/QT/SkRasterWidget.cpp b/debugger/QT/SkRasterWidget.cpp index 203d98ee4e..b5ef492ca7 100644 --- a/debugger/QT/SkRasterWidget.cpp +++ b/debugger/QT/SkRasterWidget.cpp @@ -45,7 +45,7 @@ void SkRasterWidget::paintEvent(QPaintEvent* event) { fDebugger->draw(fSurface->getCanvas()); fSurface->getCanvas()->flush(); fNeedImageUpdate = false; - emit drawComplete(); + Q_EMIT drawComplete(); } SkImageInfo info; diff --git a/debugger/QT/SkRasterWidget.h b/debugger/QT/SkRasterWidget.h index 09b529c049..d3ddaa24b3 100644 --- a/debugger/QT/SkRasterWidget.h +++ b/debugger/QT/SkRasterWidget.h @@ -1,11 +1,11 @@ + /* - * SkRasterWidget.h + * Copyright 2016 Google Inc. * - * Created on: Jul 28, 2012 - * Author: chudy + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ - #ifndef SKRASTERWIDGET_H_ #define SKRASTERWIDGET_H_ @@ -22,7 +22,7 @@ public: void updateImage(); -signals: +Q_SIGNALS: void drawComplete(); protected: diff --git a/debugger/QT/SkSettingsWidget.h b/debugger/QT/SkSettingsWidget.h index 012abc0d12..dec938e650 100644 --- a/debugger/QT/SkSettingsWidget.h +++ b/debugger/QT/SkSettingsWidget.h @@ -81,9 +81,9 @@ public: return fPathOpsCheckBox.isChecked(); } -private slots: +private Q_SLOTS: -signals: +Q_SIGNALS: void visualizationsChanged(); void texFilterSettingsChanged(); #if SK_SUPPORT_GPU diff --git a/gyp/common.gypi b/gyp/common.gypi index 9e53b0650f..8cf061db19 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -15,6 +15,7 @@ 'SK_INTERNAL', 'SK_GAMMA_SRGB', 'SK_GAMMA_APPLY_TO_A8', + 'QT_NO_KEYWORDS', # 'SK_USE_DISCARDABLE_SCALEDIMAGECACHE', # TODO(reed): Re-enable when tests don't crash with this. ], diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp index cac7d5add1..d6b97a782b 100644 --- a/gyp/debugger.gyp +++ b/gyp/debugger.gyp @@ -53,7 +53,7 @@ [ 'skia_os == "win"', { 'variables': { # This is the default location for the version of Qt current on 10/11/12 - 'qt_sdk%': 'C:/Qt/4.8.3/', + 'qt_sdk%': 'C:/Qt/4.8.6/', }, 'qt_sdk': '<(qt_sdk)', 'qt_moc%': '<(qt_sdk)/bin/moc', -- cgit v1.2.3