summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add and use qtHaveModule() functionOswald Buddenhagen2012-12-2178-91/+98
| | | | | | | | | | | this is much more elegant than the so far propagated !isEmpty(QT.foo.name). also replace feature-specific tests (no-gui and no-widgets) and the obsolete contains(QT_CONFIG, foo) syntax. Change-Id: Ia4b3c8febcabf9eeca67b1f9173a523820b1038b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix some typosSergio Ahumada2012-12-2110-12/+12
| | | | | Change-Id: I4e8d9bd8ea66ec810e4f1fbfd8ddbf25c4b3d980 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* fix linker command lineOswald Buddenhagen2012-12-211-1/+1
| | | | | | | | gcc is apparently tolerant against this abuse. icc is not. Task-number: QTBUG-28775 Change-Id: I872d32177562f076ca8aecd263bc4bb3c7e8edc0 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qmake:Add a case sensitivity flag to ProString::{starts,ends}With()Debao Zhang2012-12-211-8/+8
| | | | | Change-Id: I457cd8288ae8a0138f7b28321fe87be3308b5215 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add a manual test for QFile.Friedemann Kleint2012-12-213-0/+149
| | | | | | | | | Add a command line program allowing to test rename, copy, etc. Task-number: QTBUG-28246 Change-Id: Ie9667f03b65a874475700ec9ecd91ca2ed32ed97 Reviewed-by: David Faure (KDE) <faure@kde.org>
* Fix main() signature of headersclean stub fileKai Koehne2012-12-211-1/+1
| | | | | | | Fix MinGW build errors by using the standard main signature. Change-Id: I0ebe7307a825a7ec50e654f163fbf8fe7060a478 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge "Merge 'release' into stable" into refs/staging/stableOswald Buddenhagen2012-12-2110-217/+169
|\
| * Merge 'release' into stableOswald Buddenhagen2012-12-1910-217/+169
| |\ | | | | | | | | | Change-Id: I57aaa6747c1bfacc7dee036cd69d91a8c0d9ae7a
| | * slash the -fast configure optionOswald Buddenhagen2012-12-184-156/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | it's completely broken, and i have no time to fix it properly now. configure runs no qmake -r by default any more, so it's fast enough. Change-Id: Ib2b4c68f1fc2fe95accecbe93dd5a87c9b015692 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * finish changelog for qmake, configure & co.Oswald Buddenhagen2012-12-181-31/+108
| | | | | | | | | | | | | | | Change-Id: I69e88421b2959215f05f024aedc60dc2c52133fe Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * mention that qt3support is goneOswald Buddenhagen2012-12-181-3/+2
| | | | | | | | | | | | | | | Change-Id: I08f01eef9d93876471d365ce09f5e1706e74312d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * added changelog for linguistOswald Buddenhagen2012-12-181-0/+5
| | | | | | | | | | | | | | | Change-Id: Id4920837017de1496fa1a72581a3453e32dc93a2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Fix font sizes when X11 has a forced dpi settingv5.0.0Lars Knoll2012-12-182-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | On X11, the X resource system can override the physical DPI of the screen for resolving font sizes etc. Correctly load the setting and adjust the logicalDpi() accordingly. Change-Id: Id60d03d1d214fb99e9de17a65976abd170bb7cca Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Fix direct compilation of qtypeinfo.h and othersThiago Macieira2012-12-183-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtypeinfo.h is included by qglobal.h, so it needs to include that before the #ifdef. Otherwise, we get a circular dependency problem with qflags.h: ./QtCore/../../src/corelib/global/qflags.h:60:27: error: "Q_PRIMITIVE_TYPE" has not been declared Also, take the opportunity to fix the other headers that are included from qglobal.h to avoid similar problems in the future. Change-Id: I99a56f42775c24bdcc796995b06509c1ca0cb849 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> (cherry picked from commit 797f3c0a01e9adf0af3bc7c0bd3f7f63849d99b9) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * tst_QDBusXmlParser: make XML attribute order deterministicDavid Faure2012-12-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid QHash randomization so that the order of the XML attributes is stable This was causing intermittent failures. Change-Id: I4cc0dba4b0c2ec36601f3b06fb17ff80005cc9fb Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit aa434bc90861f1599209edd6bc614802c50704dc) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Initalize the printinfo on Mac if it requests and it needs initalizingAndy Shaw2012-12-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the print panel was closed then it would clean up the printinfo and if it was requested for the same QPrinter then it would not be recreated in time. Therefore we check if it is initalized and if not we re-initalize it. Task-number: QTBUG-28657 Change-Id: I7dc9011b80e03cfa3eae8fee2fcf6cc8021a8566 Reviewed-by: Lars Knoll <lars.knoll@digia.com> (cherry picked from commit dde9569d389b4382e8869ac48f942adb3c51ade7) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Doc: Correcting qhp link to Qt SQL's C++ Classes.Jerome Pasion2012-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28579 Change-Id: I0faae04ab125236554cb39659169780e2ab64629 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> (cherry picked from commit 7d685afe5d9f2055dc24d5a978355893c8183758) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Doc: Correcting qhp link to Qt GUI C++ API.Jerome Pasion2012-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28579 Change-Id: I224d55adc1be77138237da4efcac01641964c06b Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> (cherry picked from commit 771e29178d792274bd122e68c71a97eced2aafe4) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * OpenGL examples: Add error message about ANGLE on WindowsThomas Hartmann2012-12-187-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These OpenGL examples require a Desktop OpenGL and will not build with OpenGL ES 2.0. This means those examples do not build on Windows with the default configuration using ANGLE. ANGLE is wrapping OpenGL ES 2.0 to DirectX and does not support the full Desktop OpenGL feature set. Since this is confusing for Windows users that do not know about ANGLE this patch adds an explicit error message describing the solution. (configuring Qt with -opengl desktop) Task-number: QTBUG-28590 Change-Id: I782e6830b9e282ddcc8a2ee0a47faf3579d36aab Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit 63693430c7cb8e8ede611eb9e99f305370d11ff9) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Fix mandlebrot and imagescaling example qdoc markup.hjk2012-12-182-7/+6
| | | | | | | | | | | | | | | | | | | | | Change-Id: I5c9802cab917203092d93fca73b166d2dfeb64bc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> (cherry picked from commit 127f9e109869897c144d86be3a7999a2e1b4dea7) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Doc: Moved content from qtdocVenugopal Shivashankar2012-12-184-2/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The qdoc pages were related to qtcore and they were referring to snippets inside the qtcore module boundary. - Fixed the exampledirs for QtCore to include the examples that are referred by the \snippet instances in the moved qdoc pages work. Change-Id: Ibb6dbb131920ea8692a203f6145863e5012e4602 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> (cherry picked from commit 69e602941112da325b1154e0dc52714bc27a2cc8) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * QtBase: Removed moved linguist examples.David Schulz2012-12-1726-1624/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Linguist examples are now in qttools. Change-Id: I8abfff50d81cda143a080711bf9583e7be777009 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> (cherry picked from commit d64c4662f01ffc94c68e7c9f7abdb6309e67e489) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Doc: remove example docs that were moved to qttoolsLeena Miettinen2012-12-174-259/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove docs and images for Multiple Inheritance and Text Finder examples that were moved to qttools/uitools. Change-Id: I29e8f76b2512e329c354a6d3676c9b2e09e35726 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com> (cherry picked from commit a0a4c06736a71fedb69f01c1c4c423173a2a665e) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * stop defining QT.<module>.sourcesOswald Buddenhagen2012-12-142-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | it's the very antithesis of modularization to do it. Task-number: QTBUG-27722 Change-Id: I2540e1a70e67b55420246d0c209314c05c65a85f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Remove win32/thread.prf and thread_off.prfStephen Kelly2012-12-142-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables these files refer to are not set anywhere anymore. The Unix thread.prf file is still needed, as it is still effective and is activated by qt.prf. Task-number: QTBUG-25106 Change-Id: Ia514192d28785205df3710d78ee597285d4136b0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * add .rpath only for dynamic unix buildsOswald Buddenhagen2012-12-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | rpath is meaningless for static libraries. and windows has no concept of rpaths to start with. Change-Id: Ia02bbdfbf7112e7082175c3051c0839ac0900f57 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Mark QAbstractTextDocumentLayout test as insignificantEskil Abrahamsen Blomfeldt2012-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test fails on some setups and a pending critical change causes the existing bug to trigger in CI. To avoid blocking other changes because of this bug, it's been marked as insignificant until such a time when it can be fixed. Change-Id: Ide41f7b1c76209f9c05f95f996b2364d5dea5e67 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from commit 02032fb229e4a26b2848db60e90820e2daeb3363) Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Mark QGlyphRun and QStaticText tests as insignificant on LinuxEskil Abrahamsen Blomfeldt2012-12-142-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests have been failing on certain setups for a while, but some new critical changes causes the failure to trigger on the CI system as well. We mark them as insignificant until they can be fixed. Change-Id: I467e7030c55d6f23515275b4062c17068d2b688c Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from commit 04f25ac46ca0956dfd1209b14a1eee9e2e1274c2) Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Fix styleName support in QPA font databaseJiang Jiang2012-12-149-41/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Font styleName support was disconnected since Qt switched to QPA fontdatabase. Now add the code from Qt 4.8 back to enable this in QPA. Change-Id: Iab2cbfd5468f87542183348c2123ca4b2c270692 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> (cherry picked from commit fa7661d8b25fa338649a301010e1b5a2b63da731)
| | * Mac: fix bugs for font selection in QFontDialogLiang Qi2012-12-142-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use localized family name and style name when selecting font with non-English locale Task-number: QTBUG-27415 Change-Id: Ie81507ed011fc096e0f5edad146e97c392e86494 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> (cherry picked from commit 3c09f6bc9aee0c97427fe8da6efdc73b4ac473aa)
| | * Fix QGtkPainter::reset() to reset the clip rectJ-P Nurmi2012-12-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to preparation for GTK3 support, QGtkStyle::drawXxx() no longer creates a local instance of QGtkPainter upon every call, but QGtkStylePrivate::gtkPainter() will (in the future) dynamically choose between QGtk[2|3]Painter. The same painter instance is now re-used between the calls, but wasn't properly reseted between. Task-number: QTBUG-28557 Change-Id: I29be318dbb54d97ed23dfb88d406a3a833db4369 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> (cherry picked from commit 0b0b74a563d1513e7857000526d5c0fa462ff6af) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Fix typo in docs.Richard Moore2012-12-211-1/+1
| | | | | | | | | | | | | | | Change-Id: I37ccb10d40d2a848b7c251286d29aeb85411e912 Reviewed-by: hjk <qthjk@ovi.com>
* | | Fix typo in docs.Richard Moore2012-12-211-1/+1
| | | | | | | | | | | | | | | Change-Id: I608fbf5751bf1fa819d9fe10e159fa2a9c5e238d Reviewed-by: hjk <qthjk@ovi.com>
* | | Mac: fix transient QScrollBar flashingJ-P Nurmi2012-12-201-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-28669 Change-Id: I9825584f15c34709f7897533220911b6bf3ea21d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | Tests: stabilize tst_QAbstractScrollArea::setScrollBars2()J-P Nurmi2012-12-201-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QWidget::isVisibleTo(parent) instead of isVisible(), just like QAbstractScrollArea::replaceScrollBar() does. This removes the need of using QCoreApplication::processEvents() to deliver the actual hide event just for testing if the scrollbar was requested to be hidden as it should. Change-Id: Ie9a816e7b871d280a4b3d9d76adb10601915bd56 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | | tst_QDBusXmlParser: more reliable solution for setting the seedDavid Faure2012-12-201-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | As recommended by Giuseppe, don't rely on the env var, but use the internal but exported seed atomic int. This way, the compiler will detect breakages, rather than runtime. Change-Id: Iec2bc88c53532d3463d2dc5c73631fc9bc34747b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | QAbstractProxyModel: Document setSourceModel a bit moreDavid Faure2012-12-201-0/+4
| | | | | | | | | | | | | | | | | | | | | Especially so that subclasses remember to emit reset. Change-Id: Iadcae3fc5fe72584465d4134f385ed0a1d77bfcd Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Doc: Removed the \relates instancesVenugopal Shivashankar2012-12-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc supports \relates in the context of a function that relates to an existing class or a namespace, but not in the context of a class. We can use \sa to list the related classes or namespaces for a class instead. This change ensures that QDoc generates documentation for QMessageLogger and QMessageLogContext classes. Task-number: QTBUG-28468 Change-Id: I2242ab730fe5e3acf54b6fa65774e751d2daa7a4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | | Style animations: fix QCommonStylePrivate::stopAnimation()J-P Nurmi2012-12-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly delete animations, and remove the check for stopped state as that is already done by QAbstractAnimation::stop() and we want to delete the animation regardless of the current state. Task-number: QTBUG-28506 Change-Id: I3e34316e5077a8627ff5e6d3babd1873bbbaa774 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | Fixes: out of bounds memory access in QImage autotestaavit2012-12-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A pointer to the data of one qimage is used, with an offset, in a copy. In the mono case, that could lead to overflow: the last row would of the copy would stretch 1 byte beyond the end of the allocated area. Fix by reducing the height of the copy, so that it keeps within the allocated memory. Task-number: QTBUG-28322 Change-Id: I09abfc83f738f8af000fc50f8c94f63dba3a6cfe Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | | QUrl auto tests: make sure setAuthority is consistent with setHostPeter Hartmann2012-12-201-0/+24
| | | | | | | | | | | | | | | | | | | | | ... with respect to empty and null strings. Change-Id: Ic107d5bcc8b659497a567b75a7244caceba5a715 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Fix linking ANGLE on MinGW-w64 64-bitJonathan Liu2012-12-207-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MinGW-w64 32-bit .def files shouldn't be used with MinGW-w64 64-bit. Rename .def files from <library>_mingw.def to <library>_mingw32.def and only use them if QT_ARCH is i386. Change-Id: I5dc2a87f7d2ed59bf954faf2983d0787ed9e00e9 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Patrick von Reth <vonreth@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Generalize the check for gui in static plugin import generationMiikka Heikkinen2012-12-202-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the check for gui by checking for needs_qpa_plugin CONFIG value instead, which gui adds to MODULE_CONFIG. Task-number: QTBUG-28215 Change-Id: I5834a3f81e5c3868ee1a3fa405ebc6410db1f900 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Enable forcing generation of static plugin importsMiikka Heikkinen2012-12-201-44/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using some modules requires importing static plugins also for shared libraries (namely QtAxServer), so provided a way to force plugin imports even for non-applications using force_import_plugins MODULE_CONFIG value. This required moving the plugin handling after qtAddModules calls in qt.prf. Task-number: QTBUG-28215 Change-Id: Id6bb92ed7c078cc8c54538ddc9bb8e8ad316f277 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Enable module build with QT_NO_ACCESSIBILITYTasuku Suzuki2012-12-2015-10/+58
| | | | | | | | | | | | | | | | | | Change-Id: I330c3ddd70232d94eae5543cb0282b962e67eae5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | Use PG_VERSION if PG_MAJORVERSION is not definedAndy Shaw2012-12-201-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When only PG_VERSION was available for getting the client driver version for PostgreSQL it meant that it would not detect the client version and subsequently would not set the connection up correctly as a result. This fixes the blob test already in tst_qsqlquery. Change-Id: Ie2176a43b6be9c0e835498fca5aea129f0cc8fc6 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | | Fix the computation of the location of mkspecs.Stephen Kelly2012-12-202-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The location of the mkspecs directory comes from the archdatadir, which distros will all set. Change-Id: I20dbdce76db13dbd37eec065009e215f98985907 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Prevent a crash if the pixmap passed in is nullAndy Shaw2012-12-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | If the pixmap passed in is null then we should not try to create a NSImage for it, so we just return 0 instead. Change-Id: Idae7ba304c97878e0aa8ae1eead5f4bb644a73de Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | | Disable the JSC portion of the test unless we have a system PCREThiago Macieira2012-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | CONFIG += pcre is enabled if we're using the Qt PCRE, which isn't compiled for 8-bit. If it isn't set, then we have a system PCRE. Change-Id: I29d043b9d3f4d3223dcbb41eadc9f859e710eb88 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | | DBUS: Fix linker errors on Windows.Friedemann Kleint2012-12-202-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDBusMarshaller symbols were duplicated. Initial-patch-by: vonreth@kde.org Change-Id: Ic66681696aaf2a440119c06fce8d1dbd99c8396a Reviewed-by: Patrick von Reth <vonreth@kde.org> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 18:11:34 +0000