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

List:       kde-commits
Subject:    [kdelibs/frameworks] /: KUrl moved from staging/kcoreaddons/src/io/ to kdecore/io/
From:       Matt Williams <matt () milliams ! com>
Date:       2012-02-18 17:38:27
Message-ID: 20120218173827.9EC99A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 50fa8ab7ba1852514f29015d518b4fe04aad25ff by Matt Williams.
Committed on 18/02/2012 at 18:38.
Pushed by milliams into branch 'frameworks'.

KUrl moved from staging/kcoreaddons/src/io/ to kdecore/io/

M  +1    -0    kdecore/CMakeLists.txt
R  +0    -0    kdecore/io/kurl.cpp [from: staging/kcoreaddons/src/io/kurl.c=
pp - 100% similarity]
R  +0    -0    kdecore/io/kurl.h [from: staging/kcoreaddons/src/io/kurl.h -=
 100% similarity]
M  +0    -1    staging/kcoreaddons/src/CMakeLists.txt

http://commits.kde.org/kdelibs/50fa8ab7ba1852514f29015d518b4fe04aad25ff

diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index c08a158..444d9eb 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -186,6 +186,7 @@ set(kdecore_LIB_SRCS
    io/kmessage.cpp
    io/kmountpoint.cpp
    io/kprocess.cpp
+   io/kurl.cpp
    kernel/kauthorized.cpp
    kernel/kglobal.cpp
    kernel/kcomponentdata.cpp
diff --git a/staging/kcoreaddons/src/io/kurl.cpp b/kdecore/io/kurl.cpp
similarity index 100%
rename from staging/kcoreaddons/src/io/kurl.cpp
rename to kdecore/io/kurl.cpp
diff --git a/staging/kcoreaddons/src/io/kurl.h b/kdecore/io/kurl.h
similarity index 100%
rename from staging/kcoreaddons/src/io/kurl.h
rename to kdecore/io/kurl.h
diff --git a/staging/kcoreaddons/src/CMakeLists.txt b/staging/kcoreaddons/s=
rc/CMakeLists.txt
index 2762cf1..ceaa126 100644
--- a/staging/kcoreaddons/src/CMakeLists.txt
+++ b/staging/kcoreaddons/src/CMakeLists.txt
@@ -42,7 +42,6 @@ set(libkcoreaddons_SRCS
     io/kfilesystemtype_p.cpp
     io/ksavefile.cpp
     io/kbackup.cpp
-    io/kurl.cpp
     io/kurlmimedata.cpp
     jobs/kcompositejob.cpp
     jobs/kjob.cpp

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