tree changes

CMakeLists.txt

@@ -153,6 +153,7 @@ else()
 	if (SomeQtFound)
 		message(STATUS "Building Qt-derived targets for ${QtVersions}")
 		add_subdirectory(qad)
+		include_directories(${qad_includes})
 		set(_DIRS piqt piqt_utils qcd_utils)
 		if (Qt5)
 			list(APPEND _DIRS)

piqt_utils/CMakeLists.txt

@@ -23,7 +23,7 @@ list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME})
 set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
 include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
 file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
-pip_code_model(CCM "../pip/lib/main/io_devices/piiodevice.h" "../pip/lib/main/io_utils/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es")
+pip_code_model(CCM "../pip/libs/main/io_devices/piiodevice.h" "../pip/libs/main/io_utils/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es")
 find_qt(${QtVersions} Core Gui)
 qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
 qt_add_library(${PROJECT_NAME} ${LIBTYPE} out_CPP CCM)

piqt_utils/piintrospector/CMakeLists.txt

@@ -1,6 +1,6 @@
 project(piintrospector)
 file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
-set(PII_ROOT "../../pip/lib/main/introspection")
+set(PII_ROOT "../../pip/libs/main/introspection")
 pip_code_model(PII_CCM "${PII_ROOT}/piintrospection_server_p.h" "${PII_ROOT}/piintrospection_threads_p.h" OPTIONS "-DPIP_EXPORT" "-Es")
 find_qt(${QtVersions} Core Gui)
 qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)

qad/CMakeLists.txt

@@ -184,10 +184,6 @@ macro(qad_project NAME _MODULES _LIBS)
 	endif()
 	qt_target_link_libraries(${PROJ_NAME} ${_LIBS})
 	qad_install(${PROJ_NAME} "out_HDR" "out_QM")
-	set(${NAME}_UTILS 1)
-	if (LIBPROJECT)
-		set(${NAME}_UTILS ${UTILS})
-	endif()
 	message(STATUS "Building ${PROJ_NAME}")
 	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
 		set(_${NAME}_PLUGIN_LIBS "${_LIBS}")
@@ -195,15 +191,14 @@ macro(qad_project NAME _MODULES _LIBS)
 	endif()
 endmacro()
 
-set(DIRS utils widgets application blockview graphic sql_table touch_widgets doc)
-foreach(D ${DIRS})
-	list(APPEND QT_MULTILIB_LIST qad_${D})
-endforeach(D)
+add_subdirectory(libs)
+if (UTILS)
+	add_subdirectory(utils)
+endif()
+
 set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
-foreach(D ${DIRS})
-	include_directories(${D})
-	add_subdirectory(${D})
-endforeach(D)
+set(qad_includes ${qad_includes} PARENT_SCOPE)
 if (LIB)
 	set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
 endif()
+

qad/application/qad_application.qrc

@@ -1,35 +0,0 @@
-<RCC>
-	<qresource prefix="/">
-		<file>lang/qad_application_ru.ts</file>
-		<file>../icons/application-exit.png</file>
-		<file>../icons/dialog-close.png</file>
-		<file>../icons/configure.png</file>
-		<file>../icons/document-edit.png</file>
-		<file>../icons/document-new.png</file>
-		<file>../icons/document-save.png</file>
-		<file>../icons/document-save-all.png</file>
-		<file>../icons/document-save-as.png</file>
-		<file>../icons/document-open.png</file>
-		<file>../icons/document-open-recent.png</file>
-		<file>../icons/document-close.png</file>
-		<file>../icons/edit-clear.png</file>
-		<file>../icons/edit-clear-locationbar-rtl.png</file>
-		<file>../icons/edit-find.png</file>
-		<file>../icons/list-add.png</file>
-		<file>../icons/edit-delete.png</file>
-		<file>../icons/edit-copy.png</file>
-		<file>../icons/edit-paste.png</file>
-		<file>../icons/edit-undo.png</file>
-		<file>../icons/edit-redo.png</file>
-		<file>../icons/border-line.png</file>
-		<file>../icons/edockwidget.png</file>
-		<file>../icons/historyview.png</file>
-		<file>../icons/clear-history.png</file>
-		<file>../icons/layer-visible-off.png</file>
-		<file>../icons/layer-visible-on.png</file>
-		<file>../icons/logview.png</file>
-		<file>../icons/qt.png</file>
-		<file>../icons/select-all.png</file>
-		<file>../icons/select-none.png</file>
-	</qresource>
-</RCC>

