aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--debugger/QT/moc_4.6.2_SkCanvasWidget.cpp (renamed from debugger/QT/moc_SkCanvasWidget.cpp)0
-rw-r--r--debugger/QT/moc_4.6.2_SkDebuggerGUI.cpp (renamed from debugger/QT/moc_SkDebuggerGUI.cpp)0
-rw-r--r--debugger/QT/moc_4.6.2_SkGLWidget.cpp (renamed from debugger/QT/moc_SkGLWidget.cpp)0
-rw-r--r--debugger/QT/moc_4.6.2_SkInspectorWidget.cpp (renamed from debugger/QT/moc_SkInspectorWidget.cpp)0
-rw-r--r--debugger/QT/moc_4.6.2_SkRasterWidget.cpp (renamed from debugger/QT/moc_SkRasterWidget.cpp)0
-rw-r--r--debugger/QT/moc_4.6.2_SkSettingsWidget.cpp (renamed from debugger/QT/moc_SkSettingsWidget.cpp)0
-rw-r--r--debugger/QT/moc_SkQtWidget.cpp69
-rw-r--r--gyp/debugger.gyp12
8 files changed, 6 insertions, 75 deletions
diff --git a/debugger/QT/moc_SkCanvasWidget.cpp b/debugger/QT/moc_4.6.2_SkCanvasWidget.cpp
index 8164def960..8164def960 100644
--- a/debugger/QT/moc_SkCanvasWidget.cpp
+++ b/debugger/QT/moc_4.6.2_SkCanvasWidget.cpp
diff --git a/debugger/QT/moc_SkDebuggerGUI.cpp b/debugger/QT/moc_4.6.2_SkDebuggerGUI.cpp
index b78b39aeaf..b78b39aeaf 100644
--- a/debugger/QT/moc_SkDebuggerGUI.cpp
+++ b/debugger/QT/moc_4.6.2_SkDebuggerGUI.cpp
diff --git a/debugger/QT/moc_SkGLWidget.cpp b/debugger/QT/moc_4.6.2_SkGLWidget.cpp
index 9d09c268a8..9d09c268a8 100644
--- a/debugger/QT/moc_SkGLWidget.cpp
+++ b/debugger/QT/moc_4.6.2_SkGLWidget.cpp
diff --git a/debugger/QT/moc_SkInspectorWidget.cpp b/debugger/QT/moc_4.6.2_SkInspectorWidget.cpp
index d75946a637..d75946a637 100644
--- a/debugger/QT/moc_SkInspectorWidget.cpp
+++ b/debugger/QT/moc_4.6.2_SkInspectorWidget.cpp
diff --git a/debugger/QT/moc_SkRasterWidget.cpp b/debugger/QT/moc_4.6.2_SkRasterWidget.cpp
index 82a803a62e..82a803a62e 100644
--- a/debugger/QT/moc_SkRasterWidget.cpp
+++ b/debugger/QT/moc_4.6.2_SkRasterWidget.cpp
diff --git a/debugger/QT/moc_SkSettingsWidget.cpp b/debugger/QT/moc_4.6.2_SkSettingsWidget.cpp
index d2822ce334..d2822ce334 100644
--- a/debugger/QT/moc_SkSettingsWidget.cpp
+++ b/debugger/QT/moc_4.6.2_SkSettingsWidget.cpp
diff --git a/debugger/QT/moc_SkQtWidget.cpp b/debugger/QT/moc_SkQtWidget.cpp
deleted file mode 100644
index dcaeb790b5..0000000000
--- a/debugger/QT/moc_SkQtWidget.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-** Meta object code from reading C++ file 'SkQtWidget.h'
-**
-** Created: Tue Jun 26 16:43:31 2012
-** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
-**
-** WARNING! All changes made in this file will be lost!
-*****************************************************************************/
-
-#include "SkQtWidget.h"
-#if !defined(Q_MOC_OUTPUT_REVISION)
-#error "The header file 'SkQtWidget.h' doesn't include <QObject>."
-#elif Q_MOC_OUTPUT_REVISION != 62
-#error "This file was generated using the moc from 4.6.2. It"
-#error "cannot be used with the include files from this version of Qt."
-#error "(The moc has changed too much.)"
-#endif
-
-QT_BEGIN_MOC_NAMESPACE
-static const uint qt_meta_data_SkQtWidget[] = {
-
- // content:
- 4, // revision
- 0, // classname
- 0, 0, // classinfo
- 0, 0, // methods
- 0, 0, // properties
- 0, 0, // enums/sets
- 0, 0, // constructors
- 0, // flags
- 0, // signalCount
-
- 0 // eod
-};
-
-static const char qt_meta_stringdata_SkQtWidget[] = {
- "SkQtWidget\0"
-};
-
-const QMetaObject SkQtWidget::staticMetaObject = {
- { &QWidget::staticMetaObject, qt_meta_stringdata_SkQtWidget,
- qt_meta_data_SkQtWidget, 0 }
-};
-
-#ifdef Q_NO_DATA_RELOCATION
-const QMetaObject &SkQtWidget::getStaticMetaObject() { return staticMetaObject; }
-#endif //Q_NO_DATA_RELOCATION
-
-const QMetaObject *SkQtWidget::metaObject() const
-{
- return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
-}
-
-void *SkQtWidget::qt_metacast(const char *_clname)
-{
- if (!_clname) return 0;
- if (!strcmp(_clname, qt_meta_stringdata_SkQtWidget))
- return static_cast<void*>(const_cast< SkQtWidget*>(this));
- return QWidget::qt_metacast(_clname);
-}
-
-int SkQtWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
-{
- _id = QWidget::qt_metacall(_c, _id, _a);
- if (_id < 0)
- return _id;
- return _id;
-}
-QT_END_MOC_NAMESPACE
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp
index d3cf6743e9..3c721236e3 100644
--- a/gyp/debugger.gyp
+++ b/gyp/debugger.gyp
@@ -16,12 +16,12 @@
'../debugger/SkDebugger.cpp',
'../debugger/SkDrawCommand.h',
'../debugger/SkDrawCommand.cpp',
- '../debugger/QT/moc_SkCanvasWidget.cpp',
- '../debugger/QT/moc_SkDebuggerGUI.cpp',
- '../debugger/QT/moc_SkInspectorWidget.cpp',
- '../debugger/QT/moc_SkSettingsWidget.cpp',
- '../debugger/QT/moc_SkRasterWidget.cpp',
- '../debugger/QT/moc_SkGLWidget.cpp',
+ '../debugger/QT/moc_4.6.2_SkCanvasWidget.cpp',
+ '../debugger/QT/moc_4.6.2_SkDebuggerGUI.cpp',
+ '../debugger/QT/moc_4.6.2_SkInspectorWidget.cpp',
+ '../debugger/QT/moc_4.6.2_SkSettingsWidget.cpp',
+ '../debugger/QT/moc_4.6.2_SkRasterWidget.cpp',
+ '../debugger/QT/moc_4.6.2_SkGLWidget.cpp',
'../debugger/QT/SkDebuggerGUI.cpp',
'../debugger/QT/SkDebuggerGUI.h',
'../debugger/QT/SkCanvasWidget.cpp',