Multi-Qt building

git-svn-id: svn://db.shs.com.ru/libs@250 a8b55f48-bf90-11e4-a774-851b48703e85
2017-08-03 08:09:44 +00:00
parent 96935ebb4a
commit 0834c45c90
78 changed files with 410 additions and 249 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 project(libs)
 set(LIBPROJECT 1)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/")
-cmake_policy(SET CMP0017 OLD)
+#cmake_policy(SET CMP0017 OLD)
 if(MINGW)
 	find_package(MinGW REQUIRED)
 endif()
@@ -48,21 +48,35 @@ endif()

 set(QAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/qad)

+include(qad/QtWraps.cmake)
+set(QtVersions)
+foreach(_v ${_QT_VERSIONS_})
+	option(Qt${_v} "Build for Qt${_v}" 1)
+	if (Qt${_v})
+		#message("Qt${_v}")
+		list(APPEND QtVersions Qt${_v})
+	endif()
+endforeach()
+
 add_subdirectory(pip)
+message(STATUS "Building Qt-derived targets for ${QtVersions}")
 add_subdirectory(qad)
-set(_DIRS piqt piqt_utils cd_utils qcd_utils)
+set(_DIRS piqt piqt_utils qcd_utils)
 if (QGLVIEW)
 	list(APPEND _DIRS qglview) 
 endif()
+foreach(_D ${_DIRS})
+	list(APPEND QT_MULTILIB_LIST ${D})
+endforeach(_D)
+list(INSERT _DIRS 0 cd_utils)
 foreach(_D ${_DIRS})
 	include_directories(${_D})
 	add_subdirectory(${_D})
 endforeach(_D)

 if(WIN32)
-	get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
 	foreach(PIP_LT ${PIP_LIBS_TARGETS})
-		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/lib${PIP_LT}.dll" DESTINATION ${QTDIR})
+		qt_install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/lib${PIP_LT}.dll" DESTINATION QtBin)
 	endforeach()
 	set(CMAKES "FindMinGW.cmake")
 	install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)
--- a/FindMinGW.cmake
+++ b/FindMinGW.cmake
@@ -15,8 +15,11 @@ if(${MINGW})
 		#if(NOT ${MINGW_INCLUDE}) MINGW_INCLUDE = ${MINGW_DIR}/include
 		find_library(MINGW_LIB m HINTS ${MINGW_BIN}/../lib ${MINGW_INCLUDE}/../lib)
 		get_filename_component(MINGW_LIB ${MINGW_LIB} PATH)
+		if (NOT _MGW_MSG)
+			set(_MGW_MSG 1 CACHE BOOL "msg_mingw" FORCE)
 			message(STATUS "Found MinGW binary path = ${MINGW_BIN}")
 			message(STATUS "Found MinGW include path = ${MINGW_INCLUDE}")
 			message(STATUS "Found MinGW library path = ${MINGW_LIB}")
 		endif()
+	endif()
 endif(${MINGW})
--- a/SDKMacros.cmake
+++ b/SDKMacros.cmake
@@ -6,17 +6,18 @@ macro(sdk_install _DIR _TARGET _H_FILES)
 				#message("HFILES ${_H_FILES}")
 				install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/${_DIR})
 			endif()
-			install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB})
-			install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN})
-			get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-			install(TARGETS ${_TARGET} DESTINATION ${QTDIR})
+			qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB})
+			qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN})
+			qt_install(TARGETS ${_TARGET} DESTINATION QtBin)
 		else()
 			if (NOT _H_FILES STREQUAL "")
 				install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${_DIR})
 			endif()
-			install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+			qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 		endif()
+		#message(STATUS "Install ${_TARGET} to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
-		install(TARGETS ${_TARGET} DESTINATION bin)
+		qt_install(TARGETS ${_TARGET} DESTINATION bin)
+		#message(STATUS "Install ${_TARGET} to local \"bin\"")
 	endif()
 endmacro()
--- a/cd_utils/CMakeLists.txt
+++ b/cd_utils/CMakeLists.txt
@@ -28,10 +28,10 @@ target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY})
 add_executable(cdutilstest "cdutilstest.cpp" "cdtest.h")
 target_link_libraries(cdutilstest ${PIP_LIBRARY} ${PROJECT_NAME})
 message(STATUS "Building ${PROJECT_NAME}")
-if (LIBPROJECT)
-	include(SDKMacros)
-	sdk_install("" "${PROJECT_NAME}" "${HDRS_UTILS}")
-else()
+#if (LIBPROJECT)
+#	include(SDKMacros)
+#	sdk_install("" "${PROJECT_NAME}" "${HDRS_UTILS}")
+#else()
 	if(LIB)
 		if(WIN32)
 			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
@@ -52,4 +52,4 @@ else()
 		install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 		message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 	endif()
-endif()
+#endif()
--- a/piqt/CMakeLists.txt
+++ b/piqt/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(piqt)
 cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0017 OLD)
+#cmake_policy(SET CMP0017 OLD)
 if(NOT LIBPROJECT)
 	find_package(PIP REQUIRED)
 	option(LIB "System install" 0)
@@ -11,36 +11,38 @@ if(NOT LIBPROJECT)
 	endif()
 endif()
 find_package(QAD REQUIRED)
+list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME})
+set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
 include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
