summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tst_qlogging: fix test when QT_MESSAGE_PATTERN is already setDavid Faure2013-03-161-5/+14
| | | | | | Change-Id: I608ac9920e04eb636c8d2e9cee38c6f0cd189f1f Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* don't send output of $$join() and $$sprintf() through split_value_list()Oswald Buddenhagen2013-03-161-3/+2
| | | | | | | | | in the case of sprintf it's surprising, in the case of join it's anti-thetical. Change-Id: I4eb7e56d31ac6ed68adf852f1a19b33554d38eb4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* bring bootstrapped QT magic from qt_tool to qt_moduleOswald Buddenhagen2013-03-163-5/+13
| | | | | | | | | project files of bootstrapped modules can, just like those of bootstrapped tools, benefit from automatic adjustment of QT (and CONFIG). Change-Id: I83815e69a2b105caaee0c2e2602828f8eb425eef Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make depend_prl more thorough; introduce fast_depend_prlOswald Buddenhagen2013-03-161-3/+8
| | | | | | | | | | | | | | | depend_prl would so far only ensure that the dependency existed, not that it would be up to date. this is of only limited value, so make sure that the dependencies are always updated. as this is somewhat expensive (every dependency's makefile will be entered as many times as it is used, plus one), provide an opt-out by adding fast_depend_prl. Task-number: QTBUG-29486 Change-Id: Ifa2e100bc4c269a403ab620927bfe5c7efe9a435 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Long live QOpenGLDebug!Giuseppe D'Angelo2013-03-153-2/+2030
| | | | | | | | | | | Qt convenience classes for the GL_KHR_debug extension This allows the developer to 1) ask the GL for a log of the last generated messages; 2) emit Qt signals whenever the GL wants to tell us something. Change-Id: I830343a26714c51abb68ce1269163c145d1e2aac Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Make the QDBusVirtualObject docs public.Thiago Macieira2013-03-151-4/+1
| | | | | | | Better docs to come in a later commit. Change-Id: Iba538585e97aac779d226ef966a1a08c186c4c93 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Remove bogus portion of unit testThiago Macieira2013-03-151-12/+0
| | | | | | | | | | | | | | In Qt 4, QSignalSpy didn't *really* connect to the signal it was spying on. See the "we need to connect the signal somewhere in order for D-Bus to enable the rules" comments. In Qt 5, it connects, which rendered this section of the test bogus: since the signal is still connected, the QSignalSpy will notice that fact and will not be empty. This is passing due to a false positive. The upcoming fix breaks it, so we need to remove it. Change-Id: Ic8fbf7d0e941403e97149f5bc392334a52c66ab1 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* Add a minor convenience for calculating the distance to a pointLaszlo Papp2013-03-153-0/+69
| | | | | Change-Id: I312727bf6858ead6c30fe20bf3abc5afc73a3a14 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix calling convention in ANGLE builds on WindowsSean Harmer2013-03-151-3/+5
| | | | | | | | | | | | | | Desktop OpenGL builds on windows correctly define APIENTRY whereas at present the ES2 (ANGLE) builds do not. This leads to QOPENGLF_APIENTRY having the wrong calling convention. This fix is required for https://codereview.qt-project.org/#change,48660 but may also fix any random crashes that people may be seeing with other Qt-wrapped OpenGL functions in ANGLE builds. Change-Id: I8068c181d41be949d29168bd5ca1a181cc2245c7 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* XCB: don't map hidden windowsAlberto Mardegan2013-03-151-18/+0
| | | | | | | | | | | | This bug was introduced by the XEMBED implementation (carried over from Qt4, but there it applied to QX11EmbedWidget only): the _XEMBED_INFO property is used to inform the *embedder* whether the embedded window should be mapped when embedded. Task-number: QTBUG-30084 Change-Id: I8d1c467874bdee3300a1b18b8174b2d62f498713 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QTextEngine capitalization doesn't work with QRawFontAllan Sandfeld Jensen2013-03-141-2/+3
| | | | | | | | | The capitalization settings is attempted read via specialData->addFormats, but the QTextCharFormat there is reset when added, and should instead be accessed through specialData->addFormatIndices. Change-Id: I190c419f07c3f7e803ca1d44059e8f538216b9ab Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* update qml parser to current version from qtdeclarativeOswald Buddenhagen2013-03-1419-1465/+1883
| | | | | Change-Id: Ic623614aa3c63197e44bf1ae04001997fe7deaac Reviewed-by: Martin Smith <martin.smith@digia.com>
* don't bootstrap tools when not necessaryOswald Buddenhagen2013-03-149-12/+28
| | | | | | | | bootstrapping is only necessary if we are cross-compiling or have a circular build dependency. Change-Id: I17244457652ca9d4fc797043e57070c2ae3ee5d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* create bootstrap-dbus moduleOswald Buddenhagen2013-03-144-37/+47
| | | | | | | | this just factors out the common sources from the qdbus tools, to avoid double compilation, and to clean up the project files. Change-Id: I330d108ebffda4bc7c0e0e9ec00e51ddd48d5289 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* normalize #includesOswald Buddenhagen2013-03-144-11/+9
| | | | | | | we already have the syncqt'd include paths set, so use them. Change-Id: I9d0047a79b493dd8b65f0f5495f3592ce2e2fb1d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* the atspi bridge depends on dbus and qdbusxml2cppOswald Buddenhagen2013-03-141-0/+2
| | | | | Change-Id: Idad2fcfd33be16a5d4ab5e1a56fcc79707bd5039 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* add QStandardPaths to bootstrap libOswald Buddenhagen2013-03-141-0/+13
| | | | | | | | | it was already bootstrappable, but it was used only for configure.exe. needed for bootstrapping lupdate Change-Id: I0c2bf7db293dda47b3342dfe897a28b34383b1b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* add QCoreApplication to bootstrap libOswald Buddenhagen2013-03-145-28/+163
| | | | | | | | | | | this required making it compile with QT_NO_QOBJECT. of course this disables anything related to threading and event processing. needed for bootstrapping qmldevtools (qmlmin, lupdate) Change-Id: I6f8bd3996ac7b6eee49a5b8a55143d358abe35ee Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* re-enable QT_NO_LIBRARY support on WindowsOswald Buddenhagen2013-03-144-15/+5
| | | | | | | | the exclusion came in with the original winCE port. the reason for this is not clear. Change-Id: I8cd59d27fcc292186e5eef3238f56bad2cf320c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* simplify/fix QT_BOOTSTRAPPED-related #ifdefsOswald Buddenhagen2013-03-142-2/+2
| | | | | | | | | | don't test for building specific tools when we actually only want to know whether we are bootstrapping. so far, this was only redundant; with the upcoming change of not bootstrapping unnecessarily it would be outright broken. Change-Id: I7600d8ebb14a4194640c50035e35a04263f2ccce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qfilesystemengine_mac.cpp is empty => purgeOswald Buddenhagen2013-03-145-56/+1
| | | | | Change-Id: I61c615343f45fe52adee36b6822322bda2b2ca4f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Move Unicode script itemization code from text engine to UnicodeToolsKonstantin Ritt2013-03-144-33/+70
| | | | | | | | | | | This is still the same trivial implementation with the only difference in that that it properly handles surrogate pairs and combining marks. This temporarily makes QTextEngine::itemize() insignificatly slower due to using intermediate buffer, until refactoring is done. Change-Id: I7987d6306b0b5cdb21b837968e292dd70abfe223 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix build on MinGW, Win<7Konstantin Ritt2013-03-141-2/+2
| | | | | | | | /* broken by 26149d057a464ddafcc9694cfa94525c01a45231 */ Change-Id: I63f4d70e2a6fc1f8f1b302d188cf34d1abb0699c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Inital port of QSystemLocale on BlackBerry 10El Mehdi Fekari2013-03-145-127/+416
| | | | | Change-Id: Ic177e2867d9fa3dbaec221766964ac28656a2662 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* iOS: Don't warn about using C++11 extensionsTor Arne Vestbø2013-03-141-3/+0
| | | | | | | | | | Qt uses a lot of minor C++11 extensions such as long long, commas at the end of enumerator lists, and extra ';' outside of a functions, and not all of these can be silenced, so we build without warnings for C++11 extensions, since we plan to enable C++11 at some point anyways. Change-Id: I3ede2fb653c25475a3bd2b860c0c80c6cf6abef5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add missing .pro-file for qpainfo-test.Friedemann Kleint2013-03-141-0/+7
| | | | | Change-Id: I75fb11698d3ae305751da59af03c1853add7122e Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Add Open GL extensions only when Open GL is enabled.Friedemann Kleint2013-03-141-1/+2
| | | | | | | Task-number: QTBUG-30115 Change-Id: I6cb92c654d538fb629334cb81485058b6f1b65ef Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Do not use JIT for pcre on QNXFabian Bumberger2013-03-141-0/+1
| | | | | | | | When using JIT, pcre16_study causes a segfault. Change-Id: I43a13579b240edcd75e64a4c291712a96a6ac273 Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fix qmath autotest for armFabian Bumberger2013-03-141-1/+1
| | | | | | | | | Change the data type of PI from qreal to double, because qreal is defined as float and not as double on arm. The testcase however expects PI to be a double value. Change-Id: I003481071ecb2c1f54e6dcee9b450da2f1654969 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* GTK+ platform theme: cleanup coding styleJ-P Nurmi2013-03-144-31/+31
| | | | | Change-Id: I5db283d7ed42346d9c2b90acbc342336b450aa97 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add a generic Qt::Edge enumJ-P Nurmi2013-03-142-1/+19
| | | | | | | | | | | | The values are Top/Left/Right/BottomEdge and values specified so that it can be extended as flags later. Change-Id: I67482265e14d89942a8f59bf09e9e3fadab8243f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix interaction between sdk.prf and silent.prfTor Arne Vestbø2013-03-141-0/+8
| | | | | | | | | | | The 'silent' option to CONFIG will mangle QMAKE_CXX and friends by prepending an @echo, which sdk.prf doesn't handle (it assumes the variables contain names of executables, with optional arguments). Instead of teaching sdk.prf generic command line parsing we ensure that silent.prf does its job at the very end, when the tools have already had their paths fixed by sdk.prf. Change-Id: I7093232e5cc37ed8106a3b838f42ad8f1a43fb86 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Make qaccessible2.h internal.Frederik Gladhorn2013-03-1433-1535/+29
| | | | | | | | | | | This should have been done right from the start, instead we only made the documentation internal. Also remove the classes from the BIC data. Change-Id: I238a7a7cc5d26980b23931c78e7e5a4477d46920 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Warn about accessibility interface creation failure only onceFrederik Gladhorn2013-03-141-1/+6
| | | | | Change-Id: I0555d7d2417149f0eec54b228b842a61d0d08f85 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Detect Clang availability on Mac based on the SDK, not the OS X versionTor Arne Vestbø2013-03-141-13/+18
| | | | | | | | | | | | | Since we use the Clang from Xcode's toolchain now, the OS version is not relevant. In practice this means we will use clang for Xcode 4.2 and up, which means it's possible to use clang also on Mac OS 10.6 (Snow Leopard), where Xcode 4.3 is not available. Change-Id: I9817e237cdd82d10b93aaaa3c90e35767cdca751 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Test the OpenGLExtensions cmake module.Stephen Kelly2013-03-143-0/+79
| | | | | Change-Id: I3cc71e035fd1c34e05ecb470f897a72a39f42ca4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove incorrect export macro.Stephen Kelly2013-03-141-30/+30
| | | | | | | | | As this is a static library, no export macro is needed at all. With the wrong export macro, attempting to use this library fails on Windows. Change-Id: I618d7f02e374761fc8d8a5a0afb8d6d80e380389 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* make split_value_list() a bit less sane againOswald Buddenhagen2013-03-131-2/+7
| | | | | | | | | let the backslash escape only quotes (and itself), after all - $$list() (one of the main users of this function) is commonly used with (windows) path lists, so letting it escape anything would make a royal mess. Change-Id: I2dae2e4508903e62c190c1497da68d53978118e7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make testlib's toString() use local8Bit, not latin1Oswald Buddenhagen2013-03-131-9/+9
| | | | | | | | | | | this is consistent with what qDebug does. consequently, this makes the code usable with 8-bit strings in the first place. note that some {to,from}Latin1 is left - this is where we know that we are dealing with ascii-only text. Change-Id: I26cfdf3622250b8bf95ebfe221465ca89d7cd082 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* make stubbed QCoreApplication::translate() resolve %nOswald Buddenhagen2013-03-132-7/+13
| | | | | Change-Id: I36326d0f11e71580977d6589c9810ffa252a0fa7 Reviewed-by: hjk <hjk121@nokiamail.com>
* make Q_DECLARE_TR_FUNCTIONS() compile with QT_NO_DEPRECATEDOswald Buddenhagen2013-03-131-2/+9
| | | | | Change-Id: I9cde256347e5b59f7754bc578e56c60227c926ab Reviewed-by: hjk <hjk121@nokiamail.com>
* QStandardPaths::displayName() is unavailable when bootstrappedOswald Buddenhagen2013-03-131-0/+2
| | | | | | | reflect that in the class definition Change-Id: I1224ed851b220abae38c62a4d3dbea8ddbd40b83 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* consolidate syncqt invocationsOswald Buddenhagen2013-03-134-34/+25
| | | | | | Change-Id: Ic28ea95201501b05c4a62366d1f70fa120161927 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Window deactivation should set focus reason.Frederik Gladhorn2013-03-131-1/+1
| | | | | | Change-Id: Iccc46880278bc5f7fe2b706efcdf9b4e6483c3e6 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Improve warning messages (and readability) of connectSlotsByName()Axel Waggershauser2013-03-132-12/+45
| | | | | | | | | | | | | | | | | | | | | | | | While adding a test case for the new behavior, two issues with the connectSlotsByName implementation came up: 1. for auto-connected slots that don't exactly match a signal, a 'compatible' one is searched. There might be more than one of those. The implementation randomly picks any. 2. The "No matching signal for %s" warning gets printed even for slots that can never be connected via connectSlotsMyName anyway (e.g. "on_something"). This is inconsistent. This fixed both: an explicit warning is printed if more than one 'compatible' signal is found and the "No matching signal for %s" warning is only printed if the slot adheres to the full "on_child_signal()" naming convention. In the process I added comments and changed the code slightly to make it more readable and explicitly hint at non-obvious behavior. Change-Id: Icc8e3b9936188d2da8dfff9f0373c8e5c776eb14 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* remove pointless DBUS_PATH includesOswald Buddenhagen2013-03-132-4/+0
| | | | | | | | nothing sets this variable. QT_CFLAGS_DBUS contains the relevant -I flags. Change-Id: I888b81f2110c5966550efd4313e74fe6f76ab06b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use tools from the SDK's toolchain instead of the ones in /usr/binTor Arne Vestbø2013-03-133-16/+65
| | | | | | | | | | | | | | | | | | | | For Mac OS X we currently specify build tools without an absolute path, which means we end up using the ones in /usr/bin. This is wrong, we should be using the tools from the toolchain of the chosen SDK. For iOS we do specify an absolute path, by resolving the toolchain path in the iOS makespecs. To solve the situation on Mac OS X, we move the logic of resolving the toolchain path to sdk.prf, and share it between OSX and iOS. For configure we need to duplicate some of the logic from sdk.prf, as configure pulls out QMAKE_CC and QMAKE_CXX for running some initial tests and building qmake. The new macSDKify function also solves the issue of missing sysroot and deployment version in the flags. Change-Id: Ib1d239c9904cf3ccee5214b313cf6205869a1462 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Teach configure's pro-file parser to understand host_build scopesTor Arne Vestbø2013-03-131-2/+8
| | | | | | | | Is needed now that we write QMAKE_MAC_SDK with a !host_build scope in qdevice.pri. Change-Id: I298cc660b496460190337c175aef684a5522d5cb Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Simplify how we resolve the SDK root on Mac OSTor Arne Vestbø2013-03-131-7/+2
| | | | | | | | | | We now take advantage of the fact that xcodebuild -version allows you to pass the key that you're interested in, to only print that single value. This technique is used by Apple's own build scripts as well. Change-Id: I57b8424590d4137a0e7f263a318e17ee2e0dfad4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Don't include custom qopengles2ext.h on iOSTor Arne Vestbø2013-03-131-21/+32
| | | | | | | | | | | | | | | This fixes the build after ec9c0faefd (Update gl2ext.h with the latest version from Khronos). Just like Mac OS X, iOS is a controlled platform, and we should include the system headers instead. The OES_EGL_image_external extension is not yet in the system headers though, so we provide our own typedef to make the qopenglextensions.cpp code build, and the extension will work out of the box once Apple includes driver support for it. Change-Id: Ib6ba09d400ba38f05d91c90d4c9e54a8626889e1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 03:04:41 +0000