From 0fbbd8496e248aabbbdf11d9243b891f24f6b9f2 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Fri, 19 Mar 2010 10:30:21 +1000 Subject: Fix double definition of qt_next_power_of_two() Static linking doesn't work with two definitions of the function, one in QtGui and another in QtOpenGL. Make the one in QtGui static. Task-number: QTBUG-9170 Reviewed-by: Sarah Smith --- src/gui/painting/qtextureglyphcache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 4a563ed..cf545be 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE // returns the highest number closest to v, which is a power of 2 // NB! assumes 32 bit ints -int qt_next_power_of_two(int v) +static inline int qt_next_power_of_two(int v) { v--; v |= v >> 1; -- cgit v0.12