[Kde-bindings] KDE/kdebindings
Arno Rehn
kde at arnorehn.de
Sun Aug 23 17:20:00 UTC 2009
SVN commit 1014731 by arnorehn:
Convert most of the qt-based smokes to the new smokegenerator.
CCMAIL: kde-bindings at kde.org
M +4 -1 generator/generators/dump/generator_dump.cpp
M +1 -0 smoke/kde/CMakeLists.txt
M +5 -35 smoke/qsci/CMakeLists.txt
A smoke/qsci/qscintilla2_includes.h [License: UNKNOWN]
A smoke/qsci/smokeconfig.xml
M +26 -58 smoke/qt/CMakeLists.txt
A smoke/qt/config.xml.cmake
A smoke/qt/qt_includes.h [License: UNKNOWN]
A smoke/qt/smokeconfig.xml
M +6 -16 smoke/qtscript/CMakeLists.txt
A smoke/qtscript/qtscript_includes.h [License: UNKNOWN]
A smoke/qtscript/smokeconfig.xml
M +4 -15 smoke/qttest/CMakeLists.txt
A smoke/qttest/qttest_includes.h [License: UNKNOWN]
A smoke/qttest/smokeconfig.xml
M +6 -17 smoke/qtuitools/CMakeLists.txt
A smoke/qtuitools/qtuitools_includes.h [License: Trivial file.]
A smoke/qtuitools/smokeconfig.xml
M +4 -15 smoke/qtwebkit/CMakeLists.txt
A smoke/qtwebkit/qtwebkit_includes.h [License: UNKNOWN]
A smoke/qtwebkit/smokeconfig.xml
--- trunk/KDE/kdebindings/generator/generators/dump/generator_dump.cpp #1014730:1014731
@@ -28,6 +28,9 @@
void generate()
{
foreach (const QString& className, classes.keys()) {
- std::cout << qPrintable(className) << std::endl;
+ std::cout << qPrintable(className);
+ if (classes[className].isForwardDecl())
+ std::cout << " [forward declaration]";
+ std::cout << std::endl;
}
}
--- trunk/KDE/kdebindings/smoke/kde/CMakeLists.txt #1014730:1014731
@@ -114,6 +114,7 @@
${KDE4_KPTY_LIBS}
${KDE4_KUTILS_LIBS}
${KDE4_KPARTS_LIBS}
+ ${KDE4_KFILE_LIBS}
smokeqt )
set_target_properties(smokekde PROPERTIES VERSION 2.0.0 SOVERSION 2 )
--- trunk/KDE/kdebindings/smoke/qsci/CMakeLists.txt #1014730:1014731
@@ -2,10 +2,6 @@
include_directories( ${QT_INCLUDES} ${QSCINTILLA_INCLUDE_DIR} )
-IF(NOT PERL_FOUND)
- FIND_PACKAGE(PERL REQUIRED)
-ENDIF(NOT PERL_FOUND)
-
########### next target ###############
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
@@ -19,22 +15,12 @@
${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_11.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_12.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_13.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_14.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_15.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_16.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_17.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_18.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
- COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
+ COMMAND generator
+ ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qt/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ -I "${QSCINTILLA_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/qscintilla2_includes.h
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
include_directories (${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/qsci )
@@ -49,17 +35,7 @@
${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_11.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_12.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_13.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_14.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_15.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_16.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_17.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_18.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp)
+ ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp)
IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
ADD_DEFINITIONS(-DGCC_VISIBILITY)
@@ -72,9 +48,3 @@
install(TARGETS smokeqsci DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/qsci_smoke.h DESTINATION include/smoke)
-
-FOREACH(incname ${QT_INCLUDES} ${QSCINTILLA_INCLUDE_DIR})
- SET(qt_incs "'${incname}', ${qt_incs}")
-ENDFOREACH(incname)
-
-configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY)
--- trunk/KDE/kdebindings/smoke/qt/CMakeLists.txt #1014730:1014731
@@ -1,12 +1,9 @@
include_directories( ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/smoke )
+configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY)
-IF(NOT PERL_FOUND)
- FIND_PACKAGE(PERL REQUIRED)
-ENDIF(NOT PERL_FOUND)
-
-# for qtguess.pl
+# for QtGuess.txt
if (APPLE)
set(qt_test_threshold 15)
else (APPLE)
@@ -18,32 +15,32 @@
########### next target ###############
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_11.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_12.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_13.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_14.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_15.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_16.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_17.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_18.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_11.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_12.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_13.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_14.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_15.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_16.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_17.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_18.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
- COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
+ COMMAND generator
+ ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ -- ${CMAKE_CURRENT_SOURCE_DIR}/qt_includes.h
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
include_directories (${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/qt )
@@ -78,32 +75,6 @@
# kde4_add_library(smokeqt SHARED ${smokeqt_LIB_SRCS})
add_library(smokeqt SHARED ${smokeqt_LIB_SRCS})
-SET(QT_USE_QTNETWORK ${QT_QTNETWORK_FOUND})
-SET(QT_USE_QTOPENGL ${QT_QTOPENGL_FOUND})
-SET(QT_USE_QTSQL ${QT_QTSQL_FOUND})
-SET(QT_USE_QTXML ${QT_QTXML_FOUND})
-SET(QT_USE_QTSVG ${QT_QTSVG_FOUND})
-SET(QT_USE_QTUITOOLS ${QT_QTUITOOLS_FOUND})
-SET(QT_USE_QT3SUPPORT ${QT_QT3SUPPORT_FOUND})
-#SET(QT_USE_QTDBUS ${QT_QTDBUS_FOUND)
-# The above line doesn't work with cmake 2.4.6, but should be fixed in later versions
-
-INCLUDE(${QT_USE_FILE})
-# At this point, QT_LIBRARIES will contain a list of the found Qt Libs
-# and QT_INCLUDES contains the directories of the found includes
-
-FOREACH(filename ${QT_INCLUDES})
- set(all_includes "-I${filename} ${all_includes}")
-ENDFOREACH(filename)
-
-FOREACH(incname ${QT_INCLUDES})
- SET(qt_incs "'${incname}', ${qt_incs}")
-ENDFOREACH(incname)
-
-FOREACH(libname ${QT_LIBRARIES})
- set(all_libs "${libname} ${all_libs}")
-ENDFOREACH(libname)
-
target_link_libraries(smokeqt ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTNETWORK_LIBRARY}
@@ -119,6 +90,3 @@
# for Qt only installs
install(TARGETS smokeqt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/qt_smoke.h DESTINATION include/smoke)
-
-# configure_file(qtguess.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/qtguess.pl @ONLY)
-configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY )
--- trunk/KDE/kdebindings/smoke/qtscript/CMakeLists.txt #1014730:1014731
@@ -1,20 +1,16 @@
include_directories( ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/smoke )
-IF(NOT PERL_FOUND)
- FIND_PACKAGE(PERL REQUIRED)
-ENDIF(NOT PERL_FOUND)
-
########### next target ###############
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
- COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
+ COMMAND generator
+ ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qt/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ -- ${CMAKE_CURRENT_SOURCE_DIR}/qtscript_includes.h
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
include_directories (${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/qtscript )
@@ -33,9 +29,3 @@
install(TARGETS smokeqtscript DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/qtscript_smoke.h DESTINATION include/smoke )
-
-FOREACH(incname ${QT_INCLUDES})
- SET(qt_incs "'${incname}', ${qt_incs}")
-ENDFOREACH(incname)
-
-configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY)
--- trunk/KDE/kdebindings/smoke/qttest/CMakeLists.txt #1014730:1014731
@@ -1,20 +1,15 @@
-
include_directories( ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/smoke )
-IF(NOT PERL_FOUND)
- FIND_PACKAGE(PERL REQUIRED)
-ENDIF(NOT PERL_FOUND)
-
########### next target ###############
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
- COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
+ COMMAND generator
+ ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qt/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ -- ${CMAKE_CURRENT_SOURCE_DIR}/qttest_includes.h
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
include_directories (${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/qttest )
@@ -33,9 +28,3 @@
install(TARGETS smokeqttest DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/qttest_smoke.h DESTINATION include/smoke)
-
-FOREACH(incname ${QT_INCLUDES})
- SET(qt_incs "'${incname}', ${qt_incs}")
-ENDFOREACH(incname)
-
-configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY)
--- trunk/KDE/kdebindings/smoke/qtuitools/CMakeLists.txt #1014730:1014731
@@ -1,20 +1,15 @@
-
include_directories( ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/smoke )
-IF(NOT PERL_FOUND)
- FIND_PACKAGE(PERL REQUIRED)
-ENDIF(NOT PERL_FOUND)
-
########### next target ###############
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
- COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
+ COMMAND generator
+ ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qt/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ -- ${CMAKE_CURRENT_SOURCE_DIR}/qtuitools_includes.h
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
include_directories (${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/qtuitools )
@@ -33,9 +28,3 @@
install(TARGETS smokeqtuitools DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/qtuitools_smoke.h DESTINATION include/smoke)
-
-FOREACH(incname ${QT_INCLUDES})
- SET(qt_incs "'${incname}', ${qt_incs}")
-ENDFOREACH(incname)
-
-configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY)
--- trunk/KDE/kdebindings/smoke/qtwebkit/CMakeLists.txt #1014730:1014731
@@ -1,20 +1,15 @@
-
include_directories( ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/smoke )
-IF(NOT PERL_FOUND)
- FIND_PACKAGE(PERL REQUIRED)
-ENDIF(NOT PERL_FOUND)
-
########### next target ###############
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
- COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
+ COMMAND generator
+ ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qt/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ -- ${CMAKE_CURRENT_SOURCE_DIR}/qtwebkit_includes.h
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
include_directories (${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/qtwebkit )
@@ -33,9 +28,3 @@
install(TARGETS smokeqtwebkit DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/qtwebkit_smoke.h DESTINATION include/smoke )
-
-FOREACH(incname ${QT_INCLUDES})
- SET(qt_incs "'${incname}', ${qt_incs}")
-ENDFOREACH(incname)
-
-configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY)
More information about the Kde-bindings
mailing list