diff options
| author | David Faure <faure@kde.org> | 2006-03-29 14:16:10 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2006-03-29 14:16:10 +0000 |
| commit | 4947881ecfe66c7662c16e9294139cdf2fe28cde (patch) | |
| tree | 8d0dfce1d942069b8448bc5a651cc1830a3b0ef9 | |
| parent | 3fedea31173e32997a9343eade18872966c03977 (diff) | |
| download | extra-cmake-modules-4947881ecfe66c7662c16e9294139cdf2fe28cde.tar.gz extra-cmake-modules-4947881ecfe66c7662c16e9294139cdf2fe28cde.tar.bz2 | |
* Moved kmanagerselection.* to kdeui (it is X11-based and isn't needed by anything in kdecore)
* Moved HAVE_PTHREAD_ATTR_GET_NP/HAVE_PTHREAD_GETATTR_NP check to kjs since it's only used there
(a small step towards modular configuration, and hopefully faster re-configure when editing a CMakeList.txt in a subdir?)
svn path=/trunk/KDE/kdelibs/; revision=523933
The following changes were in SVN, but were removed from git:
M pics/CMakeLists.txt
| -rw-r--r-- | modules/kde4uic.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/kde4uic.cmake b/modules/kde4uic.cmake index 19fb10aa..5c9e4dae 100644 --- a/modules/kde4uic.cmake +++ b/modules/kde4uic.cmake @@ -37,7 +37,7 @@ if (KDE4_HEADER) endif (KDE4_HEADER) -#replace tr218n("") with QString::null to avoid waring from KLocale +#replace tr218n("") with QString::null to avoid warning from KLocale STRING(REGEX REPLACE "tr2i18n\\(\"\"\\)" "QString::null" _uic_CONTENTS "${_uic_CONTENTS}" ) STRING(REGEX REPLACE "tr2i18n\\(\"\", \"\"\\)" "QString::null" _uic_CONTENTS "${_uic_CONTENTS}" ) #replace image15_data with img15_filename to make enable_final work |