Revert "Revert "Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet into terminal_strip""

This reverts commit bb26954bd4.

qelectrotech.pro

@@ -160,7 +160,10 @@ HEADERS += $$files(sources/*.h) $$files(sources/ui/*.h) \
            $$files(sources/dataBase/*.h) \
            $$files(sources/dataBase/ui/*.h) \
            $$files(sources/factory/ui/*.h) \
-           $$files(sources/print/*.h)
+           $$files(sources/print/*.h) \
+           $$files(sources/TerminalStrip/*.h) \
+           $$files(sources/TerminalStrip/ui/*.h) \
+           $$files(sources/TerminalStrip/UndoCommand/*.h)
 
 SOURCES += $$files(sources/*.cpp) \
            $$files(sources/editor/*.cpp) \
@@ -193,7 +196,13 @@ SOURCES += $$files(sources/*.cpp) \
            $$files(sources/dataBase/*.cpp) \
            $$files(sources/dataBase/ui/*.cpp) \
            $$files(sources/factory/ui/*.cpp) \
-           $$files(sources/print/*.cpp)
+           $$files(sources/print/*.cpp) \
+           $$files(sources/TerminalStrip/*.cpp) \
+           $$files(sources/TerminalStrip/ui/*.cpp) \
+           $$files(sources/TerminalStrip/UndoCommand/*.cpp)
+
+# Needed for use promote QTreeWidget in terminalstripeditor.ui
+INCLUDEPATH += sources/TerminalStrip/ui
 
 # Liste des fichiers qui seront incorpores au binaire en tant que ressources Qt
 RESOURCES += qelectrotech.qrc
@@ -219,7 +228,8 @@ FORMS += $$files(sources/richtext/*.ui) \
          $$files(sources/qetgraphicsitem/ViewItem/ui/*.ui) \
          $$files(sources/dataBase/ui/*.ui) \
          $$files(sources/factory/ui/*.ui) \
-         $$files(sources/print/*.ui)
+         $$files(sources/print/*.ui) \
+         $$files(sources/TerminalStrip/ui/*.ui)
 
 UI_SOURCES_DIR = sources/ui/
 UI_HEADERS_DIR = sources/ui/