Eskil Abrahamsen Blomfeldt 0e0149c64d Ignore weight in .ui files instead of converting it ... In 3558704ed5, we added code to support old .ui files which used the old integer scale for font weights by checking for a special attribute which would help separate new and old files. Since then, it has become apparent that the weight element in .ui is not actually used for anything, since it is only emitted when the bold flag is set and always has to match QFont::Bold in these cases. So instead of converting, we simply ignore it now, and respect the bold flag instead. This also reverts the changes to ui4.* in uic, since the scale attribute is no longer needed. Task-number: QTBUG-42248 Change-Id: I1898868b58004099590f4eaf01f24c57bd34d779 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>		2020-09-03 07:31:45 +02:00
..
translation	uic: Revert the microoptimization patch introducing QStringLiteral	2018-07-19 12:38:45 +00:00
.gitattributes	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
addlinkdialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
addlinkdialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
addtorrentform.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
addtorrentform.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
authenticationdialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
authenticationdialog.ui.h	Ignore weight in .ui files instead of converting it	2020-09-03 07:31:45 +02:00
backside.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
backside.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
batchtranslation.ui	Updated license headers	2016-01-21 18:55:18 +00:00
batchtranslation.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
bookmarkdialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
bookmarkdialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
bookwindow.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
bookwindow.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
browserwidget.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
browserwidget.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
bug18156QTreeWidget.ui	uic - fix to handle QTreeWidget with empty header(s)	2012-11-21 16:36:50 +01:00
bug18156QTreeWidget.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
buttongroup.ui	Don't generate QButtonGroup include unconditionally	2018-01-15 15:50:07 +00:00
buttongroup.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
calculator.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
calculator.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
calculatorform.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
calculatorform.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
certificateinfo.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
certificateinfo.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
chatdialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
chatdialog.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
chatmainwindow.ui	Fix module name format in displayed code	2013-02-11 01:43:21 +01:00
chatmainwindow.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
chatsetnickname.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
chatsetnickname.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
config.ui	Updated license headers	2016-01-21 18:55:18 +00:00
config.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
config.ui.py	uic/Python: import all the classes for QtCore and QtGui	2020-05-05 22:04:51 +02:00
connectdialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
connectdialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
controller.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
controller.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
cookies.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
cookies.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
cookiesexceptions.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
cookiesexceptions.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
default.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
default.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
Dialog_with_Buttons_Bottom.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
Dialog_with_Buttons_Bottom.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
Dialog_with_Buttons_Right.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
Dialog_with_Buttons_Right.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
Dialog_without_Buttons.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
Dialog_without_Buttons.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
dialog.ui	uic: Implement form window setting to disable QObject::connectSlotsByName()	2019-07-02 09:15:47 +02:00
dialog.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
downloaditem.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
downloaditem.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
downloads.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
downloads.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
embeddeddialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
embeddeddialog.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
enumnostdset.ui	Generate QVariant::fromValue(enum_value) for enum values	2016-03-09 13:51:39 +00:00
enumnostdset.ui.h	uic: Generate correctly qualified invocation of QCoreApplication::translate()	2018-12-03 19:05:03 +00:00
filespage.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
filespage.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
filternamedialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
filternamedialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
filterpage.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
filterpage.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
finddialog.ui	Updated license headers	2016-01-21 18:55:18 +00:00
finddialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
form.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
form.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
formwindowsettings.ui	Updated license headers	2016-01-21 18:55:18 +00:00
formwindowsettings.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
generalpage.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
generalpage.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
gridalignment.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
gridalignment.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
gridpanel.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
gridpanel.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
helpdialog.ui	uic: Fix broken icon code generation	2019-01-23 17:06:59 +00:00
helpdialog.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
history.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
history.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
icontheme.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
icontheme.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
idbased.ui	uic: Support id-based translations	2018-01-18 11:31:09 +00:00
idbased.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
identifierpage.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
identifierpage.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
imagedialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
imagedialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
inputpage.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
inputpage.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
installdialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
installdialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
languagesdialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
languagesdialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
listwidgeteditor.ui	Updated license headers	2016-01-21 18:55:18 +00:00
listwidgeteditor.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
Main_Window.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
Main_Window.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
mainwindow.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
mainwindow.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
mydialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
mydialog.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
myform.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
myform.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
newactiondialog.ui	Updated license headers	2016-01-21 18:55:18 +00:00
newactiondialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
newdynamicpropertydialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
newdynamicpropertydialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
newform.ui	Updated license headers	2016-01-21 18:55:18 +00:00
newform.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
orderdialog.ui	Updated license headers	2016-01-21 18:55:18 +00:00
orderdialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
outputpage.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
outputpage.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
pagefold.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
pagefold.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
paletteeditor.ui	Updated license headers	2016-01-21 18:55:18 +00:00
paletteeditor.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
passworddialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
passworddialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
pathpage.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
pathpage.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
phrasebookbox.ui	Updated license headers	2016-01-21 18:55:18 +00:00
phrasebookbox.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
pixmapfunction.ui	uic: Fix pixmap functions for QIcon	2018-09-06 11:58:40 +00:00
pixmapfunction.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
plugindialog.ui	Updated license headers	2016-01-21 18:55:18 +00:00
plugindialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
preferencesdialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
preferencesdialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
previewconfigurationwidget.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
previewconfigurationwidget.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
previewdialogbase.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
previewdialogbase.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
previewwidget.ui	Updated license headers	2016-01-21 18:55:18 +00:00
previewwidget.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
proxy.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
proxy.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
qfiledialog.ui	Updated license headers	2016-01-21 18:55:18 +00:00
qfiledialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
qpagesetupwidget.ui	uic: Fix possible crash when reading the size hint property	2017-06-13 06:56:10 +00:00
qpagesetupwidget.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
qprintpropertieswidget.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
qprintpropertieswidget.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
qprintsettingsoutput.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
qprintsettingsoutput.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
qprintwidget.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
qprintwidget.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
qsqlconnectiondialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
qsqlconnectiondialog.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
qtgradientdialog.ui	Updated license headers	2016-01-21 18:55:18 +00:00
qtgradientdialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
qtgradienteditor.ui	Updated license headers	2016-01-21 18:55:18 +00:00
qtgradienteditor.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
qtgradientview.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
qtgradientview.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
qtgradientviewdialog.ui	Updated license headers	2016-01-21 18:55:18 +00:00
qtgradientviewdialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
qtresourceeditordialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
qtresourceeditordialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
qttoolbardialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
qttoolbardialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
qttrid.ui	uic: Accept an -idbased argument	2016-01-28 14:07:43 +00:00
qttrid.ui.h	Remove QGuiAction again and split QAction implementation up instead	2020-03-29 11:18:57 +01:00
querywidget.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
querywidget.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
remotecontrol.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
remotecontrol.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
saveformastemplate.ui	Updated license headers	2016-01-21 18:55:18 +00:00
saveformastemplate.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
settings.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
settings.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
signalslotdialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
signalslotdialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
sslclient.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
sslclient.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
sslerrors.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
sslerrors.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
statistics.ui	Updated license headers	2016-01-21 18:55:18 +00:00
statistics.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
stringlisteditor.ui	Updated license headers	2016-01-21 18:55:18 +00:00
stringlisteditor.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
stylesheeteditor.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
stylesheeteditor.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
tabbedbrowser.ui	Updated license headers	2016-01-21 18:55:18 +00:00
tabbedbrowser.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
tablewidgeteditor.ui	Updated license headers	2016-01-21 18:55:18 +00:00
tablewidgeteditor.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
tetrixwindow.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
tetrixwindow.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
textfinder.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
textfinder.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
topicchooser.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
topicchooser.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
translatedialog.ui	Updated license headers	2016-01-21 18:55:18 +00:00
translatedialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
translationsettings.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
translationsettings.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
treewidgeteditor.ui	Updated license headers	2016-01-21 18:55:18 +00:00
treewidgeteditor.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
trpreviewtool.ui	Updated license headers	2016-01-21 18:55:18 +00:00
trpreviewtool.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
validators.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
validators.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
wateringconfigdialog.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
wateringconfigdialog.ui.h	uic: Generate Qt 5 connection syntax	2020-05-04 08:12:33 +02:00
Widget.ui	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
Widget.ui.h	uic tests: Update version in baseline	2020-04-29 22:48:26 +02:00
window.ui	uic: Generate string-based connections for custom slots	2020-05-05 15:35:51 +02:00
window.ui.h	uic: Generate string-based connections for custom slots	2020-05-05 15:35:51 +02:00