[qet] [4327] Fix FTBFS

[subversion@xxxxxxxxxxxxx]

Revision: 4327
Author:   scorpio810
Date:     2016-01-18 00:28:26 +0100 (Mon, 18 Jan 2016)
Log Message:
-----------
Fix FTBFS

Modified Paths:
--------------
    branches/Qetdxf/qelectrotech.pro
    branches/Qetdxf/sources/configpages.cpp

Modified: branches/Qetdxf/qelectrotech.pro
===================================================================
--- branches/Qetdxf/qelectrotech.pro	2016-01-16 23:24:04 UTC (rev 4326)
+++ branches/Qetdxf/qelectrotech.pro	2016-01-17 23:28:26 UTC (rev 4327)
@@ -80,40 +80,23 @@
                sources/editor/graphicspart \
                sources/undocommand \
                sources/diagramevent \
-			   sources/ElementsCollection \
-			   sources/dxftoqet2 \
-			   sources/dxftoqet2/src \
-			   sources/dxftoqet2/src/dxf_base_types \
-			   sources/dxftoqet2/src/qet_base_types \
-			   sources/dxftoqet2/src/dxf_control
-			   sources/dxftoqet2/src/dxf
+               sources/ElementsCollection
 
 
 # Fichiers sources
 HEADERS += $$files(sources/*.h) $$files(sources/ui/*.h) $$files(sources/editor/*.h) $$files(sources/titleblock/*.h) $$files(sources/richtext/*.h) $$files(sources/qetgraphicsitem/*.h) $$files(sources/factory/*.h) \
            $$files(sources/properties/*.h) \
-#		   $$files(sources/dxftoqet2/*.h) \
-#		   $$files(sources/dxftoqet2/src/dxf_base_types/*.h) \
-#		   $$files(sources/dxftoqet2/src/qet_base_types/*.h) \
-#		   $$files(sources/dxftoqet2/src/dxf_control/*.h) \
-#		   $$files(sources/dxftoqet2/src/dxf/*.h) \
-		   $$files(sources/editor/ui/*.h) \
+           $$files(sources/editor/ui/*.h) \
            $$files(sources/editor/esevent/*.h) \
-		   $$files(sources/editor/graphicspart/*.h) \
+           $$files(sources/editor/graphicspart/*.h) \
            $$files(sources/dvevent/*.h) \
            $$files(sources/undocommand/*.h) \
            $$files(sources/diagramevent/*.h) \
            $$files(sources/ElementsCollection/*.h)
 
 SOURCES += $$files(sources/*.cpp) $$files(sources/editor/*.cpp) $$files(sources/titleblock/*.cpp) $$files(sources/richtext/*.cpp) $$files(sources/ui/*.cpp) $$files(sources/qetgraphicsitem/*.cpp) $$files(sources/factory/*.cpp) \
-		   $$files(sources/properties/dxf_base_types/*.cpp) \
-#		   $$files(sources/dxftoqet2/*.cpp) \
-#		   $$files(sources/dxftoqet2/src/*.cpp) \
-#		   $$files(sources/dxftoqet2/src/qet_base_types/*.cpp) \
-#		   $$files(sources/dxftoqet2/src/dxf_base_types/*.cpp) \
-#		   $$files(sources/dxftoqet2/src/dxf_control/*.cpp) \
-#		   $$files(sources/dxftoqet2/src/dxf/*.cpp) \
-		   $$files(sources/editor/ui/*.cpp) \
+           $$files(sources/properties/*.cpp) \
+           $$files(sources/editor/ui/*.cpp) \
            $$files(sources/editor/esevent/*.cpp) \
            $$files(sources/editor/graphicspart/*.cpp) \
            $$files(sources/dvevent/*.cpp) \
@@ -136,7 +119,6 @@
 # UI DESIGNER FILES AND GENERATION SOURCES FILES
 FORMS += $$files(sources/richtext/*.ui) \
          $$files(sources/ui/*.ui) \
-#		 $$files(sources/dxftoqet2/*.ui) \
          $$files(sources/editor/ui/*.ui)
 
 UI_SOURCES_DIR = sources/ui/

Modified: branches/Qetdxf/sources/configpages.cpp
===================================================================
--- branches/Qetdxf/sources/configpages.cpp	2016-01-16 23:24:04 UTC (rev 4326)
+++ branches/Qetdxf/sources/configpages.cpp	2016-01-17 23:28:26 UTC (rev 4327)
@@ -25,7 +25,7 @@
 #include "ui/reportpropertiewidget.h"
 #include "ui/xrefpropertieswidget.h"
 #include "qetproject.h"
-#include "properties/reportproperties.h"
+#include "reportproperties.h"
 #include "qetapp.h"
 
 /**