# HG changeset patch
# User eldar1@eldar1-laptop
# Date 1262189562 0
# Node ID baaf74652f4cc9b59275edf4a3cf72cdfea07666
# Parent b460cd08041f020176a593002ba366fc704de924
treat const and non-const functions as separate
diff -r b460cd08041f -r baaf74652f4c CMakeLists.txt
--- 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)
diff -r b460cd08041f -r baaf74652f4c generator/abstractmetalang.cpp
--- 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();
diff -r b460cd08041f -r baaf74652f4c generator/abstractmetalang.h
--- 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
};
diff -r b460cd08041f -r baaf74652f4c generator/typesystem_gui.xml
--- 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 @@
-
+
+