aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2016-07-25 17:21:06 +0200
committerUlf Hermann <ulf.hermann@qt.io>2016-07-27 16:01:57 +0000
commit3934ae38cd22f202508555014bca015ea8c7bf2e (patch)
tree186956c170823387bdfc148dbc549d6202d23d5b
parentc809e56591862a874a347745e829a05e9036130a (diff)
Remove some dead code
Change-Id: I1fa95d3c91e7f3ad5f2bf8f9d732ef72b74a98c8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/qml/qml/qqmlobjectcreator_p.h1
-rw-r--r--src/quick/util/qquickprofiler_p.h5
2 files changed, 0 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h
index 2320edf809..4aa3f634ed 100644
--- a/src/qml/qml/qqmlobjectcreator_p.h
+++ b/src/qml/qml/qqmlobjectcreator_p.h
@@ -65,7 +65,6 @@ QT_BEGIN_NAMESPACE
class QQmlAbstractBinding;
struct QQmlTypeCompiler;
class QQmlInstantiationInterrupt;
-struct QQmlVmeProfiler;
struct QQmlObjectCreatorSharedState : public QSharedData
{
diff --git a/src/quick/util/qquickprofiler_p.h b/src/quick/util/qquickprofiler_p.h
index f1af87f4e6..54d734a1c2 100644
--- a/src/quick/util/qquickprofiler_p.h
+++ b/src/quick/util/qquickprofiler_p.h
@@ -319,12 +319,7 @@ public:
qint64 timestamp() { return m_timer.nsecsElapsed(); }
-
static quint64 featuresEnabled;
- static bool profilingSceneGraph()
- {
- return featuresEnabled & (1 << QQuickProfiler::ProfileSceneGraph);
- }
static void initialize(QObject *parent);