diff options
author | Andy Nichols <andy.nichols@digia.com> | 2014-09-01 16:49:58 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-09-02 13:45:44 +0300 |
commit | ba0d8e93d8525bb459e9b6cb384f2fe0701d5a02 (patch) | |
tree | 8239423e74a36f24e00c9624d289c143b6824489 | |
parent | f013631527b3cc569527e9541c11b0f12c420473 (diff) |
Reformat project to be a Qt Module
Change-Id: I2fe8df530a687247a9cd7ea12c1d8de79fef506e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r-- | .qmake.conf | 3 | ||||
-rw-r--r-- | scenegraph-raster.pro | 1 | ||||
-rw-r--r-- | software-backend.pro | 3 | ||||
-rw-r--r-- | src/plugins/plugins.pro | 2 | ||||
-rw-r--r-- | src/plugins/scenegraph/scenegraph.pro | 2 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/context.cpp (renamed from softwarecontext/context.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/context.h (renamed from softwarecontext/context.h) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/glyphnode.cpp (renamed from softwarecontext/glyphnode.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/glyphnode.h (renamed from softwarecontext/glyphnode.h) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/imagenode.cpp (renamed from softwarecontext/imagenode.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/imagenode.h (renamed from softwarecontext/imagenode.h) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/ninepatchnode.cpp (renamed from softwarecontext/ninepatchnode.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/ninepatchnode.h (renamed from softwarecontext/ninepatchnode.h) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/painternode.cpp (renamed from softwarecontext/painternode.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/painternode.h (renamed from softwarecontext/painternode.h) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/pixmaptexture.cpp (renamed from softwarecontext/pixmaptexture.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/pixmaptexture.h (renamed from softwarecontext/pixmaptexture.h) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/pluginmain.cpp (renamed from softwarecontext/pluginmain.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/pluginmain.h (renamed from softwarecontext/pluginmain.h) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/rectanglenode.cpp (renamed from softwarecontext/rectanglenode.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/rectanglenode.h (renamed from softwarecontext/rectanglenode.h) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp (renamed from softwarecontext/renderingvisitor.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/renderingvisitor.h (renamed from softwarecontext/renderingvisitor.h) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/renderloop.cpp (renamed from softwarecontext/renderloop.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/renderloop.h (renamed from softwarecontext/renderloop.h) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/softwarecontext.json (renamed from softwarecontext/softwarecontext.json) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/softwarecontext.pro (renamed from softwarecontext/softwarecontext.pro) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/softwarelayer.cpp (renamed from softwarecontext/softwarelayer.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/softwarelayer.h (renamed from softwarecontext/softwarelayer.h) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp (renamed from softwarecontext/threadedrenderloop.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/threadedrenderloop.h (renamed from softwarecontext/threadedrenderloop.h) | 0 | ||||
-rw-r--r-- | src/src.pro | 2 | ||||
-rw-r--r-- | sync.profile | 13 |
33 files changed, 23 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf new file mode 100644 index 0000000..e28797d --- /dev/null +++ b/.qmake.conf @@ -0,0 +1,3 @@ +load(qt_build_config) + +MODULE_VERSION = 5.4.0 diff --git a/scenegraph-raster.pro b/scenegraph-raster.pro new file mode 100644 index 0000000..58c33f2 --- /dev/null +++ b/scenegraph-raster.pro @@ -0,0 +1 @@ +load(qt_parts) diff --git a/software-backend.pro b/software-backend.pro deleted file mode 100644 index 90289dd..0000000 --- a/software-backend.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE=subdirs -SUBDIRS=softwarecontext - diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro new file mode 100644 index 0000000..e0aabc4 --- /dev/null +++ b/src/plugins/plugins.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS += scenegraph diff --git a/src/plugins/scenegraph/scenegraph.pro b/src/plugins/scenegraph/scenegraph.pro new file mode 100644 index 0000000..807b687 --- /dev/null +++ b/src/plugins/scenegraph/scenegraph.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS += softwarecontext diff --git a/softwarecontext/context.cpp b/src/plugins/scenegraph/softwarecontext/context.cpp index 33dc7e8..33dc7e8 100644 --- a/softwarecontext/context.cpp +++ b/src/plugins/scenegraph/softwarecontext/context.cpp diff --git a/softwarecontext/context.h b/src/plugins/scenegraph/softwarecontext/context.h index 88fe4e4..88fe4e4 100644 --- a/softwarecontext/context.h +++ b/src/plugins/scenegraph/softwarecontext/context.h diff --git a/softwarecontext/glyphnode.cpp b/src/plugins/scenegraph/softwarecontext/glyphnode.cpp index eae8b62..eae8b62 100644 --- a/softwarecontext/glyphnode.cpp +++ b/src/plugins/scenegraph/softwarecontext/glyphnode.cpp diff --git a/softwarecontext/glyphnode.h b/src/plugins/scenegraph/softwarecontext/glyphnode.h index d34013b..d34013b 100644 --- a/softwarecontext/glyphnode.h +++ b/src/plugins/scenegraph/softwarecontext/glyphnode.h diff --git a/softwarecontext/imagenode.cpp b/src/plugins/scenegraph/softwarecontext/imagenode.cpp index 7718831..7718831 100644 --- a/softwarecontext/imagenode.cpp +++ b/src/plugins/scenegraph/softwarecontext/imagenode.cpp diff --git a/softwarecontext/imagenode.h b/src/plugins/scenegraph/softwarecontext/imagenode.h index a0c059a..a0c059a 100644 --- a/softwarecontext/imagenode.h +++ b/src/plugins/scenegraph/softwarecontext/imagenode.h diff --git a/softwarecontext/ninepatchnode.cpp b/src/plugins/scenegraph/softwarecontext/ninepatchnode.cpp index ab503b7..ab503b7 100644 --- a/softwarecontext/ninepatchnode.cpp +++ b/src/plugins/scenegraph/softwarecontext/ninepatchnode.cpp diff --git a/softwarecontext/ninepatchnode.h b/src/plugins/scenegraph/softwarecontext/ninepatchnode.h index 2bcd121..2bcd121 100644 --- a/softwarecontext/ninepatchnode.h +++ b/src/plugins/scenegraph/softwarecontext/ninepatchnode.h diff --git a/softwarecontext/painternode.cpp b/src/plugins/scenegraph/softwarecontext/painternode.cpp index bf5ec5f..bf5ec5f 100644 --- a/softwarecontext/painternode.cpp +++ b/src/plugins/scenegraph/softwarecontext/painternode.cpp diff --git a/softwarecontext/painternode.h b/src/plugins/scenegraph/softwarecontext/painternode.h index db0d03e..db0d03e 100644 --- a/softwarecontext/painternode.h +++ b/src/plugins/scenegraph/softwarecontext/painternode.h diff --git a/softwarecontext/pixmaptexture.cpp b/src/plugins/scenegraph/softwarecontext/pixmaptexture.cpp index d3dd747..d3dd747 100644 --- a/softwarecontext/pixmaptexture.cpp +++ b/src/plugins/scenegraph/softwarecontext/pixmaptexture.cpp diff --git a/softwarecontext/pixmaptexture.h b/src/plugins/scenegraph/softwarecontext/pixmaptexture.h index c3ee09d..c3ee09d 100644 --- a/softwarecontext/pixmaptexture.h +++ b/src/plugins/scenegraph/softwarecontext/pixmaptexture.h diff --git a/softwarecontext/pluginmain.cpp b/src/plugins/scenegraph/softwarecontext/pluginmain.cpp index afb91a8..afb91a8 100644 --- a/softwarecontext/pluginmain.cpp +++ b/src/plugins/scenegraph/softwarecontext/pluginmain.cpp diff --git a/softwarecontext/pluginmain.h b/src/plugins/scenegraph/softwarecontext/pluginmain.h index fd90823..fd90823 100644 --- a/softwarecontext/pluginmain.h +++ b/src/plugins/scenegraph/softwarecontext/pluginmain.h diff --git a/softwarecontext/rectanglenode.cpp b/src/plugins/scenegraph/softwarecontext/rectanglenode.cpp index 054ffd3..054ffd3 100644 --- a/softwarecontext/rectanglenode.cpp +++ b/src/plugins/scenegraph/softwarecontext/rectanglenode.cpp diff --git a/softwarecontext/rectanglenode.h b/src/plugins/scenegraph/softwarecontext/rectanglenode.h index 74c0971..74c0971 100644 --- a/softwarecontext/rectanglenode.h +++ b/src/plugins/scenegraph/softwarecontext/rectanglenode.h diff --git a/softwarecontext/renderingvisitor.cpp b/src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp index 879c30e..879c30e 100644 --- a/softwarecontext/renderingvisitor.cpp +++ b/src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp diff --git a/softwarecontext/renderingvisitor.h b/src/plugins/scenegraph/softwarecontext/renderingvisitor.h index d65faa4..d65faa4 100644 --- a/softwarecontext/renderingvisitor.h +++ b/src/plugins/scenegraph/softwarecontext/renderingvisitor.h diff --git a/softwarecontext/renderloop.cpp b/src/plugins/scenegraph/softwarecontext/renderloop.cpp index 7dd2034..7dd2034 100644 --- a/softwarecontext/renderloop.cpp +++ b/src/plugins/scenegraph/softwarecontext/renderloop.cpp diff --git a/softwarecontext/renderloop.h b/src/plugins/scenegraph/softwarecontext/renderloop.h index b6993a8..b6993a8 100644 --- a/softwarecontext/renderloop.h +++ b/src/plugins/scenegraph/softwarecontext/renderloop.h diff --git a/softwarecontext/softwarecontext.json b/src/plugins/scenegraph/softwarecontext/softwarecontext.json index ca87c6c..ca87c6c 100644 --- a/softwarecontext/softwarecontext.json +++ b/src/plugins/scenegraph/softwarecontext/softwarecontext.json diff --git a/softwarecontext/softwarecontext.pro b/src/plugins/scenegraph/softwarecontext/softwarecontext.pro index d60260c..d60260c 100644 --- a/softwarecontext/softwarecontext.pro +++ b/src/plugins/scenegraph/softwarecontext/softwarecontext.pro diff --git a/softwarecontext/softwarelayer.cpp b/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp index 70cb73f..70cb73f 100644 --- a/softwarecontext/softwarelayer.cpp +++ b/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp diff --git a/softwarecontext/softwarelayer.h b/src/plugins/scenegraph/softwarecontext/softwarelayer.h index 3352e60..3352e60 100644 --- a/softwarecontext/softwarelayer.h +++ b/src/plugins/scenegraph/softwarecontext/softwarelayer.h diff --git a/softwarecontext/threadedrenderloop.cpp b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp index 6b89915..6b89915 100644 --- a/softwarecontext/threadedrenderloop.cpp +++ b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp diff --git a/softwarecontext/threadedrenderloop.h b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h index 7e3bcb2..7e3bcb2 100644 --- a/softwarecontext/threadedrenderloop.h +++ b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h diff --git a/src/src.pro b/src/src.pro new file mode 100644 index 0000000..49e04ed --- /dev/null +++ b/src/src.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS += plugins diff --git a/sync.profile b/sync.profile new file mode 100644 index 0000000..8b9df1c --- /dev/null +++ b/sync.profile @@ -0,0 +1,13 @@ + +dule dependencies. +# Every module that is required to build this module should have one entry. +# Each of the module version specifiers can take one of the following values: +# - A specific Git revision. +# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) +# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) +# +%dependencies = ( + "qtbase" => "", + "qtdeclarative" => "", +); + |