summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-10-03Fix the text field alignment.BogDan Vatra1-2/+0
All Android styled controls must use AndroidControl methods. Task-number: QTBUG-41722 Change-Id: I594829bfed8468888738b39450fe94af35f14d7a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2014-10-03Enable the qmdiarea test on X11Paul Olav Tvete2-13/+2
Task-number: QTBUG-25298 Change-Id: Iec7591e9e84951a1aea47590aaedaac877cd111e Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-10-03Pass a sized format when creating multisampled renderbuffers on ESLaszlo Agocs3-15/+18
Task-number: QTBUG-40921 Change-Id: I96b05442dd5928992dab06553b3d41feca89084d Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2014-10-03Refactor tst_QFiledialog::completer().Friedemann Kleint1-48/+32
- Streamline code and remove code that has no effect. - Create temporary directory and files only when it is actually required (empty start path). - Remove try/catch as it is not commonly used in Qt autotests. Its original purpose was apparently to ensure temporary file cleanup, but that should now work since smart pointers are used for temporary files and directories. - Introduce variable for case sensitivity. Task-number: QTBUG-41681 Change-Id: Ie5f621c30fc461b880292b853e0660b8fba316eb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-10-02QRegion: fix a valgrind warningMarc Mutz1-1/+1
When: - i == 0 (at end of current POINTBLOCK), - numFullPtBlocks == 1 (only one more POINTBLOCK left) and - iCurPtBlock == 0 (last block contains no points), Valgrind rightfully complained about an invalid read: Conditional jump or move depends on uninitialised value(s) at 0x517B08B: PolygonRegion(QPoint const*, int, int) (qregion.cpp:3480) Fixed by setting 'next' to nullptr when !numFullPtBlocks OR !iCurPtBlock. Change-Id: If5225fdfa66f2910a8aafb675cd02b40c0a81ad9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2014-10-02Remove wrong unneeded definition in qopenglextensions_p.hAllan Sandfeld Jensen1-12/+0
The types are already defined by qopengl.h, and the GLchar could be incorrectly defined in the Qt namespace for GLES2 namespaced builds. Change-Id: Ia2052599538af51fdadc434935d51bbfe8437453 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-10-02iOS: Move statusbar visibility handling to QIOSViewControllerTor Arne Vestbø7-59/+71
It doesn't belong in QIOScreen, and simplifies the flow when changing the focus window or the window state of the focus window. Both will result in calling updateProperties on the view-controller, which will re-configure the statusbar visibility and hide/show it as appropriate, before triggering a re-layout of its own view, which will in turn trigger an update of the screen properties based on the new statusbar state, before re-layouting of QWindow based on the new screen state. Change-Id: I89077a3fb5f843949ce833e4e727d2c753ea2eb6 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2014-10-02Revert "Don't generate documentation for classes which are not available"Venu1-9/+0
This reverts commit dbbb4d1654ab9deec6a940d3c7304808bd425422. This change should enable QDoc to generate documentation for the Mac-specific widgets, QMacCocoaViewContainer and QMacNativeWidget. Change-Id: If0dd6530906e3e13921384372badc73ba4727b9d Reviewed-by: Andy Shaw <andy.shaw@digia.com>
2014-10-02Doc: Removed a few references to the outdated featuresVenu1-8/+1
OpenVG support and the -graphicssystem command-line option is not available since Qt 5.0. Change-Id: I19c89cd3bb2c4a2215cdfae9fd783dece637b30f Task-number: QTBUG-41265 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-10-02Update the signal and slots docsAlex Blasche1-7/+4
This lifts the documentation into a more recent context. One might argue that Qt is a little bit older too. Change-Id: I3e85f21bbad1179136629c2025e3499481fc8334 Task-number: QTBUG-16809 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-10-02Windows: Transform regions of window masks correctly.Friedemann Kleint1-1/+1
Add missing transformation for first rectangle of a region consisting of multiple rectangles. Task-number: QTBUG-41300 Change-Id: I1a25c422c93ceade79de79d5c49891e0a7211943 Reviewed-by: MihailNaydenov <garfieldhq@yahoo.com> Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-02Warn when loading opengl32sw.dll failsKai Koehne1-1/+3
Print a warning when the developer/user has explicitly requested the software backend, but loading openglsw.dll fails. Change-Id: I8b1f079538ac70ceacbf1a397a276659c760a4cc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-10-02Android: Don't include Apache code under LGPLv2 licenseEskil Abrahamsen Blomfeldt7-24/+154
The code which extracts style assets for the Android style is licensed under the Apache license, which is not compatible with LGPLv2.1. It is, however, compatible with LGPLv3. This means that the Android platform plugin cannot be LGPLv2.1 as long as this code is included. To minimize licensing confusion, we default to only providing LGPLv3 for Android. If you want to build a LGPLv2.1-compatible library, you can add -no-android-style-assets to the configuration. This will in turn enable the LGPLv2.1 in the configure output, and it will disable the extraction code in the platform plugin. Running the Android style with an LGPLv2.1-compatible platform plugin will work, but it will look horrible. [ChangeLog][Android] Default open-source license for Qt for Android is now LGPLv3. For compatibility with the LGPLv2.1 license, add "-no-android-style-assets" to your configuration. Change-Id: I6c7b52140f38138520871fa7c69debbb4ee90e6c Task-number: QTBUG-41365 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-10-02Remove existence test for LICENSE.LGPL3Eskil Abrahamsen Blomfeldt2-14/+6
This license file has to exist, since much of the code is licensed under LGPLv3. Change-Id: I2795a7cc62f6de65a35921e38d2ab5f8f0233f71 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-10-01configure: Disable pkg-config on OS X unless explicitly requestedTor Arne Vestbø1-3/+6
We don't have an explicit XPLATFORM_OSX, but XPLATFORM_MAC applies to both OS X and iOS (as now clarified), so we move the default out of the XPLATFORM_IOS scope and to a XPLATFORM_MAC scope. Change-Id: I6b9ba9c881c28def08b9ab863d0165fbd9dedc6d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-10-01Use PopupMenu when possible.BogDan Vatra9-35/+228
On API-11+ we are going to use PopupMenu instead of ContextMenu to show context menus. A PopupMenu displays a Menu in a modal popup window anchored to a View. The popup will appear below the anchor view if there is room, or above it if there is not. Task-number: QTBUG-39736 Change-Id: Ie412ab0935b868348ce5c8bb0bf53571ffefd582 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2014-10-01Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Gabriel de Dietrich30-67/+221
2014-10-01Logging: Disable tracking of debug source info for release buildsKai Koehne6-24/+95
Tracking the file, line, function means the information has to be stored in the binaries, enlarging the size. It also might be a surprise to some commercial customers that their internal file & function names are 'leaked'. Therefore we enable it for debug builds only. [ChangeLog][QtCore][Logging] File, line, function information are not recorded anymore for logging statements in release builds. Set QT_MESSAGELOGCONTEXT explicitly to enable recording in all configurations. Change-Id: I454bdb42bcf5b5a8de6507f29f2a61109dca9b91 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2014-10-01Doc: fix misleading documentation of QProcess::set[Process]EnvironmentJoerg Bornemann2-12/+7
The example suggested that QProcess searches the PATH variable to find the executable for the child process. That's not true. The environment that's passed with setProcessEnvironment is just passed to the child process. Removed the misleading example and fixed the function's description. Task-number: QTBUG-7321 Change-Id: I8ac4b6b02002eb0a99686f09bcf45f9bc677c8e2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-10-01Fix regression in metric calculation of text with mnemonicsAllan Sandfeld Jensen2-5/+13
Even when we do not intend to display the text, we still need to go through the processing of mnemonics to remove them from the text. Instead of capping the max underlines to 0, the TextDontPrint option now just saves adding the underline formats. Task-number: QTBUG-41593 Change-Id: I67790650dbed0092de2c63e5d5a9349dc02d5846 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-09-30Fix hangs on QFileSystemWatcher.Leonard Lee1-0/+1
QFileSystemWatcher hangs at a mutex or semaphore when adding network paths on OS X system. There is an else block that does not increment the 'it' iterator with ++it; inside the QFseventsFileSystemWatcherEngine::checkDir() call. Change-Id: I6c250c7f3d25399c3a0a58ce864e9466320b166b Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2014-09-30Doc: Adding API reference section in Qt Platform Headers page.Jerome Pasion1-0/+5
-better visibility to the page. Change-Id: Ibc1a9991fa7a8fda04827607edfd258e4595ad7e Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-09-30Extend QOpenGLVertexArrayObjectHelper to support glIsVertexArraysAllan Sandfeld Jensen2-1/+13
This is needed for dynamicgl support in QtWebKit. Change-Id: I4d1769394ccdeaf449cac4f002c03ca8013f62f6 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-09-30Don't dpi-scale -1 pixel metricsOswald Buddenhagen1-5/+2
It may be rounded down to 0, thus losing its magic value. Task-number: QTBUG-41324 Change-Id: I5a5b98bb24bd0478c10940a90a7dc691e2663f4d Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2014-09-30micro-optimization: make use of qtPrepareTool()'s new modeOswald Buddenhagen1-3/+3
avoids that we needlessly initialize QMLIMPORTSCANNER in addition to QMLIMPORTSCANNER_SYS (by making the former have the contents of the latter). Change-Id: Ib8a12975de426ae94bd78d489099157c94cea189 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-09-30use correct quoting style when running syncqt under mingwOswald Buddenhagen2-7/+9
to this end, add a mode to qtPrepareTool() which prepares the primary variable for system() use (instead of use in makefiles). Task-number: QTBUG-41032 Change-Id: If6aa6c206a70ecdbc2ea05bbb3cb470414fb02b1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-30kms: Support QOpenGLWidget and QQuickWidgetLaszlo Agocs9-17/+99
Also fixes the handling of shareContext() for contexts and format() for windows and makes QOffscreenSurface working. Change-Id: I3c3374a9de14a5b8428de3e11d9d7e1285c5b9c7 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2014-09-30kms: Support non-64x64 cursorsLaszlo Agocs2-8/+25
Task-number: QTBUG-41477 Change-Id: I10a519d8560c909e87ba2f673d2da4106ce93b71 Reviewed-by: Louai Al-Khanji <louai.al-khanji@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-09-30qdoc: Restore navigation bar titles for QML, QML basic typesTopi Reinio1-10/+4
Re-add the name of a QML type/QML basic type to the navigation bar. Change-Id: Ia0ced775099f1ed4071ae9a922d808b9114c10ea Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-09-30Doc: Use title case in section1 titlesNico Vertriest49-110/+110
Using Python script title-cased.py Task-number: QTBUG-41250 Change-Id: I00d3d7a0b30db7304a7904efd6d63abd9a7b493b Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-09-30Make QAccessible compile with -Werrorhjk1-0/+6
GCC was bailing out when attempting to merge this into the dev branch due to the use of "potentially uninitialized values". Change-Id: Id2fc4a123a4b180b9ab439429a0d20245c7ee41b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-09-30QMdiArea: Fix positioning of cascaded sub windows.Friedemann Kleint2-21/+20
Take PM_FocusFrameVMargin into account. Task-number: QTBUG-35146 Change-Id: I1499790537ddf9fbb912ab764b7d049ee11af95d Reviewed-by: Andy Shaw <andy.shaw@digia.com>
2014-09-30Additional support for devicePixelRatio in CE_MenuItem’s icon paintingMihailNaydenov6-12/+12
FusionStyle and MacStyle have this already, the change just brings it to the others. Task-number: QTBUG-40277 Change-Id: I08dc80771b9cd0ab47179e1994ab6510b022eade Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-09-30QSql changes for Qt 5.4.0 changelogMark Brand1-0/+7
Change-Id: I3b2b7b6bbe1089e51f71b5873d004b8f20f41d33 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
2014-09-30Handle PPK_CustomBase in QWin32PrintEngine::propertyUlf Hermann1-0/+3
If we leave out the default so that the compiler catches missing enum values we should actually handle them all ... Change-Id: Ieb4992dec84ce847e48ab3c4a94bd8825a148706 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
2014-09-30Make qopenglwidget example functional without timers tooLaszlo Agocs3-1/+34
Change-Id: I6a89eaf794202c45a5ad3152d304e46041704730 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
2014-09-30Fix losing dirty state when calling update() from paintGL()Laszlo Agocs1-1/+6
When the paint for the QOpenGLWidget was in invoked on the fast path, where only that widget was dirty, the resetWidget call after sending the paint event removed the widget from the dirty list, making it impossible to schedule an update during the event handling. The correct way is to clean the list and then send the paint events. Change-Id: Icdad5686ded7944fd1c8af56496f725e163a60e6 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
2014-09-29uic: Add QOpenGLWidget.Friedemann Kleint1-0/+1
Change-Id: I02cb6bd4a038b865fa414fa557b12e369685248f Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-09-29Make QRegion::shared_empty constMarc Mutz2-18/+13
Continuing the trend of QString, QVector, etc. Change-Id: I8f53d4abfa0dd941bfdfd3c1a9049a42dbf92691 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-09-29xcb: Fix detecting the fullscreen state from _NET_WM_STATE flagsAlexander Volkov1-3/+3
A fullscreen window can have maximized flags being set so first check the NetWmStateFullScreen flag. Change-Id: Ia802abf3cfa4c784baa2d55088e3f53310f0362e Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2014-09-29Fix build when using -WerrorSérgio Martins1-3/+6
"accessible/qaccessible.cpp:2154:43: error: 'type' may be used uninitialized in this function [-Werror=maybe-uninitialized]" Compiler doesn't seem very smart, all enumerators are handled in the switch already. Observed on android's gcc and gcc-4.7 on GNU/Linux Change-Id: I30b4660c18992158457cada01b5916aa4feae4ff Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-09-29Update the detection of when to log to stderrThiago Macieira2-49/+59
On Windows, the detection changes only by inserting the use of the environment variable before the existing tests and removing the check on stderr. This commit adds logic similar to Windows's: if the application has a controlling TTY, we'll use stderr. Otherwise, we'll use the system log. This is technically a change in behavior: previously, we would always use the system log, unless the environment variable told us not to. In practice, the behavior doesn't really change: Android and BlackBerry and systemd-spawned applications are launched with no controlling TTY, so logging will go to their logging systems. [ChangeLog][Important behavior changes][Logging (including qDebug and qWarning)] Log output will now go to the system log (if support for it was compiled into Qt) if the application has no controlling terminal or console window. Set QT_LOGGING_TO_CONSOLE to 1 to force logging to go to stderr. Task-number: QTCREATORBUG-12564 Change-Id: I043c5c4f47c15f26d4f4a5cf43df466ea38cdbc7 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29Revert "winrt: Remove depth/stencil from the default window format"Andrew Knight1-0/+2
This reverts commit 636d2e340206664a5885656c06e1ae9eb032d446. The issue was caused by a bug in ANGLE, not a lack of hardware support. Change-Id: If2a66cd023dc7f2329dc2812169042487eecd428 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
2014-09-29ANGLE: Upgrade to 2.1~abce76206141Andrew Knight279-16864/+18249
Upgrade to address issues discovered since the last upgrade. Patch notes: 0000-General-fixes-for-ANGLE-2.1.patch added removal of the unused third-party tracing functions 0003-Fix-compilation-with-MinGW-gcc-64-bit.patch removed as it is no longer needed 0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch removed as it is no longer needed 0016-ANGLE-Fix-compilation-with-MinGW-D3D11.patch now supports MinGW 64-bit [ChangeLog][Third-party libraries] ANGLE updated to 2.1~f8602ad91e4f Task-number: QTBUG-40649 Task-number: QTBUG-40658 Task-number: QTBUG-41031 Task-number: QTBUG-41081 Task-number: QTBUG-41308 Task-number: QTBUG-41563 Change-Id: I9f776c8d5cb94ddb12d608a8d5630bfc54437bea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29vcxproj: fix custom build steps in different build variantsJoerg Bornemann2-28/+47
There's a comment in VCXProjectWriter::outputFileConfigs that states: "We need to check if the file has any custom build step. If there is one then it has to be included with 'CustomBuild Include'". This patch adds the code to the comment... Task-number: QTBUG-30373 Change-Id: Ibfef3c80630e08c743bfadce299a8b6a0c58411f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-09-29introduce VCFilter::findFileJoerg Bornemann3-16/+18
Move common code into a function and exit early from simple search loop. Change-Id: I88d1227653e28badc213fbe4ebe1e2a19f6e5793 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-29remove unused member VCFilter::CustomBuildJoerg Bornemann2-16/+0
Change-Id: I2b57f0ac020ad1b85ffeb76a214b9cf2f48cb6d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-29cocoa: override new QPlatformMenu::popup() functionRichard Moe Gustavsen2-2/+3
Having two versions of popup, one that takes a point and one that takes a target rect, causes problems for client code if they use the 'target rect' version since not all platforms override that function. So this patch will change the remaining platform that override QPlatformmenu into using the new 'target rect' version. Calling the old version that takes a point will still work, since the base version will then convert the point into a zero-sized rect, and forward the call to the 'target rect' version instead. Change-Id: Icc8531d79270a4f24ec08b8ed95b18ed3db1ad4d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-09-29Do not use Q_COMPILER_CLASS_ENUM for gcc 4.4hjk1-1/+1
It breaks the compiler self-test: tst_compiler.cpp:754: error: no matching function for call to ‘qCompare(tst_Compiler::cxx11_class_enum()::X&, tst_Compiler::cxx11_class_enum()::X, const char [2], const char [13], const char [17], int)’ We not should assume it is safe to use, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=38064 and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=37946. Change-Id: I72c9c56e3e4f62bdfdfa133b6b0a2e610b5331c8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2014-09-29xcb: Fix logic for minimized stateAlexander Volkov1-0/+4
_NET_WM_STATE message can be received by a window in the minimized state. Don't change the window state in this case. Task-number: QTBUG-31117 Task-number: QTBUG-39376 Task-number: QTBUG-34430 Change-Id: Ic77a345e442891972b692803fab1e2f6aef30433 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 20:09:45 +0000