diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-07-02 08:49:13 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-07-02 09:00:27 +0300 |
commit | 7178b15207c7df560281f7cc42d090845e2b980a (patch) | |
tree | 50ba082a86431018cc2653f8af79b2b97d7c0518 /src/datavisualization | |
parent | 4e9ed2481a1960a2fc4a31ecd14d1904b76cad2e (diff) |
Removed common.pri
Common.pri was removed because it was misleadingly named.
Moved its contents to more logical places.
Change-Id: Ic400472c14f24f42c0a1d3c23786b1c05d6d2659
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Diffstat (limited to 'src/datavisualization')
-rw-r--r-- | src/datavisualization/axis/axis.pri | 2 | ||||
-rw-r--r-- | src/datavisualization/common.pri | 7 | ||||
-rw-r--r-- | src/datavisualization/data/data.pri | 2 | ||||
-rw-r--r-- | src/datavisualization/datavisualization.pro | 3 | ||||
-rw-r--r-- | src/datavisualization/engine/engine.pri | 2 | ||||
-rw-r--r-- | src/datavisualization/global/global.pri | 2 | ||||
-rw-r--r-- | src/datavisualization/input/input.pri | 2 | ||||
-rw-r--r-- | src/datavisualization/theme/theme.pri | 2 | ||||
-rw-r--r-- | src/datavisualization/utils/utils.pri | 2 |
9 files changed, 15 insertions, 9 deletions
diff --git a/src/datavisualization/axis/axis.pri b/src/datavisualization/axis/axis.pri index 0173b597..4c142c91 100644 --- a/src/datavisualization/axis/axis.pri +++ b/src/datavisualization/axis/axis.pri @@ -16,3 +16,5 @@ SOURCES += \ $$PWD/qcategory3daxis.cpp \ $$PWD/qvalue3daxisformatter.cpp \ $$PWD/qlogvalue3daxisformatter.cpp + +INCLUDEPATH += $$PWD diff --git a/src/datavisualization/common.pri b/src/datavisualization/common.pri deleted file mode 100644 index 9a497c2c..00000000 --- a/src/datavisualization/common.pri +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDEPATH += $$PWD/engine \ - $$PWD/global \ - $$PWD/utils \ - $$PWD/axis \ - $$PWD/data \ - $$PWD/input \ - $$PWD/theme diff --git a/src/datavisualization/data/data.pri b/src/datavisualization/data/data.pri index 73f398bf..37a8d084 100644 --- a/src/datavisualization/data/data.pri +++ b/src/datavisualization/data/data.pri @@ -70,3 +70,5 @@ SOURCES += \ $$PWD/customrenderitem.cpp \ $$PWD/qcustom3ditem.cpp \ $$PWD/qcustom3dlabel.cpp + +INCLUDEPATH += $$PWD diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro index 44f0f60c..692965b1 100644 --- a/src/datavisualization/datavisualization.pro +++ b/src/datavisualization/datavisualization.pro @@ -19,9 +19,8 @@ QMAKE_DOCS = $$PWD/doc/qtdatavisualization.qdocconf load(qt_module) -include($$PWD/common.pri) -include($$PWD/engine/engine.pri) include($$PWD/global/global.pri) +include($$PWD/engine/engine.pri) include($$PWD/utils/utils.pri) include($$PWD/theme/theme.pri) include($$PWD/axis/axis.pri) diff --git a/src/datavisualization/engine/engine.pri b/src/datavisualization/engine/engine.pri index 96fa7fa9..60703e96 100644 --- a/src/datavisualization/engine/engine.pri +++ b/src/datavisualization/engine/engine.pri @@ -57,3 +57,5 @@ SOURCES += $$PWD/qabstract3dgraph.cpp \ RESOURCES += engine/engine.qrc OTHER_FILES += $$PWD/meshes/* $$PWD/shaders/* + +INCLUDEPATH += $$PWD diff --git a/src/datavisualization/global/global.pri b/src/datavisualization/global/global.pri index 00a3eb65..a43ffb20 100644 --- a/src/datavisualization/global/global.pri +++ b/src/datavisualization/global/global.pri @@ -1,3 +1,5 @@ HEADERS += \ $$PWD/qdatavisualizationglobal.h \ $$PWD/datavisualizationglobal_p.h + +INCLUDEPATH += $$PWD diff --git a/src/datavisualization/input/input.pri b/src/datavisualization/input/input.pri index 5a4c4a76..f6b9fd6a 100644 --- a/src/datavisualization/input/input.pri +++ b/src/datavisualization/input/input.pri @@ -10,3 +10,5 @@ SOURCES += \ $$PWD/qabstract3dinputhandler.cpp \ $$PWD/q3dinputhandler.cpp \ $$PWD/qtouch3dinputhandler.cpp + +INCLUDEPATH += $$PWD diff --git a/src/datavisualization/theme/theme.pri b/src/datavisualization/theme/theme.pri index 1de3035a..cf7b434c 100644 --- a/src/datavisualization/theme/theme.pri +++ b/src/datavisualization/theme/theme.pri @@ -6,3 +6,5 @@ HEADERS += \ SOURCES += \ $$PWD/q3dtheme.cpp \ $$PWD/thememanager.cpp + +INCLUDEPATH += $$PWD diff --git a/src/datavisualization/utils/utils.pri b/src/datavisualization/utils/utils.pri index 30bfb156..904407b8 100644 --- a/src/datavisualization/utils/utils.pri +++ b/src/datavisualization/utils/utils.pri @@ -22,3 +22,5 @@ SOURCES += $$PWD/meshloader.cpp \ $$PWD/surfaceobject.cpp \ $$PWD/scatterobjectbufferhelper.cpp \ $$PWD/scatterpointbufferhelper.cpp + +INCLUDEPATH += $$PWD |