remove redundant QT_RCC and QT_UIC definitions

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

diff --git a/cmake/modules/OptimizeHeaders.cmake b/cmake/modules/OptimizeHeaders.cmake
index 44d9ff2..721d073 100644 (file)
--- a/cmake/modules/OptimizeHeaders.cmake
+++ b/cmake/modules/OptimizeHeaders.cmake
@@ -7,7 +7,7 @@ file(GLOB headers "$ENV{DESTDIR}/${HEADERS_DIRECTORY}/*.h")
 
 message(STATUS "Optimizing header in: $ENV{DESTDIR}/${HEADERS_DIRECTORY}")
 execute_process(
-    COMMAND ${UNIFDEF_EXECUTABLE} -m -UQT_BOOTSTRAPPED -UQT_MOC -UQT_RCC -UQT_UIC -UQT_ALLINONE ${HEADERS_DEFINITIONS} ${headers}
+    COMMAND ${UNIFDEF_EXECUTABLE} -m -UQT_BOOTSTRAPPED -UQT_MOC -UQT_ALLINONE ${HEADERS_DEFINITIONS} ${headers}
     RESULT_VARIABLE unifdef_result
     ERROR_VARIABLE unifdef_output
     OUTPUT_VARIABLE unifdef_output

diff --git a/src/designer/data/generate_header.xsl b/src/designer/data/generate_header.xsl
index 33da0dc..c290854 100644 (file)
--- a/src/designer/data/generate_header.xsl
+++ b/src/designer/data/generate_header.xsl
@@ -397,19 +397,12 @@
 
 QT_BEGIN_NAMESPACE
 
-#define QDESIGNER_UILIB_EXTERN Q_DECL_EXPORT
-#define QDESIGNER_UILIB_IMPORT Q_DECL_IMPORT
-
-#if defined(QT_DESIGNER_STATIC) || defined(QT_UIC)
+#if defined(QT_DESIGNER_STATIC)
 #  define QDESIGNER_UILIB_EXPORT
 #elif defined(QDESIGNER_UILIB_LIBRARY)
-#  define QDESIGNER_UILIB_EXPORT QDESIGNER_UILIB_EXTERN
+#  define QDESIGNER_UILIB_EXPORT Q_DECL_EXPORT
 #else
-#  define QDESIGNER_UILIB_EXPORT QDESIGNER_UILIB_IMPORT
-#endif
-
-#ifndef QDESIGNER_UILIB_EXPORT
-#    define QDESIGNER_UILIB_EXPORT
+#  define QDESIGNER_UILIB_EXPORT Q_DECL_IMPORT
 #endif
 
 #ifdef QFORMINTERNAL_NAMESPACE

diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt
index 1067332..171757b 100644 (file)
--- a/src/tools/rcc/CMakeLists.txt
+++ b/src/tools/rcc/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(-DQT_RCC)
+# add_definitions()
 set(EXTRA_RCC_LIBS
     KtCore KtXml
 )

diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt
index 97d2d77..7a02fc7 100644 (file)
--- a/src/tools/uic/CMakeLists.txt
+++ b/src/tools/uic/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(-DQT_UIC)
+add_definitions(-DQT_DESIGNER_STATIC)
 set(EXTRA_UIC_LIBS
     KtCore KtXml
 )

diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h
index 9957fbd..087b4f4 100644 (file)
--- a/src/tools/uic/ui4.h
+++ b/src/tools/uic/ui4.h
@@ -54,19 +54,12 @@
 
 QT_BEGIN_NAMESPACE
 
-#define QDESIGNER_UILIB_EXTERN Q_DECL_EXPORT
-#define QDESIGNER_UILIB_IMPORT Q_DECL_IMPORT
-
-#if defined(QT_DESIGNER_STATIC) || defined(QT_UIC)
+#if defined(QT_DESIGNER_STATIC)
 #  define QDESIGNER_UILIB_EXPORT
 #elif defined(QDESIGNER_UILIB_LIBRARY)
-#  define QDESIGNER_UILIB_EXPORT QDESIGNER_UILIB_EXTERN
+#  define QDESIGNER_UILIB_EXPORT Q_DECL_EXPORT
 #else
-#  define QDESIGNER_UILIB_EXPORT QDESIGNER_UILIB_IMPORT
-#endif
-
-#ifndef QDESIGNER_UILIB_EXPORT
-#    define QDESIGNER_UILIB_EXPORT
+#  define QDESIGNER_UILIB_EXPORT Q_DECL_IMPORT
 #endif
 
 #ifdef QFORMINTERNAL_NAMESPACE