-qt_project(${PROJECT_NAME} H CPP)
-add_library(${PROJECT_NAME} SHARED ${H} ${CPP})
-set(LIBS ${PIP_LIBRARY} ${QAD_UTILS_LIBRARY})
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+find_qt(${QtVersions} Core Gui)
+qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+qt_add_library(${PROJECT_NAME} SHARED out_CPP)
+qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIBPROJECT)
 	include(SDKMacros)
-	sdk_install("pip" "${PROJECT_NAME}" "${H}")
+	sdk_install("pip" "${PROJECT_NAME}" "${out_HDR}")
 else()
 	if(LIB)
 		if(WIN32)
 			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
-			install(FILES ${H} DESTINATION ${MINGW_INCLUDE}/pip)
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-			get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
+			install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)
 		else()
 			if(APPLE)
 				set(CMAKE_INSTALL_PREFIX /usr/local)
 			else()
 				set(CMAKE_INSTALL_PREFIX /usr)
 			endif()
-			install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+			install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 		endif()
 		message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
-		install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 		message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 	endif()
 endif()
--- a/piqt_utils/CMakeLists.txt
+++ b/piqt_utils/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(piqt_utils)
 cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0017 OLD)
+#cmake_policy(SET CMP0017 OLD)
 if(LIBPROJECT)
 	include(PIPMacros)
 	include(SDKMacros)
@@ -13,21 +13,28 @@ else()
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 	endif()
 endif()
-find_package(QAD REQUIRED)
-include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
-qt_project(${PROJECT_NAME} H CPP)
-pip_code_model(CCM "../pip/src_main/io/piiodevice.h" "../pip/src_main/io/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es")
+set(LIBTYPE SHARED)
 if(DEFINED ENV{QNX_HOST})
-	add_library(${PROJECT_NAME} STATIC ${H} ${CPP} ${CCM})
-else()
-	add_library(${PROJECT_NAME} SHARED ${H} ${CPP} ${CCM})
+	set(LIBTYPE STATIC)
 endif()
-set(LIBS ${QAD_WIDGETS_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_BLOCKVIEW_LIBRARY} ${PIP_LIBRARY})
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+find_package(QAD REQUIRED)
+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/src_main/io/piiodevice.h" "../pip/src_main/io/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)
+qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets qad_blockview)
 message(STATUS "Building ${PROJECT_NAME}")

 if (LIBPROJECT)
-	add_dependencies(piqt_utils pip_cmg)
+	foreach(_v ${_QT_VERSIONS_})
+		if (LOCAL_FOUND${_v})
+			add_dependencies(piqt_utils${_v} pip_cmg)
+		endif()
+	endforeach()
 endif()

 if (NOT DEFINED ENV{QNX_HOST})
@@ -37,29 +44,27 @@ if (NOT DEFINED ENV{QNX_HOST})
 endif()

 if(LIBPROJECT)
-	sdk_install("pip" "${PROJECT_NAME}" "${H}")
+	sdk_install("pip" "${PROJECT_NAME}" "${out_HDR}")
 else()
 	if(LIB)
 		if(WIN32)
 			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
-			install(FILES ${H} DESTINATION ${MINGW_INCLUDE}/pip)
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-			get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
+			install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)
 		else()
 			if(APPLE)
 				set(CMAKE_INSTALL_PREFIX /usr/local)
 			else()
 				set(CMAKE_INSTALL_PREFIX /usr)
-				install(TARGETS ${_TARGETS} DESTINATION /usr/bin)
 			endif()
-			install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+			install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 		endif()
 		message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
-		install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 		message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 	endif()
 endif()
--- a/piqt_utils/piconnedit/CMakeLists.txt
+++ b/piqt_utils/piconnedit/CMakeLists.txt
@@ -1,21 +1,22 @@
-qt_project(piconnedit PICONNEDIT_H PICONNEDIT_CPP)
-add_executable(${PROJECT_NAME} WIN32 ${PICONNEDIT_H} ${PICONNEDIT_CPP})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} piqt_utils)
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+project(piconnedit)
+file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+find_qt(${QtVersions} Core Gui)
+qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
+qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets piqt_utils)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 	else()
 		if(APPLE)
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		else()
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
 		endif()
 	endif()
-	message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
+	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 else()
-	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-	message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
+	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 endif()
-
--- a/piqt_utils/pidumper/CMakeLists.txt
+++ b/piqt_utils/pidumper/CMakeLists.txt
@@ -1,21 +1,22 @@
-qt_project(pidumper PIDUMPER_H PIDUMPER_CPP)
-add_executable(${PROJECT_NAME} WIN32 ${PIDUMPER_H} ${PIDUMPER_CPP})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} piqt_utils)
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+project(pidumper)
+file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+find_qt(${QtVersions} Core Gui)
+qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
+qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets piqt_utils)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 	else()
 		if(APPLE)
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		else()
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
 		endif()
 	endif()
-	message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
+	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 else()
-	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-	message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
+	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 endif()
-
--- a/piqt_utils/pidumper/pidumper.cpp
+++ b/piqt_utils/pidumper/pidumper.cpp
@@ -10,7 +10,11 @@

 PIDumper::PIDumper(QWidget * parent): QMainWindow(parent) {
 	setupUi(this);
+#if QT_VERSION >= 0x050000
+	treeDump->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#else
 	treeDump->header()->setResizeMode(QHeaderView::ResizeToContents);
+#endif
 }


