summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* QLocale: Report RTL text direction for pa_Arab and uz_ArabKonstantin Ritt2012-12-101-9/+16
| | | | | Change-Id: I97c785c9cbf550ef1ab330a4905ff7ae97ee6a30 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix binary incompatibility between openssl versionsShane Kearns2012-12-103-3/+15
| | | | | | | | | | | | | | OpenSSL changed the layout of X509_STORE_CTX between 0.9 and 1.0 So we have to consider this struct as private implementation, and use the access functions instead. This bug would cause certificate verification problems if a different version of openssl is loaded at runtime to the headers Qt was compiled against. Task-number: QTBUG-28343 Change-Id: I47fc24336f7d9c80f08f9c8ba6debc51a5591258 Reviewed-by: Richard J. Moore <rich@kde.org>
* Move a Q_DECLARE_METATYPE higher up in the file.Stephen Kelly2012-12-101-1/+2
| | | | | | | Having it low in the file causes ODR violations. Change-Id: I6267c7c1b043e77b251a88cb8940a9f063160891 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add QT_DEFAULT_QPA_PLUGIN to generated qconfig.priMiikka Heikkinen2012-12-105-0/+25
| | | | | | | | | | | | | | | Configure will now generate QT_DEFAULT_QPA_PLUGIN qmake variable to specify the default QPA plugin. "CONFIG += qpa_default_plugin" statement in application .pro file will add the default QPA plugin into QTPLUGINS. "CONFIG += qpa_minimal_plugin" statement in application .pro file will add the minimal QPA plugin into QTPLUGINS. Task-number: QTBUG-28131 Change-Id: I12a241005f30b37467d783b50f0369b47e605e68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Pro-file level support for importing plugins for static Qt buildsMiikka Heikkinen2012-12-102-2/+27
| | | | | | | | | | | | | | | | | | | | Platform plugin is needed always when gui is linked to an application. This is tedious to do manually for static builds, so provide support for generating a source file that imports static plugins for application projects. "CONFIG += import_plugins" statement in application .pro file will generate required import statements for all plugins specified with QTPLUGIN variable. The plugin class names are found from plugin's module pri generated automatically when plugin is built, as long as the plugin specifies the PLUGIN_CLASS_NAME in the plugin .pro file before loading qt_plugin.prf. Task-number: QTBUG-28131 Change-Id: I19f8ea48a3c1e9b5c81f4399c4b5d439a6d4bea1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add PLUGIN_CLASS_NAME to qtbase pluginsMiikka Heikkinen2012-12-1042-0/+42
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Icd993c0fc8335f29aeec30e853a408d888069399 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fixed installation of gui examples' targetsOliver Wolff2012-12-103-0/+9
| | | | | Change-Id: Ie945ffac56ed83d2dc4605a073bcab4ef6f290ac Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Blackberry: Fix crash when opening file dialog without parent.Sergio Martins2012-12-106-23/+25
| | | | | | | | | | | | | If parent is null, we now use qqnxintegration->primaryScreen() This simplifies ctors of QQnxTheme and QQnxFileDialogHelper which now receive a QQnxIntegration pointer instead of receiving a font database and a bps event filter. Change-Id: I3b1ed4d99f738b980a4f19a98618341a14e0c222 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QtBase: Doc: Fix Links to designer manual.David Schulz2012-12-104-7/+6
| | | | | Change-Id: I87f68fb70aa773c44b90b58bd56fc5585a7e4107 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* QtBase: Remove linguist example which was already movedDavid Schulz2012-12-1011-261/+0
| | | | | | | ... to QtTools. Change-Id: I707d8debcf35b01046b78718fd4b48c03b1fa6e2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* support include paths for the Windows resource compilerJoerg Bornemann2012-12-103-5/+37
| | | | | | | | | | | In RC_INCLUDEPATH one can add include paths for the Windows resource compiler. Task-number: QTBUG-13776 Change-Id: If1d9ed44097adb7789df03e4ccd4e3b7df9e8d08 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qmake: fix extra compilers in vcxprojs for single config modeJoerg Bornemann2012-12-101-0/+10
| | | | | | | | | | | | In single config mode extra compilers were not written to Visual Studio project files, because they were not added to the fake project object we're using to write a single config project. Task-number: QTBUG-27505 Change-Id: Ie57b648861573496252f1383dc77e0729e244947 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Updated outdated docs to use new macroChristian Stenger2012-12-102-9/+18
| | | | | Change-Id: I9a3528112fba1db988592d9f4f470ec678e81e1a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Only handle QTPLUGIN when linking against static QtMiikka Heikkinen2012-12-071-1/+2
| | | | | | | | | Usage of QTPLUGIN implies static Qt, so only handle it when that is true so user projects do not need to scope it if they support linking against both static and shared Qt. Change-Id: I011b4672bac122d7d64d8f2fc0e41ca7e5251dfc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix module pri file name for static pluginsMiikka Heikkinen2012-12-071-1/+1
| | | | | | | | | | Since QTPLUGIN variable values are used to locate both the plugin library and the module pri file, those must match. Therefore generate module pri file name using the TARGET of the plugin rather than the pro file name. Change-Id: I9ec6f2a087ba3b3cecf7034c8a28b31df155cd97 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* move cmake template files under features/data/Oswald Buddenhagen2012-12-073-2/+2
| | | | | | | | | there will be more template data, and it wouldn't be too nice to spread it all over mkspecs/. Change-Id: I909c48d26ac34f8c0f66051a65d326366d49c096 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* simplify code by using new $$absolute_path() functionOswald Buddenhagen2012-12-072-8/+2
| | | | | | Change-Id: Ie8102eea5c2b108154b76ed35bdbc6d8572bd4a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* finish the job of removing uic3 supportOswald Buddenhagen2012-12-071-25/+14
| | | | | | | | this should have been in 048b697c07. Change-Id: I8589453ef937db1a9a446b0e5d01bb830b0cf6b0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* remove another dead assignmentOswald Buddenhagen2012-12-071-1/+0
| | | | | Change-Id: I79ffdba571b48def4494b018b2a2abdee8aab0a8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Implement Cocoa KeyMapper.Morten Johan Sorvig2012-12-076-2/+604
| | | | | | | | | | Port Qt 4 implementation. Shortcuts such as shift-5 should now work. Change-Id: I1d8c4c6c4a903142361996b558ee31c8549fcef6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Only generate -fPIE on unix.Stephen Kelly2012-12-071-1/+1
| | | | | | | | This follows the same logic used to set bsymbolic_functions. Change-Id: I9300eab8a1b6673c4409b5dd07b40123fdf00d69 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Topologically sort $${MODULE}.depends when generating cmake files.Stephen Kelly2012-12-071-1/+1
| | | | | | | | | | | | The contents of this eventually go into a CMake target property IMPORTED_LINK_INTERFACE_LIBRARIES, which seems to expect sorted input. Usually the contents is generated by CMake itself, so generating content it expects is reasonable. This fixes the qtactiveqt cmake unit test with MingW on linux. Change-Id: I2a540bea5c3ac214ad4e1dfedfb7cbd2f863472b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: removed control code+minor rephrasingNico Vertriest2012-12-071-3/+3
| | | | | | | | | QTBUG-28382 Change-Id: Ic166fcb283d3339853c68a71be9aebd6cfed0523 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Set CGImage format when converting from QImage.Morten Johan Sorvig2012-12-071-1/+22
| | | | | | | | | Set the CGImage format based on QImage::format(). Handle8-bit per component (A)RGB. Change-Id: I041b0ee53d3943a0aaf9e813eb0a235c4de619dd Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Use the "copy" blend mode for backingstore drawingMorten Johan Sorvig2012-12-071-0/+1
| | | | | | | | | | The default is a "source over", but we want to completely replace the destination pixels. (Which is slightly faster). Change-Id: I4916765258a2236f70f58a8e20b06f80739183c1 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Avoid backing store color space conversions.Morten Johan Sorvig2012-12-071-1/+15
| | | | | | | | | | | | | | | | | | | | We want the Qt backing store to be in the device color space by default. This will avoid colour space conversions when blitting it to screen, at the cost of a potential loss in color accuracy. As it turns out, CGColorSpaceCreateDeviceRGB no longer crates a device color space but rather a generic color space. (Since 10.4). Create the color space with a system profile instead. Accurate color representation needs to be supported at some point, but this fast path should be the default. Change-Id: I7ebb77b36f81f66119d8c2ef464723401ec1d1e8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Deleted wrong statement about nr Qt JSON classesNico Vertriest2012-12-071-2/+0
| | | | | | Change-Id: I58d8ab73d3018d9712ec9485e0b8e52a5a75da5e Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update QNSView geometry on window resize.Morten Johan Sorvig2012-12-072-3/+4
| | | | | | | | | | | | | | | | | Ideally this should not be required since NSWindow should resize the content view automatically. However, in the case of modal QDialogs this does not happen. Add call to updateGeometry in windowDidResize as a workaround, and remove code which called QNSView::setFrameSize with the current size. This will cause duplicate handleGeometryChange calls in the non-qdialog case, add a test to see if the geometry really has changed to prevent that. Change-Id: I29bea23b2ab72f923aeadf8db8cb9131ae177a28 Reviewed-by: Liang Qi <liang.qi@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 17:47:30 +0000