1
=== modified file '.qmake.conf'
2
--- .qmake.conf	2016-09-15 15:25:54 +0000
3
+++ .qmake.conf	2016-09-22 14:19:53 +0000
4
@@ -15,6 +15,15 @@
5
15
15
6
16
exists($$PWD/../qt.pro): CONFIG += qt_submodule_build
16
exists($$PWD/../qt.pro): CONFIG += qt_submodule_build
7
17
17
8
18
# Set QT_CLANG_*_VERSION if not defined to make internal qmake features
9
19
# (warnings_are_errors and others) work since these variables are defined only
10
20
# when clang is chosen as compiler at configure time. The regexp is based on the
11
21
# Qt one used in the qtbase configure script.
12
22
clang:!defined(QT_CLANG_MAJOR_VERSION, var) {
13
23
    QT_CLANG_MAJOR_VERSION = $$system("clang -v 2>&1 | sed -n -E '/^clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/\1/;p;q;}'")
14
24
    QT_CLANG_MINOR_VERSION = $$system("clang -v 2>&1 | sed -n -E '/^clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/\2/;p;q;}'")
15
25
}
16
26
17
18
# FIXME: Fix bug 1606247 and enable the UbuntuToolkit namespace.
27
# FIXME: Fix bug 1606247 and enable the UbuntuToolkit namespace.
18
19
# build UbuntuToolkit without namespace
28
# build UbuntuToolkit without namespace
19
20
DEFINES += UBUNTUTOOLKIT_NO_NAMESPACE
29
DEFINES += UBUNTUTOOLKIT_NO_NAMESPACE
20
21
30
21
=== modified file 'features/ubuntu_common.prf'
22
--- features/ubuntu_common.prf	2016-09-15 15:37:57 +0000
23
+++ features/ubuntu_common.prf	2016-09-22 14:19:53 +0000
24
@@ -13,27 +13,39 @@
25
13
# order to workaround these issues, we unset these variables and set the
13
# order to workaround these issues, we unset these variables and set the
26
14
# different flags apart from -g and -O2 in the right qmake variables. This
14
# different flags apart from -g and -O2 in the right qmake variables. This
27
15
# allows to keep compiling with the Debian flags but in a more flexible way.
15
# allows to keep compiling with the Debian flags but in a more flexible way.
31
16
gcc:!qt_submodule_build:!debian_build {
16
!qt_submodule_build:!debian_build {
32
17
    QMAKE_CFLAGS = -fstack-protector
17
    gcc:!clang {
33
18
    QMAKE_CXXFLAGS = -fstack-protector
18
        QMAKE_CFLAGS = -fstack-protector
34
19
        QMAKE_CXXFLAGS = -fstack-protector
35
20
        QMAKE_CXXFLAGS_WARN_ON += -Wdate-time -Wformat -Werror=format-security
36
21
        QMAKE_LFLAGS_SHLIB += -Wl,-z,relro
37
22
        DEFINES += _FORTIFY_SOURCE=2
38
23
        unix:!contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions
39
24
    } else {
40
25
        QMAKE_CFLAGS =
41
26
        QMAKE_CXXFLAGS =
42
27
    }
43
19
    QMAKE_LFLAGS =
28
    QMAKE_LFLAGS =
44
20
    QMAKE_CXXFLAGS_WARN_ON += -Wdate-time -Wformat -Werror=format-security
45
21
    QMAKE_LFLAGS_SHLIB += -Wl,-z,relro
46
22
    DEFINES += _FORTIFY_SOURCE=2
47
23
    unix:!contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions
48
24
}
29
}
49
25
30
55
26
# Add suggest-override to warn about overriding virtual functions not marked
31
# Warn about overriding virtual functions not marked with the override keyword.
56
27
# with the override keyword. Breaks the build when built as a Qt submodule.
32
gcc:!clang {
57
28
# Should be fixed in Qt 5.6, see https://codereview.qt-project.org/#/c/169969/
33
    # Breaks the build when built as a Qt submodule. Should be fixed in Qt 5.6,
58
29
gcc:!qt_submodule_build:greaterThan(QT_GCC_MAJOR_VERSION, 4) {
34
    # see https://codereview.qt-project.org/#/c/169969/
59
30
    QMAKE_CXXFLAGS_WARN_ON += -Wsuggest-override
35
    !qt_submodule_build:!lessThan(QT_GCC_MAJOR_VERSION, 5): \
60
36
        QMAKE_CXXFLAGS_WARN_ON += -Wsuggest-override
61
37
} else {
62
38
    greaterThan(QT_CLANG_MAJOR_VERSION, 3)| \
63
39
        if(equals(QT_CLANG_MAJOR_VERSION, 3):!lessThan(QT_CLANG_MINOR_VERSION, 6)): \
64
40
            QMAKE_CXXFLAGS_WARN_ON += -Winconsistent-missing-override
65
31
}
41
}
66
32
42
67
33
# Use the 2011 ISO C++ standard plus amendments. Since Qt 5.6, GNU extensions
43
# Use the 2011 ISO C++ standard plus amendments. Since Qt 5.6, GNU extensions
68
34
# are enabled by default with Clang, GCC and ICC, strict_c++ disables them.
44
# are enabled by default with Clang, GCC and ICC, strict_c++ disables them.
69
35
CONFIG += c++11
45
CONFIG += c++11
71
36
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 5): CONFIG += strict_c++
46
greaterThan(QT_MAJOR_VERSION, 5)| \
72
47
    if(equals(QT_MAJOR_VERSION, 5):!lessThan(QT_MINOR_VERSION, 6)): \
