git.iko.soy/unity8
on xenial help sign in
Fix utils tests
7d149cfDalton Durst
tests/plugins/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -6,6 +6,6 @@ add_subdirectory(LightDM)
6add_subdirectory(SessionBroadcast)
6add_subdirectory(SessionBroadcast)
7add_subdirectory(Ubuntu)
7add_subdirectory(Ubuntu)
8add_subdirectory(Unity)
8add_subdirectory(Unity)
9−#add_subdirectory(Utils) #FIXME broken with qt 5.9
9+add_subdirectory(Utils)
10add_subdirectory(WindowManager)
10add_subdirectory(WindowManager)
11#add_subdirectory(Wizard) #FIXME broken
11#add_subdirectory(Wizard) #FIXME broken
tests/plugins/Utils/ModelTest.cpp+2−1
@@ -441,7 +441,8 @@ void ModelTest::data()
441 QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
441 QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
442 if ( textAlignmentVariant.isValid() ) {
442 if ( textAlignmentVariant.isValid() ) {
443 int alignment = textAlignmentVariant.toInt();
443 int alignment = textAlignmentVariant.toInt();
444− QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
444+ int alignment_test = alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask );
445+ QCOMPARE( alignment, alignment_test );
445 }
446 }
446
447
447 // General Purpose roles that should return a QColor
448 // General Purpose roles that should return a QColor