--- a/piqt_utils/piintrospector/CMakeLists.txt
+++ b/piqt_utils/piintrospector/CMakeLists.txt
@@ -1,21 +1,22 @@
-qt_project(piintrospector PIINTROSPECTOR_H PIINTROSPECTOR_CPP)
-add_executable(${PROJECT_NAME} WIN32 ${PIINTROSPECTOR_H} ${PIINTROSPECTOR_CPP})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} piqt_utils)
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+project(piintrospector)
+file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+find_qt(${QtVersions} Core Gui)
+qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
+qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets piqt_utils)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 	else()
 		if(APPLE)
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		else()
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
 		endif()
 	endif()
-	message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
+	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 else()
-	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-	message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
+	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 endif()
-
--- a/piqt_utils/piintrospector/piintrospector.cpp
+++ b/piqt_utils/piintrospector/piintrospector.cpp
@@ -7,7 +7,11 @@

 QPIIntrospector::QPIIntrospector(QWidget * parent): QMainWindow(parent), peer("__introspection_client__") {
 	setupUi(this);
+#if QT_VERSION >= 0x050000
+	tree->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#else
 	tree->header()->setResizeMode(QHeaderView::ResizeToContents);
+#endif
 	CONNECTU(&peer, dataReceivedEvent, this, peerReceived)
 	startTimer(100);
 }
--- a/piqt_utils/piqt_connection_edit.cpp
+++ b/piqt_utils/piqt_connection_edit.cpp
@@ -4,9 +4,6 @@
 #include "piqt_highlighter.h"
 #include "piqt.h"
 #include "picodeinfo.h"
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QSqlRecord>
 #include <QCheckBox>
 #include <QMessageBox>

--- a/qad/CMakeLists.txt
+++ b/qad/CMakeLists.txt
@@ -1,8 +1,7 @@
 project(qad)
 cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0017 OLD)
-find_package(Qt4 REQUIRED)
-include(QtProject.cmake)
+#cmake_policy(SET CMP0017 OLD)
+#find_package(Qt4 REQUIRED)
 if (LIBPROJECT)
 	include(../SDKMacros.cmake)
 else()
@@ -35,7 +34,7 @@ if (NOT LIBPROJECT)
 		message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 	endif()
 endif()
-set(CMAKES "FindQAD.cmake" "QtProject.cmake")
+set(CMAKES "FindQAD.cmake" "QtWraps.cmake")
 install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)

 macro(qad_install _TARGET _H_FILES)
@@ -48,45 +47,46 @@ macro(qad_install _TARGET _H_FILES)
 					#message("HFILES ${_H_FILES}")
 					install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/qad)
 				endif()
-				install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB})
-				install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN})
-				get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-				install(TARGETS ${_TARGET} DESTINATION ${QTDIR})
+				qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB})
+				qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN})
+				qt_install(TARGETS ${_TARGET} DESTINATION QtBin)
 			else()
 				if(NOT _H_FILES STREQUAL "")
 					install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad)
 				endif()
-				install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+				qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 			endif()
 		else()
-			install(TARGETS ${_TARGET} DESTINATION bin)
+			qt_install(TARGETS ${_TARGET} DESTINATION bin)
 		endif()
 	endif()
 endmacro()

-macro(qad_plugin NAME _LIBS)
-	project(qad_${NAME}_plugin)
+macro(qad_plugin NAME _MODULES _LIBS)
+	set(PROJ_NAME qad_${NAME}_plugin)
 	include_directories("..")
-	set(LIBS ${_${NAME}_PLUGIN_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)
 	add_definitions(-DQT_SHARED)
 	add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
-	file(GLOB PMOCS "./*.h")
-	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})
-	install(TARGETS ${PROJECT_NAME} DESTINATION ${QT_PLUGINS_DIR}/designer)
+	file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+	find_qt(${QtVersions} Core Designer ${_MODULES})
+	qt_wrap(${SRC} CPPS out_CPP QMS out_QM)
+	qt_add_library(${PROJ_NAME} SHARED out_CPP)
+	qt_target_link_libraries(${PROJ_NAME} ${_LIBS} qad_${NAME} ${_${NAME}_PLUGIN_LIBS})
+	qt_install(TARGETS ${PROJ_NAME} DESTINATION QtPlugins/designer)
 endmacro()

-macro(qad_project NAME _LIBS)
-	qt_project(qad_${NAME} _H _CPP)
-	add_library(qad_${NAME} SHARED ${_H} ${_CPP})
-	target_link_libraries(qad_${NAME} ${_LIBS})
-	message(STATUS "Building ${PROJECT_NAME}")
-	qad_install(${PROJECT_NAME} "${_H}")
+macro(qad_project NAME _MODULES _LIBS)
+	set(PROJ_NAME qad_${NAME})
+	file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+	find_qt(${QtVersions} Core ${_MODULES})
+	qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+	qt_add_library(${PROJ_NAME} SHARED out_CPP)
+	qt_target_link_libraries(${PROJ_NAME} ${_LIBS})
+	qad_install(${PROJ_NAME} "${out_HDR}")
+	message(STATUS "Building ${PROJ_NAME}")
 	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
 		set(_${NAME}_PLUGIN_LIBS "${_LIBS}")
 		add_subdirectory(plugin)
@@ -94,6 +94,10 @@ macro(qad_project NAME _LIBS)
 endmacro()

 set(DIRS utils widgets application blockview graphic sql_table touch_widgets)
+foreach(D ${DIRS})
+	list(APPEND QT_MULTILIB_LIST qad_${D})
+endforeach(D)
+set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
 foreach(D ${DIRS})
 	include_directories(${D})
 	add_subdirectory(${D})
