Enabled per-project QMake installation #41
Conversation
created ,qrc and ,pri files for submodules added a define to dintinguish whether fluid is used in a local install
Should be ok now, I actually tested the instructions :)
| #ifdef FLUID_LOCAL | ||
| #include "../src/dateutils.h" | ||
| #else | ||
| #include <Fluid/DateUtils> |
There was a problem hiding this comment.
don't think we need #ifdef here because DateUtils header can be found from the llocal headers dir
There was a problem hiding this comment.
Should we just keep the relative include directive then ?
There was a problem hiding this comment.
@oKcerG I was thinking to leave #include <Fluid/DateUtils> intact instead of the FLUID_LOCAL ifdef that should work if the qmake project generates those camel case headers in the build tree and the directory is in the include path.
| @@ -0,0 +1,922 @@ | |||
| <RCC> | |||
There was a problem hiding this comment.
this QRC file should be generated by the fetch script instead
There was a problem hiding this comment.
Yep that's a mistake, I meant to remove this file but forgot to do it.
| `#include "iconthemeimageprovider.h"` | ||
| * add the resources files to your `QQmlApplicationEngine` import paths : | ||
| `engine.addImportPath(engine.addImportPath(QStringLiteral("qrc:/"))` | ||
| * register fluid's IconThemeImageProvider to the engine : |
| Then, in your `main.cpp` file or wherever you set up a `QQmlApplicationEngine`: | ||
| * add this include directive : | ||
| `#include "iconthemeimageprovider.h"` | ||
| * add the resources files to your `QQmlApplicationEngine` import paths : |
| @@ -2,6 +2,7 @@ | |||
|
|
|||
| GIT_DIR=material-design-icons | |||
| TARGET_DIR=icons | |||
| QRC_FILE=icons.qrc | |||
There was a problem hiding this comment.
just tested the script and this should be:
QRC_FILE=$TARGET_DIR/icons.qrc
There was a problem hiding this comment.
Actually the issue here is a bit different: trying to build demo.pro it doesn't find $$PWD/scripts/icons.qrc so probably the path in fluid.pri should be changed instead
There was a problem hiding this comment.
I just downloaded my branch in a new folder, ran the script and could build the demo and run it without problem.
edit : I did cd scripts && ./fetch_icons.sh instead of ./scripts/fetch_icons.sh
|
@oKcerG Can you please squash the PR into one commit so I can push it? |
…d install instructions
oKcerG
force-pushed
the
feature/pri_install
branch
from
8bf7e29
to
7df1b60
Compare
Created qrc and pri files for each sub-modules.
Modified c++ files to take into account if fluid is installed locally.
Modified the icons script to generate a qrc file.