summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Test that the CMake files create appropriate version variables.Stephen Kelly2013-04-053-2/+57
| | | | | | | Change-Id: I1d8061302fbb8494b5ae31e20a644745fe969f10 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QGtkStyle: remove obsolete themeName != "Qt" checksDmitry Shachnev2013-04-051-12/+0
| | | | | Change-Id: Ibb6d952f6abc398ac5deb94d3bdfd8560777aa44 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Don't redundantly define cmake package *_VERSION variablesStephen Kelly2013-04-051-3/+1
| | | | | | | | These variables are set by the ConfigVersion.cmake file already, so no need to maintain them manually in the Config file too. Change-Id: I73d949fb22052f4f6acbc1f70518e73f8fbf7c9c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Look for cmake package dependents only in the parent directory.Stephen Kelly2013-04-051-1/+1
| | | | | | | | | | Fedora uses configure options to set the install prefix to a location which does not contain the cmake config files. Rather than finding dependencies from the installation prefix, find them in sibling directories instead. Change-Id: I06974e9655d0dda2a18064d0f9a33997cf2cb2d3 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Stabilize tst_qcompleter.Friedemann Kleint2013-04-051-41/+54
| | | | | | | | | | | | - Use qWaitForWindowActive in task178797_activatedOnReturn(). - Remove hardcoded timeouts, use qWaitForWindowActive/Exposed. - Instantiate widgets on stack or use QScopedPointer to ensure cleanup. - Move widgets to a central location, avoiding taskbar areas. Change-Id: I98991b70067dddab9aa69b1681fa80398ec8b1f6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Windows: Do not use native dialogs for non-modal dialogs.Friedemann Kleint2013-04-051-4/+2
| | | | | | | | | | | | Windows file dialogs are always modal (inheriting IModalWindow). As the QtQuick dialog plugin has a widget-based fallback now, there is no need to use native dialogs for the non-modal case. Task-number: QTBUG-30513 Change-Id: I8b62af86fde34e8c0cf5e917d2e62260e16c82fb Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Fix sql tests in respect to Oracle databasesAndy Shaw2013-04-059-377/+394
| | | | | | | | | | Oracle has a limitation of 30 characters for a tablename so the main change is to account for this, which meant changing all the usages of qTableName(). Some other fixes are included that ensure the tests are working correctly as far as Oracle is concerned. Change-Id: I8ad8a5a33e6a70fcad235f6a7e82e91687b74fee Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Fix pathing problem with our dx.batRay Donnelly2013-04-051-1/+1
| | | | | | | Need to look in <android-sdk>/platform-tools/lib for dx.jar Change-Id: I104cf157ce1795e907cca31b37c62163248b8d77 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* The default behavior should be double buffered, not singlebufferedGunnar Sletta2013-04-051-3/+2
| | | | | | | | | Without this, it is not possible to do vsync drawing on NVidia GeForce 210 on Windows 7. Change-Id: I6064826eaa55266344393f50cdf5d17113350255 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QSaveFile: allow saving to a writable file in a non-writable directoryDavid Faure2013-04-054-26/+166
| | | | | | | | | | The only way to make this possible is to disable the atomic-rename-from-temp-file behavior. This is not done by default, but only if the application allows this to happen. https://bugs.kde.org/show_bug.cgi?id=312415 Change-Id: I71ce54ae1f7f50ab5e8379f04c0ede74ebe3136d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix incorrect classification of glTexImage3D.Sean Harmer2013-04-0522-80/+122
| | | | | | | | | See https://www.khronos.org/bugzilla/show_bug.cgi?id=449 for upstream bug in gl.spec which incorrectly marks glTexImage3D as deprecated. Change-Id: Ib307a5315dd37b8b18389df54b1c93e6a43c61dd Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Special case to work around upstream bug in gl.specSean Harmer2013-04-052-1/+7
| | | | | | | | | | | This commit fixes glTexImage3D to be non-deprecated. This function is incorrectly marked as deprecated in gl.spec. For more info see https://www.khronos.org/bugzilla/show_bug.cgi?id=449 Change-Id: Ic9021b184a10d1b162158a3476b7272f4c6917fd Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Bring glgen into line with OpenGL functions and extensions codeSean Harmer2013-04-055-149/+40
| | | | | | | | | | | | This ensures that glgen outputs exactly what is included in src/gui/opengl/qopenglversionfunctions.* src/gui/opengl/qopenglfunctions_* src/openglextensions/* Change-Id: I7d41d9fc2bf6e5fedf11f58872c079339dac3649 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* iOS: Fix build on case sensitive file systemsTor Arne Vestbø2013-04-041-1/+1
| | | | | Change-Id: I920e7320e429006aef9433db3e942dc257dc72eb Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* QTDSDriver: fix index out of rangeMark Brand2013-04-041-1/+1
| | | | | | | | Follow-up to 5544208e2. Change-Id: Iba3ff291622533e8050ddc0494e4488233727ebe Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QSqlDriver: use Q_DECLARE_PUBLIC/Q_DECLARE_PRIVATEMark Brand2013-04-0415-106/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | 406c8ef6e67da introduced deriving the private SQL driver classes from QSqlDriverPrivate. However, the drivers continued to keep their own pointer to the private class, even though QObject provides the same pointer. Worse yet, the private class is allocated too late and not even passed to QSqlDriver. The result is that QSqlDriver allocates a separate instance of QSqlDriverPrivate. This is likely to cause all kinds of chaos. The private class needs to be allocated in time pass it to QSqlDriver which passes it on to QObject. This commit covers the the base class and drivers: ibase mysql odbc psql sqlite tds Fixes for the remaining drivers will follow. Change-Id: Id8e7ec4205b0ca6cd00bd022c9cd24f137089245 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* QSqlDriverPrivate clean-upMark Brand2013-04-041-15/+10
| | | | | Change-Id: Ia6cbb37330bc0beed7498e43cd18bb2a1afb8e3d Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* iOS: Handle UIDeviceOrientation vs UIInterfaceOrientationTor Arne Vestbø2013-04-043-3/+3
| | | | | | | | | | The former represents the physical device orientation, the latter the UI orientation. We need to explicitly cast between them, as they are different enums, but with compatible values for the subset we use. Change-Id: I2926068802f35680cb6de5ced6dcf286014fdb2e Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Fix warning: qt_setDockMenu not foundFrederik Gladhorn2013-04-041-0/+1
| | | | | | | | | | | | qcocoanativeinterface.mm:196:5: warning: instance method '-qt_setDockMenu:' not found (return type defaults to 'id') [-Wobjc-method-access] [NSApp QT_MANGLE_NAMESPACE(qt_setDockMenu): menu]; Change-Id: I80838d0098e7f172d9b8124f04e91dba64764318 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Android: Don't show '&' character in menusPaul Olav Tvete2013-04-041-6/+23
| | | | | | | | | Strip out shortcut indicator before showing the text. Task-number: QTBUG-30507 Change-Id: I8fa2ef8a2052f4c43d14b3babfd5aca0a08e29d5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Doc: Fix network/torrent example to work on Qt 5Topi Reinio2013-04-044-36/+31
| | | | | | | | | | | | | | | | | | This change fixes two issues in the torrent example: - Correctly use a query constructed from the announce url to fetch the list of peers (using QUrlQuery). - Reimplement QAbstractSocket's connectToHost() and disconnectFromHost() which are virtual in Qt 5, instead of of using the protected connectToHostImplementation() / disconnectFromHostImplementation() slots. Also removes a warning about deprecation of QHttp class as it's no longer used in this example. Task-number: QTBUG-30329 Change-Id: I9230cd2204bfc1a66f2ea3e98940b09681df250e Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* Include PRECOMPILED_DIR in dirs fixed by fixExclusiveOutputDirs()Tor Arne Vestbø2013-04-031-1/+1
| | | | | | | | | It's written to qmodule.pri by configure with a hard-coded path, and hence need fixing up or appending, depending on which exclusive builds are used. Change-Id: I069c04438dc303868a76349c9bdd385adc074c0a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* QPA/Mac: Fix resources leakingKonstantin Ritt2013-04-033-7/+13
| | | | | | | | | | | Having static QFont instance leads to a resources leaking, since QFontCache is unable to clean-up font engines when the application exits. Relates to QTBUG-25434 Change-Id: I71d91094de27c07ab2434c415e4c28b6acab3646 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-04-0313-20/+88
|\ | | | | | | refs/staging/stable
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-0313-20/+88
| |\ | | | | | | | | | Change-Id: Icedabda08961326a0a447ec71f1b0f0f5df075eb
| | * Boxes: Check for opengl version in .pro fileKai Koehne2013-04-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that people get an understandable error message when trying to compile the boxes demo with e.g. ANGLE. Task-number: QTBUG-30406 Change-Id: I0ba0e26e424d768f95d7977862d9f2c4e85b41fb Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| | * Changelog: add entry for QTBUG-29759Olivier Goffart2013-04-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-5.0.2 Change-Id: Ibdb85dd908368f15530db31b47c901d952bb6d93 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Fix gcc OOM error when compiling in release modeKai Koehne2013-04-021-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | O3 leads to gcc bailing out with OOM on e.g. MinGW with gcc 4.7.3 onwards. Task-number: QTBUG-29099 Change-Id: I3ce49794fa4857e756d2994454d4144cfb44ce58 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * write qmake/configure/buildsystem 5.0.2 changelogOswald Buddenhagen2013-03-291-4/+35
| | | | | | | | | | | | | | | Change-Id: I4d43cb1e833a4c3bc0d9f22e96f4053632ef744b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * qdoc: Use 'org.qt-project.' prefix in namespaceSergio Ahumada2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | Standarize the qdoc namespace to match all the others configurations. Change-Id: I364d41f20084b77ab3805e72c870147c05da1d42 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Changelog 5.0.2: Add Windows-specific changes.Friedemann Kleint2013-03-261-0/+6
| | | | | | | | | | | | | | | Change-Id: I6578b13d27373931107572f82458fc6d006cd86b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Revert "qclass_lib_map.h: Fix include of the QDeclarativeView widget."Friedemann Kleint2013-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7b655eef489038a96c5c5ba2e80d6129eca3cf41. QDeclarativeView is back in QDeclarative. Task-number: QTBUG-25196 Change-Id: Ibe40e790c98b5129bbd844924f71cf3ca0202b5f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| | * qt.conf: default LibraryExecutables to bin/ on windowsOswald Buddenhagen2013-03-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this matches the platform-specific configure default. as a "side effect", this fixes the in-builddir execution of webkit examples, as the non-installed qmake now agrees with QLibraryInfo about the location of QWebProcess.exe. Task-number: QTBUG-30322 Change-Id: Id28f2c246e4bfda6d5f4d719a66a16f24bb7cdb7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| | * Windows: Fix reported screen metrics.Friedemann Kleint2013-03-262-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | A call to SetProcessDPIAware() is required in some cases. Task-number: QTBUG-30063 Change-Id: Iba0203d76c8e7068bf9fd4581770c1aca76a4708 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| | * make the libexec default on windows bin/ after allOswald Buddenhagen2013-03-262-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the dlls being in lib/ is kind of an accident (a side effect of how qmake builds them). in fact, the libdir should be entirely irrelevant for windows deployments (and indeed, the SDK is delivered with dlls only in bin/). Change-Id: If47e72b24774721a61ba63847f6132f88ff110be Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| | * Doc: Fix typo in the property system documentationTopi Reinio2013-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | priorty -> priority Task-number: QTBUG-28756 Change-Id: I79138f49db78ee6d1b96e44585ae4c1565920b18 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Doc: Changed title of Qt Print Support's C++ Classes page.Jerome Pasion2013-03-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | -old title created broken links in Assistant. -conforms to Qt 5 naming scheme. Change-Id: Iaf619c1264edc1f9d2fd24f7031fe6c07efd2c1d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * ensure that each module has a .qmake.cache when properly qmake'dOswald Buddenhagen2013-03-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | this makes properly configured modules (whose top-level project file was evaluated) uniformly recognizable. Change-Id: Ib127df2becb2ff7f51ee8cc5a194ff168b41c227 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Load sdk.prf first, if enabled, so that other features can use QMAKE_CXXTor Arne Vestbø2013-04-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Extra-compilers such as objective_c.prf may reference QMAKE_CXX, so we need to sysroot it before it's used. Change-Id: I1e367b3d0816096300a441786619f298134de0a6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Doc: Replaced canConvert() with canConvert(Int)Venu2013-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change amends my earlier change to make the function reference relevant to the example being discussed. Task-number: QTBUG-28204 Change-Id: I841a561ba117f83a96b8b4a3661cea2a7a3e47da Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | If the menu item is merged then we should not release itAndy Shaw2013-04-031-2/+2
|/ / | | | | | | | | | | | | | | | | | | When a menu item is merged then we do not want to release it as it will cause a problem with the Application menu. Therefore we just hide it instead. Change-Id: Ia9f7acfe063001111769841c9a360cac369f7ed7 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Fix Qt tests for Android.BogDan Vatra2013-04-035-31/+87
| | | | | | | | | | Change-Id: I53856056a00684a9a37596a74b79f46d3b47331f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Also version.xml needs to be installedBogDan Vatra2013-04-031-0/+1
| | | | | | | | | | | | | | | | | | This file is used by QtCreator to decide if the java files need to be updated. Change-Id: Ib4875c32a071dd768f89950582c81ccdd420feca Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | ApplicationState: Add new event class: ApplicationStateChangeEventRichard Moe Gustavsen2013-04-035-5/+43
| | | | | | | | | | | | | | | | | | | | | | This patch will follow up on e27ca37 (add more state to QT::ApplicationState), and add a new event class QApplicationStateChangeEvent with type Qt::ApplicationStateChange. Change-Id: Idee724f181f1fbb2321ddad7e0df00c88b3488b1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | qdoc: Use Q_QDOC in quuid.h to help qdocMartin Smith2013-04-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Some new ctor initializers were added that use curly braces. qdoc's dumb C++ parser can't handle curly braces in the ctor area; it thinks they are the body of the function. In this update, the Q_QDOC macro is used to isolate these problems so qdoc doesn't have to deal with them. Task-number: QTBUG-30254 Change-Id: Ie318e4ac58861f4ebd8a7b9f004d2677f850436e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Make sure QThreadData and QAdoptedThread object is destroyed at app exitjian liang2013-04-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-30134 Restore the lines in qcoreapplication.cpp removed by commit 950b35cf97ad398f97883efd2a18ee97994a8a9c to ensure QThreadData and QAdoptedThread object of main thread is destroyed at application exit. We don't set QCoreApplicationPriavte::theMainThread to 0 as before since it will be set to zero in QThreadData::~QThreadData() Change-Id: I8ee56aff5a933ce1d812b07fb00a29ed0839ab6e Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Doc: Fix the documentation for QWindow::focusObjectChanged()Topi Reinio2013-04-031-3/+3
| | | | | | | | | | | | | | | | Fix the documented function signature to match the declared one. Task-number: QTBUG-30398 Change-Id: I0d4894e2597f70e29a3edd4ceda91a4dddb9941e Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Correct location of mtdev define.Robin Burchell2013-04-031-1/+1
| | | | | | | | | | | | | | | | evdevtouch moved to platform support, so the location in the plugin is now wrong (as was the file name) Change-Id: I976f5d7ee68f5da5ed1f61773b3d5da683e12c6f Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | make bootstrapping of qdoc optionalOswald Buddenhagen2013-04-032-2/+4
| | | | | | | | | | | | | | the weird QLibraryInfo dependency is gone. Change-Id: Iebaa5af6bc529999a2415b2ce3d2a5dca362dd5a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | add qcryptographichash to bootstrap libOswald Buddenhagen2013-04-032-4/+5
| | | | | | | | | | | | | | needed to make qdoc bootstrapping optional Change-Id: Ie630d129ed038fd90078197588a6df723eddf553 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 22:29:03 +0000