73
48
        CONFIG += strict_c++
74
37
49
75
38
CONFIG += no_keywords
50
CONFIG += no_keywords
76
39
51
77
40
52
78
=== modified file 'features/ubuntu_qml_plugin.prf'
79
--- features/ubuntu_qml_plugin.prf	2016-09-15 15:25:54 +0000
80
+++ features/ubuntu_qml_plugin.prf	2016-09-22 14:19:53 +0000
81
@@ -72,3 +72,7 @@
82
72
    INSTALLS+=autobld_install_qmltypes
72
    INSTALLS+=autobld_install_qmltypes
83
73
    QMAKE_EXTRA_TARGETS += autobld_qmltypes
73
    QMAKE_EXTRA_TARGETS += autobld_qmltypes
84
74
}
74
}
85
75
86
76
# warnings_are_errors depending on the compiler version, sometimes it doesn't
87
77
# add the required flags (for instance for recent clang version on old Qt).
88
78
!contains(QMAKE_CXXFLAGS_WARN_ON, -Werror): QMAKE_CXXFLAGS_WARN_ON += -Werror
89
75
79
90
=== modified file 'features/ubuntu_qt_module.prf'
91
--- features/ubuntu_qt_module.prf	2016-09-15 15:25:54 +0000
92
+++ features/ubuntu_qt_module.prf	2016-09-22 14:19:53 +0000
93
@@ -11,3 +11,7 @@
94
11
CONFIG -= create_cmake
11
CONFIG -= create_cmake
95
12
12
96
13
CONFIG += dll
13
CONFIG += dll
97
14
98
15
# warnings_are_errors depending on the compiler version, sometimes it doesn't
99
16
# add the required flags (for instance for recent clang version on old Qt).
100
17
!contains(QMAKE_CXXFLAGS_WARN_ON, -Werror): QMAKE_CXXFLAGS_WARN_ON += -Werror
101
14
18
102
=== modified file 'src/UbuntuMetrics/UbuntuMetrics.pro'
103
--- src/UbuntuMetrics/UbuntuMetrics.pro	2016-09-12 08:18:53 +0000
104
+++ src/UbuntuMetrics/UbuntuMetrics.pro	2016-09-22 14:19:53 +0000
105
@@ -30,6 +30,7 @@
106
30
    $$PWD/events.cpp \
