diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-03-19 00:30:21 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-03-19 00:30:21 (GMT) |
| commit | 0fbbd8496e248aabbbdf11d9243b891f24f6b9f2 (patch) | |
| tree | 179bcffb461660ea82746c3905757d4aeed7c204 /src/gui/painting/qtextureglyphcache.cpp | |
| parent | e884829f23fad15086f07aa92e1d92bcb71d53ba (diff) | |
| download | Qt-0fbbd8496e248aabbbdf11d9243b891f24f6b9f2.zip Qt-0fbbd8496e248aabbbdf11d9243b891f24f6b9f2.tar.gz Qt-0fbbd8496e248aabbbdf11d9243b891f24f6b9f2.tar.bz2 | |
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
Diffstat (limited to 'src/gui/painting/qtextureglyphcache.cpp')
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |