summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Refactor tst_QAbstractSlider::keyPressed()Mitch Curtis2018-12-131-163/+482
| | | | | | | | | | Don't do several tests at once in the test function. Instead, move the extra tests to the data function. This makes it possible to easily add a self-contained test (i.e row) for an upcoming fix. Task-number: QTBUG-25988 Change-Id: I65c8d7620f01107f8f59c96896b1a641d97f5fdc Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* configure: fix $$qtConfFindInPath() on windowsOswald Buddenhagen2018-12-121-0/+1
| | | | | | | | | | uses of this function (or the "files" stanza in configure.json) which don't explicitly target windows don't specify the .exe extension, so we need to add it automatically if it's missing. Task-number: QTBUG-57436 Change-Id: I1994378399bc3466c32ee065e752516f42652975 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Doc: correct syntax error in qmake manualNico Vertriest2018-12-121-1/+1
| | | | | | Change-Id: I600f8c9ea8e55dad19345bd4d726cf8d5438e9ce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* escape literal backslashes in qmake filesOswald Buddenhagen2018-12-126-25/+25
| | | | | | Task-number: QTBUG-70765 Change-Id: I56abbf19be88d01b2964980fb741567f28e4f0fa Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix tautological compare in error checkingThiago Macieira2018-12-121-1/+1
| | | | | | | | | size is size_t, so it's never less than zero. Fixes: QTBUG-72286 Change-Id: Idd0c85a4e7b64f9c9c7dfffd156d404d0de5ed8d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* qt_imageFromWinHBITMAP(): Fix memory corruption when converting from bitmaps ↵Friedemann Kleint2018-12-122-2/+19
| | | | | | | | | | | with low depths Insufficient memory was allocated when asking GetDIBits() to convert to 32bit. Fix allocation size and use a QScopedArrayPointer. Fixes: QTBUG-72343 Change-Id: I45f79c913a243316e01bc6efed08e50ccc7d25f4 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* tst_QMessageBox: Modernize and simplify codeVitaly Fanaskov2018-12-121-37/+36
| | | | | | | | | | Changed 0 to nullptr, used more C++-style casts, simplified some code for searching a button, and changed foreach to range-based for loop. Task-number: QTBUG-44131 Change-Id: I211b12751b0e2591d1d14294c31b51d52bb4e3f6 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* When warning about invalid style override also print available onesSergio Martins2018-12-121-2/+4
| | | | | Change-Id: Ia017a342648a1f1e1185e74ddec1a77cb6dcfebe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QFileDialog: Remember last visited directory correctlyFriedemann Kleint2018-12-121-0/+4
| | | | | | | | | | | | QFileDialogPrivate::init() sets the working directory derived from the URL passed in, causing the lastVisitedDir to be set. This in turn prevented the restoreState() logic from setting the directory retrieved from the file. Clear lastVisitedDir in init() in case the initial URL was invalid. Fixes: QTBUG-70798 Change-Id: I19084e24eb6d469330c4dd8c50495b4996279189 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* nativetext: Fix baseline positioning for CoreTextTor Arne Vestbø2018-12-111-8/+19
| | | | | | | The Qt and CoreText positioning is now in sync. Change-Id: I0cbb5b150d1bef732674b8d42c64a040773a62ab Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Handle QCollator with locale C by delegating to QStringEdward Welbourne2018-12-117-24/+70
| | | | | | | | | | | | | | | | | | | | | | Previously, the C locale was treated as English because each back-end takes the locale's bcp47Name(), which maps C to en. However, the C locale has its own rules; which QString helpfully implements; so we can delegate to it in this case. Extended this to sort keys, where possible. Clean up existing implementations in the process. Extended tst_QCollator::compare() with some cases to check this. That required wrapping the test's calls to collator.compare() in a sign canonicalizer, since it can return any -ve for < or +ve for >, not just -1 and +1 for these cases (and it'd be rash to hard-code specific negative and positive values, as they may vary between backends). [ChangeLog][QtCore][QCollator] Added support for collation in the C locale, albeit this is only well-defined for ASCII. Collation sort keys remain unsupported on Darwin. Fixes: QTBUG-58621 Change-Id: I327010d90f09bd1b1816f5590cb124e3d423e61d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Include CLDR 34 update in change logEdward Welbourne2018-12-111-0/+1
| | | | | Change-Id: I88ab9d48eaa0486cbd930166de601973be2e8e0f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Offscreen QPA: use a CoreText font database on macOSR.J.V. Bertin2018-12-111-1/+4
| | | | | | | | | | | Without this applications using the Offscreen QPA don't have access to any fonts on macOS and thus cannot render text correctly. Task-number: QTBUG-72335 Change-Id: I8e58c066365d0231d0993ad3b480d957a32f7f7b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Avoid crash in blitting or fast draw when QPointF is too bigAllan Sandfeld Jensen2018-12-112-0/+24
| | | | | | | Change-Id: I88182d5d95fda15d33836f16dee78167685b3765 Fixes: QTBUG-72392 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Silence GCC 9 warningsVille Voutilainen2018-12-112-1/+24
| | | | | Change-Id: I5654881a3adac6f67a38837321c8e1c3ce1e2d8f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc: Fix typo in snippetPaul Wicking2018-12-111-1/+1
| | | | | | | | Resolves "reference to non-static member function must be called" error. Fixes: QTBUG-72403 Change-Id: Iebd865ff553736df43548b72b45ed3f4711fffc1 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* ANGLE: Dynamically load D3D compiler from a listOliver Wolff2018-12-112-0/+84
| | | | | | | | | | | | If the default compiler cannot be found, load it from a list of DLL names, including a non-versioned proxy DLL provided by Qt. On Desktop Windows, the default compiler can also be specified by an environment variable, QT_D3DCOMPILER_DLL. Change-Id: I590bb11e58339451d187860c449b0209c1ca0578 Reviewed-by: Dmitry Kazakov <dimula73@gmail.com> Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Specify the date-time spec when setting max timeEdward Welbourne2018-12-101-1/+1
| | | | | | | | | | | | | | QDateTimeEdit::setMaximumTime() constructed a QDateTime from the given time and its current max date without propagating its existing spec; it thus got a local time. All other QDateTimeEdit methods setting bounds do propagate the spec. So bring setMaximumTime() in line with the others. Fixes: QTBUG-71311 Change-Id: Ic97d22185f76bed46bc8d2884b131942874d9a0a Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru> Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix build of static plugins with resourcesRichard Moe Gustavsen2018-12-101-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | This patch reverts 388c4ef9f78c8e. The reason is that it generates a symbol (resource_init_function) based on the name of the pro-file. But if different plugins are built from a pro-file with the same name, you end up linking in many symbols with the same name as well. Which one that ends up being used at runtime will typically depend on the linking order of the plugins. This problem will happen if you build an app for iOS that uses both controls 1 and controls 2. In that case, both QML plugins are built from a "controls.pro" file. At runtime, only one of the plugins will be imported correctly. This patch therefore reverts 388c4ef9f78c8e, but at the same time, to not re-introduce the problem it fixed, we instead genereate both a debug and release version of the plugin_resources.cpp file. That way we can still depend on the TARGET variable for generating both the resource_init_function symbol and the cpp file. Fixes: QTBUG-62647 Fixes: QTBUG-71386 Fixes: QTBUG-72108 Change-Id: I3d8c53132458b30ed9f47a259f1f8e4fa4d44130 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix qmake's detection for conflicting source files for nmakeJoerg Bornemann2018-12-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the following source tree: foo/narf.cpp bar/narf.c bar/gnampf.cpp The .pro file has SOURCES += foo/narf.cpp bar/gnampf.cpp The file bar/narf.c is not supposed to be built for whatever reason. QMake's nmake Makefile generator generates inference rules of the form {.\foo}.cpp{debug\}.obj:: ... for every source subdirectory and every source file extension. Thus, we have {.\foo}.cpp{debug\}.obj:: {.\bar}.cpp{debug\}.obj:: {.\bar}.c{debug\}.obj:: Depending on the exact execution order of the inference rules (which depends on the names of the files) the latter rule might get picked, and we're erronously compiling bar/narf.c even though it's not referenced in the .pro file. Conclusion: QMake's detection of conflicting source files must consider the base names of source files, and not the exact file names. Fixes: QTBUG-72059 Change-Id: I50c2725ae2a7421053369a10680230f571af00ea Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix addition of the wasm platform pluginJoerg Bornemann2018-12-101-1/+1
| | | | | | | | Add the plugin; do not replace the whole SUBDIRS value. Fixes: QTBUG-70375 Change-Id: Id40a69f54dfde5eb88894323c7e1146b6cad5a75 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fusion: Don't draw the background of the lineedit when drawing the frameAndy Shaw2018-12-101-1/+0
| | | | | | | | | | | Since only the frame is being drawn here, it should only draw the outline. Otherwise it will override any background drawing done via a stylesheet. Change-Id: I408fc44743747ad369c700b3d52935bfc8826f11 Fixes: QTBUG-71950 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* threads: disable threads examples for nothread buildsLorn Potter2018-12-101-1/+2
| | | | | Change-Id: I2c253de973f5399c5ed68194b969ccebe457c689 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into ↵Qt Forward Merge Bot2018-12-104-14/+126
|\ | | | | | | refs/staging/5.12
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-104-14/+126
| |\ | | | | | | | | | Change-Id: If49df791f73e9edf616baa094e0f301a44cb853d
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-042-5/+107
| | |\ | | | | | | | | | | | | Change-Id: Idcb3f03013b54385f2322d9a2a559b41846ece79
| | | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-251-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 059b10f295d8d04c4144984daf1464115bcb69c9 Doc: Check before including the \snippet from a .pro file + 7f0cc35d9c33802742aaa640472f3d9d2390ffa4 Examples: Fix minor bug in Tree Model Completer Example + 244c7bd193ab5e15e28108937cae4acf3d574350 Avoid conversion over RGBA64 for RGB32 LCD text blending + a381ba4220097bd7a982a86f32c7e65da5591c8c Document version number of pixman + ff2a71e310b18a43a41daf2d197f5715f7c26d29 Doc: Move the literal code blocks to a separate file + 20ac20bcea8954a980d1acdbc4e9fa55011fe088 Windows QPA: Fix missing accessibility info with WebEngineView + 689a1e186b76853144802d9c29f0346856bd5fde QString: Fix snippet explaining "non-spaced numbered place markers" + 85f127cb045200fa5fa3608b859e59bb4a9c27b2 Revise an incorrect QVulkanWindow doc note + 3bac18da8ef9f5750207ddf47192b5db3137c4ac Document SLJIT part of pcre2 + 621ab8ab59901cc3f9bd98be709929c9eac997a8 bmp image handler: check for out of range image size + e04b85b026f59120e69a4acb3f3e4469abccc325 Doc: improve Mandelbrot example + bff307ab93bd6963f84e08e8050efa6a838dba6e Fix XCB on endian mismatched client and server with SHM off + 45c1473847ad65c4d43f9a605a86439867442883 Detect when we are at the sentence boundary + 49efea26a5fae8c2275999c36c7c8d24cf4125de sqlite: Fix QSqlError handling when opening/closing database + 1511bfef52b0731e1fdeafd685bf4954024da0e9 Disable RGB64 backend for ARGB32 when it will be very slow + cb5c24fa26142edaff8fd2c9787dbe45c222b4ff Fix integer overflow in very long sections in ELF objects + 12c357bebb19407ee8e034f3679b6c8b77ece9c1 Document IAccessible2 version + 8aa9bb6d3fcb45579f3dc45c5bdef6d33a9f9d24 Clarify docs regarding the states of a QFutureWatcher with no future set + 4fc4f7b0ce0e6ee186a7d7fe9b5dd20e94efe432 Export qt_open64 from QtCore + 4b7ff8e98c0208273a25d84e1f0322cad5bce2bf Protect HSTS code for no-feature-settings build + 6948bf20a73d09e867fd7c2d89052237d94b7d6a QSslContext: Use 0 instead of TLS_MAX_VERSION + e226b0f94afc85f79d82fc54421487bf2a529ba5 Modernize the "textdate" feature + b26cd68bf61346273a5a03bbc1e60a7cdffa4f0d Modernize the "datestring" feature + 02663718a9da95968a7879b792508b8c0ae699b2 QHeaderView: Don't unhide hidden sections on layoutChanged() + f99e956d65058e22780d99832987edad16f6d077 Add QT_REQUIRE_CONFIG(ssl) to pre-shared key authenticator + 5e64957ee4162ecf4456306a530a68761c2b127f Fix QCompleter popups preventing the application from exiting + 555a6b5d5d2dd91a0dcf9e3d5fbadd1b31bf80f3 Modernize the "filesystemwatcher" feature + 857a0d4c51095e2f90274ab8246bb01e58c97dfc Fix the /J option for MSVC project generation + 3ed8dc37884bac67414c0840e27b5094a69cfdcd Android: fix log output pattern + ef4ba0285f9c5dd5ee2dca1e0cefee45eba3477c SSL: Don't write to closed socket or write to deallocated buffer + 94884246d445fb3e702ac8c4d4bb432768e61b61 QCommandLineParser: Ensure that an option text ends with a newline + caa598c843eb27fd0c645e62723fd2d4e3e12f60 Fix QUrl::matches for when removing authority parts (other than host) + b2b32d3147eb213c835072994c93d2af3e7d285a fix HTML subset documentation is not very readable on smaller screens + c958fb8b488ea6e86365298796d5710ec4deccc9 zlib: Fix spelling of license + 5a295a1009dad3a020be10331fa8e8c6163a9106 Scale seconds by a thousand to get milliseconds + ced34cb3d5805f1fbaf3b275714a1a5f3585900c QDateTimeParser: avoid using an invalid hour by default + d8817ddde65d8fd9c5a2785a31a01db43d050114 Use update() instead of repaint() when displaying a new message + 18ec0a8b0991855f4576c2993832f9da41d97766 Windows QPA: Fix WM_NCHITTEST not being sent to QAbstractNativeEventFilter + 04aeffbe8f6d452529671205fa2ded43103e1a46 Doc: Describe behavior of QSslConfiguration::caCertificates() on iOS + 92f42caff1d1cb02dc218adc8589c03d0b30ef80 Fix ICE on QNX 6.6 + 7146c9075c85cb46cb38b57ded3e12dfa6cbef66 Fix DejaVu fonts URL + 836a2fb8872217d2a04a209b89f2ac2ff86a4b99 [macOS] Fix position of sheets when using unifiedTitleAndToolBarOnMac + ba0ff45109a0eb051a42d6d8392d1f1b7a1e9345 Update the DNS public suffix list from publicsuffix.org + 4dc251879c129710298ec9f9360490daed6a6a59 Ssl: Fix contrived crash when calling resume + 091a386eaf91ad8932332a8aefc2df793de59f6c Use native visual ID when creating GBM surfaces for KMS + dc5f9d0c3101f95185d3c562d001e0af18f46a0b Only use a translucent background if there is support for alpha + 0d7c049e4407bf0db8d1eca1ea248c6d6b739c8c Update bundled libpng to version 1.6.35 + 0509383cf2852f2aebd1efd75413835747c8f341 Bump copyright year in executable metadata + c593492d1678a2ec08f1bfffcb572459b3bc6c00 Modernize the "animation" feature + 4e7b58629a0a431fbd5c0ba287c3958efd05da13 Modernize the "big_codecs" feature + 9c8ca26a4829d5ce810c9653fec3dfe48717f0b1 Modernize the "codecs" feature + 3eebadc1734463afa469dcd08eab8c5d2557dec6 Modernize the "mimetype" feature + b7887f9b4faad2227691a2af589e9d7680d6ae08 Linux: Remove our use of syscall() for statx(2) and renameat2(2) + fc4b0769a5d65960eea959730d5cd20d3496d40b Fix pdf printing in static builds + 1cd2955173e2248b92f44c9d52d81447ff87906c Fix enum passed to QFontDatabase::findFont + 2624676b5731a9d93a1e46429d2c597f1e4bae38 qmake: Remove the extra space before -MT + 7f60940fbedef17984e283da41eae94f29fef428 Re-disable statx() on Android + 6599c1f75832cc9286a3bf88c6b179d006dbb96e QPicture: fix crash for malformed picture + 44eeeb8e816fbdcd77ad734cfe7a7ec28da1c5ed Upgrade PCRE2 to 10.32 + 948f8ce2ecb2d6d2713279311d6090268321f0fb QWinEventNotifier: fix crash on application shutdown + 2708c6c11d685ab25c12d558961d924c9a4533d2 OpenSSL: force the "1.0.0" soname when loading OpenSSL 1.0 + 0cb44e2cfb11033cdb7e3b73a25f1ec394b08d6e Fix stylesheet example for QLineEdit:read-only code example + 72bedd49bfb02ba7c7abf2a1a4c6cd165ebcd447 [cocoa] Disable offline renderers for dual AMD FirePro GPU + 509d566ec0f257f7f1a723096b57a718d43d5002 Don't block mouse events if the window is a Tooltip type + 38afa46c47f4401cd5fe8ce6eb93978d5287cfbc macOS: Only detect changes to the SDK version within the same developer dir + d2e0e416d4444ccf3c208d6770e32ff0fb04b543 Fix leaking QTabletEventPrivate instance + d4e937a6280f34bc1cce8c8cea3806a741312fbc xcb: Don't get initial screen rotation + 3b8075de3b3c842311c157476a85d2cf9ddff403 Fix deleting of QSharedPointer internals in case QPointer loses the race + 1b9af84c1bb66770f607e157991375f7cb7ae0fb Don't create an offscreen surface when not on the GUI thread + c9d18d4a9c9d1243a267316e2a702f9ba69de2fd eglfs_kms: initialize m_deviceListener + 67c66c4ea4fbc11ee5547095117ef8930b3ab950 windows: Give up on SwitchableComposition + 033cc3403a8238d1b6d56c42e9e9be4fba1069dc mkspecs: use cross compile tools with LTCG + 9f2216667a96c2de94b28e4fd2891b6d3b938cb9 Fix memory copy in QGIFFormat::disposePrevious() + b5d249f9538bf3dc44f11879c2244deb5a37bf97 Update the floppy disk icon (save) to be physically correct + 825f98815683faea06144ab0262129b0367798ee Modernize the "textcodec" feature + 993351183893c8c5b1e55b8d819b190cc11ae008 Fix typo in define. s/GL_FRAMEBUFFER_SRB/GL_FRAMEBUFFER_SRGB + 38b87cc4bb0d4dfb47d907d39906104fea60a187 Doc: Clarify what samples() returns if not explicitly set + bdebc90c2826866e4434a6429aa6f822ee3cb8f6 Bump version + dec7961709c90f6977d2447f7fa6c6625af41cb2 QSyntaxHighlighter: Delay all highlights until first rehighlight + 9137691e745039f8ad9cdee2594a958e244ba341 Windows QPA: Fix crash showing QSystemTrayIcon's context menu with PROCESS_DPI_UNAWARE Change-Id: Id50872011aff4f604d7444d7aa4799c1c61b45f6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | * tst_QNetworkReply: Blacklist getFromHttp:success-externalLiang Qi2018-11-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-71953 Change-Id: I59566d1994dd80e7fef78f3b22ae34db9d2ad2cc Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 46076f73337d6b0fea9a006dab2af8864571ae2c) Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * Merge 5.11 into 5.11.3Oswald Buddenhagen2018-11-0974-226/+238
| | | |\ | | | | | | | | | | | | | | | Change-Id: I9a84ca8038a65daab50b6205bc7e1e3b5b5098aa
| | | * | Windows QPA: Fix crash showing QSystemTrayIcon's context menu with ↵Friedemann Kleint2018-11-091-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PROCESS_DPI_UNAWARE The coordinates of the WM_CONTEXT message may be out of any screen in PROCESS_DPI_UNAWARE mode since hi-res coordinates are delivered in this case (Windows issue). Default to primary screen with check to prevent a crash. Fixes: QTBUG-67966 Change-Id: I1950360520e93cbf3509611b3057635769f6543a Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
| | * | | OpenSSL: also try the "1.0.2" sonameGiuseppe D'Angelo2018-11-291-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that also Debian patches OpenSSL 1.0, changing its soname to "1.0.2". Therefore, try also to load that one. Amends 2708c6c11d685ab25c12d558961d924c9a4533d2. Task-number: QTBUG-68156 Change-Id: I37cc060e90422779a6c29a324ab900f0fb99cfa7 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * | | Ensure QOpenGLWidget FBO is always initializedTor Arne Vestbø2018-11-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLWidget uses an FBO internally, that is glCleared whenever recreated. But for the clear to be visible across shared contexts we must also issue a glFlush. QOpenGLWidget defers this flush until the compositing step, in QOpenGLWidgetPrivate::beginCompose(), based on a flushPending variable. This variable is set either after invoking the user's paintGL() function, or when opening a QPainter on the QOpenGLWidget, via QOpenGLWidgetPaintDevice::ensureActiveTarget(). Unfortunately, if QOpenGLWidget::paintEvent() is overridden or intercepted (meaning we will not end up calling paintGL()), but the overridden paint event does not open a QPainter, we end up never setting flushPending to true, and end up composing an uninitialized FBO. This can lead to rendering issues, or even kernel panics with some unfortunate GL drivers. The fix is to ensure the glClear is always flushed before composing, by forcing a pending flush whenever the FBO is recreated. Fixes: QTBUG-70921 Change-Id: I72b596c09dcf54bd0f37668062daaad2d6f7f4bd Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | | | macOS: Reset font glyph caches when application theme changesTor Arne Vestbø2018-12-092-1/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our glyph caches on 10.14 are based on the application appearance, so when the application goes from dark to light or light to dark, we need to reset and re-populate the glyph-caches to account for the new appearance. Change-Id: If019d8cfa33ffb2b14747444b2ff74b288992f55 Fixes: QTBUG-71018 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | | Do not use arc4random_buf() on GNU/kFreeBSDDmitry Shachnev2018-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not available in the GNU C Library. Change-Id: I36dc92fca283c126669885b75406c8e57f563ce3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Optimize further the loading of 8 Latin 1 charactersThiago Macieira2018-12-081-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is important when AVX is enabled, which makes the VMOVQ load and the VPMOVZXBW instruction be combined into a single VPMOVZXBW with direct memory access. This is guaranteed to only read 8 bytes, so it's safe even close to the end of a page. Clang and ICC do combine the instructions like we want and I have filed a request for GCC to do so too[1]. AVX was first introduced in 2011, so plenty of computers today would benefit from this. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87317 Change-Id: I8f261579aad648fdb4f0fffd1553e08e90df3171 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | Allow overriding the maximum cached glyph size via the environmentTor Arne Vestbø2018-12-081-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful for testing. Change-Id: I8cfd4453018cba0301287ad6a1c15a88cdc33c1c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | | Add manual test case for verifying our text renderingTor Arne Vestbø2018-12-083-1/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows comparing Qt's text rendering to the native rendering. Change-Id: I56f015fb64df3f70c33db58891876c325cbbc55d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | | Revert "Ensure alignment of image-data"Allan Sandfeld Jensen2018-12-081-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ae8389e19c5804c867b2981311c623003a691474. The result of malloc should be aligned in any case, and this change conflicts with the use of realloc on the data elsewhere. Change-Id: I01773132b240614a2656dd3013490b0df9cd14a7 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | QToolButton: Don't elide text if an icon is presentChristian Ehrlicher2018-12-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fix which adds an automatic text elision when the QToolButton is not large enough brought up an inconsistency between QToolButton::sizeHint() and QCommonStyle::drawControl(). Fix it by syncing the magic numbers between QToolButton::sizeHint() and QCommonStyle::drawControl(). Fixes: QTBUG-72226 Change-Id: If4a76792cb97bcdb918e18c6b29cb637730acec0 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* | | | Set QScroller's parent to its widget, for memory managementShawn Rutledge2018-12-082-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the widget to which the scroller was assigned is deleted, the QScroller ought to be deleted too, to avoid filtering events and then following a dangling pointer while trying to react. Fixes: QTBUG-71232 Change-Id: I62680df8d84fb630df1bd8c482df099989457542 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* | | | untangle the egl-x11 relationship in the build systemOswald Buddenhagen2018-12-073-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | egl-x11 is used in two places: - the eglfs-x11 plugin, which has a hard dependency on xcb-xlib - the xcb-egl plugin, which has a soft dependency on xcb-xlib that means that the egl-x11 configure test needs to be untangled from xcb, and that eglfs-x11 should be a separate feature with a proper dependency declaration. when the plugins that need egl-x11 are not built, it also makes no sense to build the respective integration in the egl_support module (even if it's possible to coax it into building), so adjust things accordingly. Change-Id: Ic729d0b7c893dd00844567329205c24ea2703033 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* | | | configure: atomize xcb-* tests properlyOswald Buddenhagen2018-12-072-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xcb is a dependency which should be detected upfront. same for xlib. this also removes calls to functions coming from the dependencies from the tests (both because these calls prove nothing, and because at some point we will stop linking transitive deps). Change-Id: Iac77305eab33ea8ff5c71302cef980eb908d8403 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* | | | configure: convert xlib to a proper library definitionOswald Buddenhagen2018-12-074-17/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I1623aee9e8632e4bfd466e09e275cc23f94c6dab Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* | | | wasm: fix freetype library sourceOswald Buddenhagen2018-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib99c4c178808c7325e55e85a1548542ae3c57524 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | | configure: fix linking with statically linked freetypeTim Blechmann2018-12-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | freetype depends on zlib. using statically linked freetype as system library lacks the usage requirement to link with zlib. so we need to add this manually. Task-number: QTBUG-63115 Change-Id: Iaf0f3027bd9d1386fcc1ecfbfbe07ab09b2d0bb9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | add support for transitive deps to QMAKE_USEOswald Buddenhagen2018-12-074-18/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we already knew the dependencies (as they are declared in the json files), but failed to export them in any way, which made linking against statically built external deps which have deps in turn fail (unless the project happened to pull in the dep anyway, as is the case with qtcore + zlib). the previous assumption was that the USE-able library objects would be self-contained, but that is conceptually unclean. instead, properly export the raw dependencies and resolve them only in qmake_use.prf. note that pkg-config produces self-contained output, so we need to actively subtract the dependencies we know. Change-Id: I4b41a7efc05bbd309a6d66275d7557a80efd5af4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | | qmake: fix QMAKE_DEFAULT_LIBDIRS detection for android on windowsOswald Buddenhagen2018-12-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clearly, nobody told clang that on windows you're supposed to use semicolons instead of colons to separate elements of a path list ... Fixes: QTBUG-72268 Change-Id: Ia7adc8de3bca586d4c15b069cb04e4cb647ae823 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.12.0' into 5.12" into ↵Liang Qi2018-12-074-2/+15
|\ \ \ \ | | | | | | | | | | | | | | | refs/staging/5.12
| * \ \ \ Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-054-2/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I54b4c14bed5150d3034ac87907a09254fd78face
| | * | | | [Android] Fix the ability to override environment and argumentsv5.12.0BogDan Vatra2018-12-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mechanism should only be enabled only for debug deployments, but the check was removed by accident in ca139228abdd522a76b2750aed607440568eb7f3. Fixes: QTBUG-72230 Fixes: QTBUG-72132 Change-Id: I3378436e93314fdf254919aed066f1284a4581b3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 11:01:15 +0000