--- a/qad/FindQAD.cmake
+++ b/qad/FindQAD.cmake
@@ -1,5 +1,5 @@
 if(NOT LIBPROJECT)
-	include(QtProject)
+	include(QtWraps)
 endif()
 set(_SEARCH_DIR)
 if(WIN32)
@@ -24,10 +24,15 @@ foreach(_Q ${_QAD_LIBS})
 		set(QAD_${_QU}_LIBRARY qad_${_Q})
 		list(APPEND QAD_INCLUDES ${QAD_DIR}/${_Q})
 	else()
-		find_library(QAD_${_QU}_LIBRARY qad_${_Q} ${_SEARCH_DIR})
+		foreach(_v ${_QT_VERSIONS_})
+			find_library(QAD${_v}_${_QU}_LIBRARY qad_${_Q}${_v} ${_SEARCH_DIR})
+		endforeach()
 	endif()
 	#message(STATUS "Library ${_Q} (${_QU}) -> ${QAD_${_QU}_LIBRARY} found in ${_SEARCH_DIR}")
 endforeach()
 if(NOT LIBPROJECT)
+	if (NOT _QAD_MSG)
+		set(_QAD_MSG 1 CACHE BOOL "msg_qad" FORCE)
 		message(STATUS "Found QAD")
 	endif()
+endif()
--- a/qad/QtProject.cmake
+++ b/qad/QtProject.cmake
@@ -1,16 +0,0 @@
-macro(qt_project NAME _H_OUT _CPP_OUT)
-	project(${NAME})
-	find_package(Qt4 REQUIRED)
-	include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
-	file(GLOB ${_H_OUT} "./*.h")
-	file(GLOB CPPS_${NAME} "./*.cpp")
-	file(GLOB UIS_${NAME}  "./*.ui")
-	file(GLOB RES_${NAME}  "./*.qrc")
-	qt4_wrap_ui(CUIS_${NAME} ${UIS_${NAME}})
-	qt4_wrap_cpp(CMOCS_${NAME} ${${_H_OUT}} OPTIONS -nw)
-	qt4_add_resources(CRES_${NAME} ${RES_${NAME}})
-	set(${_CPP_OUT} ${CPPS_${NAME}})
-	list(APPEND ${_CPP_OUT} ${CUIS_${NAME}})
-	list(APPEND ${_CPP_OUT} ${CMOCS_${NAME}})
-	list(APPEND ${_CPP_OUT} ${CRES_${NAME}})
-endmacro()
--- a/qad/application/CMakeLists.txt
+++ b/qad/application/CMakeLists.txt
@@ -1,2 +1 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets)
-qad_project(application "${LIBS}")
+qad_project(application "Gui;Widgets" "qad_widgets")
--- a/qad/application/plugin/CMakeLists.txt
+++ b/qad/application/plugin/CMakeLists.txt
@@ -1 +1 @@
-qad_plugin(application "")
+qad_plugin(application "Gui;Widgets" "")
--- a/qad/application/plugin/edockwidgetplugin.h
+++ b/qad/application/plugin/edockwidgetplugin.h
@@ -1,7 +1,11 @@
 #ifndef EDOCKWIDGETPLUGIN_H
 #define EDOCKWIDGETPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class EDockWidgetPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/application/plugin/emainwindowplugin.h
+++ b/qad/application/plugin/emainwindowplugin.h
@@ -1,7 +1,11 @@
 #ifndef EMAINWINDOWPLUGIN_H
 #define EMAINWINDOWPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class EMainWindowPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/application/plugin/historyviewplugin.h
+++ b/qad/application/plugin/historyviewplugin.h
@@ -1,7 +1,11 @@
 #ifndef HISTORYVIEWPLUGIN_H
 #define HISTORYVIEWPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class HistoryViewPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/application/plugin/qad_application.cpp
+++ b/qad/application/plugin/qad_application.cpp
@@ -1,7 +1,7 @@
+#include "qad_application.h"
 #include "edockwidgetplugin.h"
 #include "emainwindowplugin.h"
 #include "historyviewplugin.h"
-#include "qad_application.h"


 QADApplication::QADApplication(QObject * parent): QObject(parent) {
@@ -16,4 +16,6 @@ QList<QDesignerCustomWidgetInterface * > QADApplication::customWidgets() const {
 }


+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(qad_graphic_plugin, QADApplication)
+#endif
--- a/qad/application/plugin/qad_application.h
+++ b/qad/application/plugin/qad_application.h
@@ -8,7 +8,9 @@ class QADApplication: public QObject, public QDesignerCustomWidgetCollectionInte
 {
 	Q_OBJECT
 	Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
-
+#if QT_VERSION >= 0x050000
+	Q_PLUGIN_METADATA(IID "qad.application")
+#endif
 public:
 	explicit QADApplication(QObject * parent = 0);
 	virtual QList<QDesignerCustomWidgetInterface * > customWidgets() const;
--- a/qad/blockview/CMakeLists.txt
+++ b/qad/blockview/CMakeLists.txt
@@ -1,3 +1,2 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets qad_utils)
-qad_project(blockview "${LIBS}")
+qad_project(blockview "Gui;Widgets" "qad_utils;qad_widgets")
 add_subdirectory(blockeditor)
--- a/qad/blockview/blockbusitem.h
+++ b/qad/blockview/blockbusitem.h
@@ -5,7 +5,7 @@


 class BlockBusItem: public QGraphicsObject, public PropertyStorage {
-	//Q_OBJECT
+	Q_OBJECT
 	Q_INTERFACES(QGraphicsItem)
 	//Q_PROPERTY(double width READ width WRITE setWidth)
 	friend class BlockView;
--- a/qad/blockview/blockeditor/CMakeLists.txt
+++ b/qad/blockview/blockeditor/CMakeLists.txt
@@ -1,21 +1,22 @@
-qt_project(blockeditor BLOCKEDITOR_H BLOCKEDITOR_H)
-add_executable(${PROJECT_NAME} WIN32 ${BLOCKEDITOR_H} ${BLOCKEDITOR_H})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets qad_utils qad_blockview)
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+project(blockeditor)
+file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+find_qt(${QtVersions} Core Gui Widgets)
+qt_wrap(${SRC} CPPS out_CPP QMS out_QM)
+qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
+qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_blockview)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 	else()
 		if(APPLE)
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		else()
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
 		endif()
 	endif()
