rock-qtbindings 4.8.6.5 → 4.8.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 390d8d4096ad917f4f2bea75427503c000d01506522a009c5021db748148cdb5
-  data.tar.gz: a3792acb7089678a9b08bf0903acfd3da737e6f159b58b0240efec5437e7ffb3
+  metadata.gz: 26d6c9a12f8c8836f94735869eb4b9df49016a6d33a3ff214b6c99c9fb91891e
+  data.tar.gz: b4dca499a842991499827934936ab2ae1da4cddb6f4aec037f4511ccac41a3c1
 SHA512:
-  metadata.gz: c1bbbebdb390220e225518aac3c1f696eafbc3dee735669edf7858300a58171601bcd597fcae99169ae3c4cc416c1cfb25381e11c37eec1b58c7a18081da35b3
-  data.tar.gz: 1847093ac38aaa103bd40deab69a16910a92c8d5517c81fcd91db209327ca2b428876c1091edcaf676b322fabf458daa38d473b0f18c2f9970d82272c6d7d939
+  metadata.gz: c0bfc2b1e46980ab2f283b99b34478f53bee3d3e17aeb54cc1c1f8ab08820f2b2fb74034527766a23b4fc53f8572652aec487f7c2d2ae0f9bd8350a65f0f9380
+  data.tar.gz: 95cbe745ab1e49984e7177c269c35cea558e95fd627bb426e287021d081c78dd8a8501271e3aeb1837896ffab53cab2a20bafa20a6ce741001581b01522c0ec6

data/ext/CMakeLists.txt

@@ -1,8 +1,5 @@
 project(qtbind)
 
-# Always force c++03 standard
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
-
 add_subdirectory(generator)
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked

data/ext/generator/parser/parsesession.cpp

@@ -59,7 +59,7 @@ QPair<rpp::Anchor, uint> ParseSession::positionAndSpaceAt(std::size_t offset, bo
 
 std::size_t ParseSession::size() const
 {
-  return m_contents.size() + 1;
+  return m_contents.size();
 }
 
  uint* ParseSession::contents()

data/ext/smoke/CMakeLists.txt

@@ -1,5 +1,11 @@
 project(SMOKE)
 
+# Always force c++03 standard
+# This is required because smoke derives from
+# classes and some have a private destructor that
+# makes them final starting with c++11.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
+
 add_definitions(-DSMOKE_BUILDING)
 
 add_subdirectory(smokebase)

data/ext/smoke/qtcore/CMakeLists.txt

@@ -15,58 +15,29 @@ include(QtGuess.txt)
 
 ########### 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
-
-    COMMAND smokegen
-    ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-         -- ${CMAKE_CURRENT_SOURCE_DIR}/qtcore_includes.h
-    DEPENDS smokegen generator_smoke 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/qtcore  )
 
-set(smokeqtcore_LIB_SRCS ${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
+set(smokeqtcore_LIB_SRCS smokedata.cpp  
+                x_1.cpp 
+                x_2.cpp
+                x_3.cpp
+                x_4.cpp
+                x_5.cpp
+                x_6.cpp
+                x_7.cpp
+                x_8.cpp
+                x_9.cpp
+                x_10.cpp
+                x_11.cpp
+                x_12.cpp
+                x_13.cpp
+                x_14.cpp
+                x_15.cpp
+                x_16.cpp
+                x_17.cpp
+                x_18.cpp
+                x_19.cpp
+                x_20.cpp
 )
 
 IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
@@ -84,5 +55,3 @@ set_target_properties(smokeqtcore PROPERTIES VERSION 3.0.0 SOVERSION 3 )
 # for Qt only installs
 install(TARGETS smokeqtcore DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
 install(FILES ${CMAKE_SOURCE_DIR}/smoke/qtcore_smoke.h DESTINATION include/smoke)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qt-config.xml DESTINATION share/smokegen)
-install(FILES ${CMAKE_BINARY_DIR}/smoke/qtdefines DESTINATION share/smokegen)