various cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cd28fa..eee3e19 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -977,7 +977,6 @@ configure_file(
     @ONLY
 )
 
-# translations
 katie_setup_paths()
 file(GLOB TRANSLATIONS "translations/*.ts")
 katie_translations(${TRANSLATIONS})
@@ -1011,15 +1010,13 @@ install(
     FILE KatieBinaryTargets.cmake
 )
 
-if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
-    install(
-        FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.conf
-        DESTINATION ${LDCONF_INSTALL_PATH}
-    )
-    install(
-        FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.sh
-        DESTINATION ${PROFILE_INSTALL_PATH}
-    )
-endif()
+install(
+    FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.conf
+    DESTINATION ${LDCONF_INSTALL_PATH}
+)
+install(
+    FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.sh
+    DESTINATION ${PROFILE_INSTALL_PATH}
+)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) 

diff --git a/src/core/plugin/quuid.cpp b/src/core/plugin/quuid.cpp
index d3d1ab4..a37b5a5 100644 (file)
--- a/src/core/plugin/quuid.cpp
+++ b/src/core/plugin/quuid.cpp
@@ -804,21 +804,6 @@ bool QUuid::operator>(const QUuid &other) const
 
     \sa variant(), version()
 */
-#if defined(Q_OS_WIN32) && ! defined(Q_CC_MWERKS)
-
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <objbase.h> // For CoCreateGuid
-QT_END_INCLUDE_NAMESPACE
-
-QUuid QUuid::createUuid()
-{
-    GUID guid;
-    CoCreateGuid(&guid);
-    QUuid result = guid;
-    return result;
-}
-
-#else // !Q_OS_WIN32
 
 QT_BEGIN_INCLUDE_NAMESPACE
 #include "qdatetime.h"
@@ -873,7 +858,6 @@ QUuid QUuid::createUuid()
 
     return result;
 }
-#endif // !Q_OS_WIN32
 
 /*!
     \fn bool QUuid::operator==(const GUID &guid) const