-	message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
+	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 else()
-	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-	message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
+	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 endif()
-
--- a/qad/blockview/blockview.cpp
+++ b/qad/blockview/blockview.cpp
@@ -7,6 +7,7 @@
 #include <QShortcut>
 #include <QVector2D>
 #include <QClipboard>
+#include <QMimeData>

 const QString _BlockView_Mime_ = "_BlockView_copypaste_";

--- a/qad/blockview/plugin/CMakeLists.txt
+++ b/qad/blockview/plugin/CMakeLists.txt
@@ -1 +1 @@
-qad_plugin(blockview "")
+qad_plugin(blockview "Gui;Widgets" "")
--- a/qad/blockview/plugin/blockviewplugin.h
+++ b/qad/blockview/plugin/blockviewplugin.h
@@ -1,7 +1,11 @@
 #ifndef BLOCKVIEWPLUGIN_H
 #define BLOCKVIEWPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class BlockViewPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/blockview/plugin/qad_blockview.cpp
+++ b/qad/blockview/plugin/qad_blockview.cpp
@@ -1,5 +1,5 @@
-#include "blockviewplugin.h"
 #include "qad_blockview.h"
+#include "blockviewplugin.h"

 QADBlockView::QADBlockView(QObject * parent): QObject(parent)
 {
@@ -11,4 +11,7 @@ QList<QDesignerCustomWidgetInterface * > QADBlockView::customWidgets() const {
 	return m_widgets;
 }

+
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(qad_graphic_plugin, QADBlockView)
+#endif
--- a/qad/blockview/plugin/qad_blockview.h
+++ b/qad/blockview/plugin/qad_blockview.h
@@ -8,7 +8,9 @@ class QADBlockView: public QObject, public QDesignerCustomWidgetCollectionInterf
 {
 	Q_OBJECT
 	Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
-
+#if QT_VERSION >= 0x050000
+	Q_PLUGIN_METADATA(IID "qad.blockview")
+#endif
 public:
 	explicit QADBlockView(QObject * parent = 0);
 	virtual QList<QDesignerCustomWidgetInterface * > customWidgets() const;
--- a/qad/graphic/CMakeLists.txt
+++ b/qad/graphic/CMakeLists.txt
@@ -1,3 +1,2 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} qad_widgets qad_utils)
-qad_project(graphic "${LIBS}")
+qad_project(graphic "Gui;Widgets;OpenGL" "qad_widgets;qad_utils;${OPENGL_LIBRARIES}")
 add_subdirectory(qpicalculator)
--- a/qad/graphic/graphic.cpp
+++ b/qad/graphic/graphic.cpp
@@ -2,7 +2,7 @@
 #include "ui_graphic.h"
 #include "ui_graphic_conf.h"
 #if QT_VERSION >= 0x050100
-#  include <QSensorGestureManager>
+//#  include <QSensorGestureManager>
 #endif


--- a/qad/graphic/plugin/CMakeLists.txt
+++ b/qad/graphic/plugin/CMakeLists.txt
@@ -1 +1 @@
-qad_plugin(graphic "")
+qad_plugin(graphic "Gui;Widgets;OpenGL" "")
--- a/qad/graphic/plugin/graphicplugin.h
+++ b/qad/graphic/plugin/graphicplugin.h
@@ -1,7 +1,11 @@
 #ifndef GRAPHICPLUGIN_H
 #define GRAPHICPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class GraphicPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/graphic/plugin/qad_graphic.cpp
+++ b/qad/graphic/plugin/qad_graphic.cpp
@@ -1,5 +1,5 @@
-#include "graphicplugin.h"
 #include "qad_graphic.h"
+#include "graphicplugin.h"

 QADGraphic::QADGraphic(QObject * parent): QObject(parent)
 {
@@ -11,4 +11,7 @@ QList<QDesignerCustomWidgetInterface * > QADGraphic::customWidgets() const {
 	return m_widgets;
 }

+
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(qad_graphic_plugin, QADGraphic)
+#endif
--- a/qad/graphic/plugin/qad_graphic.h
+++ b/qad/graphic/plugin/qad_graphic.h
@@ -8,7 +8,9 @@ class QADGraphic: public QObject, public QDesignerCustomWidgetCollectionInterfac
 {
 	Q_OBJECT
 	Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
-
+#if QT_VERSION >= 0x050000
+	Q_PLUGIN_METADATA(IID "qad.graphic")
+#endif
 public:
 	explicit QADGraphic(QObject * parent = 0);
 	virtual QList<QDesignerCustomWidgetInterface * > customWidgets() const;
--- a/qad/graphic/qpicalculator/CMakeLists.txt
+++ b/qad/graphic/qpicalculator/CMakeLists.txt
@@ -1,21 +1,23 @@
-qt_project(qpicalc QPICALC_H QPICALC_H)
-add_executable(${PROJECT_NAME} WIN32 ${QPICALC_H} ${QPICALC_H})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets qad_utils qad_graphic)
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+project(qpicalc)
+file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+find_qt(${QtVersions} Core Gui Widgets)
+qt_wrap(${SRC} CPPS out_CPP QMS out_QM)
+qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
+qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_graphic)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 	else()
 		if(APPLE)
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		else()
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
 		endif()
 	endif()
