summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/devLiang Qi2016-08-25179-637/+844
|\
| * Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-08-25179-637/+844
| |\ | | | | | | | | | Change-Id: I309691a541ff0b296fb6bbfbc0761cc1c627573a
| | * QMimeProvider: fix quadratic loopMarc Mutz2016-08-251-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling QMutableListIterator::remove() in a loop constitutes quadratic behavior (O(N) function called O(N) times). Fix by splitting the loop, simplifying it by sharing conditions, and using std::remove_if(), which is linear. Removes one more use of mutable Java iterators. Change-Id: I88bde414777b50996e546bc8cb238619ea4fb645 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: David Faure <david.faure@kdab.com>
| | * Fix issue causing pch configure test to always failJake Petroules2016-08-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced in 4a1bafcc4ee5b7d968620808e155c1617aa6f273. Change-Id: Iafeec043c39af79cee8b53cf74dcd452c03a4826 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * DirectWrite: Fix crash when embedding empty glyphs in PDFEskil Abrahamsen Blomfeldt2016-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empty QPainterPaths can have one move-to element, so the test to detect this case was incomplete. For empty glyphs returned from DirectWrite this would trigger a crash. This is only reproducible after also enabling embedding of fonts with the DirectWrite engine. Task-number: QTBUG-54740 Change-Id: I3fbbfb8d958818550d5ab5234242d39688b84811 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Windows Font Engine: Fix MinGW developer buildFriedemann Kleint2016-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress warning: qwindowsfontengine.cpp:590:26: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] Amends change ac1e87d9f373ad649d989f254b37d2f29ddf25fe. Change-Id: Ibd25c522aac8e946c5e0759ea20e023883622914 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * qdbusxmlgenerator.cpp: reduce allocations in typeNameToXml()Anton Kudryavtsev2016-08-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create QString from QL1S, just iterate over QL1S directly. Change-Id: I35196991224c206841efb11894a9baf736ead97e Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Merge dev into 5.8Oswald Buddenhagen2016-08-22786-9090/+11489
| | |\ | | | | | | | | | | | | Change-Id: I41ee7b50534b01cf042bed8bb8824ba2e5026a29
| | * | Support C++17 fallthrough attributeAllan Sandfeld Jensen2016-08-1971-162/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces our mix of comments for annotating intended absence of break in switches with the C++17 attribute [[fallthrough]], or its earlier a clang extension counterpart. Change-Id: I4b2d0b9b5e4425819c7f1bf01608093c536b6d14 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | qdnd.cpp: Extract Method imageMimeFormatsAnton Kudryavtsev2016-08-191-25/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imageReadMimeFormats and imageWriteMimeFormats had duplicated source code. While touching the code, do some optimizations: - use QStringBuilder more - replace index based loop with 'range for' Change-Id: I174456bf4e55e030930b9b5a4aaef57c722d8f05 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * | Add NEON optimization of rotated bilinear samplingAllan Sandfeld Jensen2016-08-191-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSE2 has had a vectorized code-path for rotated sampling for a long time, but the NEON version has been missing due to a bug in the original commit. This patch reintroduces the NEON optimization. Change-Id: I69d63b60faee9ebf5d69192acd680f35b9619a23 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| | * | Remove type-punned unionsAllan Sandfeld Jensen2016-08-181-30/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type punning even over a union is not legal C++, and also causes the compilers to produce poorly performing code. This has already been fixed for the SSE2 code in bilinear sampling but not for the NEON code. Change-Id: Id5e184051e0bd78db730d83ef0dda56ac3206e5b Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| | * | Use QStringRef to optimize memory allocationAnton Kudryavtsev2016-08-185-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace substring functions that return QString with corresponding functions that return QStringRef. Change-Id: I3c485f89352a1ee66076fba74fd486da9349c354 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * | Register fonts with their given style nameAllan Sandfeld Jensen2016-08-172-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of guessing which styles we have available (always bold/italic) register the ones we actually find. Change-Id: I57380d0417411456a3037f8769440e7b43517e0e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * | xcb: eradicate Q_FOREACH loopsMarc Mutz2016-08-172-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and mark the library with QT_NO_FOREACH. Change-Id: I4924f1419f470b5fa92bb2f3fdefa745b65957f7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | * | xcb: mark some types as movable/primitiveMarc Mutz2016-08-173-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These are all held in Qt containers. Change-Id: Ie285887b285bbcc0b70962d9f9c52d22d213d022 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | * | Standardize some "We mean it" commentsFriedemann Kleint2016-08-1743-125/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the occurrences where the wrong classes are mentioned. Change-Id: Ia291af77f0f454a39cab93e7376a110c19a07771 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * | QMimeData: use QStringBuilder moreAnton Kudryavtsev2016-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a6937545561c51add0d48a618b1921cf9201c4b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | * | Fix qdoc warningsFriedemann Kleint2016-08-174-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtbase/src/network/socket/qsctpsocket.cpp:506: warning: Undocumented parameter 'datagram' in QSctpSocket::writeDatagram() qtbase/src/network/ssl/qssldiffiehellmanparameters.cpp:129: warning: Undocumented parameter 'encoding' in QSslDiffieHellmanParameters::QSslDiffieHellmanParameters() qtbase/src/gui/opengl/qopengltextureblitter.cpp:540: warning: Undocumented parameter 'opacity' in QOpenGLTextureBlitter::setOpacity() qtbase/src/gui/opengl/qopengltextureblitter.cpp:522: warning: Undocumented parameter 'swizzle' in QOpenGLTextureBlitter::setRedBlueSwizzle() qtbase/src/testlib/qtestcase.qdoc:1124: warning: Cannot find 'createTouchDevice(...)' in '\fn' QTest::createTouchDevice() Change-Id: Ie8799aa5f63a4ea6c9fe309e2a627fbe3a13b685 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * | QLinkedList: restore move special member functions for iteratorsMarc Mutz2016-08-171-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were masked by the pointless user-defined copy special member functions, which we cannot remove because it would change the way the iterators are passed by value into functions, on some platforms. Add a reminder for Qt 6 to fix the issue for good. Change-Id: I039093894db4a4e5e4bbf94fb346fd90311316c0 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | tst_QString: clean upMarc Mutz2016-08-171-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add Q_DECLARE_TYPEINFO for types held in Qt containers (incl. QVariant) - port Q_FOREACH to C++11 range-for - port uses of inefficient QLists to QVector Fixes errors pointed out by my tree's static checks. Change-Id: I7176b4b12ed47ed23166857bd127c459ea2a48d5 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | * | tst_QStyleSheetStyle: Extract Method sample_widgets()Marc Mutz2016-08-171-28/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only difference between the sample widget sets was: - widgets << new QLabel("TESTING TESTING"); + widgets << new QLabel("<b>TESTING TESTING</b>"); I chose the latter, because it's the more complex example and neither the hoverColors nor focusColors tests suggest the boldness of the text matters. Part of port away from Q_FOREACH. Change-Id: I9a928de4e781b96ad00a8c9515977c35ebfa6c24 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | * | QColor: remove unused qt_get_rgb_val()Marc Mutz2016-08-172-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defined out-of-line, not exported, not used anywhere in QtGui, so it can be removed. Change-Id: Ib049bad7d02e5412c063965cd81c8d95e1c1c183 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | * | Don't hold MakefileGenerator::Compiler in QListMarc Mutz2016-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MakefileGenerater::Compiler is larger than a void*, so holding it in QList is horribly inefficient. Fix by using QVector instead. Change-Id: I9ea173271caf9b4995d311c3864c6967da049380 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | qmake: don't hold VCFilter in QListMarc Mutz2016-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib10539187e0c8e4ffa2000dcad75715a7b931701 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | qmake: remove pointless ~VCProjectSingleConfig()Marc Mutz2016-08-161-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's empty, but non-trivial, thus preventing move special member functions from being generated by the compiler (now that qmake is compiled as C++11, too). The default ctor was also empty - removed, too. Change-Id: I714db524f681f1fc250d21926245757e97351e87 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | qmake: mark VCProjectSingleConfig as movableMarc Mutz2016-08-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Has a few too many fields for defining a member-swap (which would be required to mark it shared). Change-Id: Iecbeec9e60a9884cb4a984c58cb192918cef799d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | Remove special case for color fonts from Freetype font engineEskil Abrahamsen Blomfeldt2016-08-161-21/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding color font support to the Freetype engine, we added a special case to some functions based on the assumption that color fonts do not contain the latin alphabet. The reason for the assumption is that color fonts are currently most popular for emojis and the most popular ones on Linux did not contain the latin alphabet. But there is nothing special about color fonts making them less likely to contain latin characters than other fonts especially made for non-latin writing systems. If we want an additional fallback when the x character is not available, this should be implemented for all font engines and font types. Change-Id: I1c4aa28d49c38ba7a416c1cae50a1d1c09cbda41 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: jian liang <jianliang79@gmail.com>
| | * | Fix alpha from qfontengine_ft to fit qdrawhelper expectationsAllan Sandfeld Jensen2016-08-161-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The short-cuts in qdrawhelper's qt_alphargbblit_argb32 expects the alpha value of the A32 glyphs to be 0xff. Since the alpha value is not otherwise used, set it to that. The reported image format is also changed to RGB32, matching coretext and windows fontengines, and expected by the OpenGL paintengine. Change-Id: I0873156d716566f7f1634249155b6c9983a3d0de Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * | qmake: Mark MakefileGenerator::Compiler as Q_MOVABLE_TYPEMarc Mutz2016-08-151-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I6469ffe3027c8519e80b71f5014f7bd9474e836b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | qmake: remove pointless ~VCConfiguration()Marc Mutz2016-08-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's empty, but non-trivial, thus preventing move special member functions from being generated by the compiler (now that qmake is compiled as C++11, too). Change-Id: I7e4b6d7f604020dd5e6da81f7a046202c8b78e09 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | qmake: remove pointless ~VCFilter()Marc Mutz2016-08-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's empty, but non-trivial, thus preventing move special member functions from being generated by the compiler (now that qmake is compiled as C++11, too). Change-Id: I9431311d24da802f147ce10e475936838bb85d41 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | qmake: replace a uint:1 with a boolMarc Mutz2016-08-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't save any memory, generates worse code, and prevents a member-swap from being added. Change-Id: Iddc0f1338478e465f34076857e266f1912fbaba6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | Added capHeight() to QRawFont and QFontMetrics(F)Konstantin Tokarev2016-08-1519-2/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cap height is an important metric of font, in particular it is required to make decent implementation of "initial-letter" CSS property in QtWebKit. Note that some fonts lack cap height metadata, so we need to fall back to measuring H letter height. Change-Id: Icf69d92159d070889085e20d31f2e397d796d940 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * | tst_QRegularExpression: clean upMarc Mutz2016-08-151-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - port Q_FOREACH to C++11 range-for (incl. one case of iterating over QHash::keys()) - port uses of inefficient QLists to QVector - add Q_DECLARE_TYPEINFO for types held in Qt containers Fixes errors pointed out by my tree's static checks. Change-Id: I30eb432528fa3008240b5c217d5f2f9ddc3679be Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| | * | QMetaType: clean up #ifdefsMarc Mutz2016-08-151-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We require Q_COMPILER_VARIADIC_TEMPLATES since Qt 5.7, so remove the non-variadic version which anyway has zero test coverage. Change-Id: I24dd22a798e11d797238f9209312802d1d84a672 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | * | QFactoryLoader: clean up #ifdefsMarc Mutz2016-08-151-64/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We require Q_COMPILER_RVALUE_REFS (implicitly used, but not explicitly checked for) and Q_COMPILER_VARIADIC_TEMPLATES since Qt 5.7, so remove the non-variadic version which anyway has zero test coverage. Change-Id: Ie3658ff6ae71a66df9d35100c3d6df41f2326c80 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | * | QSharedPointer: clean up #ifdefsMarc Mutz2016-08-152-54/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We require Q_COMPILER_RVALUE_REFS and _VARIADIC_TEMPLATES since Qt 5.7, so remove the non-variadic version which anyway has zero test coverage. Also drop #include <utility>, as that is included from qglobal.h already, and drop QSKIP from test. Change-Id: I1fc7f7068eac80ad6fd85e1d8f6d33c5c7bb67db Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | * | Move QTriangulator and QTriangulatingStroker classes to paintingAndy Nichols2016-08-157-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the private APIs for QTriangulator and QTriangulatingStroker were located in src/gui/opengl because they were used by the OpenGL paint engine. These API's are not actually specific to OpenGL however, and were not being built when QT_NO_OPENGL was defined. It makes more sense for these classes to belong in the painting subgroup. Aside from the OpenGL paint engine, these private APIs are used by QtLocation to triangulate polylines to be rendered by QtQuick. Change-Id: Idb4d1e5b2a51394d4c6bcdf9ab1ece99de23d4de Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | * | Avoid synthesizing stretch on condensed font familiesAllan Sandfeld Jensen2016-08-157-16/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an entire font family is condensed or stretched and we match by family name, the default stretch factor of 100 will make the font engine try to synthesize it back to medium stretched font. The existing code is already made to deal with a stretch of 0 that is no longer used. This patch reintroduces 0 stretch to indicate no specific stretch has been requested. Specifically setting stretch to 100 on a QFont will introduce the old behavior. [ChangeLog][QtGui][QFont] The default value of QFont::stretch() is now 0 to indicate any default stretch is acceptable. Task-number: QTBUG-48043 Change-Id: I574747f980fd4f9893df828818aae99a07b41623 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * | QTranslator: use const to avoid detach()'ingAnton Kudryavtsev2016-08-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idbab696affed9486e9077d72ba14ce409b98174c Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | tst_qnetworkreply: use preprocessor rather than "commenting out"Edward Welbourne2016-08-251-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debug code is suppressed; let someone investigating a problem be able to turn it on/off by just editing one byte instead of each line of the block of debug code. Change-Id: Iba06df4042d9126d3a5d0873e524ef504c19d3de Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | | | tst_qnetworkreply: use .left(...) in place of .mid(0, ...)Edward Welbourne2016-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iaa150788011552e19b239e675862c0224dbcefc9 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | | | tst_qnetworkreply: ditch fatuous 1* on a constantEdward Welbourne2016-08-251-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I0960fccaaf1316b822c26c5c8be1504469a63ddc Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | | | tst_qnetworkreply: condition dereferencing on non-nullEdward Welbourne2016-08-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The (event) loop member spends most of its time NULL, so make sure slots that dereference it can't trip up if called asynchronously when it is. Change-Id: If634df0ecf9650b52621bdb5a3e9f151abbc18fc Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | | | tst_qnetworkreply: purge stray space inside parenthesisEdward Welbourne2016-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I82c382b4678c3bd8517221c85febdd174f7058d4 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | | | tst_qnetworkreply: linearise a succession of checksEdward Welbourne2016-08-251-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Restructure an if { if/else} else chain so that it reads more logically. Change-Id: I0d9a68451147d2b7e6a6d01cf7bee1a64b9902a7 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | | | tst_qnetworkreply: restructure #if-ery round a conditionEdward Welbourne2016-08-251-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SSL was unavailable but requested (should never happen) MiniHttpServer::incomingConnection() would have crashed on dereferencing unset member client. Rework the run-time conditioning on SSL to sit entirely inside the #if-ery on SSL support, so that client is at least set in each code-path. Change-Id: I9a8ee8e4186e16dd0d00b7f9cc9b988f0b4c62ff Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | | | tst_qnetworkreply: deduplicate some codeEdward Welbourne2016-08-251-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved a line of code that appeared after each call to setupSslServer() into that function and replaced a copy of its code with a call to it. Moved a line from the end of both branches of an if/else to after it. Change-Id: I74ef3e643e41ce0279a6de7f4828baea4423f267 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | | | tst_qnetworkreply, coding style: fixes to brace-placementEdward Welbourne2016-08-251-72/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many struct, class and function bodies had their open braces on the declaring line rather than on a line of their own. Split some lines up and joined others in the course of resolving. Removed a stray semicolon after a constructor body. Change-Id: I492233ca8c499f13ebe4b7d63349382e5eaa1e19 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 11:27:58 +0000