diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 4 | ||||
| -rw-r--r-- | qmake/generators/makefile.cpp | 3 | ||||
| -rw-r--r-- | qmake/project.cpp | 3 | ||||
| -rw-r--r-- | src/kernel/ntqgif.h | 4 | ||||
| -rw-r--r-- | src/tools/qcstring.cpp | 4 | ||||
| -rw-r--r-- | src/tools/qstring.cpp | 3 |
7 files changed, 0 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 59fa0906e..c8e8cfdbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,7 +205,6 @@ include( config.tests/unix/ipv6/ConfigureChecks.cmake ) # test: IPv6 net ###### global compiler settings -add_definitions( -DHAVE_CONFIG_H ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) @@ -225,7 +224,6 @@ tde_conditional_add_subdirectory( BUILD_TRANSLATIONS translations ) ##### write configure files -configure_file( config.h.cmake config.h @ONLY ) configure_file( src/tools/qconfig.cpp.cmake src/tools/qconfig.cpp @ONLY ) configure_file( include/ntqconfig.h.cmake include/ntqconfig.h @ONLY ) configure_file( include/ntqmodules.h.cmake include/ntqmodules.h @ONLY ) diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index c9698f0a0..329b79967 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -36,10 +36,6 @@ ** **********************************************************************/ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "pbuilder_pbx.h" #include "option.h" #include "meta.h" diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index fe5584a88..f31c7e085 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -35,9 +35,6 @@ ** herein. ** **********************************************************************/ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "makefile.h" #include "option.h" diff --git a/qmake/project.cpp b/qmake/project.cpp index fc297e72b..de57507e2 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -35,9 +35,6 @@ ** herein. ** **********************************************************************/ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "project.h" #include "property.h" diff --git a/src/kernel/ntqgif.h b/src/kernel/ntqgif.h index 5ef852ed4..f5fee77be 100644 --- a/src/kernel/ntqgif.h +++ b/src/kernel/ntqgif.h @@ -52,10 +52,6 @@ #include "ntqglobal.h" #endif // QT_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #ifndef QT_BUILTIN_GIF_READER #define QT_BUILTIN_GIF_READER 0 #endif diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp index 67a831970..de8d89023 100644 --- a/src/tools/qcstring.cpp +++ b/src/tools/qcstring.cpp @@ -39,10 +39,6 @@ ** **********************************************************************/ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "ntqstring.h" #include "ntqregexp.h" #include "ntqdatastream.h" diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index 536951b8e..26e9b61cd 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -38,9 +38,6 @@ ** herein. ** **********************************************************************/ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // Don't define it while compiling this module, or USERS of TQt will // not be able to link. |