projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7851568
)
Reinstate and deprecate the two argument QMetaType::construct
author
Kevin Simons
<kevin.simons@nokia.com>
Fri, 4 Nov 2011 11:43:49 +0000
(12:43 +0100)
committer
Qt by Nokia
<qt-info@nokia.com>
Sat, 5 Nov 2011 22:47:02 +0000
(23:47 +0100)
Change-Id: Id291f00ba13a39b4af022b75fd428b876d6dd9b0
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
src/corelib/kernel/qmetatype.h
patch
|
blob
|
history
diff --git
a/src/corelib/kernel/qmetatype.h
b/src/corelib/kernel/qmetatype.h
index
156c52b
..
24802ee
100644
(file)
--- a/
src/corelib/kernel/qmetatype.h
+++ b/
src/corelib/kernel/qmetatype.h
@@
-132,6
+132,10
@@
public:
static int sizeOf(int type);
static bool isRegistered(int type);
static void *create(int type, const void *copy = 0);
+#if QT_DEPRECATED_SINCE(5, 0)
+ QT_DEPRECATED static void *construct(int type, const void *copy = 0)
+ { return create(type, copy); }
+#endif
static void destroy(int type, void *data);
static void *construct(int type, void *where, const void *copy);
static void destruct(int type, void *where);