summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Add qpainfo manual test.Friedemann Kleint2013-03-132-0/+221
| | | | | | | | | Print out available information from QLibraryInfo, QStandardPaths, QSysInfo, QPlatformIntegration, QStyleHints, QPlatformTheme and QScreen. Change-Id: Ia0bdc6174a1748c539acee18ba16a27a48d58ee5 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Generate a Qt5ConfigVersion.cmake file.Stephen Kelly2013-03-132-3/+6
| | | | | | | | This allows finding a minimum particular version of Qt 5. Change-Id: I96112f1be90f397ec60a2b233989ac0e0380bef9 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix openglextensions module depends.Stephen Kelly2013-03-131-1/+0
| | | | | | | | It requires the QtGui module. Just remove the QT line and allow the default to be used. Change-Id: Ie6dffaa0621c7ececd31ff0b696814bc82a2a764 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Improved appearance of mac toolbar handlesJens Bache-Wiig2013-03-131-9/+3
| | | | | | | The old ones were too heavy and cluttered to fit on mac. Change-Id: I5d9f1a8801992026af65af4c6b2aeae3a03a9f5c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Improve the look and feel of Mac extension arrowJens Bache-Wiig2013-03-136-75/+6
| | | | | | | | This adds an improved extension arrow as well as a graphic for retina macs. Change-Id: Ie7395bbd87d6d354437bdbcc0cf258a27c09a360 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Draw StatusBar with gradient on macJens Bache-Wiig2013-03-131-12/+0
| | | | | | | | We can safely remove code applying to 10.3 on mac. We also should draw the gradient even on non unified toolbars. Change-Id: Ia97c3c93daf7a711c3ce4b61b74a5eb1d914519b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add convenience for section actions in QMenuKevin Ottens2013-03-136-2/+115
| | | | | | | | | | | | | | | | | | Those actions are just separators having also text and potentially icon. It is very convenient to create titled sections in a menu, or give a title to a context menu. Obviously requires support for them on the style side, but modern styles like fusion or oxygen handle them just fine. For legacy styles it properly falls back to a regular separator aspect. That's why a specific style hint is also introduced. It is used by QMenu to know how the sections will be treated and take care of them correctly when eliminating duplicated separators or separators at the beginning of the menu. Change-Id: Iad00a93422b7983dc90dfc4b4b1c360122e47610 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix build with Windows SDKs pre 7.0.Friedemann Kleint2013-03-131-3/+3
| | | | | | | | | | | Check whether the IShellLibrary interface exists. Task-number: QTBUG-29447 Change-Id: I93fc54a1e6d5c090f7c1768c756571ba57a7b2d2 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fixed bug in QTimeLine::setPaused(false)Jan Arve Saether2013-03-132-0/+26
| | | | | | | | | | | The problem was that the elapsed timer was not restarted, causing the currentTime() not being adjusted for the time it was paused. Task-number: QTBUG-30108 Change-Id: Ib9b2c5a0dea52762109e0b25f1068dd7c88e15ba Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Manual file test: Add permission and compile with Qt 4.8.Friedemann Kleint2013-03-131-1/+44
| | | | | Change-Id: I604b3107d3e049af5cd14ae5bf5bd6785330eac7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* QTextEngine::itemize(): Minor optimizationKonstantin Ritt2013-03-131-1/+1
| | | | | | | | | Avoid using script_to_hbscript() in generateScriptItems()'s loop. This is absolutely unnecessary due to hbscript_to_script(script_to_hbscript(..)) in QTextEngine::itemize(). Change-Id: I44e710d010f8e57043a6c74dd80f3164e95e18e6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Hide Harfbuzz from the outer worldKonstantin Ritt2013-03-1311-115/+231
| | | | | | | | Don't export, don't generate private headers, don't mention HB in API. Change-Id: I048ebd178bf4afaf9fda710a00933b95274cf910 Reviewed-by: Josh Faust <jfaust@suitabletech.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Avoid using HB types in QFontEngine APIKonstantin Ritt2013-03-136-55/+81
| | | | | | | | | | | This affects HB_Font and HB_Face. As of now, the Hurfbuzz API usage is concentrated in qfontengine(|_ft).cpp and qtextengine.cpp, thus it is a lot easier to switch to Hurfbuzz-NG. Change-Id: Ie06959efd5d6080fe44c407d9f5de0a07dd1c210 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Josh Faust <jfaust@suitabletech.com>
* Fix building of the manual tests.Friedemann Kleint2013-03-134-15/+20
| | | | | | | Adapt to API-changes, exclude network/SSL-tests for Windows. Change-Id: I80d5ef1bd81e149a2f04fa7644376a8a88b1f7b9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* g_thread_init is deprecatedFrederik Gladhorn2013-03-121-0/+2
| | | | | | | | | | Since glib 2.32 this function is just an empty body. Fix the warning and don't try to call it. There seems to be no way to disable threading in glib. Change-Id: Id30e606d341bd6ef871737275336f6c6b3b2559b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* melt src/tools/tools.pro into src/src.proOswald Buddenhagen2013-03-122-46/+34
| | | | | | | | | | | | this is done mainly to resolve spurious dependencies, in preparation for making some tools not bootstrapped in native builds. as a nice side effect, there is even more parallelization possible now. Change-Id: I779cf0059c98c65aba8510bf3d24fdab4eeaa863 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove strange qdoc dependencyOswald Buddenhagen2013-03-121-7/+0
| | | | | | | it's not quite clear why it was here. probably a vestige. Change-Id: I6768df717ff9605a5833bcc4db56f486c266ea2e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make QT setup for bootstrapped tools more cleverOswald Buddenhagen2013-03-121-1/+5
| | | | | | | instead of simply overwriting it, intelligently re-interpret it. Change-Id: I5f7d8fff69ac8092653d7583da4c3884b9864b3a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QNX: Fix build errorRafael Roquetto2013-03-121-5/+0
| | | | | | | | | This error was caused by a merge Change-Id: I937ab6ac905ba3a729669060285df6d0c3d5be2f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Tobias Koenig Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
* interpret format argument of QString::sprintf() as UTF-8Oswald Buddenhagen2013-03-121-1/+3
| | | | | | | | | we expect our source code to be utf-8 throughout, so it doesn't make sense to expect the specifier to be latin-1, as that limits the effective charset to ascii. Change-Id: I22335509ba6c5805d8b264cfd01d7f9a4cf7ef76 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* make QtCriticalMsg fatal if QT_FATAL_WARNINGS is setOswald Buddenhagen2013-03-121-1/+1
| | | | | | | | | if warnings are fatal, then critical messages should be even more so. Change-Id: I3681fa1fc606337006f1781dd961ea9cf6ce282d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* de-duplicate and accelerate codeOswald Buddenhagen2013-03-121-3/+1
| | | | | | | | ... by using existing function. Change-Id: I25e60e70b307885c46b03b6458f06a561976590c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* fix encoding when invoking default message handlerOswald Buddenhagen2013-03-121-1/+1
| | | | | | | | the output is local8bit, not latin1. Change-Id: Ib1ab260ac378b354c5ab47856ce6c6c657caefd4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* fix encoding when printing debug under winceOswald Buddenhagen2013-03-121-1/+1
| | | | | | | the strings are in local8bit format, not latin1 Change-Id: I19f20b0310351aacb26b70d8053ed267e710986f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't clobber 8-bit outputOswald Buddenhagen2013-03-121-2/+2
| | | | | | | | otherwise it becomes useless for utf-8. the output is encoded as local8bit, so it shouldn't be garbage. Change-Id: I68e59bddb092ac53746f421a90e3803632dbf1c6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* make split_value_list() saneOswald Buddenhagen2013-03-121-31/+33
| | | | | | | | | don't count parentheses, don't nest quotes, don't create empty elements, let backslash uniformly escape. in short, behave like a sane parser. Change-Id: I29252fbe14fd6d28217450ec41cf8acfb2e30681 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make qml_plugin.prf usable without a parent c++ moduleOswald Buddenhagen2013-03-121-5/+14
| | | | | | | | | | | so far the assumption was that every qml plugin/module in qt is a wrapper/extension of a corresponding qt module. this not the case for the upcoming quickcontrols, for example. Task-number: QTBUG-28200 Change-Id: If4b8bb6633e76b2a510908d09a010cee12d33634 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove redundant codeOswald Buddenhagen2013-03-121-4/+0
| | | | | | | amends bb6b2f407 Change-Id: Ib56c502350bf46db352fb36d0ce46b6eb7c8ff58 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* permit returning from filesOswald Buddenhagen2013-03-121-12/+17
| | | | | | | | | this allows skipping an entire feature file if a condition is not fulfilled, without putting the whole body inside a conditional. Change-Id: I84fe9c94dda58c794fb52c3f163b40563b0db30a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove pointless initialization of qmakespecOswald Buddenhagen2013-03-121-1/+0
| | | | | | | we have proper fallback paths further down the line. Change-Id: I3648cc985d21bbec4c2c24e179830db4467af210 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Replace HB types used in API with Qt analogsKonstantin Ritt2013-03-1213-68/+75
| | | | | | | | | | hb_uint32 <-> quint32 HB_Glyph <-> glyph_t HB_Fixed <-> QFixed, HB_FixedPoint <-> QFixedPoint HB_GlyphAttributes <-> QGlyphAttributes Change-Id: I4338ec4ce9a9c20ea591606ab10e6ef4f19931b8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Do not list desktop widgets and desktop screen widgets as top-levels.Friedemann Kleint2013-03-123-3/+19
| | | | | | Change-Id: Iea4905d802213848594d2ad0266696e5edb884f8 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Android: install java-related filesPaul Olav Tvete2013-03-123-15/+29
| | | | | | | | The jar files are deployed on the device. The files in the java directory are used by creator when making a new project. Change-Id: Ie59f40edaa9c10044a1ca9949808ee22e6622ea1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Skip unstable autotestPaul Olav Tvete2013-03-121-0/+2
| | | | | | | | | | tst_QSharedMemory::simpleProcessProducerConsumer is on the top list of unstable autotests. Disabling it for now. Task-number: QTBUG-25655 Change-Id: Ib297b3382b736794bab6cdb668103bef74a55d8c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 10:23:15 +0000