summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* consolidate syncqt invocationsOswald Buddenhagen2013-03-132-30/+12
| | | | | | 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-131-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* 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>
* Generate a Qt5ConfigVersion.cmake file.Stephen Kelly2013-03-131-2/+5
| | | | | | | | 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-131-0/+3
| | | | | | | | | | | 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>
* 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-137-107/+227
| | | | | | | | 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>
* 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>
* 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>
* Replace HB types used in API with Qt analogsKonstantin Ritt2013-03-1212-66/+73
| | | | | | | | | | 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-122-3/+2
| | | | | | 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>
* Android build fixPaul Olav Tvete2013-03-121-1/+1
| | | | | | | Apparently, the Linux Perf Counter is not supported on Android. Change-Id: I38115d140a3ee783bfcd8a984d8832ffe5bbace4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* XCB: support creation of OpenGL ES profilesGiuseppe D'Angelo2013-03-121-46/+78
| | | | | | | | | | | | The GLX_EXT_create_context_es2_profile extension allows us to create OpenGL ES profiles even under a desktop OpenGL implementation. Therefore, if a OpenGL ES renderable type is requested, and we have that extension, we can fullfill the request. We also strenghten the renderable types that the XCB plugin supports (default, OpenGL, OpenGL ES). Change-Id: I94ecbbaa910ab4c6d71185a69640e79594cb7bdc Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Get rid of qt_determine_writing_systems_from_truetype_bits()Konstantin Ritt2013-03-128-384/+115
| | | | | | | Move this code to QPlatformFontDatabase and get rid of all dups of it. Change-Id: Idea6c84819039bf3b345b1305305951ade8d1ac4 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QFontComboBox: Minor code optimization & simplificationKonstantin Ritt2013-03-121-25/+12
| | | | | Change-Id: If536a0b8721bdc562b505fc94a9fe4f77cc619de Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Avoid crash in QVertexArrayObject destructorSean Harmer2013-03-121-1/+2
| | | | | | Change-Id: If43c7b1cfdee504171a26b07db2ade9c20528299 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Add QOpenGLTimerQuery and QOpenGLTimeMonitor classesSean Harmer2013-03-124-3/+1174
| | | | | | | | | | | | | QOpenGLTimerQuery encapsulates a single OpenGL timer query object. QOpenGLTimeMonitor is a convenience wrapper around a sequence of OpenGL timer query objects that can be used to profile OpenGL rendering code or to allow real-time adaptation of rendering methods based upon run-time performance. Change-Id: I873e591927080dea2b079b0e2a1eb9fed15c0372 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: James Turner <james.turner@kdab.com>
* Fix wrong initial positionCaroline Chao2013-03-122-1/+25
| | | | | | | | | | | | If the widget is larger than the screen, its title bar top left corner will be shown inside the screen. Task-number: QTBUG-30142 Change-Id: Id93773874be3616b3ef4b9bee6e1bb751c541d7b Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Update gl2ext.h with the latest version from KhronosGiuseppe D'Angelo2013-03-121-20/+461
| | | | | | | | | | This adds (amongst other things) the support for the GL_KHR_debug extension, which is required by QOpenGLDebug classes. Change-Id: Id8b80968807e4f3db7eebd8cc9d9beae23b5d7e2 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Reset the X error handler after initializing GTKGiuseppe D'Angelo2013-03-121-0/+8
| | | | | | | | | | | | It turns out that we were setting the error handler to a dummy one in qxcbconnection.cpp, but GTK then overrides it to an handler that calls exit(1) on errors. This causes problems as we are relying on the glXCreateContextAttribsARB call to fail when creating an OpenGL context, so we need to reset the handler after GTK initialization. Change-Id: I9bc3eb2480abfd3740884cb0000b9180d2cf37a5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QRegularExpression: refactor the handling of the study dataGiuseppe D'Angelo2013-03-121-17/+24
| | | | | | | | | | | | | | | | | | | | Consider the following situation: - threads A and B have shallow copies of the same QRegularExpression - threads A and B both call match() on a string - thread A calls optimizePattern(), which doesn't optimize - thread B calls optimizePattern(), which does optimize, and sets studyData - thread A uses studyData (set by B) A needs to properly acquire the memory pointed by studyData (which, in turn, needs to be released by B). This commit implements that. (Before, we used to return a copy of the current studyData from optimizePattern(), so A didn't see that B optimized the pattern and set studyData). Change-Id: I9e4741a3d3229905c247491a07099519815680bb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Build with GL headers in non-standard locations.Volker Krause2013-03-121-0/+4
| | | | | | Change-Id: Icd5fdfeea8e2642ee68ec1811c6a6ce9205b7e00 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Add support for setting/getting the paper name on the QPrinterAndy Shaw2013-03-129-18/+209
| | | | | | | | This adds support for specifying a paper name which will be set on the printer if it is available for the driver. Change-Id: Id7fd0c8cf68745db3d7a8de7e2ac98d3e2ba9b79 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Silence warning about unused fields in test event (CLANG).Friedemann Kleint2013-03-121-1/+1
| | | | | Change-Id: I8e05fc9b8820136a7714219627dbdae300af0b0d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix warning about unhandled enumeration value.Friedemann Kleint2013-03-121-0/+2
| | | | | Change-Id: Ic22a9bddfa04c286f359bc29e1d5d1ec8ef98ecc Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Fix MinGW-64-warnings about cast from DWORD to HWND.Friedemann Kleint2013-03-121-8/+12
| | | | | | Change-Id: I16580f58fda56b18a7611f94f7359e3ceeb65c69 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QApplication: Fix MSVC-warning about unused variable q.Friedemann Kleint2013-03-121-6/+2
| | | | | | Change-Id: I44f34816cb18583fcbbab0a6c79b313a829d9236 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Windows: Use arrow cursor for toplevels with no cursor set.Friedemann Kleint2013-03-121-2/+15
| | | | | | | | | | Fixes unsetting the cursor in Qt Quick Controls. Task-number: QTBUG-28879 Change-Id: I049beafaa723f6e782df872f14c09b7f927e70ac Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Documentation and versioning for new Window propertiesShawn Rutledge2013-03-122-18/+28
| | | | | | | Task-number: QTBUG-29807 Change-Id: Id03ae17270832a7b5915e4324a508e591c0b6d98 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* Android: Allow more than three touch pointsPaul Olav Tvete2013-03-121-41/+7
| | | | | | | | | Now that we do not support Android versions below API level 9, we can use the modern multi-touch functions. Change-Id: I5887b4c35f9e02089a334526cebecf0cf767bd6c Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix multi-touch input on AndroidEskil Abrahamsen Blomfeldt2013-03-125-3/+35
| | | | | | | | | The touch events were collected but then thrown away because of a missing port of he handleTouchEvent() function call. Task-number: QTBUG-29126 Change-Id: I02f7380945be04a36da14a89f2f3ff9429b17cbc Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Disable PCRE JIT on iOSTor Arne Vestbø2013-03-122-2/+3
| | | | | | | | | | | | | | | | First of all, we were missing an implementation of SLJIT_CACHE_FLUSH, as ___clear_cache was not available and we would get missing symbols. This was fixed in upstream PCRE 8.31, but even then the JIT would only work on jailbroken devices, so we disable it. http://bugs.exim.org/show_bug.cgi?id=1243 Change-Id: I678f9a31eb76d7d08882465befb9d799e46e7cf8 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>