From 0ba4e3c0a468d0ce3d64c4062a39e8a792b29b93 Mon Sep 17 00:00:00 2001
From: samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 11 Jan 2011 16:43:23 +0000
Subject: [kdelibs] move "-include tqt.h" directive to CMAKE_CXX_FLAGS; move
 TQT_CFLAGS_OTHER definitions to main CMakeLists.txt; remove useless
 defintions

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1213800 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 khtml/CMakeLists.txt            | 5 -----
 khtml/css/CMakeLists.txt        | 4 ----
 khtml/dom/CMakeLists.txt        | 4 ----
 khtml/ecma/CMakeLists.txt       | 4 ----
 khtml/html/CMakeLists.txt       | 4 ----
 khtml/java/CMakeLists.txt       | 4 ----
 khtml/kmultipart/CMakeLists.txt | 4 ----
 khtml/misc/CMakeLists.txt       | 4 ----
 khtml/rendering/CMakeLists.txt  | 5 -----
 khtml/xml/CMakeLists.txt        | 4 ----
 10 files changed, 42 deletions(-)

(limited to 'khtml')

diff --git a/khtml/CMakeLists.txt b/khtml/CMakeLists.txt
index 793fa6b8f..9a2488c4a 100644
--- a/khtml/CMakeLists.txt
+++ b/khtml/CMakeLists.txt
@@ -22,11 +22,6 @@ add_subdirectory( java )
 add_subdirectory( ecma )
 add_subdirectory( kmultipart )
 
-
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/css/CMakeLists.txt b/khtml/css/CMakeLists.txt
index 53c261559..1283dce2d 100644
--- a/khtml/css/CMakeLists.txt
+++ b/khtml/css/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/dom/CMakeLists.txt b/khtml/dom/CMakeLists.txt
index b3e3e0591..ea0837cdf 100644
--- a/khtml/dom/CMakeLists.txt
+++ b/khtml/dom/CMakeLists.txt
@@ -11,10 +11,6 @@
 
 set( CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${USE_EXCEPTIONS} )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/ecma/CMakeLists.txt b/khtml/ecma/CMakeLists.txt
index 6d62d7d1d..307623f48 100644
--- a/khtml/ecma/CMakeLists.txt
+++ b/khtml/ecma/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/html/CMakeLists.txt b/khtml/html/CMakeLists.txt
index 4b636dbaa..0736cb407 100644
--- a/khtml/html/CMakeLists.txt
+++ b/khtml/html/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/java/CMakeLists.txt b/khtml/java/CMakeLists.txt
index 5e2fcafb0..7c1e7dd43 100644
--- a/khtml/java/CMakeLists.txt
+++ b/khtml/java/CMakeLists.txt
@@ -11,10 +11,6 @@
 
 add_subdirectory( dummy )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/kmultipart/CMakeLists.txt b/khtml/kmultipart/CMakeLists.txt
index bcd28ec24..4c798f584 100644
--- a/khtml/kmultipart/CMakeLists.txt
+++ b/khtml/kmultipart/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/misc/CMakeLists.txt b/khtml/misc/CMakeLists.txt
index 93913df3b..ea074a639 100644
--- a/khtml/misc/CMakeLists.txt
+++ b/khtml/misc/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/rendering/CMakeLists.txt b/khtml/rendering/CMakeLists.txt
index da4c0c535..45924ac2d 100644
--- a/khtml/rendering/CMakeLists.txt
+++ b/khtml/rendering/CMakeLists.txt
@@ -9,11 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-  -include tqt.h
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/xml/CMakeLists.txt b/khtml/xml/CMakeLists.txt
index b21335367..c9ea9f696 100644
--- a/khtml/xml/CMakeLists.txt
+++ b/khtml/xml/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
-- 
cgit v1.2.1