1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
From 404f2675f8ca5496a5e528825078b1ce27669cd7 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Mon, 20 Mar 2017 17:01:39 +0100
Subject: fix compilation on old gcc
same as https://phabricator.kde.org/D5083,
gcc 4.8.5 (opensuse leap) fails building modeltest with
CMakeFiles/testHistoryModel.dir/modeltest.cpp.o: In function `ModelTest::data()':
modeltest.cpp:(.text+0x5a57): undefined reference to `bool QTest::qCompare<int, unsigned int>(int const&, unsigned int const&, char const*, char const*, char const*, int)'
---
kcmkwin/kwincompositing/test/modeltest.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kcmkwin/kwincompositing/test/modeltest.cpp b/kcmkwin/kwincompositing/test/modeltest.cpp
index d356b26..c077d9b 100644
--- a/kcmkwin/kwincompositing/test/modeltest.cpp
+++ b/kcmkwin/kwincompositing/test/modeltest.cpp
@@ -453,7 +453,7 @@ void ModelTest::data()
// Check that the alignment is one we know about
QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
if ( textAlignmentVariant.isValid() ) {
- int alignment = textAlignmentVariant.toInt();
+ unsigned int alignment = textAlignmentVariant.toUInt();
QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
}
--
cgit v0.11.2
|
