summaryrefslogtreecommitdiffstats
path: root/src/logic
diff options
context:
space:
mode:
Diffstat (limited to 'src/logic')
-rw-r--r--src/logic/executor.cpp3
-rw-r--r--src/logic/logic.pri23
-rw-r--r--src/logic/logic.pro13
-rw-r--r--src/logic/qlogicaspect.cpp3
4 files changed, 4 insertions, 38 deletions
diff --git a/src/logic/executor.cpp b/src/logic/executor.cpp
index d43cc77cc..ba9af0da5 100644
--- a/src/logic/executor.cpp
+++ b/src/logic/executor.cpp
@@ -11,11 +11,12 @@
QT_BEGIN_NAMESPACE
-using namespace Qt3DCore;
namespace Qt3DLogic {
namespace Logic {
+using namespace Qt3DCore;
+
Executor::Executor(QObject *parent)
: QObject(parent)
, m_scene(nullptr)
diff --git a/src/logic/logic.pri b/src/logic/logic.pri
deleted file mode 100644
index 619f99329..000000000
--- a/src/logic/logic.pri
+++ /dev/null
@@ -1,23 +0,0 @@
-INCLUDEPATH += $$PWD
-
-HEADERS += \
- $$PWD/qt3dlogic_global.h \
- $$PWD/qlogicaspect.h \
- $$PWD/qlogicaspect_p.h \
- $$PWD/qframeaction.h \
- $$PWD/handle_types_p.h \
- $$PWD/qframeaction_p.h \
- $$PWD/callbackjob_p.h \
- $$PWD/executor_p.h \
- $$PWD/handler_p.h \
- $$PWD/manager_p.h \
- $$PWD/managers_p.h \
- $$PWD/job_common_p.h
-
-SOURCES += \
- $$PWD/qlogicaspect.cpp \
- $$PWD/qframeaction.cpp \
- $$PWD/manager.cpp \
- $$PWD/handler.cpp \
- $$PWD/executor.cpp \
- $$PWD/callbackjob.cpp
diff --git a/src/logic/logic.pro b/src/logic/logic.pro
deleted file mode 100644
index 0fa0f8d55..000000000
--- a/src/logic/logic.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TARGET = Qt3DLogic
-MODULE = 3dlogic
-
-QT = core-private gui-private 3dcore 3dcore-private
-
-gcov {
- QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
- QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
-}
-
-include(logic.pri)
-
-load(qt_module)
diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp
index 2fa783620..c12a0fbdc 100644
--- a/src/logic/qlogicaspect.cpp
+++ b/src/logic/qlogicaspect.cpp
@@ -19,10 +19,11 @@
QT_BEGIN_NAMESPACE
-using namespace Qt3DCore;
namespace Qt3DLogic {
+using namespace Qt3DCore;
+
/*!
\class Qt3DLogic::QLogicAspect
\inherits Qt3DCore::QAbstractAspect