move some widgets in libplasmaqgv
This commit is contained in:
Marco Martin
parent
68569d25fd
commit
68bc6b9a6a
120
CMakeLists.txt
120
CMakeLists.txt
@ -60,8 +60,9 @@ set(plasmagik_SRCS
|
||||
|
||||
set(plasma_LIB_SRCS
|
||||
${plasmagik_SRCS}
|
||||
abstractrunner.cpp
|
||||
abstracttoolbox.cpp
|
||||
dialog.cpp
|
||||
abstractrunner.cpp
|
||||
animator.cpp
|
||||
animations/animation.cpp
|
||||
animations/animationscriptengine.cpp
|
||||
@ -82,32 +83,30 @@ set(plasma_LIB_SRCS
|
||||
animations/water.cpp
|
||||
animations/widgetsnapshot.cpp
|
||||
animations/zoom.cpp
|
||||
applet.cpp
|
||||
configloader.cpp
|
||||
containment.cpp
|
||||
containmentactions.cpp
|
||||
containmentactionspluginsconfig.cpp
|
||||
context.cpp
|
||||
corona.cpp
|
||||
datacontainer.cpp
|
||||
dataengine.cpp
|
||||
dataenginemanager.cpp
|
||||
delegate.cpp
|
||||
dialog.cpp
|
||||
abstractdialogmanager.cpp
|
||||
extenders/extender.cpp
|
||||
extenders/extendergroup.cpp
|
||||
extenders/extenderitem.cpp
|
||||
pluginloader.cpp
|
||||
abstractdialogmanager.cpp
|
||||
paintutils.cpp
|
||||
framesvg.cpp
|
||||
plasma.cpp
|
||||
applet.cpp
|
||||
containment.cpp
|
||||
containmentactions.cpp
|
||||
containmentactionspluginsconfig.cpp
|
||||
popupapplet.cpp
|
||||
private/animablegraphicswebview.cpp
|
||||
pluginloader.cpp
|
||||
|
||||
private/applethandle.cpp
|
||||
private/associatedapplicationmanager.cpp
|
||||
private/datacontainer_p.cpp
|
||||
private/dataenginebindings.cpp
|
||||
private/dataengineconsumer.cpp
|
||||
private/dataengineservice.cpp
|
||||
private/denyallauthorization.cpp
|
||||
@ -116,7 +115,6 @@ set(plasma_LIB_SRCS
|
||||
private/extenderitemmimedata.cpp
|
||||
private/focusindicator.cpp
|
||||
private/getsource.cpp
|
||||
private/nativetabbar.cpp
|
||||
private/packages.cpp
|
||||
private/pinpairingauthorization.cpp
|
||||
private/pinpairingdialog.cpp
|
||||
@ -129,12 +127,11 @@ set(plasma_LIB_SRCS
|
||||
private/storage.cpp
|
||||
private/storagethread.cpp
|
||||
private/style.cpp
|
||||
private/trustedonlyauthorization.cpp
|
||||
private/tooltip.cpp
|
||||
private/trustedonlyauthorization.cpp
|
||||
private/wallpaperrenderthread.cpp
|
||||
private/windowpreview.cpp
|
||||
private/kineticscroll.cpp
|
||||
private/declarative/declarativenetworkaccessmanagerfactory.cpp
|
||||
private/effects/halopainter.cpp
|
||||
private/effects/ripple.cpp
|
||||
querymatch.cpp
|
||||
@ -164,33 +161,7 @@ set(plasma_LIB_SRCS
|
||||
view.cpp
|
||||
wallpaper.cpp
|
||||
windoweffects.cpp
|
||||
widgets/checkbox.cpp
|
||||
widgets/combobox.cpp
|
||||
widgets/declarativewidget.cpp
|
||||
widgets/flashinglabel.cpp
|
||||
widgets/frame.cpp
|
||||
widgets/groupbox.cpp
|
||||
widgets/iconwidget.cpp
|
||||
widgets/itembackground.cpp
|
||||
widgets/label.cpp
|
||||
widgets/lineedit.cpp
|
||||
widgets/meter.cpp
|
||||
widgets/pushbutton.cpp
|
||||
widgets/radiobutton.cpp
|
||||
widgets/scrollbar.cpp
|
||||
widgets/signalplotter.cpp
|
||||
widgets/slider.cpp
|
||||
widgets/spinbox.cpp
|
||||
widgets/toolbutton.cpp
|
||||
widgets/busywidget.cpp
|
||||
widgets/scrollwidget.cpp
|
||||
widgets/separator.cpp
|
||||
widgets/svgwidget.cpp
|
||||
widgets/tabbar.cpp
|
||||
widgets/textbrowser.cpp
|
||||
widgets/treeview.cpp
|
||||
widgets/textedit.cpp
|
||||
widgets/webview.cpp
|
||||
|
||||
|
||||
#Temporary QtJolie branch
|
||||
private/qtjolie-branch/qtjolie/abstractadaptor.cpp
|
||||
@ -205,6 +176,45 @@ set(plasma_LIB_SRCS
|
||||
private/qtjolie-branch/qtjolie/pendingreply.cpp
|
||||
private/qtjolie-branch/qtjolie/server.cpp
|
||||
private/qtjolie-branch/qtjolie/serverthread.cpp
|
||||
|
||||
widgets/pushbutton.cpp
|
||||
widgets/busywidget.cpp
|
||||
widgets/iconwidget.cpp
|
||||
widgets/label.cpp
|
||||
widgets/scrollbar.cpp
|
||||
widgets/scrollwidget.cpp
|
||||
widgets/svgwidget.cpp
|
||||
widgets/textbrowser.cpp
|
||||
widgets/textedit.cpp
|
||||
)
|
||||
|
||||
set (plasmaqgv_LIB_SRCS
|
||||
|
||||
private/animablegraphicswebview.cpp
|
||||
private/dataenginebindings.cpp
|
||||
private/declarative/declarativenetworkaccessmanagerfactory.cpp
|
||||
private/focusindicator.cpp
|
||||
private/nativetabbar.cpp
|
||||
private/style.cpp
|
||||
|
||||
widgets/checkbox.cpp
|
||||
widgets/combobox.cpp
|
||||
widgets/declarativewidget.cpp
|
||||
widgets/flashinglabel.cpp
|
||||
widgets/frame.cpp
|
||||
widgets/groupbox.cpp
|
||||
widgets/itembackground.cpp
|
||||
widgets/lineedit.cpp
|
||||
widgets/meter.cpp
|
||||
widgets/radiobutton.cpp
|
||||
widgets/signalplotter.cpp
|
||||
widgets/slider.cpp
|
||||
widgets/spinbox.cpp
|
||||
widgets/toolbutton.cpp
|
||||
widgets/separator.cpp
|
||||
widgets/tabbar.cpp
|
||||
widgets/treeview.cpp
|
||||
widgets/webview.cpp
|
||||
)
|
||||
|
||||
if(NOT KDE_NO_DEPRECATED)
|
||||
@ -228,27 +238,27 @@ kde4_add_ui_files(plasma_LIB_SRCS
|
||||
# TEST_INCLUDES
|
||||
#)
|
||||
|
||||
if (QT_QTOPENGL_FOUND)
|
||||
message(STATUS "Adding support for OpenGL applets to libplasma")
|
||||
set(plasma_LIB_SRCS
|
||||
${plasma_LIB_SRCS}
|
||||
glapplet.cpp)
|
||||
endif(QT_QTOPENGL_FOUND)
|
||||
|
||||
if (PHONON_FOUND)
|
||||
message(STATUS "Adding support for Phonon to libplasma")
|
||||
include_directories(${KDE4_PHONON_INCLUDES})
|
||||
set(plasma_LIB_SRCS
|
||||
${plasma_LIB_SRCS}
|
||||
set(plasmaqgv_LIB_SRCS
|
||||
${plasmaqgv_LIB_SRCS}
|
||||
widgets/videowidget.cpp)
|
||||
endif(PHONON_FOUND)
|
||||
|
||||
kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
|
||||
|
||||
kde4_add_library(plasmaqgv ${LIBRARY_TYPE} ${plasmaqgv_LIB_SRCS})
|
||||
|
||||
target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
|
||||
${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
|
||||
${KDE4_KDEUI_LIBS} kdnssd threadweaver kdeclarative ${PLASMA_EXTRA_LIBS})
|
||||
|
||||
target_link_libraries(plasmaqgv plasma ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
|
||||
${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
|
||||
${KDE4_KDEUI_LIBS} kdeclarative ${PLASMA_EXTRA_LIBS})
|
||||
|
||||
if(QCA2_FOUND)
|
||||
target_link_libraries(plasma ${QCA2_LIBRARIES})
|
||||
endif(QCA2_FOUND)
|
||||
@ -258,7 +268,7 @@ if(X11_FOUND)
|
||||
endif(X11_FOUND)
|
||||
|
||||
if(PHONON_FOUND)
|
||||
target_link_libraries(plasma ${KDE4_PHONON_LIBS})
|
||||
target_link_libraries(plasmaqgv ${KDE4_PHONON_LIBS})
|
||||
endif(PHONON_FOUND)
|
||||
|
||||
if(DL_LIBRARY)
|
||||
@ -277,8 +287,13 @@ set_target_properties(plasma PROPERTIES
|
||||
SOVERSION 3
|
||||
)
|
||||
|
||||
install(TARGETS plasma EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
set_target_properties(plasmaqgv PROPERTIES
|
||||
VERSION 1.0.0
|
||||
SOVERSION 1
|
||||
)
|
||||
|
||||
install(TARGETS plasma EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(TARGETS plasmaqgv EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
########### install files ###############
|
||||
|
||||
@ -348,11 +363,6 @@ if(NOT KDE_NO_DEPRECATED)
|
||||
endif(NOT KDE_NO_DEPRECATED)
|
||||
|
||||
|
||||
if(QT_QTOPENGL_FOUND)
|
||||
set(plasma_LIB_INCLUDES
|
||||
${plasma_LIB_INCLUDES}
|
||||
glapplet.h)
|
||||
endif(QT_QTOPENGL_FOUND)
|
||||
|
||||
install(FILES
|
||||
${plasma_LIB_INCLUDES}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user