diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt
index 68f01b0..bf2f9d1 100644
--- a/qad/CMakeLists.txt
+++ b/qad/CMakeLists.txt
@@ -66,7 +66,7 @@ endmacro()
 macro(qad_plugin NAME _LIBS)
 	project(qad_${NAME}_plugin)
 	include_directories("..")
-	set(LIBS ${_${NAME}_LIBS} qad_${NAME} "${_LIBS}")
+	set(LIBS ${_${NAME}_LIBS} qad_${NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDESIGNER_LIBRARY} "${_LIBS}")
 	#message(${_${NAME}_PLUGIN_LIBS})
 	add_definitions(-DQT_PLUGIN)
 	add_definitions(-DQT_NO_DEBUG)
@@ -76,7 +76,7 @@ macro(qad_plugin NAME _LIBS)
 	file(GLOB PCPPS "./*.cpp")
 	qt4_wrap_cpp(PCMOCS ${PMOCS} OPTIONS -nw)
 	add_library(${PROJECT_NAME} SHARED ${PCMOCS} ${PCPPS} ${PMOCS})
-	target_link_libraries(${PROJECT_NAME} ${LIBS} ${QT_QTDESIGNER_LIBRARY})
+	target_link_libraries(${PROJECT_NAME} ${LIBS})
 	install(TARGETS ${PROJECT_NAME} DESTINATION ${QT_PLUGINS_DIR}/designer)
 endmacro()
 
diff --git a/qad/QtProject.cmake b/qad/QtProject.cmake
index 96f992d..cf6311c 100644
--- a/qad/QtProject.cmake
+++ b/qad/QtProject.cmake
@@ -1,7 +1,5 @@
 macro(qt_project NAME _H_OUT _CPP_OUT)
 	project(${NAME})
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wall")
 	find_package(Qt4 REQUIRED)
 	include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
 	file(GLOB ${_H_OUT} "./*.h")
diff --git a/qad/application/plugin/CMakeLists.txt b/qad/application/plugin/CMakeLists.txt
index d04cba1..09f97dd 100644
--- a/qad/application/plugin/CMakeLists.txt
+++ b/qad/application/plugin/CMakeLists.txt
@@ -1,2 +1 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-qad_plugin(application ${LIBS})
+qad_plugin(application "")
diff --git a/qad/blockview/plugin/CMakeLists.txt b/qad/blockview/plugin/CMakeLists.txt
index 7770866..15ccc7a 100644
--- a/qad/blockview/plugin/CMakeLists.txt
+++ b/qad/blockview/plugin/CMakeLists.txt
@@ -1,2 +1 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-qad_plugin(blockview "${LIBS}")
+qad_plugin(blockview "")
diff --git a/qad/graphic/plugin/CMakeLists.txt b/qad/graphic/plugin/CMakeLists.txt
index 4007a22..61032be 100644
--- a/qad/graphic/plugin/CMakeLists.txt
+++ b/qad/graphic/plugin/CMakeLists.txt
@@ -1,2 +1 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-qad_plugin(graphic "${LIBS}")
+qad_plugin(graphic "")
diff --git a/qad/sql_table/plugin/CMakeLists.txt b/qad/sql_table/plugin/CMakeLists.txt
index 2dcf545..65de9df 100644
--- a/qad/sql_table/plugin/CMakeLists.txt
+++ b/qad/sql_table/plugin/CMakeLists.txt
@@ -1,2 +1 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-qad_plugin(sql_table "${LIBS}")
+qad_plugin(sql_table "")
diff --git a/qad/touch_widgets/plugin/CMakeLists.txt b/qad/touch_widgets/plugin/CMakeLists.txt
index 97e865b..879009e 100644
--- a/qad/touch_widgets/plugin/CMakeLists.txt
+++ b/qad/touch_widgets/plugin/CMakeLists.txt
@@ -1,2 +1 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-qad_plugin(touch_widgets "${LIBS}")
+qad_plugin(touch_widgets "")
diff --git a/qad/utils/plugin/CMakeLists.txt b/qad/utils/plugin/CMakeLists.txt
index 032b314..058341f 100644
--- a/qad/utils/plugin/CMakeLists.txt
+++ b/qad/utils/plugin/CMakeLists.txt
@@ -1,2 +1 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-qad_plugin(utils "${LIBS}")
+qad_plugin(utils "")
diff --git a/qad/widgets/plugin/CMakeLists.txt b/qad/widgets/plugin/CMakeLists.txt
index 2029ac1..b4d9aec 100644
--- a/qad/widgets/plugin/CMakeLists.txt
+++ b/qad/widgets/plugin/CMakeLists.txt
@@ -1,2 +1 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-qad_plugin(widgets "${LIBS}")
+qad_plugin(widgets "")