diff options
| author | Marius Kintel <marius@kintel.net> | 2012-02-14 00:33:44 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-02-14 00:33:44 (GMT) |
| commit | f61c9c9fbc1394f530e8166837ff8d69bf8e2561 (patch) | |
| tree | 1de21c7d0ca5efa6c1af76b94c0c5e95b42233b9 /openscad.pro.user | |
| parent | a83fda0c3d9e92a6e47622cd1c2fdeebdfbb8c1a (diff) | |
| parent | d4efb54284f0781aee40cb660712fa15256676df (diff) | |
Merge branch 'master' of https://github.com/clothbot/openscad into clothbot-master
Conflicts:
scripts/macosx-build-dependencies.sh
Diffstat (limited to 'openscad.pro.user')
| -rw-r--r-- | openscad.pro.user | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/openscad.pro.user b/openscad.pro.user index 4bce49a..e53f571 100644 --- a/openscad.pro.user +++ b/openscad.pro.user @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> -<!-- Written by Qt Creator 2.4.1, 2012-02-06T09:01:56. --> +<!-- Written by Qt Creator 2.4.1, 2012-02-09T21:15:55. --> <qtcreator> <data> <variable>ProjectExplorer.Project.ActiveTarget</variable> @@ -150,14 +150,17 @@ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"> <value type="QString">OPENSCAD_LIBRARIES=$$PWD/../libraries/install</value> + <value type="QString">CCACHE_BASEDIR=$$PWD/..</value> + <value type="QString">PATH=/opt/local/libexec/ccache:/usr/bin:/Users/clothbot/QtSDK/Desktop/Qt/474/gcc/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/local/bin</value> + <value type="QString">EIGEN2DIR=$$PWD/../libraries/install/include/eigen2</value> </valuelist> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 4.7.4 for GCC (Qt SDK) Debug</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/clothbot/Projects/github/clothbot/openscad-build-desktop</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/clothbot/Projects/github/clothbot/openscad</value> <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">3</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> |