summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-06-12 10:16:38 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-12 13:15:25 +0200
commitba4e0300d3b748a59372553f7a64036a98fccf41 (patch)
tree2dc98c45f77eb495eed938d83c33cb06b09d7366
parentf6b2bc0d788af2bd85d90548918b26090a9012f9 (diff)
Fix build on Windows after qdatetime.h cleanup
Define NOMINMAX before including windows system header files, to prevent them from defining min/max as macros and thus breaking the usage of std::min/max in qdatetime.h Change-Id: I75573ae0bf05a40558a5eb1626bd3a296ee818da Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/3rdparty/phonon/ds9/videorenderer_soft.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp
index 0e04e85..8a2107f 100644
--- a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp
+++ b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp
@@ -15,6 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+// Prevent windows system header files from defining min/max.
+#define NOMINMAX
#include "videorenderer_soft.h"