30
    $$PWD/events.cpp \
107
31
    $$PWD/gputimer.cpp \
31
    $$PWD/gputimer.cpp \
108
32
    $$PWD/logger.cpp \
32
    $$PWD/logger.cpp \
110
33
    $$PWD/overlay.cpp
33
    $$PWD/overlay.cpp \
111
34
    $$PWD/ubuntumetricsglobal.cpp
112
34
35
113
35
load(ubuntu_qt_module)
36
load(ubuntu_qt_module)
114
36
37
115
=== modified file 'src/UbuntuMetrics/applicationmonitor.cpp'
116
--- src/UbuntuMetrics/applicationmonitor.cpp	2016-09-12 09:03:50 +0000
117
+++ src/UbuntuMetrics/applicationmonitor.cpp	2016-09-22 14:19:53 +0000
118
@@ -36,7 +36,7 @@
119
36
    , m_flags(0)
36
    , m_flags(0)
120
37
{
37
{
121
38
    m_queue = static_cast<UMEvent*>(
38
    m_queue = static_cast<UMEvent*>(
123
39
        aligned_alloc(logQueueAlignment, logQueueSize * sizeof(UMEvent)));
39
        alignedAlloc(logQueueAlignment, logQueueSize * sizeof(UMEvent)));
124
40
40
125
41
#if !defined(QT_NO_DEBUG)
41
#if !defined(QT_NO_DEBUG)
126
42
    setObjectName(QStringLiteral("UbuntuMetrics logging"));  // Thread name.
42
    setObjectName(QStringLiteral("UbuntuMetrics logging"));  // Thread name.
127
43
43
128
=== modified file 'src/UbuntuMetrics/events.cpp'
129
--- src/UbuntuMetrics/events.cpp	2016-09-22 10:49:07 +0000
130
+++ src/UbuntuMetrics/events.cpp	2016-09-22 14:19:53 +0000
131
@@ -37,9 +37,9 @@
132
37
EventUtilsPrivate::EventUtilsPrivate()
37
EventUtilsPrivate::EventUtilsPrivate()
133
38
{
38
{
134
39
#if !defined(QT_NO_DEBUG)
39
#if !defined(QT_NO_DEBUG)
136
40
    ASSERT(m_buffer = static_cast<char*>(aligned_alloc(bufferAlignment, bufferSize)));
40
    ASSERT(m_buffer = static_cast<char*>(alignedAlloc(bufferAlignment, bufferSize)));
137
41
#else
41
#else
139
42
    m_buffer = static_cast<char*>(aligned_alloc(bufferAlignment, bufferSize));
42
    m_buffer = static_cast<char*>(alignedAlloc(bufferAlignment, bufferSize));
140
43
#endif
43
#endif
141
44
    m_cpuTimer.start();
44
    m_cpuTimer.start();
142
45
    m_cpuTicks = times(&m_cpuTimes);
45
    m_cpuTicks = times(&m_cpuTimes);
143
46
46
144
=== modified file 'src/UbuntuMetrics/logger.h'
145
--- src/UbuntuMetrics/logger.h	2016-09-09 17:49:07 +0000
146
+++ src/UbuntuMetrics/logger.h	2016-09-22 14:19:53 +0000
147
@@ -22,9 +22,9 @@
148
22
22
149
23
#include <UbuntuMetrics/ubuntumetricsglobal.h>
23
#include <UbuntuMetrics/ubuntumetricsglobal.h>
150
24
24
151
25
class UMEvent;
152
26
class UMFileLoggerPrivate;
25
class UMFileLoggerPrivate;
153
27
struct UMLTTNGPlugin;
26
struct UMLTTNGPlugin;
154
27
struct UMEvent;
155
28
28
156
29
// Log events to a specific device.
29
// Log events to a specific device.
157
30
class UBUNTU_METRICS_EXPORT UMLogger
30
class UBUNTU_METRICS_EXPORT UMLogger
158
@@ -70,7 +70,7 @@
159
70
    static UMLTTNGPlugin* m_plugin;
70
    static UMLTTNGPlugin* m_plugin;
160
71
    static bool m_error;
71
    static bool m_error;
161
72
72
163
73
    void* __reserved;
73
    Q_DECL_UNUSED_MEMBER void* __reserved;
164
74
};
74
};
165
75
75
166
76
#endif  // LOGGER_H
76
#endif  // LOGGER_H
167
77
77
168
=== modified file 'src/UbuntuMetrics/overlay.cpp'
169
--- src/UbuntuMetrics/overlay.cpp	2016-09-09 17:49:07 +0000
170
+++ src/UbuntuMetrics/overlay.cpp	2016-09-22 14:19:53 +0000
171
@@ -96,7 +96,7 @@
172
96
{
96
{
173
97
    DASSERT(text);
97
    DASSERT(text);
174
98
98
176
99
    m_buffer = aligned_alloc(bufferAlignment, bufferSize);
99
    m_buffer = alignedAlloc(bufferAlignment, bufferSize);
177
100
    memset(&m_processEvent, 0, sizeof(m_processEvent));
100
    memset(&m_processEvent, 0, sizeof(m_processEvent));
178
101
    m_processEvent.type = UMEvent::Process;
101
    m_processEvent.type = UMEvent::Process;
179
102
}
102
}
180
103
103
181
=== added file 'src/UbuntuMetrics/ubuntumetricsglobal.cpp'
182
--- src/UbuntuMetrics/ubuntumetricsglobal.cpp	1970-01-01 00:00:00 +0000
183
+++ src/UbuntuMetrics/ubuntumetricsglobal.cpp	2016-09-22 14:19:53 +0000
184
@@ -0,0 +1,34 @@
185
1
// Copyright © 2016 Canonical Ltd.
186
2
// Author: Loïc Molinari <loic.molinari@canonical.com>
187
3
//
188
4
// This file is part of Ubuntu UI Toolkit.
189
5
//
190
6
// Ubuntu UI Toolkit is free software: you can redistribute it and/or modify it
191
7
// under the terms of the GNU Lesser General Public License as published by the
192
8
// Free Software Foundation; version 3.
193
9
//
194
10
// Ubuntu UI Toolkit is distributed in the hope that it will be useful, but
195
11
// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
196
12
// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
197
13
// for more details.
198
14
//
199
15
// You should have received a copy of the GNU Lesser General Public License
200
16
// along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
201
17
202
18
#include "ubuntumetricsglobal_p.h"
203
19
204
20
void* alignedAlloc(size_t alignment, size_t size)
205
21
{
206
22
    DASSERT(IS_POWER_OF_TWO(alignment));
207
23
    // DASSERT(((size % alignment) == 0));  // FIXME(loicm) ASSERT doesn't support '%'...
208
24
209
25
#if defined(__APPLE__)
210
26
    void* pointer;
211
27
    posix_memalign(&pointer, alignment, size);
212
28
    return pointer;
213
29
#elif defined(_WIN32)
214
30
    return _aligned_malloc(size, alignment);
215
31
#else
216
32
    return aligned_alloc(alignment, size);
217
33
#endif
218
34
}
219
0
35
220
=== modified file 'src/UbuntuMetrics/ubuntumetricsglobal_p.h'
221
--- src/UbuntuMetrics/ubuntumetricsglobal_p.h	2016-09-09 17:49:07 +0000
222
+++ src/UbuntuMetrics/ubuntumetricsglobal_p.h	2016-09-22 14:19:53 +0000
223
@@ -51,4 +51,8 @@
224
51
51
225
52
#define UBUNTU_METRICS_PRIVATE_EXPORT UBUNTU_METRICS_EXPORT
52
#define UBUNTU_METRICS_PRIVATE_EXPORT UBUNTU_METRICS_EXPORT
226
53
53
227
54
// Allocates size bytes and returns an pointer to the aligned memory. alignment
228
55
// must be a power-of-two and size a multiple of alignment.
229
56
void* alignedAlloc(size_t alignment, size_t size);
230
57
231
54
#endif  // UBUNTUMETRICSGLOBAL_P_H
58
#endif  // UBUNTUMETRICSGLOBAL_P_H
232
55
59
233
=== modified file 'src/UbuntuToolkit/unitythemeiconprovider.cpp'
234
--- src/UbuntuToolkit/unitythemeiconprovider.cpp	2016-09-12 09:03:50 +0000
235
+++ src/UbuntuToolkit/unitythemeiconprovider.cpp	2016-09-22 14:19:53 +0000
236
@@ -138,15 +138,13 @@
237
138
138
238
139
    static QImage loadIcon(const QString &filename, QSize *impsize, const QSize &requestSize)
139
    static QImage loadIcon(const QString &filename, QSize *impsize, const QSize &requestSize)
239
140
    {
140
    {
240
141
        QImage image;
241
142
        QImageReader imgio(filename);
141
        QImageReader imgio(filename);
242
143
142
243
144
        const bool force_scale = imgio.format() == QStringLiteral("svg")
244
145
            || imgio.format() == QStringLiteral("svgz");
245
146
246
147
        if (requestSize.width() > 0 || requestSize.height() > 0) {
143
        if (requestSize.width() > 0 || requestSize.height() > 0) {
247
144
            const bool force_scale = (imgio.format() == "svg") || (imgio.format() == "svgz");
248
148
            QSize s = imgio.size();
145
            QSize s = imgio.size();
249
149
            qreal ratio = 0.0;
146
            qreal ratio = 0.0;
250
147
251
150
            if (requestSize.width() > 0 && (force_scale || requestSize.width() < s.width())) {
148
            if (requestSize.width() > 0 && (force_scale || requestSize.width() < s.width())) {
252
151
                ratio = qreal(requestSize.width())/s.width();
149
                ratio = qreal(requestSize.width())/s.width();
253
152
            }
150
            }
254
@@ -165,6 +163,7 @@
255
165
        if (impsize)
163
        if (impsize)
256
166
            *impsize = imgio.scaledSize();
164
            *impsize = imgio.scaledSize();
257
167
165
258
166
        QImage image;
259
168
        if (imgio.read(&image)) {
167
        if (imgio.read(&image)) {
260
169
            if (impsize)
168
            if (impsize)
261
170
                *impsize = image.size();
169
                *impsize = image.size();
Status:	Superseded
Proposed branch:	lp:~loic.molinari/ubuntu-ui-toolkit/uitk-aligned-alloc-for-apple-and-win32
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	261 lines (+91/-24) 12 files modified .qmake.conf (+9/-0) features/ubuntu_common.prf (+25/-13) features/ubuntu_qml_plugin.prf (+4/-0) features/ubuntu_qt_module.prf (+4/-0) src/UbuntuMetrics/UbuntuMetrics.pro (+2/-1) src/UbuntuMetrics/applicationmonitor.cpp (+1/-1) src/UbuntuMetrics/events.cpp (+2/-2) src/UbuntuMetrics/logger.h (+2/-2) src/UbuntuMetrics/overlay.cpp (+1/-1) src/UbuntuMetrics/ubuntumetricsglobal.cpp (+34/-0) src/UbuntuMetrics/ubuntumetricsglobal_p.h (+4/-0) src/UbuntuToolkit/unitythemeiconprovider.cpp (+3/-4)
To merge this branch:	bzr merge lp:~loic.molinari/ubuntu-ui-toolkit/uitk-aligned-alloc-for-apple-and-win32
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-09-22
Zsombor Egri		2016-09-22	Pending
Review via email: mp+306471@code.launchpad.net