AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5e2f583a67
qt5base-lts/src
History
Albert Astals Cid 5e2f583a67 CUPS: Fix conflict handling 
The previous code assumed that ppdMarkOption returning non zero (i.e. it has conflicts)
also meant that the option wasn't applied at the ppd level, but it actually is.

What we need to do is after calling ppdMarkOption parse the tree again looking
to see if any option is conflicting and mark it as such in the UI.

Change-Id: I836f1902d14dc8c176bb06776471cbf4ed11786f
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
2018-01-05 15:38:35 +00:00
..
3rdparty Merge remote-tracking branch 'origin/5.10' into dev 2018-01-02 09:58:44 +01:00
android Merge remote-tracking branch 'origin/5.10' into dev 2018-01-02 09:58:44 +01:00
angle ANGLE: Fix resizing of windows 2017-12-13 13:07:52 +00:00
concurrent Merge remote-tracking branch 'origin/5.10' into dev 2018-01-02 09:58:44 +01:00
corelib Merge remote-tracking branch 'origin/5.10' into dev 2018-01-04 19:49:26 +01:00
dbus QtDBus: Raise minimum supported MSVC version to 2015 2018-01-04 20:24:09 +00:00
gui Merge remote-tracking branch 'origin/5.10' into dev 2018-01-04 19:49:26 +01:00
network Merge remote-tracking branch 'origin/5.10' into dev 2018-01-02 09:58:44 +01:00
opengl doc: clangqdoc must always see GL typedefs 2017-12-08 17:37:54 +00:00
openglextensions Replace Q_DECL_FINAL with final 2017-09-22 07:30:01 +00:00
platformheaders Merge remote-tracking branch 'origin/5.9' into dev 2017-04-20 12:31:27 +02:00
platformsupport Update most Unicode data to version 10.0 2018-01-03 07:46:31 +00:00
plugins CUPS: Fix conflict handling 2018-01-05 15:38:35 +00:00
printsupport CUPS: Fix conflict handling 2018-01-05 15:38:35 +00:00
sql QtSql: Raise minimum supported MSVC version to 2015 2018-01-04 20:23:54 +00:00
testlib Merge remote-tracking branch 'origin/5.10' into dev 2018-01-04 19:49:26 +01:00
tools Merge remote-tracking branch 'origin/5.10' into dev 2018-01-02 09:58:44 +01:00
widgets Add an option to scroll the QComboBox on macOS with the mouse wheel 2018-01-05 15:01:43 +00:00
winmain Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
xml Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
src.pro Merge remote-tracking branch 'origin/5.9' into dev 2017-03-28 09:28:31 +02:00