-	message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
+	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 else()
-	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-	message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
+	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 endif()

--- a/qad/graphic/qpicalculator/main.cpp
+++ b/qad/graphic/qpicalculator/main.cpp
@@ -1,8 +1,8 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "mainwindow.h"

-int main(int argc, char *argv[])
-{
+
+int main(int argc, char *argv[]) {
 	QApplication a(argc, argv);
 	MainWindow w;
 	w.show();
--- a/qad/graphic/qpicalculator/mainwindow.cpp
+++ b/qad/graphic/qpicalculator/mainwindow.cpp
@@ -5,8 +5,13 @@ MainWindow::MainWindow(QWidget * parent): QMainWindow(parent), Ui::MainWindow()
 	setupUi(this);
 	active_ = false;
 	lineInput->setFocus();
+#if QT_VERSION >= 0x050000
+	treeGraphics->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+	treeGraphics->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+#else
 	treeGraphics->header()->setResizeMode(0, QHeaderView::ResizeToContents);
 	treeGraphics->header()->setResizeMode(1, QHeaderView::ResizeToContents);
+#endif
 	npal = epal = lineInput->palette();
 	epal.setColor(lineInput->backgroundRole(), QColor(Qt::red).lighter(150));
 	connect(&session, SIGNAL(loading(QPIConfig & )), this, SLOT(loading(QPIConfig & )));
--- a/qad/sql_table/CMakeLists.txt
+++ b/qad/sql_table/CMakeLists.txt
@@ -1,2 +1 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSQL_LIBRARY} qad_widgets qad_utils)
-qad_project(sql_table "${LIBS}")
+qad_project(sql_table "Gui;Widgets;Sql" "qad_utils;qad_widgets")
--- a/qad/sql_table/plugin/CMakeLists.txt
+++ b/qad/sql_table/plugin/CMakeLists.txt
@@ -1 +1 @@
-qad_plugin(sql_table "")
+qad_plugin(sql_table "Gui;Widgets;Sql" "")
--- a/qad/sql_table/plugin/qad_sql_table.cpp
+++ b/qad/sql_table/plugin/qad_sql_table.cpp
@@ -14,4 +14,6 @@ QList<QDesignerCustomWidgetInterface * > QADSQLTable::customWidgets() const {
 }


+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(qad_sql_table_plugin, QADSQLTable)
+#endif
--- a/qad/sql_table/plugin/qad_sql_table.h
+++ b/qad/sql_table/plugin/qad_sql_table.h
@@ -8,7 +8,9 @@ class QADSQLTable: public QObject, public QDesignerCustomWidgetCollectionInterfa
 {
 	Q_OBJECT
 	Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
-
+#if QT_VERSION >= 0x050000
+	Q_PLUGIN_METADATA(IID "qad.sql_table")
+#endif
 public:
 	explicit QADSQLTable(QObject * parent = 0);
 	virtual QList<QDesignerCustomWidgetInterface * > customWidgets() const;
--- a/qad/sql_table/plugin/sql_record_plugin.h
+++ b/qad/sql_table/plugin/sql_record_plugin.h
@@ -1,7 +1,11 @@
 #ifndef SQLRECORDPLUGIN_H
 #define SQLRECORDPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class SQLRecordPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/sql_table/plugin/sql_table_plugin.h
+++ b/qad/sql_table/plugin/sql_table_plugin.h
@@ -1,7 +1,11 @@
 #ifndef SQLTABLEPLUGIN_H
 #define SQLTABLEPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class SQLTablePlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/touch_widgets/CMakeLists.txt
+++ b/qad/touch_widgets/CMakeLists.txt
@@ -1,2 +1 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-qad_project(touch_widgets "${LIBS}")
+qad_project(touch_widgets "Gui;Widgets" "")
--- a/qad/touch_widgets/plugin/CMakeLists.txt
+++ b/qad/touch_widgets/plugin/CMakeLists.txt
@@ -1 +1 @@
-qad_plugin(touch_widgets "")
+qad_plugin(touch_widgets "Gui;Widgets" "")
--- a/qad/touch_widgets/plugin/touch_widgets.cpp
+++ b/qad/touch_widgets/plugin/touch_widgets.cpp
@@ -1,7 +1,7 @@
+#include "touch_widgets.h"
 #include "touchsliderplugin.h"
 #include "touchbuttframeplugin.h"
 #include "touchbuttonplugin.h"
-#include "touch_widgets.h"

 TW::TW(QObject *parent)
        : QObject(parent)
@@ -16,4 +16,7 @@ QList<QDesignerCustomWidgetInterface*> TW::customWidgets() const
    return m_widgets;
 }

