kdecore: export private class used in tests when testing is enabled

fixes testing build

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

config.h.cmake

@@ -91,3 +91,6 @@ int snprintf(char *str, size_t n, char const *fmt, ...);
 
 /* Defined to 1 if you have a d_type member in struct dirent */
 #cmakedefine HAVE_DIRENT_D_TYPE 1
+
+/* Define to 1 if testing is enabled */
+#cmakedefine ENABLE_TESTING 1

kdecore/localization/klocale_p.h

@@ -21,17 +21,24 @@
 #ifndef KLOCALE_P_H
 #define KLOCALE_P_H
 
+#include "config.h"
 #include "klocale.h"
 #include "kdayperiod_p.h"
 
 #include <mutex>
 
+#ifdef ENABLE_TESTING
+#  define KLOCALEPRIVATE_EXPORT KDECORE_EXPORT
+#else
+#  define KLOCALEPRIVATE_EXPORT
+#endif
+
 class KCatalog;
 
 // Used by both KLocale and KLocalizedString, since they call each other.
 std::recursive_mutex& kLocaleMutex();
 
-class KLocalePrivate
+class KLOCALEPRIVATE_EXPORT KLocalePrivate
 {
 public:
     /**

solid/solid/config-solid.h.cmake

@@ -18,7 +18,5 @@
     License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#cmakedefine ENABLE_TESTING
-
 #cmakedefine UDEV_FOUND
 #cmakedefine LIBCDIO_FOUND

solid/solid/managerbase.cpp

@@ -18,10 +18,10 @@
     License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "config.h"
 #include "managerbase_p.h"
 
 #include <stdlib.h>
-#include <config-solid.h>
 
 #include "backends/fstab/fstabmanager.h"
 

solid/solid/managerbase_p.h

@@ -24,7 +24,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>
 
-#include "config-solid.h"
+#include "config.h"
 #include "solid/solid_export.h"
 
 #ifdef ENABLE_TESTING

solid/tests/CMakeLists.txt

@@ -5,7 +5,6 @@ include_directories(
     ${KDE4_KDEUI_INCLUDES}
     ${KDE4_KIO_INCLUDES}
     ${CMAKE_CURRENT_SOURCE_DIR}/../solid/backends/fakehw
-    ${CMAKE_CURRENT_BINARY_DIR}/../solid
 )