Multi-Qt building

git-svn-id: svn://db.shs.com.ru/libs@250 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
2017-08-03 08:09:44 +00:00
parent 96935ebb4a
commit 0834c45c90
78 changed files with 410 additions and 249 deletions

View File

@@ -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)

View File

@@ -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;

View File

@@ -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()

View File

@@ -7,6 +7,7 @@
#include <QShortcut>
#include <QVector2D>
#include <QClipboard>
#include <QMimeData>
const QString _BlockView_Mime_ = "_BlockView_copypaste_";

View File

@@ -1 +1 @@
qad_plugin(blockview "")
qad_plugin(blockview "Gui;Widgets" "")

View File

@@ -1,7 +1,11 @@
#ifndef BLOCKVIEWPLUGIN_H
#define BLOCKVIEWPLUGIN_H
#include <QDesignerCustomWidgetInterface>
#if QT_VERSION >= 0x050000
# include <QtUiPlugin/QDesignerCustomWidgetInterface>
#else
# include <QDesignerCustomWidgetInterface>
#endif
class BlockViewPlugin: public QObject, public QDesignerCustomWidgetInterface
{

View File

@@ -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

View File

@@ -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;