qad/blockview/CMakeLists.txt

@@ -1,4 +0,0 @@
-qad_project(blockview "Gui;Widgets" "qad_utils;qad_widgets")
-if (blockview_UTILS)
-	add_subdirectory(blockeditor)
-endif()

qad/blockview/qad_blockview.qrc

@@ -1,51 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>../icons/draw-line.png</file>
-        <file>../icons/align-hor.png</file>
-        <file>../icons/align-ver.png</file>
-        <file>../icons/dialog-close.png</file>
-        <file>../icons/edit-clear.png</file>
-        <file>../icons/edit-guides.png</file>
-        <file>../icons/view-grid.png</file>
-        <file>../icons/zoom-fit-best.png</file>
-        <file>../icons/configure.png</file>
-        <file>../icons/document-save.png</file>
-        <file>../icons/edit-clear-locationbar-rtl.png</file>
-        <file>../icons/edit-find.png</file>
-        <file>../icons/list-add.png</file>
-        <file>../icons/edit-delete.png</file>
-        <file>../icons/item.png</file>
-        <file>../icons/node-add.png</file>
-        <file>../icons/node.png</file>
-        <file>../icons/edit-copy.png</file>
-        <file>../icons/edit-paste.png</file>
-        <file>../icons/expand_s_x.png</file>
-        <file>../icons/expand_s_y.png</file>
-        <file>../icons/expand_x.png</file>
-        <file>../icons/expand_y.png</file>
-        <file>../icons/border-line.png</file>
-        <file>../icons/legend.png</file>
-        <file>../icons/blockview.png</file>
-        <file>../icons/view-fullscreen.png</file>
-        <file>../icons/draw-ellipse.png</file>
-        <file>../icons/draw-rectangle.png</file>
-        <file>../icons/draw-text.png</file>
-        <file>../icons/view-preview.png</file>
-        <file>../icons/format-fill-color.png</file>
-        <file>../icons/format-stroke-color.png</file>
-        <file>../icons/document-open.png</file>
-        <file>../icons/align-bottom-center.png</file>
-        <file>../icons/align-bottom-left.png</file>
-        <file>../icons/align-bottom-right.png</file>
-        <file>../icons/align-center-center.png</file>
-        <file>../icons/align-center-left.png</file>
-        <file>../icons/align-center-right.png</file>
-        <file>../icons/align-top-center.png</file>
-        <file>../icons/align-top-left.png</file>
-        <file>../icons/align-top-right.png</file>
-        <file>../icons/z-bottom.png</file>
-        <file>../icons/z-down.png</file>
-        <file>../icons/z-top.png</file>
-        <file>../icons/z-up.png</file>
-    </qresource>
-</RCC>

qad/graphic/qad_graphic.qrc

@@ -1,28 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>../icons/media-playback-pause.png</file>
-        <file>../icons/dialog-close.png</file>
-        <file>../icons/edit-clear.png</file>
-        <file>../icons/edit-guides.png</file>
-        <file>../icons/view-grid.png</file>
-		<file>../icons/view-autofit.png</file>
-        <file>../icons/configure.png</file>
-        <file>../icons/document-save.png</file>
-        <file>../icons/edit-clear-locationbar-rtl.png</file>
-        <file>../icons/edit-find.png</file>
-        <file>../icons/list-add.png</file>
-        <file>../icons/edit-delete.png</file>
-        <file>../icons/edit-copy.png</file>
-        <file>../icons/edit-paste.png</file>
-        <file>../icons/expand_s_x.png</file>
-        <file>../icons/expand_s_y.png</file>
-        <file>../icons/expand_x.png</file>
-        <file>../icons/expand_y.png</file>
-        <file>../icons/border-line.png</file>
-        <file>../icons/legend.png</file>
-        <file>../icons/graphic.png</file>
-        <file>../icons/view-fullscreen.png</file>
-        <file>../icons/pause-back.png</file>
-        <file>../icons/pause-front.png</file>
-    </qresource>
-</RCC>