+
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(twplugin, TW)
+#endif
--- a/qad/touch_widgets/plugin/touch_widgets.h
+++ b/qad/touch_widgets/plugin/touch_widgets.h
@@ -8,7 +8,9 @@ class TW : public QObject, public QDesignerCustomWidgetCollectionInterface
 {
    Q_OBJECT
    Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
-
+#if QT_VERSION >= 0x050000
+	Q_PLUGIN_METADATA(IID "qad.touch_widgets")
+#endif
 public:
    explicit TW(QObject *parent = 0);

--- a/qad/touch_widgets/plugin/touchbuttframeplugin.h
+++ b/qad/touch_widgets/plugin/touchbuttframeplugin.h
@@ -1,7 +1,11 @@
 #ifndef TOUCHBUTTFRAMEPLUGIN_H
 #define TOUCHBUTTFRAMEPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class TouchButtFramePlugin : public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/touch_widgets/plugin/touchbuttonplugin.h
+++ b/qad/touch_widgets/plugin/touchbuttonplugin.h
@@ -1,7 +1,11 @@
 #ifndef TOUCHBUTTONPLUGIN_H
 #define TOUCHBUTTONPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class TouchButtonPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/touch_widgets/plugin/touchsliderplugin.h
+++ b/qad/touch_widgets/plugin/touchsliderplugin.h
@@ -1,7 +1,11 @@
 #ifndef TOUCHSLIDERPLUGIN_H
 #define TOUCHSLIDERPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class TouchSliderPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/touch_widgets/touchbuttframe.h
+++ b/qad/touch_widgets/touchbuttframe.h
@@ -1,7 +1,7 @@
 #ifndef TOUCHBUTTFRAME_H
 #define TOUCHBUTTFRAME_H

-#include <QtGui/QFrame>
+#include <QFrame>
 #include <QBoxLayout>
 #include <QDebug>
 #include "touchbutton.h"
--- a/qad/utils/CMakeLists.txt
+++ b/qad/utils/CMakeLists.txt
@@ -1,2 +1 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-qad_project(utils "${LIBS}")
+qad_project(utils "Gui" "")
--- a/qad/utils/plugin/CMakeLists.txt
+++ b/qad/utils/plugin/CMakeLists.txt
@@ -1 +1 @@
-qad_plugin(utils "")
+qad_plugin(utils "Gui" "")
--- a/qad/utils/plugin/qad_utils.cpp
+++ b/qad/utils/plugin/qad_utils.cpp
@@ -10,4 +10,7 @@ QList<QDesignerCustomWidgetInterface * > QADUtils::customWidgets() const {
 	return m_widgets;
 }

+
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(qad_utils_plugin, QADUtils)
+#endif
--- a/qad/utils/plugin/qad_utils.h
+++ b/qad/utils/plugin/qad_utils.h
@@ -7,8 +7,11 @@
 class QADUtils: public QObject, public QDesignerCustomWidgetCollectionInterface
 {
 	Q_OBJECT
+	//Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
+#if QT_VERSION >= 0x050000
+	Q_PLUGIN_METADATA(IID "qad.utils")
+#endif
 	Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
-
 public:
 	explicit QADUtils(QObject * parent = 0);
 	virtual QList<QDesignerCustomWidgetInterface * > customWidgets() const;
--- a/qad/widgets/CMakeLists.txt
+++ b/qad/widgets/CMakeLists.txt
@@ -1,2 +1 @@
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_utils)
-qad_project(widgets "${LIBS}")
+qad_project(widgets "Gui;Widgets" "qad_utils")
--- a/qad/widgets/plugin/CMakeLists.txt
+++ b/qad/widgets/plugin/CMakeLists.txt
@@ -1 +1 @@
-qad_plugin(widgets "")
+qad_plugin(widgets "Gui;Widgets" "")
--- a/qad/widgets/plugin/chardialogplugin.h
+++ b/qad/widgets/plugin/chardialogplugin.h
@@ -1,7 +1,11 @@
 #ifndef CHARDIALOGPLUGIN_H
 #define CHARDIALOGPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class CharDialogPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/clineeditplugin.h
+++ b/qad/widgets/plugin/clineeditplugin.h
@@ -1,7 +1,11 @@
 #ifndef CLINEEDITPLUGIN_H
 #define CLINEEDITPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class CLineEditPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/colorbuttonplugin.h
+++ b/qad/widgets/plugin/colorbuttonplugin.h
@@ -1,7 +1,11 @@
 #ifndef COLORBUTTONPLUGIN_H
 #define COLORBUTTONPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class ColorButtonPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/ecomboboxplugin.h
+++ b/qad/widgets/plugin/ecomboboxplugin.h
@@ -1,7 +1,11 @@
 #ifndef ECOMBOBOXPLUGIN_H
 #define ECOMBOBOXPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class EComboBoxPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/iconedlabelplugin.h
+++ b/qad/widgets/plugin/iconedlabelplugin.h
@@ -1,7 +1,11 @@
 #ifndef ICONEDLABEPLUGIN_H
 #define ICONEDLABEPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class IconedLabelPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/qad_widgets.cpp
+++ b/qad/widgets/plugin/qad_widgets.cpp
@@ -1,3 +1,4 @@
+#include "qad_widgets.h"
 #include "spinsliderplugin.h"
 #include "colorbuttonplugin.h"
 #include "chardialogplugin.h"
@@ -12,7 +13,6 @@
 #include "qcodeeditplugin.h"
 #include "qvarianteditplugin.h"
 #include "qpiconfigplugin.h"
-#include "qad_widgets.h"

 QADWidgets::QADWidgets(QObject * parent): QObject(parent)
 {
@@ -37,4 +37,7 @@ QList<QDesignerCustomWidgetInterface * > QADWidgets::customWidgets() const {
 	return m_widgets;
 }

+
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(qad_widgets_plugin, QADWidgets)
+#endif
--- a/qad/widgets/plugin/qad_widgets.h
+++ b/qad/widgets/plugin/qad_widgets.h
@@ -8,7 +8,9 @@ class QADWidgets: public QObject, public QDesignerCustomWidgetCollectionInterfac
 {
 	Q_OBJECT
 	Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
-
+#if QT_VERSION >= 0x050000
+	Q_PLUGIN_METADATA(IID "qad.widgets")
+#endif
 public:
 	explicit QADWidgets(QObject * parent = 0);
 	virtual QList<QDesignerCustomWidgetInterface * > customWidgets() const;
--- a/qad/widgets/plugin/qcodeeditplugin.h
+++ b/qad/widgets/plugin/qcodeeditplugin.h
@@ -1,7 +1,11 @@
 #ifndef QCODEEDITPLUGIN_H
 #define QCODEEDITPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class QCodeEditPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/qipeditplugin.h
+++ b/qad/widgets/plugin/qipeditplugin.h
@@ -1,7 +1,11 @@
 #ifndef QIPEDITPLUGIN_H
 #define QIPEDITPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class QIPEditPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/qpiconfigplugin.h
+++ b/qad/widgets/plugin/qpiconfigplugin.h
@@ -1,7 +1,11 @@
 #ifndef QPICONFIGPLUGIN_H
 #define QPICONFIGPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class QPIConfigPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/qpiconsoleplugin.h
+++ b/qad/widgets/plugin/qpiconsoleplugin.h
@@ -1,7 +1,11 @@
 #ifndef QPICONSOLEPLUGIN_H
 #define QPICONSOLEPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class QPIConsolePlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/qpointeditplugin.h
+++ b/qad/widgets/plugin/qpointeditplugin.h
@@ -1,7 +1,11 @@
 #ifndef QPOINTEDITPLUGIN_H
 #define QPOINTEDITPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class QPointEditPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/qrecteditplugin.h
+++ b/qad/widgets/plugin/qrecteditplugin.h
@@ -1,7 +1,11 @@
 #ifndef QRECTEDITPLUGIN_H
 #define QRECTEDITPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class QRectEditPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/qvarianteditplugin.h
+++ b/qad/widgets/plugin/qvarianteditplugin.h
@@ -1,7 +1,11 @@
 #ifndef QVARIANTEDITPLUGIN_H
 #define QVARIANTEDITPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class QVariantEditPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/shortcutsplugin.h
+++ b/qad/widgets/plugin/shortcutsplugin.h
@@ -1,7 +1,11 @@
 #ifndef SHORTCUTSPLUGIN_H
 #define SHORTCUTSPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class ShortcutsPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qad/widgets/plugin/spinsliderplugin.h
+++ b/qad/widgets/plugin/spinsliderplugin.h
@@ -1,7 +1,11 @@
 #ifndef SPINSLIDERPLUGIN_H
 #define SPINSLIDERPLUGIN_H

+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
 #  include <QDesignerCustomWidgetInterface>
+#endif

 class SpinSliderPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
--- a/qcd_utils/CMakeLists.txt
+++ b/qcd_utils/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(qcd_utils)
 cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0017 OLD)
+#cmake_policy(SET CMP0017 OLD)
 if (NOT LIBPROJECT)
 	find_package(PIP REQUIRED)
 	option(LIB "System install" 0)
@@ -11,35 +11,37 @@ if (NOT LIBPROJECT)
 	endif()
 endif()
 find_package(QAD REQUIRED)
+list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME})
+set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
 include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
