0032320: Documentation - mention rapidjson-dev and qtcreator within Debian packages

diff --git a/adm/qmake/Occt.pro b/adm/qmake/Occt.pro
index 3a4698c..90b83a8 100644 (file)
--- a/adm/qmake/Occt.pro
+++ b/adm/qmake/Occt.pro
@@ -9,6 +9,10 @@
 # - Open project in Qt Creator, and call "Run qmake".
 # - Close the project in Qt Creator, open it again so that you should see the sub-modules in Project tree; call "Run qmake" again.
 # - "Run qmake" and perform Build.
+#
+# Within Debian-based Linux repository Qt Creator can be installed like this:
+# > sudo apt-get install qtcreator qtbase5-dev
+
 TEMPLATE = subdirs
 exists(custom.auto.pri) { include(custom.auto.pri) }
 exists(custom.pri)      { include(custom.pri) }

diff --git a/adm/qmake/qtcreator-occt-cpp.xml b/adm/qmake/qtcreator-occt-cpp.xml
new file mode 100644 (file)
index 0000000..133ca00
--- /dev/null
+++ b/adm/qmake/qtcreator-occt-cpp.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorCodeStyle>
+<!-- Written by QtCreator 3.6.1, 2016-05-19T14:46:43. -->
+<qtcreator>
+ <data>
+  <variable>CodeStyleData</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="AlignAssignments">true</value>
+   <value type="bool" key="AutoSpacesForTabs">false</value>
+   <value type="bool" key="BindStarToIdentifier">false</value>
+   <value type="bool" key="BindStarToLeftSpecifier">true</value>
+   <value type="bool" key="BindStarToRightSpecifier">false</value>
+   <value type="bool" key="BindStarToTypeName">true</value>
+   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">true</value>
+   <value type="bool" key="IndentAccessSpecifiers">false</value>
+   <value type="bool" key="IndentBlockBody">true</value>
+   <value type="bool" key="IndentBlockBraces">false</value>
+   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentClassBraces">false</value>
+   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
+   <value type="bool" key="IndentEnumBraces">false</value>
+   <value type="bool" key="IndentFunctionBody">true</value>
+   <value type="bool" key="IndentFunctionBraces">false</value>
+   <value type="bool" key="IndentNamespaceBody">true</value>
+   <value type="bool" key="IndentNamespaceBraces">false</value>
+   <value type="int" key="IndentSize">2</value>
+   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentSwitchLabels">true</value>
+   <value type="int" key="PaddingMode">2</value>
+   <value type="bool" key="SpacesForTabs">true</value>
+   <value type="int" key="TabSize">2</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>DisplayName</variable>
+  <value type="QString">occt</value>
+ </data>
+</qtcreator>

diff --git a/dox/build/build_3rdparty/building_3rdparty.md b/dox/build/build_3rdparty/building_3rdparty.md
index 889969d..8203062 100644 (file)
--- a/dox/build/build_3rdparty/building_3rdparty.md
+++ b/dox/build/build_3rdparty/building_3rdparty.md
@@ -265,6 +265,18 @@ There are two types of third-party products, which are  necessary to build OCCT:
        * FreeImage 3.14.1 - 3.16.0;
        * VTK 6.1.0.
 
+@subsection dev_guides__building_3rdparty_linux_4 Installation From Official Repositories
+
+**Debian-based distributives**
+
+All 3rd-party products required for building of OCCT could be installed
+from official repositories. You may install them from console using apt-get utility:
+
+    sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libfreeimage-dev rapidjson-dev
+
+Building is possible with C++ compliant compiler:
+
+    sudo apt-get install g++
 
 @subsection dev_guides__building_3rdparty_linux_2_1 Tcl/Tk 
 
@@ -439,19 +451,6 @@ Download the necessary archive from https://www.vtk.org/VTK/resources/software.h
 
        make install
 
-@subsection dev_guides__building_3rdparty_linux_4 Installation From Official Repositories
-
-**Debian-based distributives**
-
-All 3rd-party products required for building of  OCCT could be installed
-from official repositories. You may install them from  console using apt-get utility:
-
-    sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libfreeimage-dev
-
-Building is possible with C++ compliant compiler:
-
-    sudo apt-get install g++
-
 @section build_3rdparty_macos Mac OS X
 
 This document presents additional guidelines for building third-party products