d21ef59 · unity8 · git.iko.soy

CMakeLists.txt+3

compare with xenial

unifiedsplit

@@ -101,6 +101,9 @@ add_definitions(-DQT_NO_KEYWORDS)

101# Save a few container detach and conversions

102add_definitions(-DQT_STRICT_ITERATORS)

103

104+# Use the fast string builder

105+add_definitions(-DQT_USE_QSTRINGBUILDER)

106+

104# Autopilot tests

107# Autopilot tests

105include(autopilot)

108include(autopilot)

106declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)

109declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)

plugins/IntegratedLightDM/UsersModel.cpp+7−6

@@ -43,16 +43,17 @@ MangleModel::MangleModel(QObject* parent)

43

44QVariant MangleModel::data(const QModelIndex &index, int role) const

45{

46− QVariant data = QSortFilterProxyModel::data(index, role);

46+ QVariant variantData = QSortFilterProxyModel::data(index, role);

47

48 // If user's real name is empty, switch to unix name

49− if (role == QLightDM::UsersModel::RealNameRole && data.toString().isEmpty()) {

49+ if (role == QLightDM::UsersModel::RealNameRole && variantData.toString().isEmpty()) {

50− data = QSortFilterProxyModel::data(index, QLightDM::UsersModel::NameRole);

50+ variantData = QSortFilterProxyModel::data(index, QLightDM::UsersModel::NameRole);

51− } else if (role == QLightDM::UsersModel::BackgroundPathRole && data.toString().startsWith('#')) {

51+ } else if (role == QLightDM::UsersModel::BackgroundPathRole && variantData.toString().startsWith('#')) {

52− data = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='" + data.toString() + "'/></svg>";

52+ const QString stringData = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='" + variantData.toString() + "'/></svg>";

53+ variantData = stringData;

53 }

54 }

54

55

55− return data;

56+ return variantData;

56}

57}

57

58

58// **** Now we continue with actual UsersModel class ****

59// **** Now we continue with actual UsersModel class ****

plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp+2−1

@@ -34,7 +34,8 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

34 entries.reserve(users.count());

35 Q_FOREACH(const QString &user, users)

36 {

37− QString name = settings.value(user + "/name", user[0].toUpper() + user.mid(1)).toString();

37+ QVariant defaultValue = QString(user[0].toUpper() + user.mid(1));

38+ QString name = settings.value(user + "/name", defaultValue).toString();

38 entries.append({user, name, 0, 0, false, false, 0, 0});

39 entries.append({user, name, 0, 0, false, false, 0, 0});

39 }

40 }

40}

41}

tests/mocks/Unity/Launcher/MockQuickListModel.cpp+1−1

@@ -32,7 +32,7 @@ QVariant MockQuickListModel::data(const QModelIndex &index, int role) const

32 switch (role)

33 {

34 case RoleLabel:

35− return QLatin1String("test menu entry ") + QString::number(index.row());

35+ return QString(QLatin1String("test menu entry ") + QString::number(index.row()));

36 case RoleIcon:

37 return QLatin1String("copy.png");

38 case RoleClickable:

tests/mocks/Unity/fake_resultsmodel.cpp+1−1

@@ -78,7 +78,7 @@ ResultsModel::data(const QModelIndex& index, int role) const

78 case RoleTitle:

79 return QString("Title.%1.%2").arg(m_categoryId).arg(index.row());

80 case RoleArt:

81− return qmlDirectory() + "/graphics/applicationIcons/dash.png";

81+ return QString(qmlDirectory() + "/graphics/applicationIcons/dash.png");

82 case RoleSubtitle:

83 return QString("Subtitle.%1.%2").arg(m_categoryId).arg(index.row());

84 case RoleMascot:

tests/mocks/Unity/fake_scopesoverview.cpp+1−1

@@ -308,7 +308,7 @@ QVariant ScopesOverviewResultsModel::data(const QModelIndex& index, int role) co

308 case RoleSubtitle:

309 return scope && scope->name() == "Videos this is long ab cd ef gh ij kl" ? "tube, movies, cinema, pictures, art, moving images, magic in a box" : QString();

310 case RoleArt:

311− return qmlDirectory() + "/graphics/applicationIcons/dash.png";

311+ return QString(qmlDirectory() + "/graphics/applicationIcons/dash.png");

312 case RoleMascot:

313 case RoleEmblem:

314 case RoleSummary:

tests/plugins/Wizard/tst_pagelist.cpp+5−5

@@ -88,13 +88,13 @@ void PageListTest::testIterate()

88

89 PageList pageList;

90 QCOMPARE(pageList.index(), -1);

91− QCOMPARE(pageList.next(), root.path() + "/a/" + PAGES_PATH + "/1.qml");

91+ QCOMPARE(pageList.next(), QString(root.path() + "/a/" + PAGES_PATH + "/1.qml"));

92 QCOMPARE(pageList.prev(), QString());

93− QCOMPARE(pageList.next(), root.path() + "/a/" + PAGES_PATH + "/2.qml");

93+ QCOMPARE(pageList.next(), QString(root.path() + "/a/" + PAGES_PATH + "/2.qml"));

94− QCOMPARE(pageList.prev(), root.path() + "/a/" + PAGES_PATH + "/1.qml");

94+ QCOMPARE(pageList.prev(), QString(root.path() + "/a/" + PAGES_PATH + "/1.qml"));

95 QCOMPARE(pageList.index(), 0);

96− QCOMPARE(pageList.next(), root.path() + "/a/" + PAGES_PATH + "/2.qml");

96+ QCOMPARE(pageList.next(), QString(root.path() + "/a/" + PAGES_PATH + "/2.qml"));

97− QCOMPARE(pageList.next(), root.path() + "/a/" + PAGES_PATH + "/3.qml");

97+ QCOMPARE(pageList.next(), QString(root.path() + "/a/" + PAGES_PATH + "/3.qml"));

98 QCOMPARE(pageList.index(), 2);

99 QCOMPARE(pageList.next(), QString());

100 QCOMPARE(pageList.index(), 2);