-qt_project(${PROJECT_NAME} H CPP)
-add_library(${PROJECT_NAME} SHARED ${H} ${CPP})
-set(LIBS ${PIP_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} cd_utils piqt)
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+find_qt(${QtVersions} Core Gui)
+qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+qt_add_library(${PROJECT_NAME} SHARED out_CPP)
+qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets cd_utils piqt)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIBPROJECT)
-	sdk_install("" ${PROJECT_NAME} "${H}")
+	sdk_install("" "${PROJECT_NAME}" "${out_HDR}")
 else()
 	if(LIB)
 		if(WIN32)
 			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
-			install(FILES ${H} DESTINATION ${MINGW_INCLUDE}/pip)
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-			get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
+			install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE})
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)
 		else()
 			if(APPLE)
 				set(CMAKE_INSTALL_PREFIX /usr/local)
 			else()
 				set(CMAKE_INSTALL_PREFIX /usr)
 			endif()
-			install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+			install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 		endif()
 		message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
-		install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 		message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 	endif()
 endif()
--- a/qcd_utils/pult/CMakeLists.txt
+++ b/qcd_utils/pult/CMakeLists.txt
@@ -1,21 +1,22 @@
-qt_project(cd_pult PULT_H PULT_CPP)
-add_executable(${PROJECT_NAME} WIN32 ${PULT_H} ${PULT_CPP})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QAD_GRAPHIC_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} qcd_utils)
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+project(cd_pult)
+file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+find_qt(${QtVersions} Core Gui)
+qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
+qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_graphic qcd_utils)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 	else()
 		if(APPLE)
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		else()
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
 		endif()
 	endif()
-	message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
+	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 else()
-	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-	message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
+	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 endif()
-
--- a/qcd_utils/pult/main.cpp
+++ b/qcd_utils/pult/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "form.h"