git-svn-id: svn://db.shs.com.ru/libs@162 a8b55f48-bf90-11e4-a774-851b48703e85

qad_application/CMakeLists.txt

@@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
 if (DEBUG)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 endif ()
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_utils)
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets)
 file(GLOB MOCS "./*.h")
 file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")

qad_utils/CMakeLists.txt

@@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
 if (DEBUG)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 endif ()
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets)
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
 file(GLOB MOCS "./*.h")
 file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")

qad_utils/plugin/qad_utils.cpp

@@ -1,9 +1,8 @@
-#include "qpiconfigplugin.h"
+//#include "qpiconfigplugin.h"
 #include "qad_utils.h"
 
-QADUtils::QADUtils(QObject * parent): QObject(parent)
+QADUtils::QADUtils(QObject * parent): QObject(parent) {
-{
+	//m_widgets.append(new QPIConfigPlugin(this));
-	m_widgets.append(new QPIConfigPlugin(this));
 }
 
 

qad_widgets/CMakeLists.txt

@@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
 if (DEBUG)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 endif ()
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_utils)
 file(GLOB MOCS "./*.h")
 file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")

qad_widgets/plugin/qad_widgets.cpp

@@ -11,6 +11,7 @@
 #include "iconedlabelplugin.h"
 #include "qcodeeditplugin.h"
 #include "qvarianteditplugin.h"
+#include "qpiconfigplugin.h"
 #include "qad_widgets.h"
 
 QADWidgets::QADWidgets(QObject * parent): QObject(parent)
@@ -28,6 +29,7 @@ QADWidgets::QADWidgets(QObject * parent): QObject(parent)
 	m_widgets.append(new IconedLabelPlugin(this));
 	m_widgets.append(new QCodeEditPlugin(this));
 	m_widgets.append(new QVariantEditPlugin(this));
+	m_widgets.append(new QPIConfigPlugin(this));
 }