summaryrefslogtreecommitdiff
path: root/src/declarative/debugger/qdeclarativedebugtrace_p.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2012-10-15 15:58:44 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-17 17:18:22 +0200
commit79fed8757e26f946745eec9d8bba8b91aeb1a742 (patch)
tree2bf779aff001b7e9675f52ccb270a0041de06b62 /src/declarative/debugger/qdeclarativedebugtrace_p.h
parent049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0 (diff)
downloadqtquick1-79fed8757e26f946745eec9d8bba8b91aeb1a742.tar.gz
Rename the QtQuick1 module back to QtDeclarative
Matches the name that this code used to have in Qt 4. - Adapt library, change import path to 'QtDeclarative'. - Update the tests and examples to match the new library name. - Rename qtquick1global{_p}.h to qtdeclarativeglobal.h. - Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like it was in Qt 4 and matching the library name again. This also changes the include guards in qtdeclarativeglobal{,_p}.h. - Fix occurrence of quick_debug in tools/qml/qml.pro. Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/declarative/debugger/qdeclarativedebugtrace_p.h')
-rw-r--r--src/declarative/debugger/qdeclarativedebugtrace_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h
index dfd478b0..d505f6d4 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace_p.h
+++ b/src/declarative/debugger/qdeclarativedebugtrace_p.h
@@ -42,7 +42,7 @@
#ifndef QDECLARATIVEDEBUGTRACE_P_H
#define QDECLARATIVEDEBUGTRACE_P_H
-#include "qtquick1global.h"
+#include "qtdeclarativeglobal.h"
#include <private/qdeclarativedebugservice_p.h>
#include <private/qperformancetimer_p.h>
@@ -65,7 +65,7 @@ struct QDeclarativeDebugData
};
class QUrl;
-class Q_QUICK1_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugService
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugService
{
public:
enum Message {