qad/graphic/qpicalculator/CMakeLists.txt.user

@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.2.1, 2016-03-25T15:17:49. -->
-<qtcreator>
- <data>
-  <variable>EnvironmentId</variable>
-  <value type="QByteArray">{948faa78-0b50-402e-a285-1bca3b08de64}</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">0</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.EditorSettings</variable>
-  <valuemap type="QVariantMap">
-   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
-   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
-   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">false</value>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
-    <value type="QString" key="language">Cpp</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
-    </valuemap>
-   </valuemap>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
-    <value type="QString" key="language">QmlJS</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
-    </valuemap>
-   </valuemap>
-   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
-   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
-   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
-   <value type="int" key="EditorConfiguration.IndentSize">4</value>
-   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
-   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
-   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
-   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
-   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
-   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
-   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
-   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
-   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
-   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
-   <value type="int" key="EditorConfiguration.TabSize">8</value>
-   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
-   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
-   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
-   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
-   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
-   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.PluginSettings</variable>
-  <valuemap type="QVariantMap"/>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Target.0</variable>
-  <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">DesktopBuild</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">DesktopBuild</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{3c749452-9483-442d-b011-933a1b5dac10}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="bool" key="CMakeProjectManager.CMakeBuildConfiguration.UseNinja">false</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/work/qpicalculator-build</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
-      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="CMakeProjectManager.MakeStep.Clean">false</value>
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">clean</value>
-      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="CMakeProjectManager.MakeStep.Clean">true</value>
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">all</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Установка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Локальная установка</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
-    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
-    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
-    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
-    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">3</value>
-    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
-    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
-    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
-     <value type="int">0</value>
-     <value type="int">1</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">11</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">14</value>
-    </valuelist>
-    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qpicalculator</value>
-    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
-    <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
-    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
-    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
-    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qpicalculator</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.qpicalculator</value>
-    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
-    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
-    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="int">1</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
-  <value type="int">16</value>
- </data>
- <data>
-  <variable>Version</variable>
-  <value type="int">16</value>
- </data>
-</qtcreator>

qad/libs/application/qad_application.qrc

@@ -0,0 +1,34 @@
+<RCC>
+	<qresource prefix="/">
+		<file>../../icons/application-exit.png</file>
+		<file>../../icons/dialog-close.png</file>
+		<file>../../icons/configure.png</file>
+		<file>../../icons/document-edit.png</file>
+		<file>../../icons/document-new.png</file>
+		<file>../../icons/document-save.png</file>
+		<file>../../icons/document-save-all.png</file>
+		<file>../../icons/document-save-as.png</file>
+		<file>../../icons/document-open.png</file>
+		<file>../../icons/document-open-recent.png</file>
+		<file>../../icons/document-close.png</file>
+		<file>../../icons/edit-clear.png</file>
+		<file>../../icons/edit-clear-locationbar-rtl.png</file>
+		<file>../../icons/edit-find.png</file>
+		<file>../../icons/list-add.png</file>
+		<file>../../icons/edit-delete.png</file>
+		<file>../../icons/edit-copy.png</file>
+		<file>../../icons/edit-paste.png</file>
+		<file>../../icons/edit-undo.png</file>
+		<file>../../icons/edit-redo.png</file>
+		<file>../../icons/border-line.png</file>
+		<file>../../icons/edockwidget.png</file>
+		<file>../../icons/historyview.png</file>
+		<file>../../icons/clear-history.png</file>
+		<file>../../icons/layer-visible-off.png</file>
+		<file>../../icons/layer-visible-on.png</file>
+		<file>../../icons/logview.png</file>
+		<file>../../icons/qt.png</file>
+		<file>../../icons/select-all.png</file>
+		<file>../../icons/select-none.png</file>
+	</qresource>
+</RCC>

qad/libs/blockview/CMakeLists.txt

@@ -0,0 +1 @@
+qad_project(blockview "Gui;Widgets" "qad_utils;qad_widgets")

qad/libs/blockview/qad_blockview.qrc

