summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Some fixes to the OpenGL docs in GUIGunnar Sletta2012-12-123-5/+41
| | | | | Change-Id: I6415ff16b1765a5814d50a4cd39db00495d43073 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Add directory to xcb-static.pro's INCLUDEPATHAlejandro Exojo2012-12-121-1/+1
| | | | | | | | | | In src/3rdparty/xcb/xcb-util-image/xcb_image.c, the includes require all this directories, or otherwise compiliation fails when -qt-xcb is used in the configure step. Change-Id: I8566bea662eced144cb9a2b1ce1dbfdb65654dea Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* FreeType bitmaps interpreted in wrong formatFlorian Hänel2012-12-121-1/+13
| | | | | | | | | | | | We ask grayscale or mono bitmaps from FreeType but in some cases treat the output as ARGB without conversion. This surfaces using QGLWidget as a viewport to QDeclarative content. The offending glyphs are then generated through QTextureGlyphCache::textureMapForGlyph. This adds a fix for converting to the expected ARGB32 data. Change-Id: Ia219582ebd76b7e4e9379111a42312b4d97718de Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Improve Cocoa platform plugin loading.Morten Johan Sorvig2012-12-124-9/+22
| | | | | | | | | | | | | | | | | | | Loading both the debug and release version of the cocoa plugins causes the objective-c runtime to print "duplicate class definitions" warnings. Fix this by directing the plugin loader to only load one of the cocoa plugins if both are available. Implement this as a special case directly in QFactoryLoader. Define QT_NO_DEBUG_PLUGIN_CHECK to allow mixing debug and release builds. Task-number: QTBUG-28155 Change-Id: Ie1927b219cc501a821f91b7e4b56f0589e0acbf5 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Document the new load / store methods in QAtomic{Int,Pointer}Thiago Macieira2012-12-122-0/+86
| | | | | | | Task-number: QTBUG-24627 Change-Id: Iaa2573aa8f0f36cac81efa73020c2f365bfcba53 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Doc: Remove the mention of non-atomic convenience operators in QAtomicThiago Macieira2012-12-122-12/+6
| | | | | | | | | | For two reasons: 1) those operators are gone and 2) the ones that remain are atomic. Task-number: QTBUG-28532 Task-number: QTBUG-24627 Change-Id: I1e9d1b076d923546c1ee3d45f312066590f97416 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* test: Mark cmake tests as insignificant when -no-widgets is usedSergio Ahumada2012-12-111-0/+2
| | | | | | Task-number: QTBUG-28540 Change-Id: Iaa238ce8fb857ec8856dd9d6f3adc49795db1de1 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Partially revert e84e86dc.Morten Johan Sorvig2012-12-111-1/+1
| | | | | | | | | | | Make tst_qquickview::resizemodeitem pass. Returning on equal geometry breaks for non-top-level windows. Change-Id: I3b361655e25b6cf2d5e29410dc1f3567ab8f54d9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* a11y: Do not refer to destructed QObject in Windows bridgeJan Arve Saether2012-12-112-10/+22
| | | | | | | | | | | | | The crash could happen if a QWidget in the UI got deleted, and the AT client later tried to access the widget through the cache (qAccessibleRecentSentEvents()). Solution: Use a QPointer as a guard. Task-number: QTBUG-26187 Change-Id: I1aa716766626cf171757e76ba255a6d5ae4fd854 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* qmake: fix manifest embedding for DLLsJoerg Bornemann2012-12-111-1/+3
| | | | | | | | | | | | Manifests must be embedded into DLLs with the resource id 2, not 1. This fixes a regression introduced in commit c9406bcf. Task-number: QTBUG-28524 Change-Id: I93b1dfe4614d0535f47fd881b8688a23e83e845f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Ismo Haataja <ismo.haataja@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Mac: disable transient scrollbar animations for non-QScrollBarsJ-P Nurmi2012-12-113-8/+12
| | | | | | | | Task-number: QTBUG-28389 Task-number: QTBUG-28380 Change-Id: I91edd9c8aba60118d722bbf9ad5b85f994398823 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* QApplication docs: restore console mode -snippetJ-P Nurmi2012-12-112-14/+25
| | | | | Change-Id: I1f8ce949ae660a209a2092a2863d5c25e2908004 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QScrollBar::initStyleOption(): fix QStyle::State_On handlingJ-P Nurmi2012-12-111-1/+1
| | | | | | | | | | | | | QWindowsStyle considers QStyle::State_On as pressed, whereas QMacStyle uses the same state for transient scrollbars. Thus, to indicate transient scrollbars, QScrollBar::initStyleOption() must set QStyle::State_On only when the current style actually supports transient scrollbars. Task-number: QTBUG-28523 Change-Id: I94d207b1e8c5c4bd6f4b99e8b4f1661197fbe9dd Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix compilation with (all versions of) MinGWKai Koehne2012-12-111-1/+1
| | | | | | | | | | | | | | | | Commit 320b16110f0f9cef032a64846dc792d40ccd367b changed the arguments of swprintf to be compliant with latest MinGW-w64 headers: The headers now excludes the non-standard swprintf(wchar*t,wchar_t*,...) version for C++11. However, the swprintf(wchar_t*,size_t,wchar_t*,...) version is actually not supported by e.g. stock Mingw-32 from mingw.org. Instead, use _snwprintf(wchar_t*,size_t,wchar_t*,...), which both MSVC, and all MinGW versions should support. Task-number: QTBUG-28520 Change-Id: Icadd11773a25143e46a72c898adfd1c324f9c468 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc CSS: Edited CSS line-height of paragraphs and landing page.Jerome Pasion2012-12-112-2/+8
| | | | | | | | -value copied from qt-project.org -more room between lines of text and the list at the landing page. Change-Id: Iee995325ded0c803feca44d112c5e73a024917bb Reviewed-by: hjk <qthjk@ovi.com>
* Automatically import plugins in all applications with static QtMiikka Heikkinen2012-12-115-32/+33
| | | | | | | | | | | | | | Since all gui applications already need some QPA plugin added, we might as well add the default plugin and generate the code to import the plugins automatically. User can opt out from the automation by removing relevant items from CONFIG variable: link_qpa_plugin or import_plugins. Task-number: QTBUG-28131 Change-Id: Ic171c363464c099143374d3e39bcc28f6edf73d2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Hardcoded url for RFC 1929 QTBUG-28500Nico Vertriest2012-12-111-1/+1
| | | | | | | | | Entered hardcoded url for RFC 1928 QTBUG-28500 Corrected in qtnetworkproxy.cpp Change-Id: Idad0e2294e610095990a65ffc7d5c9c881b09329 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QGraphicsView - fix rubberband to expand on wheel eventThorbjørn Lund Martsum2012-12-112-11/+18
| | | | | | | | | | | | | | | | | In SHA 51914375b615ddcac711171ac31779fea01b4323 the rubberband selection was fixed, so it followed the scene-point on mousemove. However wheelEvent could move the view - but avoid update of the rubberband (that would not be updated until next mouse-move). This patch fixes that (and generally improves rubberband behavior) since QGraphicsViewPrivate::mouseMoveEventHandler is called by replayLastMouseEvent, which is called from various places, where we need to update the rubberband (e.g scrollContentsBy). Change-Id: I1b78c27edaaecea797a2319086d7a11d437d2bd3 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Remove incorrect and confusing documentation from qplatformwindow.cppSamuel Rødal2012-12-111-3/+0
| | | | | Change-Id: If3fd383bf7ff08a04df2e11c727c11aeef05a6de Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Consistently prefix all platform plugin libraries with "q".Samuel Rødal2012-12-115-5/+5
| | | | | | | | | | | | | This means the xcb plugin library will be named libqxcb.so instead of libxcb.so, which doesn't clash with the system's libxcb.so. We need to consistently apply this on all platforms for static linking to work. Change-Id: I1640a7cae7b9846bbe62b19ab1c2c5bad7d02b4c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QGraphicsView - move rubberband-handling into a private functionThorbjørn Lund Martsum2012-12-112-48/+55
| | | | | | | | | | | | | This patch moves the rubberband-handling from QGraphicsView::mouseMoveEvent to QGraphicsViewPrivate::updateRubberBand. This function is then called from QGraphicsView::mouseMoveEvent. I have removed some d-> and added some q-> but beside that nothing is changed in the code. Change-Id: Iab70c55635c43733e0e02bb70e2bb03b90bf62f0 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Fixed leading tabRobert Loehning2012-12-111-1/+1
| | | | | Change-Id: I357bf802cde3d842a7af0c13845cfda55b9c7b59 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* configure : remove .qmake.vars after status message.Elvis Lee2012-12-111-1/+2
| | | | | Change-Id: I3a4c1c10ce0d27d05faf64049224e0022a414fa4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove QT_DLL and QT_NODLL defines.Stephen Kelly2012-12-112-7/+2
| | | | | | | Task-number: QTBUG-28044 Change-Id: Ib8c4e1e8e52703aa6590875c34f05b6bc71db808 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QGraphicsView - add const to a not modified local variableThorbjørn Lund Martsum2012-12-111-1/+1
| | | | | | | | | The QPointF ep is not modified. There is no reason it shouldn't be const. Change-Id: I41fb8f9ae5296a7a40f7eb8be13fc14d56915e3f Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* QGraphicsView - remove reference to avoid weird code.Thorbjørn Lund Martsum2012-12-111-1/+1
| | | | | | | | | | Even though the code before theoretic is ok, we really shouldn't have a reference since mapFromScene returns a QPointF and not a const QPointF&. Change-Id: I5ea8fd238bdbdd21fb1e3b6b5f280d45e3bc43ef Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* install a sane top-level examples.pro fileOswald Buddenhagen2012-12-113-1/+13
| | | | | | | | | | generally, don't install anything from the top-level examples dirs automatically. the global README and the aggregator examples.pro are installed explicitly. Change-Id: I5f6b8760f37d917b800fa85979896a471778cac0 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove bizarre jsc source referenceOswald Buddenhagen2012-12-111-2/+1
| | | | | | | | | it compiles just fine without it. if this was meant to inject a newer version of JSC than what is in QtScript, it can be redone without creating a bizarre hybrid. Change-Id: I61fe60bfa6a9bdb6423e8a7135250e332a5835ec Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* re-enable "check" targets for all projects, but with opt-out possibilityOswald Buddenhagen2012-12-112-2/+1
| | | | | | | | | | | the feature was backported to qt 4.8, and people apparently started to rely on it. it doesn't add too much overhead when not used, so enable it by default again. Change-Id: I15890027603ede733347f2c05b36ad1389c649cf Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix static lib dep additionOswald Buddenhagen2012-12-111-5/+6
| | | | | | | | | | leave MODULE_LIBS unmodified - MODULE_LIBS_ADD takes the role of the filtered variable. Change-Id: I2a67078bbc453eccc08317a1ca8e3228cbc3a8f7 Reviewed-by: Davide Pesavento <davidepesa@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Inserted hardcoded urls for State Charts and S. C. XMLNico Vertriest2012-12-111-5/+3
| | | | | | | | Corrected in qstatemachine QTBUG-28500 Change-Id: I45b2ffea983ee5754b080b8a6faa18d4d163e578 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* centralize headersclean testOswald Buddenhagen2012-12-114-80/+22
| | | | | | | | | so other modules can actually re-use the code without referencing qtbase sources. Change-Id: Id66f07b476e539273dd32455e7642a17d7e5d0ef Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't use testlib for headersclean testOswald Buddenhagen2012-12-113-68/+11
| | | | | | | | | this is a compile-only test, and it's not even marked as a testcase in the autotest system. Change-Id: I9b48ddad3c8e3e953d0e6fcfa010bab73289bc6f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QMetaType: remember whether a type was registered with Q_DECLARE_METATYPEMarc Mutz2012-12-115-2/+176
| | | | | | | | | | | | | | | | | | | | There are two ways to register a type: using Q_DECLARE_METATYPE(T) and using qRegisterMetaType<T>("T"). Doing one thing in one translation unit and another thing in another TU constitutes an ODR violation, because the value of QMetaTypeId<T>::Defined will differ in the two TUs. By adding the information whether a type was declared with Q_DECLARE_METATYPE to the typeFlags(), such a use will trigger the existing binary-incompatibility failure that checks for equality of the incoming type flags with the stored ones (if any). I had to encode the type as a defaulted function argument in order to avoid the linker merging instantiations of the function templates and therefore rendering the detection moot. Change-Id: I82017caf300458b411cc8ac2f6653536fac64117 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QDoc: Fix generated anchors for c++ class signalsTopi Reinio2012-12-111-1/+1
| | | | | | | | | | Add a missing 's' for plural form for signals. This fixes the linking to Signals topic in class references. Task-number: QTBUG-28450 Change-Id: Ic666e608b4b5b40b1f886ea581e54227e1a94678 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Added url for SVG Color Keyword Names QTBUG-28500Nico Vertriest2012-12-111-1/+1
| | | | | Change-Id: I7aaf2cbd9b4bf4e6ff35fa39c5340e3dbc4225ff Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Added hardcoded url QTBUG-28500Nico Vertriest2012-12-111-2/+2
| | | | | Change-Id: Ida2bcd8e470cc336db69dcec6130ad942e14d3a0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Hardcoded url for Mac Os X Aqua QTBUG-28500Nico Vertriest2012-12-111-2/+2
| | | | | Change-Id: I83d87d155b7ca502098a53e955fdde3c908e3300 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Hardcoded url Item View Classes QTBUG-28500Nico Vertriest2012-12-111-3/+0
| | | | | | | Removed link to Item View Classes in Qt4 Change-Id: Ic3c38a33edc88faf072b8fe7e3accfe1ee75ac78 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Workaround with hardcoded url QT-BUG 28500Nico Vertriest2012-12-111-1/+1
| | | | | Change-Id: I385c14401ced85b12ce65446b224de6910bf3b37 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Qdoc: workaround, put hardcoded url QTBUG 28500Nico Vertriest2012-12-111-4/+4
| | | | | Change-Id: Iab38307459eff8c20a66f8f41240075aaff1b086 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Qdoc: put hardcoded url as workaround QTBUG-28500Nico Vertriest2012-12-111-1/+1
| | | | | | Change-Id: Ic9d0805897278d6caaf4cd763352d2d2d98d65f6 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Entered hardcoded urls QTBUG-28500Nico Vertriest2012-12-111-2/+2
| | | | | | | | Hardcoded urls for rfc 2109 and 2965 Corrected in qnetworkcookie.cpp Change-Id: Id3668fec24c3c658437f22a977ea9e631a423aed Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Hardcoded url to RFC3174 QTBUG-28500Nico Vertriest2012-12-111-1/+1
| | | | | | | Corrected in torrent.qdoc Change-Id: Idb1bf1ed869c0db80e557832a61d6eb28585c77a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* test: Remove CONFIG += testcase from manual testsSergio Ahumada2012-12-117-7/+0
| | | | | | | | Manual tests are not supposed to be run by "make check" Change-Id: I0539b94f5286e89ddad2edf487d4b0d82fc2f374 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* Doc: Added documentation for the examplesVenugopal Shivashankar2012-12-1151-60/+552
| | | | | | | | | | | - Moved documentation for the Qt XML, Qt Widgets, Qt Concurrent, and Qt Network examples from qtdoc. - Grouped the documentation pages under relevant groups - Fixed \snippet paths Task-number: QTBUG-27515 Change-Id: I43c22a679e2eefbb48e3cd5893aa2afd3d905863 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Generate the introspection string during parsingKevin Ottens2012-12-113-84/+173
| | | | | | | | | | | Commit 0696071316b3dacb8d1ca15a269e4f4215642b9d moved away from QDom but also lost the ability to fill the introspection field of the created QDBusIntrospection::Interface instances. This commit now generate the string again as we proceed with the QXmlStreamReader based parsing. Task-number: QTBUG-26668 Change-Id: I8f406e1f4e9d3e667a8557db69da36cac369ba4f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc: Restored CSS images for the offline HTML and QCH buildJerome Pasion2012-12-108-70/+31
| | | | | | | | | | | | | Revert "Doc: Removing entry in CSS for adding icons to HTTP links" This reverts commit ceb2799163c7e80148ef0bffafac9b05269514d7. Also: -edited image to use Qt Project brand colors -removed breadcrumbs from CSS Change-Id: I3c2e655f8eac463677b20b68bc2ffa0efd2fd468 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* SQL: Change in QSqlResultPrivate::positionalToNamedBinding()Caroline Chao2012-12-105-2/+177
| | | | | | | | | | | | | | | | | | | | | | | | With the change cff46983a, prepared queries can now store a named paramater to be used more than once. When using ?, thus positional binding, there is no named parameter, thus there is no need to store it. When prepare is called from a query with ?, it currently causes an error when the feature QSqlDriver::NamedPlaceholders is true. Because holders values are called while holders is actually empty. QSqlDriver::NamedPlaceholders is true for QOCI plugin only but the problem is independant of the plugin used. Adding a test case with a test driver to make the test runnable without Oracle installed. Change-Id: I6d7491f7e09a7b62d2d4d216b40fedd67e927e27 Reviewed-by: Matt Newell <newellm@blur.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Mark \brief comments in thread examples.hjk2012-12-104-4/+4
| | | | | Change-Id: Ib496b1e500820774354c20003edb22748324cb5f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 14:31:58 +0000