diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-18 08:37:31 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-18 08:37:31 +0100 |
| commit | beb65dcd79f8c354dab7bb4a8d08157bd9d69329 (patch) | |
| tree | 4632a0ff0df8462f8913f347042cf8378de03268 /src/widgets/doc | |
| parent | 3fc1002489d5861d4f7cc2e1e8800881d6593c9d (diff) | |
| parent | e3288f246b44ba2b6d90b90eb99ab61f496d8d57 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/gui/painting/painting.pri
src/plugins/platforms/xcb/qxcbconnection.cpp
tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
tests/auto/corelib/tools/qlocale/test/test.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
tools/configure/environment.cpp
Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495
Diffstat (limited to 'src/widgets/doc')
| -rw-r--r-- | src/widgets/doc/src/guibooks.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/doc/src/guibooks.qdoc b/src/widgets/doc/src/guibooks.qdoc index 8a1198c328..b3afe06961 100644 --- a/src/widgets/doc/src/guibooks.qdoc +++ b/src/widgets/doc/src/guibooks.qdoc @@ -76,7 +76,7 @@ advises against will produce more easily comprehensible software. Doing what it tells you to do may also help. - \b{\l{http://www.amazon.com/exec/obidos/ASIN/047159900X/trolltech/t}{The + \b{\l{http://www.amazon.com/New-Windows-Interface-Microsoft-Press/dp/1556156790/}{The Microsoft Windows User Experience}}, ISBN 1-55615-679-0, is Microsoft's look and feel bible. Indispensable for everyone who has customers that worship Microsoft, and it's quite good, too. |