@@ -0,0 +1,51 @@
+<RCC>
+    <qresource prefix="/">
+        <file>../../icons/draw-line.png</file>
+        <file>../../icons/align-hor.png</file>
+        <file>../../icons/align-ver.png</file>
+        <file>../../icons/dialog-close.png</file>
+        <file>../../icons/edit-clear.png</file>
+        <file>../../icons/edit-guides.png</file>
+        <file>../../icons/view-grid.png</file>
+        <file>../../icons/zoom-fit-best.png</file>
+        <file>../../icons/configure.png</file>
+        <file>../../icons/document-save.png</file>
+        <file>../../icons/edit-clear-locationbar-rtl.png</file>
+        <file>../../icons/edit-find.png</file>
+        <file>../../icons/list-add.png</file>
+        <file>../../icons/edit-delete.png</file>
+        <file>../../icons/item.png</file>
+        <file>../../icons/node-add.png</file>
+        <file>../../icons/node.png</file>
+        <file>../../icons/edit-copy.png</file>
+        <file>../../icons/edit-paste.png</file>
+        <file>../../icons/expand_s_x.png</file>
+        <file>../../icons/expand_s_y.png</file>
+        <file>../../icons/expand_x.png</file>
+        <file>../../icons/expand_y.png</file>
+        <file>../../icons/border-line.png</file>
+        <file>../../icons/legend.png</file>
+        <file>../../icons/blockview.png</file>
+        <file>../../icons/view-fullscreen.png</file>
+        <file>../../icons/draw-ellipse.png</file>
+        <file>../../icons/draw-rectangle.png</file>
+        <file>../../icons/draw-text.png</file>
+        <file>../../icons/view-preview.png</file>
+        <file>../../icons/format-fill-color.png</file>
+        <file>../../icons/format-stroke-color.png</file>
+        <file>../../icons/document-open.png</file>
+        <file>../../icons/align-bottom-center.png</file>
+        <file>../../icons/align-bottom-left.png</file>
+        <file>../../icons/align-bottom-right.png</file>
+        <file>../../icons/align-center-center.png</file>
+        <file>../../icons/align-center-left.png</file>
+        <file>../../icons/align-center-right.png</file>
+        <file>../../icons/align-top-center.png</file>
+        <file>../../icons/align-top-left.png</file>
+        <file>../../icons/align-top-right.png</file>
+        <file>../../icons/z-bottom.png</file>
+        <file>../../icons/z-down.png</file>
+        <file>../../icons/z-top.png</file>
+        <file>../../icons/z-up.png</file>
+    </qresource>
+</RCC>

qad/libs/graphic/CMakeLists.txt

@@ -1,4 +1 @@
 qad_project(graphic "Gui;Widgets;OpenGL" "qad_widgets;qad_utils;${OPENGL_LIBRARIES}")
-if (graphic_UTILS)
-	add_subdirectory(qpicalculator)
-endif()

qad/libs/graphic/qad_graphic.qrc

@@ -0,0 +1,28 @@
+<RCC>
+    <qresource prefix="/">
+        <file>../../icons/media-playback-pause.png</file>
+        <file>../../icons/dialog-close.png</file>
+        <file>../../icons/edit-clear.png</file>
+        <file>../../icons/edit-guides.png</file>
+        <file>../../icons/view-grid.png</file>
+		<file>../../icons/view-autofit.png</file>
+        <file>../../icons/configure.png</file>
+        <file>../../icons/document-save.png</file>
+        <file>../../icons/edit-clear-locationbar-rtl.png</file>
+        <file>../../icons/edit-find.png</file>
+        <file>../../icons/list-add.png</file>
+        <file>../../icons/edit-delete.png</file>
+        <file>../../icons/edit-copy.png</file>
+        <file>../../icons/edit-paste.png</file>
+        <file>../../icons/expand_s_x.png</file>
+        <file>../../icons/expand_s_y.png</file>
+        <file>../../icons/expand_x.png</file>
+        <file>../../icons/expand_y.png</file>
+        <file>../../icons/border-line.png</file>
+        <file>../../icons/legend.png</file>
+        <file>../../icons/graphic.png</file>
+        <file>../../icons/view-fullscreen.png</file>
+        <file>../../icons/pause-back.png</file>
+        <file>../../icons/pause-front.png</file>
+    </qresource>
+</RCC>