projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "DALi Version 2.0.5" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
magnifier
/
magnifier-impl.h
diff --git
a/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
b/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
index
c707523
..
b4d7b0f
100644
(file)
--- a/
dali-toolkit/internal/controls/magnifier/magnifier-impl.h
+++ b/
dali-toolkit/internal/controls/magnifier/magnifier-impl.h
@@
-137,7
+137,7
@@
private:
private:
- v
irtual void OnSizeSet(const Vector3& targetSize)
;
+ v
oid OnSizeSet(const Vector3& targetSize) override
;
private: