From 6f8315099503c6b320a514487ed9802484d3f5d0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 18 Jun 2014 00:36:11 +0200 Subject: Bump version Change-Id: I947513f71eecc748d787d5abfceadb52750286ce --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 00e3fcf..3d3f19b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.3.1 +MODULE_VERSION = 5.3.2 -- cgit v1.2.3 From acae229348b8acd995a9deb3f8066f78fb06470e Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Thu, 6 Feb 2014 14:04:19 +0100 Subject: Include cleanup This patch corrects the include generating warnings on build Change-Id: I943da0ec630ec85a36c3be6dbb570ea90799678b Reviewed-by: Jake Petroules --- src/macextras/qmacfunctions.h | 2 +- src/macextras/qmacpasteboardmime.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/macextras/qmacfunctions.h b/src/macextras/qmacfunctions.h index cf7cc2a..74a0c86 100644 --- a/src/macextras/qmacfunctions.h +++ b/src/macextras/qmacfunctions.h @@ -46,7 +46,7 @@ #pragma qt_class(QtMac) #endif -#include "qmacextrasglobal.h" +#include "QtMacExtras/qmacextrasglobal.h" typedef struct CGImage *CGImageRef; typedef struct CGContext *CGContextRef; diff --git a/src/macextras/qmacpasteboardmime.h b/src/macextras/qmacpasteboardmime.h index d0dda6c..9a107ae 100644 --- a/src/macextras/qmacpasteboardmime.h +++ b/src/macextras/qmacpasteboardmime.h @@ -42,7 +42,7 @@ #if !defined(QMACMIME_H) && !defined(QMIME_H) #define QMACMIME_H -#include "qmacextrasglobal.h" +#include "QtMacExtras/qmacextrasglobal.h" #include -- cgit v1.2.3