[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] /: Move KTextBrowser to KDE4Support
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2013-05-15 10:31:49
Message-ID: 20130515103149.88D97A605B () git ! kde ! org
[Download RAW message or body]

Git commit 8b305e334f2fa681f9b02ff57e8aa7a68fae5725 by Anne-Marie Mahfouf.
Committed on 15/05/2013 at 12:27.
Pushed by annma into branch 'frameworks'.

Move KTextBrowser to KDE4Support

REVIEW: 110437

M  +0    -2    kdeui/CMakeLists.txt
M  +0    -1    kdeui/tests/CMakeLists.txt
M  +2    -0    staging/kde4support/src/CMakeLists.txt
R  +0    -0    staging/kde4support/src/kdeui/ktextbrowser.cpp [from: kdeui/=
widgets/ktextbrowser.cpp - 100% similarity]
R  +2    -2    staging/kde4support/src/kdeui/ktextbrowser.h [from: kdeui/wi=
dgets/ktextbrowser.h - 097% similarity]
M  +1    -0    staging/kde4support/tests/CMakeLists.txt
R  +0    -0    staging/kde4support/tests/ktextbrowsertest.cpp [from: kdeui/=
tests/ktextbrowsertest.cpp - 100% similarity]

http://commits.kde.org/kdelibs/8b305e334f2fa681f9b02ff57e8aa7a68fae5725

diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index db4c1d5..1497e3f 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -187,7 +187,6 @@ set(kdeui_LIB_SRCS
  widgets/kshortcutwidget.cpp
  widgets/kstringvalidator.cpp
  widgets/ktabbar.cpp
- widgets/ktextbrowser.cpp
  widgets/ktextedit.cpp
  widgets/ktimecombobox.cpp
  widgets/ktimezonewidget.cpp
@@ -497,7 +496,6 @@ install( FILES
  widgets/krichtextedit.h
  widgets/krichtextwidget.h
  widgets/kstringvalidator.h
- widgets/ktextbrowser.h
  widgets/ktextedit.h
  widgets/ktimecombobox.h
  widgets/ktimezonewidget.h
diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index d0c8b42..9a6cab9 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -72,7 +72,6 @@ KDEUI_EXECUTABLE_TESTS(
   kratingwidgettest
   krulertest
   ktextedittest
-  ktextbrowsertest
   ktoolbartest
   ktoolbarlabelactiontest
   ktreewidgetsearchlinetest
diff --git a/staging/kde4support/src/CMakeLists.txt b/staging/kde4support/s=
rc/CMakeLists.txt
index 354a278..a8e0a0c 100644
--- a/staging/kde4support/src/CMakeLists.txt
+++ b/staging/kde4support/src/CMakeLists.txt
@@ -73,6 +73,7 @@ set(libkde4support_SRCS
     kdeui/kundostack.cpp
     kdeui/krestrictedline.cpp
     kdeui/klistwidget.cpp
+    kdeui/ktextbrowser.cpp
 =

     kio/metainfojob.cpp
 =

@@ -173,6 +174,7 @@ install(FILES
     kdeui/kundostack.h
     kdeui/krestrictedline.h
     kdeui/klistwidget.h
+    kdeui/ktextbrowser.h
     ${CMAKE_CURRENT_BINARY_DIR}/kde4support_export.h
     ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h
     DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
diff --git a/kdeui/widgets/ktextbrowser.cpp b/staging/kde4support/src/kdeui=
/ktextbrowser.cpp
similarity index 100%
rename from kdeui/widgets/ktextbrowser.cpp
rename to staging/kde4support/src/kdeui/ktextbrowser.cpp
diff --git a/kdeui/widgets/ktextbrowser.h b/staging/kde4support/src/kdeui/k=
textbrowser.h
similarity index 97%
rename from kdeui/widgets/ktextbrowser.h
rename to staging/kde4support/src/kdeui/ktextbrowser.h
index 71aa7e7..5e5daf9 100644
--- a/kdeui/widgets/ktextbrowser.h
+++ b/staging/kde4support/src/kdeui/ktextbrowser.h
@@ -21,7 +21,7 @@
 #ifndef KTEXTBROWSER_H
 #define KTEXTBROWSER_H
 =

-#include <kdeui_export.h>
+#include <kde4support_export.h>
 =

 #include <QTextBrowser>
 =

@@ -44,7 +44,7 @@
  * @author Espen Sand (espensa@online.no)
  */
 =

-class KDEUI_EXPORT KTextBrowser : public QTextBrowser
+class KDE4SUPPORT_EXPORT KTextBrowser : public QTextBrowser
 {
   Q_OBJECT
   Q_PROPERTY( bool notifyClick READ isNotifyClick WRITE setNotifyClick )
diff --git a/staging/kde4support/tests/CMakeLists.txt b/staging/kde4support=
/tests/CMakeLists.txt
index e3e42ba..4115688 100644
--- a/staging/kde4support/tests/CMakeLists.txt
+++ b/staging/kde4support/tests/CMakeLists.txt
@@ -23,5 +23,6 @@ kde4support_examples(
   ksystemtraytest
   ktabwidgettest
   kfontdialogtest
+  ktextbrowsertest
 )
 =

diff --git a/kdeui/tests/ktextbrowsertest.cpp b/staging/kde4support/tests/k=
textbrowsertest.cpp
similarity index 100%
rename from kdeui/tests/ktextbrowsertest.cpp
rename to staging/kde4support/tests/ktextbrowsertest.cpp
[prev in list] [next in list] [prev in thread] [next in thread]