summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* require modules to define their versionOswald Buddenhagen2013-03-063-4/+10
| | | | | | | | | | | | | | | otherwise they would inherit it from qtbase, which may effectively result in a lie if building against a different release. for convenience we define the version centrally per repo. qtbase is special, in that we use the version defined in qglobal.h to avoid defining it redundantly (the instance in qglobal.h is currently needed to bootstrap qmake; the configures would need some work to change this). Task-number: QTBUG-29838 Change-Id: Ie9a5b0ff0d64b69ff2d34af2f7c42d6278e957cc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed potential access violation in QPixmap::copy() for <32 bit pixmaps.Samuel Rødal2013-03-062-2/+13
| | | | | | | | | | | QImage is supposed to maintain the invariant that each scan-line begins on a 4-byte boundary, so we need to verify that this is the case before using the optimized path of short-cutting QImage::copy() by referencing the source image's bits directly. Task-number: QTBUG-14766 Change-Id: I0a178aeb2f34cc64f98deae9470b55b5c53fcb06 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Cocoa: Improve expose event handling.Morten Johan Sørvig2013-03-066-9/+60
| | | | | | | | | | | | | | | | | | | | | | | Send expose events on window and view show/hide notifications. Implement QCocoaWindow::isExposed. Close all windows on quit. This allows sending (de-)expose events for those windows while the event loop is running. Remove the flushWindowSystemEvents call in setVisible. This function is called from application code. Flushing window system events here is wrong since it can lead to events being processed in the middle of the user code call stack. flushWindowSystemEvents should only be called as a result of (native) window system activity. Skip one of the tst_qtooltip tests which becomes unstable/ fails in the CI system as a result of this change. Task-number: QTBUG-29583 Change-Id: I3fb8b3f77e2b2e19dfeafba5d7dfcef602891d37 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Add snippet for QT_VERSION_CHECK.Mitch Curtis2013-02-272-0/+14
| | | | | | Change-Id: I048771f21ce694329a7e9acd4dbfbebfec964b05 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix generation of XCode projects for XCode 4.6Andy Shaw2013-02-271-3/+5
| | | | | | | | | | | When a framework is referenced in the XCode project then it is known as a framework by the lastKnownFileType and not the reference type. This ensures it works in both XCode 3 and XCode 4. Task-number: QTBUG-29371 Change-Id: I434246a46d6c5bfd50ba7de1a7c710c0caf0bc0a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Fix some punctuation errors.Mitch Curtis2013-02-272-4/+3
| | | | | Change-Id: I6aa2ad2b506466fbef6a22380d151988930807c9 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix Qt Designer warning about being unable to handle property.Friedemann Kleint2013-02-261-1/+1
| | | | | | | | | | | | | Qt Designer warns: "The property "document" of type 1053 (user type) is not supported yet!" when loading forms containing a QTextEdit. Introduced by 468c22f6732b5755b68f658dbd7a9c4e9e9601d1 . Change-Id: Ia1b7bdc9f7188e0b092c010056fcd12c9e891fd7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Doc: Added the missing example snippetsVenugopal Shivashankar2013-02-266-10/+333
| | | | | | | | | | | | | The snippet files referred were outside the scope exampledirs for QtCore. I made of a copy of those files in the snippets folder to fix this issue. Task-number: QTBUG-29755 Change-Id: I2f765104394071d035e9cee610945ae290033deb Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
* Remove extra $ in default libexec directoryEskil Abrahamsen Blomfeldt2013-02-251-1/+1
| | | | | | | | | Produces qt_lbexpath=$PREFIX/29677QT_INSTALL_LIBEXECS_DIRNAME in qconfig.cpp Change-Id: Ie6f208d759a748dfcd4f1547943a1dfb4b7aedd5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove debug output that can cause crashes in static builds.Frederik Gladhorn2013-02-251-12/+53
| | | | | | | | | | Currently static builds ignore the accessibility plugins. The debug output would also potentially crash for other events when they could not create interfaces. Task-number: QTBUG-28707 Change-Id: I5ae20cac89bd7f4a74add2b80834f4e9d4fa438c Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* List the Release library before the Debug library in cmake files.Stephen Kelly2013-02-221-24/+24
| | | | | | | | | | | | | | | | | | | | | | | This way, the Release library is chosen if Qt is configured to build both debug and release, and if the consumer configuration is not an exact match for 'Debug'. This means that RelWithDebInfo and MinSizeRel, which are 'standard' configurations in CMake with mulit-configuration generators, will use the Release version of Qt. All other configurations will also use the Release version, unless MAP_IMPORTED_CONFIG_<CONFIG> is used as described in: http://doc-snapshot.qt-project.org/5.0/qtdoc/cmake-manual.html and in the cmake documentation: http://www.cmake.org/cmake/help/v2.8.10/cmake.html#prop_tgt:MAP_IMPORTED_CONFIG_CONFIG Task-number: QTBUG-29186 Change-Id: Ifc11a9e19fcb304297c204e34a3b25c510329767 Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Create module-specific internal cmake macrosStephen Kelly2013-02-211-9/+9
| | | | | | | | This ensures that invoking the macro from a different module (operating on a different target) is not possible. Change-Id: Idbcd41d03172a8f1dcea26954464ab981fce8879 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Populate the cmake variables only one time.Stephen Kelly2013-02-214-63/+118
| | | | | | | | | | | | Since we're only including the Extras file one time, invoking set() for the include dirs again will overwrite the addition of include dirs in the extras file. We only need to populate these variables if not set anyway, so do that. Change-Id: I04dad0674778e79c8c12c18231b8ce6c92edf881 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Hiding scrollbar on MacOSX 10.7 if policy is set to ScrollBarAlwaysOffCyril Oblikov2013-02-211-6/+6
| | | | | | | | | | | | On Mac OS X 10.7 (if System Preferences -> General -> Show scroll bar is "When scrolling") scroll bar was shown even if policy was set to ScrollBarAlwaysOff. This is a regression from 5.0.0. Change-Id: I161b350874c085a1397df7b398af8f3fb0fbeacf Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* moc: Fix infinite recursion in macro substitutionOlivier Goffart2013-02-215-5/+29
| | | | | | | | | | | | | | When performing macro argument substitution, one should keep the set of macro to exclude, else we can enter an infinite recursion. Testcase: #define M1(A) A #define M2 M1(M2) Task-number: QTBUG-29759 Change-Id: I564bbfed65e1c8599592eaf12c6d67285d2fd9ce Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Add qcore_mac_p.h to the list of headers.Thiago Macieira2013-02-211-0/+2
| | | | | Change-Id: I3a8db99166a34c15c19b142a05bf81ababb2eeb8 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Forward the 3rd parameter of dataChangedAlbert Astals Cid2013-02-213-8/+46
| | | | | Change-Id: I94f893bf65cd150c3cb1099c91cb13882bcca79a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Emit which role actually changedAlbert Astals Cid2013-02-211-1/+1
| | | | | Change-Id: I596a81628e5553779986a94769e114d89a44b264 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Doc: Update image in QPainter class reference docsTopi Reinio2013-02-201-0/+0
| | | | | | | | | The code snippet demonstrating the use of drawText() was already updated to use the text 'Qt Project' - update the image accordingly. Task-number: QTBUG-29784 Change-Id: Iea5e729bd26df2d8ab6a02bb7ea804494e554a28 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* qdoc: QML Inheritance is not resolved correctly.Martin Smith2013-02-2010-49/+215
| | | | | | | | | | This change adds some QML property, signal, and method data to the .index file. It also provides more robust resolving of QML inheritance for qml types. Task-number: QTBUG-29778 Change-Id: Iaefd64227913a19f427b21e904ca5e32c82d7b29 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix QVector detaching in one thread while another destroys it.Jędrzej Nowacki2013-02-202-3/+78
| | | | | | | | | | | | The patch adds handling for a case when a QVector is shared between two threads. In such scenario detaching in one thread could collide with destruction in the other one, causing a memory leak or assert in debug mode. Task-number: QTBUG-29134 Change-Id: Idbff250d9cfc6cf83174954ea91dbf41f8ea4aa4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make QVector instances counter thread safeJędrzej Nowacki2013-02-201-100/+101
| | | | | | Change-Id: I7c7aa1eb0f8e91c43023882a3734e908be4ba4fe Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* add -skip option to the configuresOswald Buddenhagen2013-02-205-2/+41
| | | | | | | | | | | | | | | this makes it possible to exclude modules from the build without moving their sources out of the way. substitutes the much-requested -no-webkit. not adding a symmetrical option, as it is relatively pointless: to build only specific "leaf" modules, you only need to run "make module-qt<module> ..." once you configured. and removing particular "intermediate" modules is achieved with this very option. Task-number: QTBUG-26697 Change-Id: I25cebdbd029885a2c653c4cde696f9bb78691768 Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* simplify qtAddModule() by using $$qtPlatformTargetSuffix()Oswald Buddenhagen2013-02-201-6/+1
| | | | | Change-Id: I02b6c1eb2db0c8a36c50b1ec3c79dea215fba03a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless conditionals and expansions from qtLibraryTarget()Oswald Buddenhagen2013-02-201-4/+1
| | | | | | | | this function is called only from library TEMPLATEs, and always with exactly one word as the only argument. Change-Id: I6282e3826791f89e6cf89dde625c8166e4e56028 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't suppress building examples in non-prefix buildsOswald Buddenhagen2013-02-201-2/+2
| | | | | | | | | | | | | these have no (useful) install target, so it makes no sense to reduce the "build" to installing sources. suppressing the actual build can be achieved with -nomake examples instead. conversely, as the build dir is the install dir, people actually need to be able to (selectively) build examples in there. Task-number: QTBUG-29756 Change-Id: I98f34235442b552e51c0d5f5cec96a3eab4f1e7f Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix libexec configure.exe status lineOswald Buddenhagen2013-02-201-1/+1
| | | | | Change-Id: I22b4c07a3d39ab2f3288d0872a0ccaff45b0c153 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Document example manifest files in QDoc manualTopi Reinio2013-02-201-0/+93
| | | | | | | | | Adds documentation for example manifest files and the related qdoc configuration command \manifestmeta into QDoc manual. Change-Id: I6a627698ab14f57c9a117b6d4b794f352959f5ac Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QMacStyle::drawControl(CE_ProgressBar): add missing null pointer checkJ-P Nurmi2013-02-201-1/+1
| | | | | | | | Do not spin off progress bar animations if QStyleOption::styleObject is not set. Task-number: QTBUG-29748 Change-Id: I4e17a4892e82cae48250afa7a270b15ca5730f46 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix generated pkg-config files when cross-compilingMatt Fischer2013-02-201-5/+2
| | | | | | | | | | | | | | | The Libs: line of the pkg-config files is constructed by taking the name of the .pc file itself, and stripping off the path and extension. However, the code which does this does not handle path separators correctly when the target OS and local OS are different. To get around this, the custom string manipulation was replaced with a call to QFileInfo::completeBaseName(), which can handle the different path separators correctly. Task-number: QTBUG-29700 Change-Id: Ia817b415d303b249f56fcc3d1f073cae99c43046 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Avoid potential crash when changing styles with stylesheetJan Arve Saether2013-02-201-8/+11
| | | | | | | | | | | | | This is not always reproducible, but it probably crashed because QStyleSheetStyle::polish() can do some nasty things such as creating and deleting objects, which can leave the list with dangling QObject pointers. However, it should not delete QWidgets, so we make sure we only have a list of QWidgets before we perform the polish iteration. Change-Id: I84c1ca6a7316e72348248ff056b65dcbae3d20a3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix multiselection by CTRL-click in QFileDialog/KDE.Friedemann Kleint2013-02-201-1/+5
| | | | | | | | Task-number: QTBUG-29257 Change-Id: Idfac80e855455a4537dd38a23136762cd9398e15 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix reentrancy problem in image readingaavit2013-02-201-0/+4
| | | | | | | | | There were race conditions when accessing the plugin factory and the image reader plugins from different threads; ref QTBUG-29281. Added a mutex lock to avoid. Change-Id: Ic1a3b6cbaf5603f1bcf7025b58247a9a3f6d08a9 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix for url encoding in QDesktopServices::openUrl().Indrajit Tapadar2013-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | URLs containing spaces (encoded) couldnt be opened using QDesktopServices::openUrl() -method. This is a regression as it works for 4.8, Using url.toEncoded() instead of url.toString() which removed percent encoding. The NSUrl uses RFC 2396 for parsing, and according to the documentation, of 2.4. Escape Sequences - Data must be escaped if it does not have a representation using an unreserved character; And as a space does not have a representation using unreserved character it needs to be escaped. Example: Using this url, http://www.google.com/search?q=testme%20withspace url.toString() returns "http://www.google.com/search?q=testme withspace" and url.toEncoded() returns, http://www.google.com/search?q=testme%20withspace" which is also the expected result. Task-number: QTBUG-29124 Change-Id: Ieed3d4cfb689b9311f6cf21e5098a1e70256ab03 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Revert "QGtkStyle: GTK3 compatible combo boxes"J-P Nurmi2013-02-203-22/+17
| | | | | | | | | | | | | | | | | This reverts commit 15fc255c7c0a6a693c754734c39c37bd50b0634b. The change was not compatible with the oxygen-gtk theme engine. Furthermore, GTK3 compatibility in QGtkStyle is not important, since it won't be feasible to support both GTK2 and GTK3 in the same style implementation. Conflicts: src/widgets/styles/qgtkstyle_p.cpp src/widgets/styles/qgtkstyle_p.h Task-number: QTCREATORBUG-8524 Change-Id: I8ea6dcfd1f432d51b306a5d9f6c4106137979c5a Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fixed qtbase examples build when configured with -no-openglSamuel Rødal2013-02-203-1/+7
| | | | | | Change-Id: Idafdc3264f760d6400ce04bb9da36289b1f96438 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Clean up the cached cursors inside the destructor of QCocoaCursorAndy Shaw2013-02-202-0/+5
| | | | | Change-Id: I4e1222832efa29680b4e658a5c9109641599a2b9 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix the default handling of cursor shape when there is no standard oneAndy Shaw2013-02-201-0/+5
| | | | | | | | | When the cursor specified is a bitmap one we cannot cache it based on the shape as the pixmap set on the cursor may be different. Therefore we should always create a new cursor in this instance. Change-Id: I2c201590ff632490d76c1b423908ae32aa584eb6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix QDockWidget being unable to dock when initially floating.Friedemann Kleint2013-02-201-3/+11
| | | | | | | | | | | When setFloating(true) is called before show, frame strut events are not enabled for the native window (since there is none yet) in QDockWidgetPrivate::setWindowState(). In that case, do it in the show event handling. Task-number: QTBUG-29012 Change-Id: I93b679f20200c149d608a1bcc65b4936a035c6a0 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Document the qintptr for public usageLaszlo Papp2013-02-201-2/+20
| | | | | | | | | | | | The QAbstractSocket API has been already using this as a return type. Hence, this has already been exposed to the public API users, anyhow. http://qt-project.org/doc/qt-5.0/qtnetwork/qabstractsocket.html#socketDescriptor A minor mistake has also been fixed in this commit at the quintptr section. Change-Id: I8143b3050428548ff6baee2e3a0bce4058ea8701 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't enable HIDPI when rendering directly to PDF on MacAndy Shaw2013-02-191-2/+2
| | | | | | | | | | | When rendering to PDF using the PDF paint engine on Mac it would consider it to be rendering as HIDPI when ScreenResolution was used. This would mean nothing was being rendered at all in the PDF as a result. Task-number: QTBUG-28709 Change-Id: Ieb97ca9d0b47f6b96debbcf5e05e96c39292e412 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix focus handling of native child widgets in xcb.Gunnar Sletta2013-02-195-3/+44
| | | | | | Change-Id: If4d596195624011142bff6853849a23064e478df Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> (cherry picked from commit fc663b5f9aae16fe6a03160e3eb148a5f742ac58)
* QStackedLayout: Fix crash when focus widget is destroyed in hide()Jan Arve Saether2013-02-192-12/+103
| | | | | | | | | | We also have to make sure that when moving back to a page that has a focusWidget(), the focus should go to the focusWidget() Task-number: QTBUG-18242 Change-Id: Ibfa7d6361c1a456480b2f1584a88ef4c4f405709 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Clean whitespaceJan Arve Saether2013-02-191-5/+5
| | | | | Change-Id: Iec1950a0f4053cd71633162f0cb50efc9d4d493f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* moc: Error out when detecting unterminated macro usageTor Arne Vestbø2013-02-193-0/+74
| | | | | | | | | Exhausting the symbol list while looking for the final right parenthesis means it is missing. Task-number: QTBUG-29308 Change-Id: Iccf5897b0f5eb719699fd12d6c8e4a16ff189d9b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QNX: Don't crash with 0 by 0 sized windowsSergio Martins2013-02-191-2/+6
| | | | | | | | | | | | In the rare event of an invalid sized window, the application crashes because libscreen doesn't like creating empty buffers. Not creating the buffers at all would also be a solution, if we didn't have QPainter crashes due do null paint devices. Change-Id: I561d0082576b6226dd52129f9640952ba46273c8 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* undef B0 to build on PPC (conflict with definition in termios.h)Shawn Rutledge2013-02-191-0/+3
| | | | | | | | | | This is the same fix that was already done in qprinter.h /usr/include/bits/termios.h:122:#define B0 0000000 /* hang up */ so the compiler sees B0 as a numeric constant Task-number: QTBUG-29704 Change-Id: I2df5e1783f3142558cbc1606e0c61fcf636f2de8 Reviewed-by: David Faure (KDE) <faure@kde.org>
* Doc: Removed reference to deprecated \badcode command.Jerome Pasion2013-02-194-75/+15
| | | | | | | | -QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: Ifabd51b7e433a1c30cf30c267d3ce63dded1bd43 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Cocoa: Add QMdiSubWindow size grip back.Morten Johan Sørvig2013-02-192-26/+14
| | | | | | | | | | Change all Q_WS_MAC -> Q_OS_MAC in qmdisubwindow.cpp Remove QEXPECT_FAIL from tst_qmdisubwindow.cpp. Task-number: QTBUG-29434, QTBUG-25297 Change-Id: I299b87ab994e2d5ba93d5bbae48de0df1ac1c9d6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* QColorDialog/QFontDialog: Fix setOption().Friedemann Kleint2013-02-182-4/+6
| | | | | | | | | | Call setOptions() such that the option takes effect. Task-number: QTBUG-28817 Change-Id: Ibef834efc988d3ba49e88ea88ef475b1fd7fd98f Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 17:08:23 +0000