Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix qdeclarativeview plugin build

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-12-11 00:02:37 +02:00
parent 8e2b0e39fe
commit 8f9f5b5beb
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/plugins/CMakeLists.txt
View file

@ -133,6 +133,5 @@ if(WITH_DBUS AND DBUS_FOUND)
endif() endif()
# FIXME: requires some desginer definitions include(designer/qdeclarativeview/qdeclarativeview.cmake)
# include(designer/qdeclarativeview/qdeclarativeview.cmake)
include(designer/phonon/phonon.cmake) include(designer/phonon/phonon.cmake)

8
src/plugins/designer/qdeclarativeview/qdeclarativeview.cmake
View file

@ -1,3 +1,5 @@
include_directories(${CMAKE_CURRENT_BINARY_DIR}/designer/qdeclarativeview)
set(QDECLARATIVEVIEWPLUGIN_HEADERS set(QDECLARATIVEVIEWPLUGIN_HEADERS
${QDECLARATIVEVIEWPLUGIN_HEADERS} ${QDECLARATIVEVIEWPLUGIN_HEADERS}
${CMAKE_CURRENT_SOURCE_DIR}/designer/qdeclarativeview/qdeclarativeview_plugin.h ${CMAKE_CURRENT_SOURCE_DIR}/designer/qdeclarativeview/qdeclarativeview_plugin.h
@ -12,7 +14,11 @@ katie_resources("${QDECLARATIVEVIEWPLUGIN_HEADERS}")
katie_resources("${QDECLARATIVEVIEWPLUGIN_SOURCES}") katie_resources("${QDECLARATIVEVIEWPLUGIN_SOURCES}")
add_library(qdeclarativeviewplugin ${KATIE_TYPE} ${QDECLARATIVEVIEWPLUGIN_SOURCES} ${QDECLARATIVEVIEWPLUGIN_HEADERS}) add_library(qdeclarativeviewplugin ${KATIE_TYPE} ${QDECLARATIVEVIEWPLUGIN_SOURCES} ${QDECLARATIVEVIEWPLUGIN_HEADERS})
target_link_libraries(qdeclarativeviewplugin KtCore KtDeclarative KtDesigner)
set_target_properties(qdeclarativeviewplugin PROPERTIES OUTPUT_NAME qdeclarativeview) set_target_properties(qdeclarativeviewplugin PROPERTIES OUTPUT_NAME qdeclarativeview)
target_compile_definitions(qdeclarativeviewplugin PRIVATE -DQDESIGNER_SDK_LIBRARY) target_compile_definitions(qdeclarativeviewplugin PRIVATE -DQDESIGNER_SDK_LIBRARY)
install(TARGETS qdeclarativeviewplugin DESTINATION ${QT_PLUGINS_PATH_INST}/designer/) install(
TARGETS qdeclarativeviewplugin
DESTINATION ${QT_PLUGINS_PATH_INST}/designer
)

3
src/plugins/designer/qdeclarativeview/qdeclarativeview_plugin.cpp
View file

@ -41,7 +41,7 @@
#include "qdeclarativeview_plugin.h" #include "qdeclarativeview_plugin.h"
#include <QtDesigner/QExtensionFactory> #include <QtDesigner/default_extensionfactory.h>
#include <QtDesigner/QExtensionManager> #include <QtDesigner/QExtensionManager>
#include <QtCore/qplugin.h> #include <QtCore/qplugin.h>
@ -130,4 +130,5 @@ QString QDeclarativeViewPlugin::domXml() const
Q_EXPORT_PLUGIN2(customwidgetplugin, QDeclarativeViewPlugin) Q_EXPORT_PLUGIN2(customwidgetplugin, QDeclarativeViewPlugin)
QT_END_NAMESPACE QT_END_NAMESPACE
#include <moc_qdeclarativeview_plugin.h> #include <moc_qdeclarativeview_plugin.h>

2
src/plugins/designer/qdeclarativeview/qdeclarativeview_plugin.h
View file

@ -42,7 +42,7 @@
#ifndef QDECLARATIVEVIEW_PLUGIN_H #ifndef QDECLARATIVEVIEW_PLUGIN_H
#define QDECLARATIVEVIEW_PLUGIN_H #define QDECLARATIVEVIEW_PLUGIN_H
#include <QtDesigner/customwidget.h> #include <QtUiTools/customwidget.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE