summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fixed android-no-sdk build by excluding platformsupport/jniconvenience.Samuel Rødal2013-03-071-1/+1
| | | | | Change-Id: I02e45523a0e35aad3afdbef4a4b3a00de32663f3 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fixed build of SSL when using android-no-sdk.Samuel Rødal2013-03-071-3/+5
| | | | | | | | Introduced Q_OS_ANDROID_NO_SDK which makes more sense than Q_OS_LINUX_ANDROID when Q_OS_ANDROID also defines Q_OS_LINUX. Change-Id: Id2aa228b66daffba82776a12c91a264a360afd86 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Let QMetaObject::connectSlotsByName(o) also check for signals of oAxel Waggershauser2013-03-071-1/+7
| | | | | | | | | | | | | | | | | | | QMetaObject::connectSlotsByName(QObject* o) creates a list of all children to look for signals that match slots of o. This changeset simply adds the object o itself to that list. The motivation is to finally fix the long standing QtCreator bug QTCREATORBUG-6494. Where executing 'Go to slot...' and choosing 'accepted()' for a simple QDialog named 'MyDialog' will add a on_MyDialog_accepted() slot to MyDialog. That slot never gets connected. More details may be found in the linked QTBUG-7595. Task-number: QTBUG-7595 Task-number: QTCREATORBUG-6494 Change-Id: I35f52761791af697eabb569adb5faee6fae50638 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QVector - removeLast optimizeThorbjørn Martsum2013-03-071-1/+18
| | | | | | | | | | | | In case somebody uses QVector as a stack, it is not fair to have takeLast, removeLast and pop_back to do way too much work. This is still very slow compared to std::vector::pop_back (mostly due implicit sharing), however it is more than a factor faster than before. Change-Id: I636872675e80c8ca0c8ebc94b04f587a2dcd6d8d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QVector - add functions takeFirst and takeLastThorbjørn Martsum2013-03-072-2/+26
| | | | | | | | This patch adds takeFirst and takeLast which are functions that QList also has. Change-Id: I761f90b529774edc8fa96e07c6fcf76226123b20 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QVector - add remove functionsThorbjørn Martsum2013-03-072-4/+26
| | | | | | | | | | | This patch adds the functions removeFirst() and removeLast(). Functions that QList has. Beside making these functions, pop_back and pop_front are redirected to these rather than calling erase. Change-Id: Ifc5f8a78e33f436f06f21095a920ec5d4311fd6f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add support for attributes in the -perfcounter argumentThiago Macieira2013-03-061-1/+38
| | | | | | | | | Five attributes are supported, matching what the perf(1) tool supports. The 'p' attribute (precise IP reporting) wasn't added because we don't do assembly-level debugging with benchlib. Change-Id: I726f735a5bcc0c97e62cde0fbe0843597068ad7c Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Store the performance counter attributes globallyThiago Macieira2013-03-061-22/+27
| | | | | | | This will allow us to modify more attributes from the command-line Change-Id: I84d4933cbfa2b69c4e1009eaf3e005cfc3e7e01c Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Add support for the cache-related operations counters in benchlibThiago Macieira2013-03-061-23/+180
| | | | | | | | | | | | This adds support for checking cache accesses and misses, per operation (read, write and prefetch) as well as per cache level (L1 for data, L1 for instructions, last level). The branch prediction unit (BPU) is also accessed via the cache monitor subsystem. Change-Id: I8fa96b141cc777c9d231bd57fa36bca33ae7bdfd Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Add support for more performance counters in QBenchlibThiago Macieira2013-03-063-8/+213
| | | | | | | | | | | | | Added support for most hardware and software counters available on Linux 3.3. The cache-based counters are missing because they need special handling. Also added an option that lists available counters. Note that the list is of counters the library knows about, not the counters that the hardware can measure. Change-Id: I9f6fb09b5460bf4ac6082081611c1d6ff806a3fa Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Add more events for QBenchlib, based on the Linux perf countersThiago Macieira2013-03-063-12/+137
| | | | | Change-Id: Ic7e7e122bfe3995eb7ea033c744fd501579ea8fa Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Implement the Linux Perf Counter backend for benchlibThiago Macieira2013-03-063-2/+109
| | | | | | | | | | | | | | | | Currently, we only support one event type: counting CPU cycles with hardware counters. There are no fallbacks if this hardware counter is not available, and there is currently no way to specify other counters. Benchlib only supports reporting one event per benchmark, even though the event counter interface allows specifying more than one. Still, the hardware usually has limitations on how many events it can monitor at a time, and we'd prefer to have the counter running at 100% of the time, so this will not change. Change-Id: I79858a3ad1e696dc4b7b72c420e5a04b67cd55de Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Add the skeleton Linux perf events counter for QtTestThiago Macieira2013-03-066-1/+224
| | | | | | | | Currently, it only prints "perf available" if you use the -perf option and perf is available. The implementation comes in the next commits. Change-Id: Ic6cdee70e21df25780799a4bc31ca2c2d923b9f8 Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Import the Linux header linux/perf_event.hThiago Macieira2013-03-061-0/+615
| | | | | | | | | | | | | | Imported from linux's own git, at v3.7:include/uapi/linux/perf_event.h (blob SHA-1 is 4f63c05d27c91d04569971ea4a2c4849203c36a9). We cannot rely on the file being shipped by distributions. Older versions did not have all fields in the perf_event_attr structure. If those bits are enabled at runtime, the kernel will simply reject the perf_open call (-EINVAL). Currently, this can only happen with the non-default options exclude_guest and exclude_host. Change-Id: Ib329e52c21d6969406da0cf33de823d721d94206 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add methods to convert lists of QKeySequence to/from stringsKevin Ottens2013-03-062-0/+44
| | | | | | | | | | | QKeySequence provides conversion to and from strings. But a similar convenience was missing for QList<QKeySequence>. It would come in handy when you want for instance to save/restore the shortcuts of a QAction. Change-Id: I9e4f2001c58a595392a5019a57c564992c39bf88 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: David Faure (KDE) <faure@kde.org>
* Aero-Style-QWizard: Hide/Show back-button correctly.Friedemann Kleint2013-03-062-1/+4
| | | | | | | Task-number: QTBUG-29904 Change-Id: Id832594be4bc15c868f11bd762390803c8f9c158 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Aero-Style-QWizard: Fix drawing when used as a child widget.Friedemann Kleint2013-03-062-13/+33
| | | | | | | | | | | | | Introduce function to retrieve HDC with transformation. Paint Vista-style items at correct location when used as a child widget (for example, in Qt Designer). Disable special drawing that works only for top-levels. Task-number: QTBUG-29904 Change-Id: Ic902fd30e8050317b24ab7f7e2757ef1e16407f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Aero-Style-QWizard: Do not use parent window handle.Friedemann Kleint2013-03-063-21/+48
| | | | | | | | | | | If no window exists at the time QWizard::setWizardStyle() is set, further delay initialization of the Aero style until show(). If the wizard is a child window, just adapt the geometry. Task-number: QTBUG-29904 Change-Id: I3805331ae726a0aa2020815d5bff571ca407efbc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Aero-Style-QWizard: Set custom margins only for Areo-Style.Friedemann Kleint2013-03-063-9/+7
| | | | | | | Task-number: QTBUG-29904 Change-Id: Ifaf4d5e692f97436535feb1af44dc29d3512c5ea Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* QAndroidStyle: Fix warnings and compilation on Windows.Friedemann Kleint2013-03-061-10/+10
| | | | | Change-Id: I0ce4545bdc40a5e1a8297a225c2a656076df4580 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix export of QAndroidStyle.Friedemann Kleint2013-03-061-1/+1
| | | | | Change-Id: I779323403f6721ca904c517b7ffd78aff29d0a96 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* moc: Remove VC6 workaroundOlivier Goffart2013-03-061-10/+0
| | | | | Change-Id: I9022eee72235309303ca384f2d52fc24256af6ec Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fixed QTreeWidgetIterator to work with sorted QTreeWidgetJan Arve Saether2013-03-061-5/+4
| | | | | | | | | | | We cannot access children directly, since that won't ensure that the pending sort is executed. However, the functions we need are there already and actually makes the code nicer. Task-number: QTBUG-29903 Change-Id: I6899284275dd79b991896a5f08486b58d95f819d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* qtbase: Fix duplicate symbol errors in static build on MacGabriel de Dietrich2013-03-063-29/+34
| | | | | | | | | | | There is some code duplication between QMacStyle anf the Cocoa QPA plugin regarding painting and bridging with Cocoa. Task-number: QTBUG-29725 Change-Id: I347407a9bca47b6fccd77fb924688bd35135d96b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Compile.Morten Johan Sørvig2013-03-061-1/+1
| | | | | | | | | | | | d28073d9 enables the Mac style on all "mac" platforms, including iOS where it does not compile. Disable the mac style on all platforms except "macx" (Mac OS X). Change-Id: I67685f745b1a0910b05794cddeaf27cdaa31cbfd Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Implement XEmbed protocolAlberto Mardegan2013-03-0620-24/+410
| | | | | | | | | | | | | | | | | | | Add a static QWindow::fromWinId(WId id) constructor which can be used to create a QWindow object representing windows created by other processes. Then, QWindow::setParent() can be used to embed a window into a foreign window socket and QWindow::setTransientParent() to stick the current window on top of a foreign window. The changes in the QtWidgets module ensure that the focus chain (TAB navigation) correctly works when a QtWidgets-based window is embedded into another application. As far as the platform implementation is concerned, this commit only implements the embedding functionality in the XCB plugin. So, this is roughly equivalent to the Qt4 QX11EmbedWidget functionality. Change-Id: Iff8f7b9ee974d33fb30f36056f7838b433a413c7 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* QMap - add multiInsert with hintThorbjørn Martsum2013-03-062-0/+91
| | | | | | | | This provides a fast multiInsert in QMap (and a fast insert in QMultiMap) when providing a correct hint. Change-Id: I3c864c3a7842765fe63f8ecb4b54d0e8c9fd22d7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QMap - add insert overload that provide a hintThorbjørn Lund Martsum2013-03-062-0/+93
| | | | | | | | This adds a fast insert on QMap when providing a correct hint. Change-Id: I256bba342932c1d4f24c6e65074e1bf47b519537 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-0627-46/+111
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/qnx/qqnxscreen.cpp src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: Ib64f21c077b54f2291d19187590bfe869b98477a
| * Silence warning about an unused variable in Q_ASSUME.Jędrzej Nowacki2013-03-061-0/+1
| | | | | | | | | | Change-Id: Ia7dd537d1f0dadb1dc41b8123fda0da82e83598b Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Fix potential crash in accessibility key event handlingFrederik Gladhorn2013-03-062-7/+10
| | | | | | | | | | Change-Id: Id3eec6c83d7f8ece186e6b5bc02771c00893294b Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Workaround a bug in mktime on QNXFabian Bumberger2013-03-051-0/+10
| | | | | | | | | | | | | | | | | | | | Under certain circumstances, mktime failes to convert the tm struct into secs since epoch. This is a workaround and fixes the qdatetime and qqmllocale autotests. Change-Id: If99385142a049c5315429dca177df7fc8e947d55 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Wolfgang Bremer <wbremer@rim.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Delete the reference of the QNX screen in child windows on deletionFabian Bumberger2013-03-052-2/+10
| | | | | | | | | | | | Change-Id: Ic3e5deaeabe282ff44400aba80f8746067473030 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Doc: fixed snippet issues with customcompleter.qdocNico Vertriest2013-03-052-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Edited customcompleter.qdoc (paths snippets + ingroup statement) Moved customcompleter.qdoc to widgets/tools/customcompleter/doc/src Moved png files to doc/qtwidgets/images Task-number: QTBUG-29101 Change-Id: Iab66f178b92321257c4eb0e4e9704bb1e3043ef6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
| * qdoc: Maintain correct nesting level for QML parsingMartin Smith2013-03-052-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc was not incrementing the nesting level when parsing a UiObjectBinding, which can contain a component definition. qdoc now increments the nesting level when starting to vidit a UiObjectBinding and decrements it when ending the visit. Note this fix does not stop qdoc from reporting that public signal handlers have not been documented. If that is to be changed, it will be done separately. Task-number: QTBUG-29993 Change-Id: Ibd5ef81082e989652b3a15dcc95080a2757e0077 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Return -1 as the API documents it for socket issuesLaszlo Papp2013-03-051-5/+5
| | | | | | | | | | | | Task-number: QTBUG-30024 Change-Id: I51498e6d74ab139134abfb94f35647e995319ee8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Avoid setting initialNameFilter when mode is DirectoryIrfan Omair2013-03-051-4/+8
| | | | | | | | | | | | | | | | Task-number: QTBUG-30001 Change-Id: I5e854ce99137bd9d718cb2052f2c8dc1fb92b78f Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Fixed memory leak in QXmlStreamReaderRoman Pasechnik2013-03-052-0/+3
| | | | | | | | | | | | | | | | | | | | Fixed memory leak caused by repetitive usage of the same QXmlStreamReader instance. Task-number: QTBUG-27889 Change-Id: I673f4d26bae1503cb43e972f95b418dbf6d6fd89 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Fix spellingOlivier Goffart2013-03-042-4/+4
| | | | | | | | | | Change-Id: If3d5e09b2553d95caacd3e61a1bb108f1172111f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Windows: Repaint when switching off layered windows by opacity.Friedemann Kleint2013-03-041-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-29010 Change-Id: I565a800e5a5b4870bd3ee2e3fb3f55523334425f Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * qdoc: Allow QML linking without version nrMartin Smith2013-03-041-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows links of the form: \l{qml-module-name::qml-type}{name} i.e. no version number provided. This change does not handle collisions. There aren't any in Qt5 at the moment. If a collision occurs, qdoc will link to the name in one of the colliding QML modules, but not necessarily the most recent one. Hence, the link may go to the wrong page. A further update might be forthcoming that will handle this better. Task-number: QTBUG-29778 Change-Id: Ie2c2b117446ed02852593dd0273c390d39fed927 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * QGnomeTheme style names: replace cleanlooks with fusionJ-P Nurmi2013-03-031-1/+1
| | | | | | | | | | Change-Id: I681b2124fda14c08bd7d58f9adcc76774fc984ad Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * showIsFullscreen: only respect this hint for windows and dialogsRichard Moe Gustavsen2013-03-022-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the window or widget is a popup, ignore the hint. The intention of the flag should be to show main windows etc in fullscreen, and not all kinds of popups and tooltips. The user can always call showFullscreen explicit when necessary. This is a backport of 48c73540ad2a507963db0fba57484faf66462ad7. We need it in stable to fix menus on BlackBerry platform, they're appearing fullscreen. Task-number: QTBUG-29969 Change-Id: Id0d6cfc194916aa7f993cde54b5a0002f60399e1 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * Fix warnings reported by ICC in qdocThiago Macieira2013-03-012-2/+2
| | | | | | | | | | | | | | | | doc.cpp(3292): error #68: integer conversion resulted in a change of sign generator.cpp(363): error #68: integer conversion resulted in a change of sign Change-Id: Ie714ffcb4098debc701ce3fb6fa444154ac02ae5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * QMimeDatabase: pass MatchMode down, to fix MatchContent.David Faure2013-03-011-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-29702 Change-Id: I2f1538adbf8e7a5edfc4276585bf4ef04ce69874 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Cocoa: Don't send duplicate mouse move events.Morten Johan Sørvig2013-03-011-1/+0
| | | | | | | | | | | | | | | | | | | | We now use tracking regions to generate move events, setAcceptsMouseMoveEvents will generate duplicates. See also commit b077e67f. Change-Id: I750e33766e66693ce899380c5cd9715baa9aa241 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-03-0112-27/+404
| |\ | | | | | | | | | refs/staging/stable
| * | Fix Alt key capture issue with mouseWheelIrfan Omair2013-03-011-0/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29820 Change-Id: I8932b7bcadd6495debda6cdf0a576f83a0ccad47 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * | Fixed -dbus-linked when cross-compiling from WindowsMatt Fischer2013-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Windows doesn't have pkg-config, it doesn't get -ldbus-1 added to the command line automatically like Linux does. Code was present to deal with this case, however it was only configured to work when native-compiling Qt. The flag was not added when cross-compiling, meaning that -dbus-linked did not work correctly in that case. This patch changes the code to add the flag properly in both cases. Change-Id: I67881643bd658161f4929f3932859ccf636ca7a9 Task-number: QTBUG-29984 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 23:27:29 +0000