Mercurial > projects > qtd

changeset 326:baaf74652f4c signals

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
treat const and non-const functions as separate
author eldar1@eldar1-laptop
date Wed, 30 Dec 2009 16:12:42 +0000
parents b460cd08041f
children c97e5d15bf95
files CMakeLists.txt generator/abstractmetalang.cpp generator/abstractmetalang.h generator/typesystem_gui.xml
diffstat 4 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Dec 30 11:25:07 2009 +0000
+++ b/CMakeLists.txt	Wed Dec 30 16:12:42 2009 +0000
@@ -319,10 +319,10 @@
 	else(NOT is_founded)
 	      set(qtd_libs ${${package}_lib_param} ${qtd_libs})
 	endif(NOT is_founded)	
-    endforeach(package ${PACKAGES_tmp})
+    endforeach(package ${PACKAGES_tmp})
     add_d_program(${name} ${SOURCES_tmp} NO_DEPS_SOURCES ${res_sources} ${uic_sources}
 	DEPENDS ${res_sources} INCLUDES ${QTD_IMPORT_PATH} ${CMAKE_CURRENT_BINARY_DIR}
-	LIB_PATHS ${QTD_LIBRARIES_PATH} ${CMAKE_SOURCE_DIR}/lib LIBS ${qtd_libs})
+	LIB_PATHS ${QTD_LIBRARIES_PATH} ${CMAKE_SOURCE_DIR}/lib ${QT_LIBRARY_DIR} LIBS ${qtd_libs})
     ## TODO: Uncomment.
     #if(STRIP AND ${CMAKE_BUILD_TYPE} EQUAL "Release" AND CMAKE_HOST_UNIX) ##
     #	add_custom_command(TARGET example_${name} POST_BUILD COMMAND "${STRIP}" ARGS "${output}")
@@ -581,4 +581,4 @@
 
 set(SECOND_RUN 0 CACHE INTERNAL "")
 
-endif(NOT SECOND_RUN)
\ No newline at end of file
+endif(NOT SECOND_RUN)
--- a/generator/abstractmetalang.cpp	Wed Dec 30 11:25:07 2009 +0000
+++ b/generator/abstractmetalang.cpp	Wed Dec 30 16:12:42 2009 +0000
@@ -258,6 +258,11 @@
         result |= EqualAttributes;
     }
 
+    // Attributes
+    if (isConstant() == other->isConstant()) {
+        result |= EqualConstness;
+    }
+
     // Compare types
     AbstractMetaType *t = type();
     AbstractMetaType *ot = other->type();
--- a/generator/abstractmetalang.h	Wed Dec 30 11:25:07 2009 +0000
+++ b/generator/abstractmetalang.h	Wed Dec 30 16:12:42 2009 +0000
@@ -406,10 +406,11 @@
         EqualReturnType             = 0x00000010,
         EqualDefaultValueOverload   = 0x00000020,
         EqualModifiedName           = 0x00000040,
+        EqualConstness              = 0x00000080,
 
         NameLessThan                = 0x00001000,
 
-        PrettySimilar               = EqualName | EqualArguments,
+        PrettySimilar               = EqualName | EqualArguments | EqualConstness,
         Equal                       = 0x0000001f,
         NotEqual                    = 0x00001000
     };
--- a/generator/typesystem_gui.xml	Wed Dec 30 11:25:07 2009 +0000
+++ b/generator/typesystem_gui.xml	Wed Dec 30 16:12:42 2009 +0000
@@ -2202,7 +2202,8 @@
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
 
     <modify-function signature="children()const" remove="all"/>
-    <modify-function signature="isBlockedByModalPanel(QGraphicsItem**)const" remove="all"/>
+    <modify-function signature="isBlockedByModalPanel(QGraphicsItem**)const" remove="all"/>
+<!--    <modify-function signature="toGraphicsObject()const" remove="all"/> -->
 	<!--
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>