move bootstrap stuff into moc build file since it's the only thing using it

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

CMakeLists.txt

@@ -545,7 +545,6 @@ endif()
 
 # semi-shared
 include(src/shared/linguist/linguist.cmake)
-include(src/shared/bootstrap.cmake)
 include(src/shared/deviceskin/deviceskin.cmake)
 include(src/shared/qtgradienteditor/qtgradienteditor.cmake)
 include(src/shared/qtpropertybrowser/qtpropertybrowser.cmake)
@@ -898,7 +897,6 @@ if(UNIX AND WITH_X11 AND X11_FOUND)
     katie_generate_obsolete(qx11embedcontainer.h QtGui qx11embed_x11.h)
     katie_generate_obsolete(qx11embedwidget.h QtGui qx11embed_x11.h)
 endif()
-katie_generate_obsolete(qttestgui.h QtTest qtest_gui.h)
 # those have shuffled from QtXml to QtCore
 katie_generate_obsolete(qxmlstream.h QtXml ../QtCore/qxmlstream.h)
 katie_generate_obsolete(qxmlstreamattribute.h QtXml ../QtCore/qxmlstream.h)

package/archlinux/PKGBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Ivailo Monev <xakepa10@gmail.com>
 
 pkgname=katie-git
-pkgver=4.9.0.af7b3b6a
+pkgver=4.9.0.3a7935df
 pkgrel=1
 pkgdesc='C++ toolkit derived from the Qt 4.8 framework'
 arch=('i686' 'x86_64')

src/shared/bootstrap.cmake

@@ -1,83 +0,0 @@
-set(BOOTSTRAP_DEFINITIONS
-    ${BOOTSTRAP_DEFINITIONS}
-    -DQT_BOOTSTRAPPED
-    -DQT_TEXTCODEC
-    -DQT_NO_CAST_FROM_BYTEARRAY
-    -DQT_NO_CAST_FROM_ASCII
-    -DQT_NO_CAST_TO_ASCII
-    -DQT_NO_CODECS
-    -DQT_NO_DATASTREAM
-    -DQT_NO_GEOM_VARIANT
-    -DQT_NO_LIBRARY
-    -DQT_NO_QOBJECT
-    -DQT_NO_SYSTEMLOCALE
-    -DQT_NO_TEXTSTREAM
-    -DQT_NO_THREAD
-    -DQT_NO_UNICODETABLES
-    -DQT_NO_USING_NAMESPACE
-    -DQT_NO_DEPRECATED
-    -DQT_NO_COMPRESS
-)
-
-set(BOOTSTRAP_INCLUDES
-    ${BOOTSTRAP_INCLUDES}
-    ${CMAKE_BINARY_DIR}/include
-    ${CMAKE_BINARY_DIR}/privateinclude
-    ${CMAKE_BINARY_DIR}/include/QtCore
-    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
-    ${CMAKE_SOURCE_DIR}/src/core/global
-    ${CMAKE_SOURCE_DIR}/src/core/kernel
-    ${CMAKE_SOURCE_DIR}/src/core/tools
-    ${CMAKE_SOURCE_DIR}/src/core/io
-    ${CMAKE_SOURCE_DIR}/src/core/codecs
-)
-
-set(BOOTSTRAP_SOURCES
-    ${BOOTSTRAP_SOURCES}
-    ${CMAKE_SOURCE_DIR}/src/core/codecs/qisciicodec.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/codecs/qlatincodec.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/codecs/qsimplecodec.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/codecs/qtextcodec.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/codecs/qtsciicodec.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/codecs/qutfcodec.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/global/qglobal.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/global/qnumeric.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qabstractfileengine.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qbuffer.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qdir.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qdiriterator.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qfile.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qfileinfo.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qfilesystementry.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qfilesystemengine.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qfsfileengine.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qfsfileengine_iterator.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qiodevice.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qtemporaryfile.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qtextstream.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/kernel/qmetatype.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/kernel/qvariant.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/kernel/qsystemerror.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qbitarray.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qbytearray.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qbytearraymatcher.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qdatetime.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qhash.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qlist.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qlocale.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qlocale_tools.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qmap.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qregexp.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qstring.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qstringlist.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qvector.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qvsnprintf.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qfilesystemengine_unix.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qfilesystemiterator_unix.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/io/qfsfileengine_unix.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/tools/qlocale_unix.cpp
-)
-
-add_library(bootstrap OBJECT ${BOOTSTRAP_SOURCES})
-target_compile_definitions(bootstrap PRIVATE ${BOOTSTRAP_DEFINITIONS})
-target_include_directories(bootstrap PRIVATE ${BOOTSTRAP_INCLUDES})

src/tools/moc/CMakeLists.txt

@@ -7,7 +7,6 @@ include_directories(
     ${CMAKE_BINARY_DIR}/include/QtCore
     ${CMAKE_BINARY_DIR}/privateinclude/QtCore
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${BOOTSTRAP_INCLUDES}
 )
 
 set(MOC_SOURCES
@@ -19,7 +18,72 @@ set(MOC_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/token.cpp
 )
 
-add_executable(bootstrap_moc $<TARGET_OBJECTS:bootstrap> ${MOC_SOURCES})
+set(BOOTSTRAP_DEFINITIONS
+    -DQT_BOOTSTRAPPED
+    -DQT_TEXTCODEC
+    -DQT_NO_CAST_FROM_BYTEARRAY
+    -DQT_NO_CAST_FROM_ASCII
+    -DQT_NO_CAST_TO_ASCII
+    -DQT_NO_CODECS
+    -DQT_NO_DATASTREAM
+    -DQT_NO_GEOM_VARIANT
+    -DQT_NO_LIBRARY
+    -DQT_NO_QOBJECT
+    -DQT_NO_SYSTEMLOCALE
+    -DQT_NO_TEXTSTREAM
+    -DQT_NO_THREAD
+    -DQT_NO_UNICODETABLES
+    -DQT_NO_USING_NAMESPACE
+    -DQT_NO_DEPRECATED
+    -DQT_NO_COMPRESS
+)
+
+set(BOOTSTRAP_SOURCES
+    ${CMAKE_SOURCE_DIR}/src/core/codecs/qisciicodec.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/codecs/qlatincodec.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/codecs/qsimplecodec.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/codecs/qtextcodec.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/codecs/qtsciicodec.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/codecs/qutfcodec.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/global/qglobal.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/global/qnumeric.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qabstractfileengine.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qbuffer.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qdir.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qdiriterator.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qfile.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qfileinfo.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qfilesystementry.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qfilesystemengine.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qfsfileengine.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qfsfileengine_iterator.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qiodevice.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qtemporaryfile.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qtextstream.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qfilesystemengine_unix.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qfilesystemiterator_unix.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/io/qfsfileengine_unix.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/kernel/qmetatype.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/kernel/qvariant.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/kernel/qsystemerror.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qbitarray.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qbytearray.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qbytearraymatcher.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qdatetime.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qhash.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qlist.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qlocale.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qlocale_tools.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qmap.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qregexp.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qstring.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qstringlist.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qvector.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qvsnprintf.cpp
+    ${CMAKE_SOURCE_DIR}/src/core/tools/qlocale_unix.cpp
+)
+
+add_executable(bootstrap_moc ${BOOTSTRAP_SOURCES} ${MOC_SOURCES})
 target_compile_definitions(bootstrap_moc PRIVATE ${BOOTSTRAP_DEFINITIONS})
 
 add_executable(moc ${MOC_SOURCES})