[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdelibs/frameworks-kcolors] /: Move khbox and kvbox from kdeui/widgets to staging/kwidgets/src/widg
From: Giorgos Tsiapaliwkas <terietor () gmail ! com>
Date: 2012-03-07 14:17:13
Message-ID: 20120307141713.AEED0A60A9 () git ! kde ! org
[Download RAW message or body]
Git commit d470e76948624257610bd7c583c442a542411093 by Giorgos Tsiapaliwkas.
Committed on 07/03/2012 at 15:16.
Pushed by tsiapaliwkas into branch 'frameworks-kcolors'.
Move khbox and kvbox from kdeui/widgets to staging/kwidgets/src/widgets
M +2 -0 CMakeLists.txt
M +0 -4 kdeui/CMakeLists.txt
M +0 -1 kdeui/tests/CMakeLists.txt
M +1 -0 staging/CMakeLists.txt
M +1 -1 staging/kcolorwidgets/src/CMakeLists.txt
A +12 -0 staging/kwidgets/CMakeLists.txt
A +28 -0 staging/kwidgets/src/CMakeLists.txt
R +0 -0 staging/kwidgets/src/widgets/khbox.cpp [from: kdeui/widgets/khbox.cpp \
- 100% similarity] R +2 -2 staging/kwidgets/src/widgets/khbox.h [from: \
kdeui/widgets/khbox.h - 096% similarity] R +0 -0 \
staging/kwidgets/src/widgets/kvbox.cpp [from: kdeui/widgets/kvbox.cpp - 100% \
similarity] R +1 -1 staging/kwidgets/src/widgets/kvbox.h [from: \
kdeui/widgets/kvbox.h - 097% similarity] A +28 -0 \
staging/kwidgets/tests/CMakeLists.txt R +0 -0 \
staging/kwidgets/tests/khboxtest.cpp [from: kdeui/tests/khboxtest.cpp - 100% \
similarity] R +0 -0 staging/kwidgets/tests/khboxtest.h [from: \
kdeui/tests/khboxtest.h - 100% similarity]
http://commits.kde.org/kdelibs/d470e76948624257610bd7c583c442a542411093
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ce5e4c..710aaff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,6 +258,8 @@ set(KDE4_KDEUI_INCLUDES ${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/staging/kdeguiaddons/src
${CMAKE_BINARY_DIR}/staging/kcolorwidgets/src
${CMAKE_SOURCE_DIR}/staging/kcolorwidgets/src
+ ${CMAKE_BINARY_DIR}/staging/kwidgets/src
+ ${CMAKE_SOURCE_DIR}/staging/kwidgets/src
${KDE4_KDECORE_INCLUDES})
# kio depends on kdeui
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index eb33c5b..57341bf 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -232,7 +232,6 @@ set(kdeui_LIB_SRCS
widgets/kdatewidget.cpp
widgets/keditlistwidget.cpp
widgets/kfadewidgeteffect.cpp
- widgets/khbox.cpp
widgets/khelpmenu.cpp
widgets/khistorycombobox.cpp
widgets/kkeysequencewidget.cpp
@@ -267,7 +266,6 @@ set(kdeui_LIB_SRCS
widgets/ktitlewidget.cpp
widgets/ktoolbar.cpp
widgets/kurllabel.cpp
- widgets/kvbox.cpp
widgets/kdeuiwidgetsproxystyle.cpp
widgets/nestedlisthelper.cpp
xmlgui/kxmlguibuilder.cpp
@@ -600,7 +598,6 @@ install( FILES
widgets/kdialogbuttonbox.h
widgets/keditlistwidget.h
widgets/kfadewidgeteffect.h
- widgets/khbox.h
widgets/khelpmenu.h
widgets/khistorycombobox.h
widgets/kkeysequencewidget.h
@@ -635,7 +632,6 @@ install( FILES
widgets/kstatusbar.h
widgets/ktoolbar.h
widgets/kurllabel.h
- widgets/kvbox.h
xmlgui/kxmlguiwindow.h
xmlgui/kxmlguiclient.h
xmlgui/kxmlguibuilder.h
diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index 05c5428..14a2193 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -86,7 +86,6 @@ KDEUI_EXECUTABLE_TESTS(
keditlistwidgettest
kfontdialogtest
kglobalsettingsclient # helper program for kglobalsettingstest
- khboxtest
kiconeffecttest
kicondialogtest
kiconloadertest
diff --git a/staging/CMakeLists.txt b/staging/CMakeLists.txt
index 52289a8..555524c 100644
--- a/staging/CMakeLists.txt
+++ b/staging/CMakeLists.txt
@@ -5,6 +5,7 @@ add_subdirectory(karchive)
add_subdirectory(kde4support)
add_subdirectory(kcolorwidgets)
add_subdirectory(kdeguiaddons)
+add_subdirectory(kwidgets)
if(NOT QT5_BUILD)
add_subdirectory(kwindowsystem)
# TODO: Remove this:
diff --git a/staging/kcolorwidgets/src/CMakeLists.txt \
b/staging/kcolorwidgets/src/CMakeLists.txt index 7eb31f6..926ea5d 100644
--- a/staging/kcolorwidgets/src/CMakeLists.txt
+++ b/staging/kcolorwidgets/src/CMakeLists.txt
@@ -18,7 +18,7 @@ add_library(kcolorwidgets ${LIBRARY_TYPE} \
${kcolorwidgets_LIB_SRCS})
generate_export_header(kcolorwidgets)
-target_link_libraries(kcolorwidgets kdeguiaddons ${KDE4_KDECORE_LIBS} \
${QT_QTGUI_LIBRARY} ${KDEUI_EXTRA_LIBS}) +target_link_libraries(kcolorwidgets \
kdeguiaddons kwidgets ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${KDEUI_EXTRA_LIBS})
install(TARGETS kcolorwidgets EXPORT kdelibsLibraryTargets \
${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/staging/kwidgets/CMakeLists.txt b/staging/kwidgets/CMakeLists.txt
new file mode 100644
index 0000000..1f7cc97
--- /dev/null
+++ b/staging/kwidgets/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 2.8.7)
+
+project(kwidgets)
+
+find_package(extra-cmake-modules 0.0.2 REQUIRED)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${EXTRA_CMAKE_MODULES_MODULE_PATH})
+
+include(ECMVersion)
+
+add_subdirectory(src)
+add_subdirectory(tests) #TODO
diff --git a/staging/kwidgets/src/CMakeLists.txt \
b/staging/kwidgets/src/CMakeLists.txt new file mode 100644
index 0000000..29f22d4
--- /dev/null
+++ b/staging/kwidgets/src/CMakeLists.txt
@@ -0,0 +1,28 @@
+include_directories(
+ ${KDE4_KDECORE_INCLUDES}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets
+ ${DBUSMENUQT_INCLUDE_DIR}
+ ${CMAKE_BINARY_DIR}/staging/kwidgets/src
+)
+
+set(kwidgets_LIB_SRCS
+ widgets/khbox.cpp
+ widgets/kvbox.cpp
+)
+
+add_library(kwidgets ${LIBRARY_TYPE} ${kwidgets_LIB_SRCS})
+
+generate_export_header(kwidgets)
+
+target_link_libraries(kwidgets ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} \
${KDEUI_EXTRA_LIBS}) +
+install(TARGETS kwidgets EXPORT kdelibsLibraryTargets \
${INSTALL_TARGETS_DEFAULT_ARGS}) +
+install( FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/kwidgets_export.h
+ widgets/khbox.h
+ widgets/kvbox.h
+
+ DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
+)
diff --git a/kdeui/widgets/khbox.cpp b/staging/kwidgets/src/widgets/khbox.cpp
similarity index 100%
rename from kdeui/widgets/khbox.cpp
rename to staging/kwidgets/src/widgets/khbox.cpp
diff --git a/kdeui/widgets/khbox.h b/staging/kwidgets/src/widgets/khbox.h
similarity index 96%
rename from kdeui/widgets/khbox.h
rename to staging/kwidgets/src/widgets/khbox.h
index f51afd7..06be90d 100644
--- a/kdeui/widgets/khbox.h
+++ b/staging/kwidgets/src/widgets/khbox.h
@@ -19,7 +19,7 @@
#ifndef KHBOX_H
#define KHBOX_H
-#include <kdeui_export.h>
+#include <kwidgets_export.h>
#include <QFrame>
@@ -37,7 +37,7 @@ class QChildEvent;
*
* @see KVBox
*/
-class KDEUI_EXPORT KHBox : public QFrame
+class KWIDGETS_EXPORT KHBox : public QFrame
{
Q_OBJECT
diff --git a/kdeui/widgets/kvbox.cpp b/staging/kwidgets/src/widgets/kvbox.cpp
similarity index 100%
rename from kdeui/widgets/kvbox.cpp
rename to staging/kwidgets/src/widgets/kvbox.cpp
diff --git a/kdeui/widgets/kvbox.h b/staging/kwidgets/src/widgets/kvbox.h
similarity index 97%
rename from kdeui/widgets/kvbox.h
rename to staging/kwidgets/src/widgets/kvbox.h
index 3e68c78..a094337 100644
--- a/kdeui/widgets/kvbox.h
+++ b/staging/kwidgets/src/widgets/kvbox.h
@@ -33,7 +33,7 @@
*
* @see KHBox
*/
-class KDEUI_EXPORT KVBox : public KHBox
+class KWIDGETS_EXPORT KVBox : public KHBox
{
Q_OBJECT
diff --git a/staging/kwidgets/tests/CMakeLists.txt \
b/staging/kwidgets/tests/CMakeLists.txt new file mode 100644
index 0000000..a43c9ad
--- /dev/null
+++ b/staging/kwidgets/tests/CMakeLists.txt
@@ -0,0 +1,28 @@
+set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+
+include_directories( ${KDE4_KDEUI_INCLUDES} proxymodeltestsuite )
+
+# QtTest needs this in order to include the gui stuff.
+# The alternative (which requires Qt>=4.6) is #include <QTestGui>
+add_definitions(-DQT_GUI_LIB)
+
+add_definitions(-DQT_WIDGETS_LIB)
+
+
+MACRO(KDEUI_UNIT_TESTS)
+ FOREACH(_testname ${ARGN})
+ kde4_add_unit_test(${_testname} TESTNAME kdeui-${_testname} \
${_testname}.cpp) + target_link_libraries(${_testname} \
${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} ${KDEWIN_LIBRARIES} \
kcoreaddons) + ENDFOREACH(_testname)
+ENDMACRO(KDEUI_UNIT_TESTS)
+MACRO(KDEUI_EXECUTABLE_TESTS)
+ FOREACH(_testname ${ARGN})
+ kde4_add_executable(${_testname} TEST ${_testname}.cpp)
+ target_link_libraries(${_testname} ${KDE4_KDEUI_LIBS} \
${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} ${KDEWIN_LIBRARIES} kcoreaddons) + \
ENDFOREACH(_testname) +ENDMACRO(KDEUI_EXECUTABLE_TESTS)
+
+KDEUI_EXECUTABLE_TESTS(
+ khboxtest
+)
+
diff --git a/kdeui/tests/khboxtest.cpp b/staging/kwidgets/tests/khboxtest.cpp
similarity index 100%
rename from kdeui/tests/khboxtest.cpp
rename to staging/kwidgets/tests/khboxtest.cpp
diff --git a/kdeui/tests/khboxtest.h b/staging/kwidgets/tests/khboxtest.h
similarity index 100%
rename from kdeui/tests/khboxtest.h
rename to staging/kwidgets/tests/khboxtest.h
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic