@@ -67,16 +67,16 @@ void KeyboardLayoutsModel::setLanguage(const QString &language)
6767
6868static bool compareLayouts(const KeyboardLayoutInfo &layout0, const KeyboardLayoutInfo &layout1)
6969{
70− QString name0(layout0.displayName);
71− QString name1(layout1.displayName);
70+ QString name0(layout0.id);
71+ QString name1(layout1.id);
7272
7373 if (name0 == name1) {
74− name0 = layout0.language;
75− name1 = layout1.language;
74+ name0 = layout0.displayName;
75+ name1 = layout1.displayName;
7676
7777 if (name0 == name1) {
78− name0 = layout0.id;
79− name1 = layout1.id;
78+ name0 = layout0.language;
79+ name1 = layout1.language;
8080 }
8181 }
8282